diff --git a/local-dev-env/hosted-importmap.json b/local-dev-env/hosted-importmap.json
index cea983b..3b04ecc 100644
--- a/local-dev-env/hosted-importmap.json
+++ b/local-dev-env/hosted-importmap.json
@@ -5,7 +5,6 @@
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
-    "@madie/madie-patient": "//localhost:8507/madie-madie-patient.js",
     "@madie/madie-cql-library": "//localhots:8507/madie-madie-cql-library.js",
     "@madie/madie-util": "//localhost:8508/madie-madie-util.js",
     "rxjs": "https://unpkg.com/@esm-bundle/rxjs/system/rxjs.min.js",
diff --git a/local-dev-env/importmap.json b/local-dev-env/importmap.json
index 3978669..573da24 100644
--- a/local-dev-env/importmap.json
+++ b/local-dev-env/importmap.json
@@ -5,7 +5,6 @@
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
-    "@madie/madie-patient": "//localhost:8506/madie-madie-patient.js",
     "@madie/madie-cql-library": "//localhost:8507/madie-madie-cql-library.js",
     "@madie/madie-util": "//localhost:8508/madie-madie-util.js",
     "rxjs": "https://unpkg.com/@esm-bundle/rxjs/system/rxjs.min.js",
diff --git a/local-dev-env/serviceConfig.json b/local-dev-env/serviceConfig.json
index d11d6a3..09276dd 100644
--- a/local-dev-env/serviceConfig.json
+++ b/local-dev-env/serviceConfig.json
@@ -30,6 +30,7 @@
   "features": {
     "CQLBuilderIncludes": false,
     "CQLBuilderParameters": false,
+    "CQLBuilderFunctions": false,
     "qiCore6": false,
     "qiCoreElementsTab": true,
     "qiCoreBonnieTestCases": false,
@@ -37,6 +38,7 @@
     "enableQdmRepeatTransfer": false,
     "CQLBuilderDefinitions": true,
     "TestCaseListSearch": true,
-    "TestCaseID": false
+    "TestCaseID": false,
+    "MeasureButtons": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 1c8664e..57b6798 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5429,10 +5429,11 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5497,9 +5498,10 @@
       }
     },
     "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==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -6581,17 +6583,18 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
       "dev": true,
+      "license": "MIT",
       "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.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -7551,10 +7554,11 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
diff --git a/src/index.ejs b/src/index.ejs
index 7cf2a5c..1bcbc38 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -73,11 +73,10 @@
     You need to enable JavaScript to run this app.
   </noscript>
   <main id="main"></main>
-  
+
   <div id="application-registry" style="display:none;">
     <div id="madie-editor"></div>
     <div id="madie-auth"></div>
-    <div id="madie-patient"></div>
     <div id="madie-cql-library"></div>
   </div>
   <script>
diff --git a/src/madie-root-config.ts b/src/madie-root-config.ts
index 566e71d..3d651f3 100644
--- a/src/madie-root-config.ts
+++ b/src/madie-root-config.ts
@@ -4,14 +4,12 @@ import layoutConfig from "./layout-config";
 import editorConfig from "./editor-config";
 import authConfig from "./auth-config";
 import measureConfig from "./measure-config";
-import patientConfig from "./patient-config";
 import cqllibraryConfig from "./cql-library-config";
 
 registerApplication<ApplicationProps>(layoutConfig);
 registerApplication<ApplicationProps>(editorConfig);
 registerApplication<ApplicationProps>(authConfig);
 registerApplication<ApplicationProps>(measureConfig);
-registerApplication<ApplicationProps>(patientConfig);
 registerApplication<ApplicationProps>(cqllibraryConfig);
 
 start({
diff --git a/src/patient-config.test.ts b/src/patient-config.test.ts
deleted file mode 100644
index ca27a50..0000000
--- a/src/patient-config.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import editorConfig from "./patient-config";
-
-describe("Patient Config", () => {
-  const appModuleStub = { success: true };
-  beforeEach(async () => {
-    System.import = jest.fn().mockResolvedValue(appModuleStub);
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it("should contain the expected properties", () => {
-    expect(editorConfig).toMatchObject({
-      name: "@madie/madie-patient",
-      app: expect.any(Function),
-      activeWhen: ["/"],
-      customProps: {
-        domElementGetter: expect.any(Function),
-      },
-    });
-  });
-
-  it("should have a domElementGetter to locate the #madie-patient element", () => {
-    document.getElementById = jest.fn(() => null);
-    expect(editorConfig.customProps.domElementGetter()).toBeNull();
-    expect(document.getElementById).toHaveBeenCalledWith("madie-patient");
-  });
-
-  it("should have a module loader which loads the madie-patient app", async () => {
-    let result = await editorConfig.app();
-    expect(result).toBe(appModuleStub);
-    expect(System.import).toHaveBeenCalledWith("@madie/madie-patient");
-  });
-});
diff --git a/src/patient-config.ts b/src/patient-config.ts
deleted file mode 100644
index aafd44a..0000000
--- a/src/patient-config.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import ApplicationConfig from "./ApplicationConfig";
-
-const config: ApplicationConfig = {
-  name: "@madie/madie-patient",
-  app: () => System.import("@madie/madie-patient"),
-  activeWhen: ["/"],
-  customProps: {
-    domElementGetter: (): HTMLElement | null =>
-      document.getElementById("madie-patient"),
-  },
-};
-
-export default config;