From 22d8e6d17a2ec4752f180245186409790e273593 Mon Sep 17 00:00:00 2001
From: Randy Woods <randy1@radiorandy.com>
Date: Mon, 2 Feb 2026 10:12:46 -0500
Subject: [PATCH] More SSG cleanup for multi-sector

---
 .../Demographic/DemographicBusinessTests.cs   | 12 +++----
 .../Demographic/DemographicBusiness.cs        |  2 +-
 .../Maturity/CpgBusiness.cs                   | 34 +++++++++----------
 .../CSETWebCore.Helpers/CpgStructure.cs       |  2 +-
 .../MaturityStructureForModel.cs              |  5 +++
 .../Assessment/Demographics.cs                |  6 +++-
 .../Controllers/DemographicsController.cs     |  2 +-
 .../assessment-config-iod.component.ts        |  1 +
 .../assessment-demographics.component.ts      | 24 ++++++-------
 .../assessment-detail.component.ts            |  1 +
 .../demographics-iod.component.ts             | 10 ------
 .../csi-service-demographics.component.ts     |  9 ++++-
 .../cpg-practices/cpg-practices.component.ts  |  4 ++-
 .../cpg-summary/cpg-summary.component.html    | 10 +++---
 .../cpg/cpg-summary/cpg-summary.component.ts  |  3 +-
 .../src/app/models/assessment-info.model.ts   |  4 +--
 .../src/app/models/demographics-iod.model.ts  |  2 +-
 .../cpg-deficiency.component.ts               |  2 +-
 .../cpg/cpg-report/cpg-report.component.html  |  4 +--
 .../cpg/cpg-report/cpg-report.component.ts    |  3 +-
 .../src/app/reports/edm/edm.component.ts      |  4 +++
 .../src/app/services/demographic.service.ts   | 16 +++------
 CSETWebNg/src/app/services/ssg.service.ts     | 25 +-------------
 CSETWebNg/src/assets/i18n/en.json             |  6 ++--
 CSETWebNg/src/assets/i18n/reports/en.json     |  6 ++--
 25 files changed, 91 insertions(+), 106 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business.Tests/Demographic/DemographicBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business.Tests/Demographic/DemographicBusinessTests.cs
index 5ffe0b4622..9208fbeba8 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business.Tests/Demographic/DemographicBusinessTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business.Tests/Demographic/DemographicBusinessTests.cs
@@ -249,7 +249,7 @@ public void GetDemographics_ReturnsBasicDemographics_WhenNoExtendedDataExists()
             // Assert
             Assert.NotNull(result);
             Assert.Equal(assessmentId, result.AssessmentId);
-            Assert.Empty(result.SsgSectorIds);
+            Assert.Empty(result.SsgModelIds);
         }
 
         [Fact]
@@ -278,10 +278,10 @@ public void GetDemographics_LoadsSsgSectors_WhenSsgDataExists()
 
             // Assert
             Assert.NotNull(result);
-            Assert.Equal(3, result.SsgSectorIds.Count);
-            Assert.Contains(1, result.SsgSectorIds);
-            Assert.Contains(2, result.SsgSectorIds);
-            Assert.Contains(3, result.SsgSectorIds);
+            Assert.Equal(3, result.SsgModelIds.Count);
+            Assert.Contains(1, result.SsgModelIds);
+            Assert.Contains(2, result.SsgModelIds);
+            Assert.Contains(3, result.SsgModelIds);
         }
 
         [Fact]
@@ -321,7 +321,7 @@ public void SaveDemographics_RemovesAndReplacesSSGSectors()
             var demographics = new Demographics
             {
                 AssessmentId = assessmentId,
-                SsgSectorIds = new List<int> { 1, 2, 3 }
+                SsgModelIds = new List<int> { 1, 2, 3 }
             };
 
             var existingSSG = new List<DETAILS_DEMOGRAPHICS>
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs
index bc3b909cac..ff66f589e4 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Demographic/DemographicBusiness.cs
@@ -82,7 +82,7 @@ public Demographics GetDemographics(int assessmentId)
             }
 
 
-            demographics.SsgSectorIds.AddRange(new CpgBusiness(_context, "en").DetermineSsgModels(assessmentId));
+            demographics.SsgModelIds.AddRange(new CpgBusiness(_context, "en").DetermineSsgModels(assessmentId));
 
 
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CpgBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CpgBusiness.cs
index a3bb550459..2686a84951 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CpgBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CpgBusiness.cs
@@ -123,33 +123,33 @@ private List<Series> InitializeSeries()
         /// <summary>
         /// Figures out if an SSG model is applicable as a bonus.
         /// The SSG is based on the assessment's sector.
-        /// Returns null if no SSG is applicable.
+        /// Returns an empty list if no SSG is applicable.
         /// </summary>
         /// <returns></returns>
         public List<int> DetermineSsgModels(int assessmentId)
         {
-            List<int> list = [];
-
-            var ddSectors = _context.ASSESSMENT_SECTOR_SUBSECTOR.Where(x => x.Assessment_Id == assessmentId).ToList();
-
-            foreach (var s in ddSectors)
+            var sectorToModelMap = new Dictionary<int, int>
             {
-                // CHEMICAL
-                var chemicalSectors = new List<int>() { 1, 19 };
-                if (chemicalSectors.Contains((int)s.SectorId))
-                {
-                    list.Add(Constants.Constants.Model_SSG_CHEM);
-                }
+                { 1, Constants.Constants.Model_SSG_CHEM },
+                { 19, Constants.Constants.Model_SSG_CHEM },
+                { 13, Constants.Constants.Model_SSG_IT },
+                { 28, Constants.Constants.Model_SSG_IT },
+            };
+
+            var ssgModels = new HashSet<int>();
+            var sectors = _context.ASSESSMENT_SECTOR_SUBSECTOR
+                .Where(x => x.Assessment_Id == assessmentId)
+                .ToList();
 
-                // INFORMATION TECHNOLOGY (IT)
-                var itSectors = new List<int>() { 13, 28 };
-                if (itSectors.Contains((int)s.SectorId))
+            foreach (var sector in sectors)
+            {
+                if (sectorToModelMap.TryGetValue((int)sector.SectorId, out var modelId))
                 {
-                    list.Add(Constants.Constants.Model_SSG_IT);
+                    ssgModels.Add(modelId);
                 }
             }
 
-            return list;
+            return ssgModels.ToList();
         }
 
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CpgStructure.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CpgStructure.cs
index 9d6b58f5e5..e2ad645b94 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CpgStructure.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CpgStructure.cs
@@ -110,7 +110,7 @@ private void LoadStructure()
             Top.ModelName = mm.Model_Name;
             Top.ModelId = (int)this.ModelId;
 
-            Top.TechDomain = _context.DETAILS_DEMOGRAPHICS.Where(x => x.DataItemName == "TECH-DOMAIN").FirstOrDefault()?.StringValue ?? null;
+            Top.TechDomain = _context.DETAILS_DEMOGRAPHICS.Where(x => x.Assessment_Id == this.AssessmentId && x.DataItemName == "TECH-DOMAIN").FirstOrDefault()?.StringValue ?? null;
 
 
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs
index fb5b7ad61b..d77c2f7070 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/MaturityStructureForModel.cs
@@ -195,6 +195,7 @@ private void GetSubgroups(object oParent, int? parentID)
                         DisplayNumber = myQ.Question_Title,
                         ParentQuestionId = myQ.Parent_Question_Id,
                         QuestionType = myQ.Mat_Question_Type,
+                        IsAnswerable = myQ.Is_Answerable,
                         AnswerText = answer?.Answer_Text,
                         AltAnswerText = answer?.Alternate_Justification,
                         Comment = answer?.Comment,
@@ -260,6 +261,9 @@ private List<Question> GetFollowupQuestions(int parentId)
                     DisplayNumber = myQ.Question_Title,
                     ParentQuestionId = myQ.Parent_Question_Id,
                     QuestionType = myQ.Mat_Question_Type,
+                    IsAnswerable = myQ.Is_Answerable,
+                    AnswerText = answer?.Answer_Text,
+                    AltAnswerText = answer?.Alternate_Justification,
                     Comment = answer?.Comment ?? "",
                     Options = GetOptions(myQ.Mat_Question_Id)
                 };
@@ -323,6 +327,7 @@ private List<Option> GetOptions(int questionId)
                         ParentQuestionId = myQ.Parent_Question_Id,
                         ParentOptionId = myQ.Parent_Option_Id,
                         QuestionType = myQ.Mat_Question_Type,
+                        IsAnswerable = myQ.Is_Answerable,
                         Options = GetOptions(myQ.Mat_Question_Id)
                     };
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs
index 13a1faa30e..5dd93c28df 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Assessment/Demographics.cs
@@ -30,7 +30,11 @@ public class Demographics
         public List<SectorSubsector> SectorSubsectors { get; set; } = [];
 
 
-        public List<int> SsgSectorIds { get; set; } = [];
+        /// <summary>
+        /// The list of all in-scope SSG models due to the assessment's
+        /// current state.
+        /// </summary>
+        public List<int> SsgModelIds { get; set; } = [];
 
 
         public int? Size { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs
index 94c61d0de4..b7dbfe8b22 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/DemographicsController.cs
@@ -88,7 +88,7 @@ public IActionResult Post([FromBody] Demographics demographics)
                 });
             }
 
-            return Ok(assessmentId);
+            return Ok(_demographic.GetDemographics(assessmentId));
         }
 
 
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts
index 0bb7c35e87..47635bbb2f 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts
@@ -36,6 +36,7 @@ export class AssessmentConfigIodComponent implements OnInit {
   ngOnInit() {
     this.demoSvc.getDemographic().subscribe((data: any) => {
       this.demographics = data;
+      this.assessSvc.assessment.ssgModelIds = data.ssgModelIds;
     });
 
     this.iodDemoSvc.getDemographics().subscribe((data: any) => {
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts
index 48a24c972d..d7001c09d1 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts
@@ -107,11 +107,15 @@ export class AssessmentDemographicsComponent implements OnInit {
         if (this.demoSvc.id) {
             this.getDemographics();
         }
+        
         this.refreshContacts();
         this.getOrganizationTypes();
     }
 
-    // Functionality to import demographic information, excluding contacts, organization point of contact, facilitator, critical service point of contact 
+    /**
+     * Functionality to import demographic information, excluding contacts, 
+     * organization point of contact, facilitator, critical service point of contact 
+     */
     importClick(event) {
         let dialogRef = null;
         this.unsupportedImportFile = false;
@@ -134,19 +138,12 @@ export class AssessmentDemographicsComponent implements OnInit {
     }
 
 
-    //Functionality to export demographic information, excluding contacts, organization point of contact, facilitator, critical service point of contact 
-    exportClick() {
-        this.demoSvc.exportDemographics()
-    }
-
     /**
-     * 
+     * Functionality to export demographic information, excluding contacts, 
+     * organization point of contact, facilitator, critical service point of contact 
      */
-    onChangeSsg(list: number[]) {
-        this.demographicData.ssgSectorIds = list;
-        this.assessSvc.assessment.ssgSectorIds = list;
-        this.assessSvc.assessmentStateChanged$.next(this.c.NAV_REFRESH_TREE_ONLY);
-        this.updateDemographics();
+    exportClick() {
+        this.demoSvc.exportDemographics()
     }
 
     /**
@@ -156,6 +153,8 @@ export class AssessmentDemographicsComponent implements OnInit {
         this.demoSvc.getDemographic().subscribe(
             (data: Demographic) => {
                 this.demographicData = data;
+                this.assessSvc.assessment.ssgModelIds = data.ssgModelIds;
+
                 if (this.demographicData.organizationType == "3") {
                     this.isSLTT = true;
                 }
@@ -225,7 +224,6 @@ export class AssessmentDemographicsComponent implements OnInit {
             && (moduleBehavior?.showCriticalServiceDemog ?? true);
     }
 
-
     showEdmFields() {
         return this.assessSvc.assessment?.maturityModel?.modelName == 'EDM';
     }
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts
index 7f6a062af3..964aebcc54 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.ts
@@ -90,6 +90,7 @@ export class AssessmentDetailComponent implements OnInit {
 
     this.demoSvc.getDemographic().subscribe((data: any) => {
       this.demographics = data;
+      this.assessSvc.assessment.ssgModelIds = data.ssgModelIds;
 
 
       if (data.acknowledgement == true) {
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-iod/demographics-iod.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-iod/demographics-iod.component.ts
index 1cb8ea92c9..6e9ad65a99 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-iod/demographics-iod.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-iod/demographics-iod.component.ts
@@ -91,16 +91,6 @@ export class DemographicsIodComponent implements OnInit {
     })
   }
 
-  /**
-   * 
-   */
-  onChangeSsg(list: number[]) {
-    this.demographicData.ssgSectors = list;
-    this.assessSvc.assessment.ssgSectorIds = list;
-    this.assessSvc.assessmentStateChanged$.next(this.c.NAV_REFRESH_TREE_ONLY);
-    this.updateDemographics();
-  }
-
   /**
    * 
    */
diff --git a/CSETWebNg/src/app/assessment/prepare/csi/csi-service-demographics/csi-service-demographics.component.ts b/CSETWebNg/src/app/assessment/prepare/csi/csi-service-demographics/csi-service-demographics.component.ts
index 33369d2356..52b18aa39e 100644
--- a/CSETWebNg/src/app/assessment/prepare/csi/csi-service-demographics/csi-service-demographics.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/csi/csi-service-demographics/csi-service-demographics.component.ts
@@ -32,6 +32,7 @@ import {
 import { CsiService } from '../../../../services/cis-csi.service';
 import { ConfigService } from './../../../../services/config.service';
 import { DemographicService } from '../../../../services/demographic.service';
+import { AssessmentService } from '../../../../services/assessment.service';
 
 @Component({
     selector: 'app-csi-service-demographics',
@@ -92,7 +93,12 @@ export class CsiServiceDemographicsComponent implements OnInit {
 
   demographics: any = {};
 
-  constructor(private csiSvc: CsiService, private demoSvc: DemographicService, private configSvc: ConfigService) { }
+  constructor(
+    private assessSvc: AssessmentService,
+    private csiSvc: CsiService, 
+    private demoSvc: DemographicService, 
+    private configSvc: ConfigService
+  ) { }
 
   ngOnInit(): void {
     this.csiSvc.getAllCsiBudgetBases().subscribe(
@@ -136,6 +142,7 @@ export class CsiServiceDemographicsComponent implements OnInit {
 
     this.demoSvc.getDemographic().subscribe((data: any) => {
       this.demographics = data;
+      this.assessSvc.assessment.ssgModelIds = data.ssgModelIds;
     });
   }
 
diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.ts b/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.ts
index fc16d8d17b..a7a8db8121 100644
--- a/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.ts
+++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-practices/cpg-practices.component.ts
@@ -23,6 +23,7 @@
 ////////////////////////////////
 import { Component, OnInit } from '@angular/core';
 import { SsgService } from '../../../../services/ssg.service';
+import { AssessmentService } from '../../../../services/assessment.service';
 
 @Component({
   selector: 'app-cpg-practices',
@@ -38,6 +39,7 @@ export class CpgPracticesComponent implements OnInit {
    * 
    */
   constructor(
+    public assessSvc: AssessmentService,
     public ssgSvc: SsgService
   ) { }
 
@@ -46,7 +48,7 @@ export class CpgPracticesComponent implements OnInit {
    * 
    */
   ngOnInit(): void {
-    this.ssgBonusModels = this.ssgSvc.activeSsgModelIds;
+    this.ssgBonusModels = this.assessSvc.assessment.ssgModelIds;
   }
 
   /**
diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.html b/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.html
index 2749212767..bb34e4553a 100644
--- a/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.html
+++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.html
@@ -23,12 +23,12 @@
 <div>
     <div class="white-panel d-flex flex-column flex-11a" *transloco="let t">
         <h3 class="d-flex flex-column flex-00a">{{t('reports.core.cpg.report.performance summary')}}</h3>
-        <p>
+        <p class="mb-5">
             {{t('reports.core.cpg.report.p.a')}}
         </p>
 
 
-        <div *ngIf="assessorWorkflow">
+        <div *ngIf="assessorWorkflow" class="mb-5">
             <h4>
                 {{t('reports.core.cpg.report.compliance score')}}
             </h4>
@@ -50,7 +50,7 @@ <h4>
 
         <!-- CPG 2.0 chart/table -->
         <ng-container *ngIf="modelId == 21">
-            <div class="mb-4" *ngIf="techDomain == 'OT' || techDomain == 'OT+IT' || techDomain == null">
+            <div class="mb-5" *ngIf="techDomain == 'OT' || techDomain == 'OT+IT' || techDomain == null">
                 <h4>{{t('reports.core.cpg.ot')}}</h4>
                 <app-cpg-domain-summary [distrib]="answerDistribByDomainOt?.distrib"></app-cpg-domain-summary>
 
@@ -58,7 +58,7 @@ <h4>{{t('reports.core.cpg.ot')}}</h4>
                 <app-cpg-domain-summary-table [data]="answerDistribByDomainOt?.distrib"></app-cpg-domain-summary-table>
             </div>
 
-            <div class="mb-4" *ngIf="techDomain == 'IT' || techDomain == 'OT+IT' || techDomain == null">
+            <div class="mb-5" *ngIf="techDomain == 'IT' || techDomain == 'OT+IT' || techDomain == null">
                 <h4>{{t('reports.core.cpg.it')}}</h4>
                 <app-cpg-domain-summary [distrib]="answerDistribByDomainIt?.distrib"></app-cpg-domain-summary>
 
@@ -70,7 +70,7 @@ <h4>{{t('reports.core.cpg.it')}}</h4>
 
         <!-- SSG chart/table -->
         <ng-container *ngFor="let s of answerDistribsSsg">
-            <div class="mt-4 mb-4">
+            <div class="mt-4 mb-5">
                 <h4>{{ t('reports.core.cpg.report.ssg.2') }} - {{t(`reports.core.ssg.${s.modelId}`)}}</h4>
                 <app-cpg-domain-summary [distrib]="s.distribution"></app-cpg-domain-summary>
 
diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts b/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts
index 1aa36115e1..f0557381c3 100644
--- a/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts
+++ b/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts
@@ -75,6 +75,7 @@ export class CpgSummaryComponent implements OnInit {
     this.assessorWorkflow = this.assessSvc.assessment.assessorMode ?? false;
 
     var demog: Demographic = await firstValueFrom(this.demoSvc.getDemographic());
+    this.assessSvc.assessment.ssgModelIds = demog.ssgModelIds;
     this.techDomain = demog.techDomain;
 
     // CPG 1.1
@@ -94,7 +95,7 @@ export class CpgSummaryComponent implements OnInit {
     }
 
     // SSG
-    const ssgPromises = this.ssgSvc.activeSsgModelIds.map(async id => {
+    const ssgPromises = this.assessSvc.assessment.ssgModelIds.map(async id => {
       const d = await this.getAnswerDistribution(id, '');
       return {
         modelId: id,
diff --git a/CSETWebNg/src/app/models/assessment-info.model.ts b/CSETWebNg/src/app/models/assessment-info.model.ts
index e1de3992dc..2a42c4fe98 100644
--- a/CSETWebNg/src/app/models/assessment-info.model.ts
+++ b/CSETWebNg/src/app/models/assessment-info.model.ts
@@ -48,7 +48,7 @@ export interface AssessmentDetail {
 
     // sectors
     sectorSubsectors?: SectorSub[];
-    ssgSectorIds?: number[];
+    ssgModelIds?: number[];
 
 
     useStandard?: boolean;
@@ -125,7 +125,7 @@ export interface Demographic {
     industryId?: number;
     sectorSubsectors?: SectorSub[];
 
-    ssgSectorIds?: number[];
+    ssgModelIds?: number[];
 
     size?: number;
     assetValue?: number;
diff --git a/CSETWebNg/src/app/models/demographics-iod.model.ts b/CSETWebNg/src/app/models/demographics-iod.model.ts
index bc3d4ea2ff..2d6eaaf6a1 100644
--- a/CSETWebNg/src/app/models/demographics-iod.model.ts
+++ b/CSETWebNg/src/app/models/demographics-iod.model.ts
@@ -37,7 +37,7 @@ export interface DemographicsIod {
   sectorSubsectors?: SectorSub[];
 
 
-  ssgSectors?: number[];
+  // TODO-3261 ssgSectors?: number[];
 
   // Technology Domain (IT vs OT)
   techDomain?: string;
diff --git a/CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.ts b/CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.ts
index 754be3805b..5576b580ca 100644
--- a/CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.ts
+++ b/CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.ts
@@ -126,7 +126,7 @@ export class CpgDeficiencyComponent implements OnInit {
    */
   getSsgModels() {
     this.loadingSsg = true;
-    this.ssgBonusModels = this.ssgSvc.activeSsgModelIds;
+    this.ssgBonusModels = this.assessSvc.assessment.ssgModelIds;
 
     const obs: Observable<any>[] = [];
     this.ssgBonusModels.forEach(m => obs.push(this.maturitySvc.getMaturityDeficiency(m)));
diff --git a/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.html b/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.html
index 59ff802c98..1b6ac3efb6 100644
--- a/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.html
+++ b/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.html
@@ -83,7 +83,7 @@ <h1>{{t('reports.core.cpg.report.security practice checklist')}}</h1>
         <app-cpg-practice-table [modelId]="modelId"></app-cpg-practice-table>
 
         <!-- heatmap - waiting for approval to enable this -->
-        <div *ngIf="false">
+        <div *ngIf="true">
             <h2 style="font-size: 1.4rem">{{ t('reports.core.heatmap.title') }}</h2>
             <div class="d-flex flex-row">
                 <p style="width: 70%" class="me-4">
@@ -108,7 +108,7 @@ <h1>{{t('reports.core.cpg.report.ssg.2')}} - {{t(`reports.core.ssg.${s}`)}}</h1>
         <app-cpg-practice-table [ssgModelId]="s"></app-cpg-practice-table>
 
         <!-- heatmap - waiting for approval to enable this -->
-        <div *ngIf="false">
+        <div *ngIf="true">
             <h2 style="font-size: 1.4rem">{{ t('reports.core.heatmap.title') }}</h2>
             <div class="d-flex flex-row">
                 <p style="width: 70%" class="me-4">
diff --git a/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.ts b/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.ts
index 14107637e0..32a1462513 100644
--- a/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.ts
+++ b/CSETWebNg/src/app/reports/cpg/cpg-report/cpg-report.component.ts
@@ -131,6 +131,7 @@ export class CpgReportComponent implements OnInit {
 
     var demog: Demographic = await firstValueFrom(this.demoSvc.getDemographic());
     this.techDomain = demog.techDomain;
+    this.assessSvc.assessment.ssgModelIds = demog.ssgModelIds;
 
     // CPG 1.1
     if (this.modelId == 11) {
@@ -173,7 +174,7 @@ export class CpgReportComponent implements OnInit {
    * 
    */
   async initSsg(): Promise<void> {
-    this.ssgBonusModelIds = this.ssgSvc.activeSsgModelIds;
+    this.ssgBonusModelIds = this.assessSvc.assessment.ssgModelIds;
 
     const ssgDistrib$ = this.ssgBonusModelIds.map(async id => {
       const d = await this.getAnswerDistribution(id, '');
diff --git a/CSETWebNg/src/app/reports/edm/edm.component.ts b/CSETWebNg/src/app/reports/edm/edm.component.ts
index d7273d15d4..a3908f8af8 100644
--- a/CSETWebNg/src/app/reports/edm/edm.component.ts
+++ b/CSETWebNg/src/app/reports/edm/edm.component.ts
@@ -29,6 +29,7 @@ import { MaturityQuestionResponse } from '../../models/questions.model';
 import { Demographic } from '../../models/assessment-info.model';
 import { ReportService } from '../../services/report.service';
 import { saveAs } from "file-saver";
+import { AssessmentService } from '../../services/assessment.service';
 
 @Component({
     selector: 'edm',
@@ -56,6 +57,7 @@ export class EdmComponent implements OnInit, AfterContentInit {
    */
   constructor(
     private titleService: Title,
+    private assessSvc: AssessmentService,
     public maturitySvc: MaturityService,
     public demoSvc: DemographicService,
     public reportSvc: ReportService
@@ -132,7 +134,9 @@ export class EdmComponent implements OnInit, AfterContentInit {
         this.demoSvc.getDemographic().subscribe(
           (data: Demographic) => {
             this.demographicData = data;
+            this.assessSvc.assessment.ssgModelIds = data.ssgModelIds;
             this.orgName = this.demographicData.organizationName;
+
             if (this.demographicData.organizationName?.length > 0) {
               this.displayName = this.orgName;
             }
diff --git a/CSETWebNg/src/app/services/demographic.service.ts b/CSETWebNg/src/app/services/demographic.service.ts
index a440a748af..c4769643e3 100644
--- a/CSETWebNg/src/app/services/demographic.service.ts
+++ b/CSETWebNg/src/app/services/demographic.service.ts
@@ -57,7 +57,7 @@ export class DemographicService {
   ) {
   }
 
-  
+
   /**
    *
    */
@@ -99,25 +99,19 @@ export class DemographicService {
    * @param demographic
    */
   updateDemographic(demographic: Demographic) {
-    // TODO-3261 - how should we do this?
-    //this.assessSvc.assessment.sectorId = demographic.sectorId;
-    
-    this.assessSvc.assessment.ssgSectorIds = demographic.ssgSectorIds;
     this.assessSvc.assessmentStateChanged$.next(this.c.NAV_REFRESH_TREE_ONLY);
 
     this.http.post(this.apiUrl, JSON.stringify(demographic), headers)
-      .subscribe(() => {
-        if (this.configSvc.userIsCisaAssessor) {
-        }
+      .subscribe((demographic: Demographic) => {
+        this.assessSvc.assessment.ssgModelIds = demographic.ssgModelIds;
+
         this.demographicUpdateCompleted$.next();
       });
   }
 
   importDemographics(demographic: Demographic) {
     return this.http.post(this.apiUrl + 'import', JSON.stringify(demographic), headers)
-      .subscribe(() => {
-
-      });
+      .subscribe(() => { });
   }
 
   exportDemographics() {
diff --git a/CSETWebNg/src/app/services/ssg.service.ts b/CSETWebNg/src/app/services/ssg.service.ts
index 868a569d08..b78f5ee063 100644
--- a/CSETWebNg/src/app/services/ssg.service.ts
+++ b/CSETWebNg/src/app/services/ssg.service.ts
@@ -84,29 +84,6 @@ export class SsgService {
    * Indicates if any of the SSGs are selected.
    */
   get isSsgActive(): boolean {
-    if (this.assessSvc.assessment?.ssgSectorIds) {
-      return this.assessSvc.assessment.ssgSectorIds.length > 0;
-    }
-
-    return false;
-  }
-
-  /**
-   * Returns the currently selected SSG models.
-   */
-  get activeSsgModelIds(): number[] {
-
-    // TODO:  crude mapping - make this slicker
-    const list = new Set<number>();
-    this.assessSvc.assessment?.ssgSectorIds?.forEach(sectorId => {
-      if (sectorId == 1 || sectorId == 19) {
-        list.add(18); // SSG CHEM
-      }
-      if (sectorId == 13 || sectorId == 28) {
-        list.add(20); // SSG IT
-      }
-    });
-
-    return Array.from(list);
+    return (this.assessSvc.assessment?.ssgModelIds?.length ?? 0) > 0;
   }
 }
diff --git a/CSETWebNg/src/assets/i18n/en.json b/CSETWebNg/src/assets/i18n/en.json
index 5d2ea1d5bb..c8fdb3f31d 100644
--- a/CSETWebNg/src/assets/i18n/en.json
+++ b/CSETWebNg/src/assets/i18n/en.json
@@ -45,8 +45,8 @@
   "tech domain": {
     "label": "Technology Domain for Assessment",
     "select": "Select Technology Domain",
-    "ot": "Operational Technology (OT)",
-    "it": "Information Technology (IT)",
+    "ot": "Cross-Sector Goals - Operational Technology (OT)",
+    "it": "Cross-Sector Goals - Information Technology (IT)",
     "ot+it": "Both OT and IT"
   },
   "crit svc poc": "Critical Service Point of Contact",
@@ -1012,7 +1012,7 @@
     "cpg2": {
       "display-name": "Cyber Performance Goals (CPG) 2.0",
       "model short title": "CPG 2.0",
-      "question node title": "Goals"
+      "question node title": "Cross-Sector Goals"
     },
     "ssg": {
       "1": "Select any additional functions to include as Sector-Specific Goals",
diff --git a/CSETWebNg/src/assets/i18n/reports/en.json b/CSETWebNg/src/assets/i18n/reports/en.json
index 96f0328062..d61559fdb1 100644
--- a/CSETWebNg/src/assets/i18n/reports/en.json
+++ b/CSETWebNg/src/assets/i18n/reports/en.json
@@ -640,7 +640,7 @@
                          "1": "This table lists all applicable SSG security practices and how they have been answered.",
                          "2": "Sector Specific"
                     },
-                    "compliance score": "Compliance Score",
+                    "compliance score": "Cross-Sector Goals Compliance Score",
                     "current assessment": "Current Assessment",
                     "notes": "Notes",
                     "ttp or risk addressed": "TTP or Risk Addressed",
@@ -667,9 +667,9 @@
                          "5": "There are no deficiences in the sector-specific questions."
                     }
                },
-               "ot": "Operational Technology (OT)",
+               "ot": "Cross-Sector Goals - Operational Technology (OT)",
                "ot-abbrev": "OT",
-               "it": "Information Technology (IT)",
+               "it": "Cross-Sector Goals - Information Technology (IT)",
                "it-abbrev": "IT"
           },
           "ssg": {