Updated to new fragment approach

2024-09-04 21:08:35 -06:00 · 2024-09-04 21:08:35 -06:00 · d1da054253
commit d1da054253
parent 6fdca86d33
20 changed files with 19650 additions and 15269 deletions
--- a/input-cache/schemas/R5/fhir-single.xsd
+++ b/input-cache/schemas/R5/fhir-single.xsd
--- a/input-cache/schemas/R5/fhir-xhtml.xsd
+++ b/input-cache/schemas/R5/fhir-xhtml.xsd
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" targetNamespace="http://www.w3.org/1999/xhtml" elementFormDefault="qualified" version="1.0" xml:lang="en">
  <!--
  FHIR XHTML Schema
@ -13,7 +13,7 @@
  
  The content that is restricted to not appear:
    - javascript attributes and the script element
-    - head, body etc (FHIR just uses div)
+    - head, body etc. (FHIR just uses div)
    - forms, objects, and inserted and deleted text
  -->
  <!-- Note: When using this schema with some tools, it may also be necessary to declare xmlns:xml="http://www.w3.org/XML/1998/namespace", however this causes performance issues with other tools and thus is not in the base schemas. -->
@ -244,7 +244,7 @@
  <xs:simpleType name="Coords">
    <xs:annotation>
      <xs:documentation>
-      comma separated list of lengths
+      comma-separated list of lengths
      </xs:documentation>
    </xs:annotation>
    <xs:restriction base="xs:string">
--- a/input-cache/schemas/R5/xml.xsd
+++ b/input-cache/schemas/R5/xml.xsd
@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en">
  <!-- Note: When using this schema with some tools, it may also be necessary to declare xmlns:xml="http://www.w3.org/XML/1998/namespace", however this causes performance issues with other tools and thus is not in the base schemas. -->
--- a/input-cache/schemas/R5/xmldsig-core-schema.xsd
+++ b/input-cache/schemas/R5/xmldsig-core-schema.xsd
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Schema for XML Signatures
    http://www.w3.org/2000/09/xmldsig#
    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
--- a/input-cache/txcache/.capabilityStatement.cache
+++ b/input-cache/txcache/.capabilityStatement.cache
@ -1,62 +0,0 @@
-{
-  "resourceType" : "CapabilityStatement",
-  "id" : "FhirServer",
-  "meta" : {
-    "tag" : [{
-      "system" : "http://hl7.org/fhir/v3/ObservationValue",
-      "code" : "SUBSETTED",
-      "display" : "Subsetted"
-    }]
-  },
-  "url" : "http://fhir.healthintersections.com.au/open/metadata",
-  "version" : "4.0.1-2.0.12-SNAPSHOT",
-  "name" : "FHIR Reference Server Conformance Statement",
-  "status" : "active",
-  "date" : "2022-03-21T10:27:12.209Z",
-  "contact" : [{
-    "telecom" : [{
-      "system" : "other",
-      "value" : "http://healthintersections.com.au/"
-    }]
-  }],
-  "kind" : "instance",
-  "instantiates" : ["http://hl7.org/fhir/CapabilityStatement/terminology-server"],
-  "software" : {
-    "name" : "Reference Server",
-    "version" : "2.0.12-SNAPSHOT",
-    "releaseDate" : "2021-12-20T02:28:03.769Z"
-  },
-  "fhirVersion" : "4.0.1",
-  "format" : ["application/fhir+xml",
-  "application/fhir+json"],
-  "rest" : [{
-    "mode" : "server",
-    "security" : {
-      "cors" : true
-    },
-    "operation" : [{
-      "name" : "expand",
-      "definition" : "http://hl7.org/fhir/OperationDefinition/ValueSet-expand"
-    },
-    {
-      "name" : "lookup",
-      "definition" : "http://hl7.org/fhir/OperationDefinition/ValueSet-lookup"
-    },
-    {
-      "name" : "validate-code",
-      "definition" : "http://hl7.org/fhir/OperationDefinition/Resource-validate"
-    },
-    {
-      "name" : "translate",
-      "definition" : "http://hl7.org/fhir/OperationDefinition/ConceptMap-translate"
-    },
-    {
-      "name" : "closure",
-      "definition" : "http://hl7.org/fhir/OperationDefinition/ConceptMap-closure"
-    },
-    {
-      "name" : "versions",
-      "definition" : "/OperationDefinition/fso-versions"
-    }]
-  }]
-}
--- a/input-cache/txcache/.terminologyCapabilities.tx.fhir.org.r4.cache
+++ b/input-cache/txcache/.terminologyCapabilities.tx.fhir.org.r4.cache
@ -1,11 +1,11 @@
 {
  "resourceType" : "TerminologyCapabilities",
  "id" : "FhirServer",
-  "url" : "http://fhir.healthintersections.com.au/open/metadata",
-  "version" : "1.0.0",
+  "url" : "http://tx.fhir.org/r4/metadata",
+  "version" : "2.0.0",
  "name" : "FHIR Reference Server Teminology Capability Statement",
  "status" : "active",
-  "date" : "2022-03-15T00:37:18.559Z",
+  "date" : "2024-09-04T23:48:16.809Z",
  "contact" : [{
    "telecom" : [{
      "system" : "other",
@ -14,6 +14,9 @@
  }],
  "description" : "Standard Teminology Capability Statement for the open source Reference FHIR Server provided by Health Intersections",
  "codeSystem" : [{
+    "uri" : "http://cap.org/eCP"
+  },
+  {
    "uri" : "http://cds-hooks.hl7.org/CodeSystem/indicator"
  },
  {
@ -28,6 +31,9 @@
  {
    "uri" : "http://fdasis.nlm.nih.gov"
  },
+  {
+    "uri" : "http://fhir.ohdsi.org/CodeSystem/concepts"
+  },
  {
    "uri" : "http://healthit.gov/nhin/purposeofuse"
  },
@ -829,12 +835,39 @@
  {
    "uri" : "http://hl7.org/fhir/us/core/CodeSystem/condition-category"
  },
+  {
+    "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-category"
+  },
  {
    "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category"
  },
  {
    "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-provenance-participant-type"
  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/assemble-expectation"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/chf-codes"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/collapsible"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/CSPHQ9"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/entryMode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/questionnaire-answer-constraint"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/uv/sdc/CodeSystem/temp"
+  },
  {
    "uri" : "http://hl7.org/fhir/variable-type"
  },
@ -856,9 +889,15 @@
  {
    "uri" : "http://loinc.org"
  },
+  {
+    "uri" : "http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl"
+  },
  {
    "uri" : "http://nucc.org/provider-taxonomy"
  },
+  {
+    "uri" : "http://radlex.org"
+  },
  {
    "uri" : "http://snomed.info/sct"
  },
@ -916,6 +955,15 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/appointment-cancellation-reason"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/appropriateness-score"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/artifact-identifier-type"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/artifact-version-policy-codes"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/attribute-estimate-type"
  },
@ -949,6 +997,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/catalogType"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/cdshooks-indicator"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/certainty-rating"
  },
@ -1084,6 +1135,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/cql-access-modifier"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
  },
@ -1261,6 +1315,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
  },
@ -1309,6 +1366,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/match-grade"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/measure-aggregate-method"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/measure-data-usage"
  },
@ -1321,6 +1381,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/measure-scoring"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/measure-supplemental-data"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/measure-type"
  },
@ -1528,9 +1591,15 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/service-type"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/sex-parameter-for-clinical-use"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/smart-capabilities"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/software-system-type-codes"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/special-values"
  },
@ -3253,6 +3322,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/v3-ManagedParticipationStatus"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/v3-ManufacturerModelNameExample"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/v3-MapRelationship"
  },
@ -3415,6 +3487,9 @@
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/v3-SetOperator"
  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/v3-SoftwareNameExample"
+  },
  {
    "uri" : "http://terminology.hl7.org/CodeSystem/v3-SpecimenType"
  },
@ -3514,12 +3589,27 @@
  {
    "uri" : "http://www.ada.org/snodent"
  },
+  {
+    "uri" : "http://www.ama-assn.org/go/cpt"
+  },
+  {
+    "uri" : "http://www.cms.gov/Medicare/Coding/ICD10"
+  },
  {
    "uri" : "http://www.nlm.nih.gov/research/umls/rxnorm"
  },
  {
    "uri" : "http://www.whocc.no/atc"
  },
+  {
+    "uri" : "https://nahdo.org/sopt"
+  },
+  {
+    "uri" : "https://www.cdc.gov/nhsn/cdaportal/terminology/codesystem/cdcnhsn.html"
+  },
+  {
+    "uri" : "https://www.cdc.gov/nhsn/cdaportal/terminology/codesystem/hsloc.html"
+  },
  {
    "uri" : "https://www.cms.gov/Medicare/Medicare-Fee-for-Service-Payment/HospitalAcqCond/Coding"
  },
@ -3567,15 +3657,92 @@
  },
  {
    "uri" : "urn:oid:2.16.840.1.113883.3.1937.98.5.8"
+  },
+  {
+    "uri" : "urn:oid:2.16.840.1.113883.6.238"
  }],
  "expansion" : {
    "parameter" : [{
      "name" : "cache-id",
-      "documentation" : "This server supports caching terminology resources between calls. Clients only need to send value sets and codesystems once; there after tehy are automatically in scope for calls with the same cache-id. The cache is retained for 30 min from last call"
+      "documentation" : "This server supports caching terminology resources between calls. Clients only need to send value sets and codesystems once; there after they are automatically in scope for calls with the same cache-id. The cache is retained for 30 min from last call"
    },
    {
      "name" : "tx-resource",
      "documentation" : "Additional valuesets needed for evaluation e.g. value sets referred to from the import statement of the value set being expanded"
+    },
+    {
+      "name" : "_incomplete"
+    },
+    {
+      "name" : "abstract"
+    },
+    {
+      "name" : "activeOnly"
+    },
+    {
+      "name" : "check-system-version"
+    },
+    {
+      "name" : "count"
+    },
+    {
+      "name" : "default-to-latest-version"
+    },
+    {
+      "name" : "displayLanguage"
+    },
+    {
+      "name" : "excludeNested"
+    },
+    {
+      "name" : "excludeNotForUI"
+    },
+    {
+      "name" : "excludePostCoordinated"
+    },
+    {
+      "name" : "force-system-version"
+    },
+    {
+      "name" : "inactive"
+    },
+    {
+      "name" : "includeAlternateCodes"
+    },
+    {
+      "name" : "includeDefinition"
+    },
+    {
+      "name" : "includeDesignations"
+    },
+    {
+      "name" : "incomplete-ok"
+    },
+    {
+      "name" : "limitedExpansion"
+    },
+    {
+      "name" : "mode",
+      "documentation" : "=lenient-display-validation"
+    },
+    {
+      "name" : "no-cache"
+    },
+    {
+      "name" : "offset"
+    },
+    {
+      "name" : "profile"
+    },
+    {
+      "name" : "property"
+    },
+    {
+      "name" : "system-version"
+    },
+    {
+      "name" : "valueSetMode",
+      "documentation" : "= CHECK_MEMBERSHIP_ONLY | NO_MEMBERSHIP_CHECK"
    }]
  }
 }
--- a/input-cache/txcache/all-systems.cache
+++ b/input-cache/txcache/all-systems.cache
@ -1,84 +1,462 @@
 -------------------------------------------------------------------------------------
 {"code" : {
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "code" : "001"
-}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
+  "system" : "http://example.org/some-system",
+  "code" : "01",
+  "display" : "keyword 1"
+}, "url": "http://hl7.org/fhir/ValueSet/definition-use", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
-  "display" : "World",
-  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
+  "code" : "01",
+  "system" : "http://example.org/some-system",
+  "severity" : "error",
+  "error" : "A definition for CodeSystem 'http://example.org/some-system' could not be found, so the code cannot be validated; The provided code 'http://example.org/some-system#01 ('keyword 1')' was not found in the value set 'http://hl7.org/fhir/ValueSet/definition-use|4.0.1'",
+  "class" : "UNKNOWN",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "http://example.org/some-system",
+  "issues" : {
+  "resourceType" : "OperationOutcome",
+  "issue" : [{
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "not-found",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-found"
+      }],
+      "text" : "A definition for CodeSystem 'http://example.org/some-system' could not be found, so the code cannot be validated"
+    },
+    "location" : ["Coding.system"],
+    "expression" : ["Coding.system"]
+  },
+  {
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "code-invalid",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-in-vs"
+      }],
+      "text" : "The provided code 'http://example.org/some-system#01 ('keyword 1')' was not found in the value set 'http://hl7.org/fhir/ValueSet/definition-use|4.0.1'"
+    },
+    "location" : ["Coding.code"],
+    "expression" : ["Coding.code"]
+  }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://example.org/some-system",
+  "code" : "01",
+  "display" : "keyword 2"
+}, "url": "http://hl7.org/fhir/ValueSet/definition-use", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "code" : "01",
+  "system" : "http://example.org/some-system",
+  "severity" : "error",
+  "error" : "A definition for CodeSystem 'http://example.org/some-system' could not be found, so the code cannot be validated; The provided code 'http://example.org/some-system#01 ('keyword 2')' was not found in the value set 'http://hl7.org/fhir/ValueSet/definition-use|4.0.1'",
+  "class" : "UNKNOWN",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "http://example.org/some-system",
+  "issues" : {
+  "resourceType" : "OperationOutcome",
+  "issue" : [{
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "not-found",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-found"
+      }],
+      "text" : "A definition for CodeSystem 'http://example.org/some-system' could not be found, so the code cannot be validated"
+    },
+    "location" : ["Coding.system"],
+    "expression" : ["Coding.system"]
+  },
+  {
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "code-invalid",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-in-vs"
+      }],
+      "text" : "The provided code 'http://example.org/some-system#01 ('keyword 2')' was not found in the value set 'http://hl7.org/fhir/ValueSet/definition-use|4.0.1'"
+    },
+    "location" : ["Coding.code"],
+    "expression" : ["Coding.code"]
+  }]
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "text/cql"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "text/cql",
  "code" : "text/cql",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "text/cql"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "text/cql",
+  "code" : "text/cql",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "application/elm+xml"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "application/elm+xml",
  "code" : "application/elm+xml",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/elm+xml"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "application/elm+xml",
+  "code" : "application/elm+xml",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "application/elm+json"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "application/elm+json",
  "code" : "application/elm+json",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/elm+json"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "application/elm+json",
+  "code" : "application/elm+json",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "image/png"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "image/png",
  "code" : "image/png",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "image/png"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "image/png",
+  "code" : "image/png",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "text/x-sql"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "text/x-sql",
  "code" : "text/x-sql",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "text/x-sql"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "text/x-sql",
+  "code" : "text/x-sql",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "application/pdf"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "application/pdf",
  "code" : "application/pdf",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/pdf"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "application/pdf",
+  "code" : "application/pdf",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "code" : "image/jpeg"
-}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "image/jpeg",
  "code" : "image/jpeg",
-  "system" : "urn:ietf:bcp:13"
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
-  "system" : "http://loinc.org",
-  "code" : "85354-9"
-}, "url": "http://somewhere.org/fhir/uv/myig/ValueSet/valueset-fake", "version": "0.2.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
+  "code" : "image/jpeg"
+}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
-  "display" : "Blood pressure panel with all children optional",
-  "code" : "85354-9",
-  "system" : "http://loinc.org"
+  "display" : "image/jpeg",
+  "code" : "image/jpeg",
+  "system" : "urn:ietf:bcp:13",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
--- a/input-cache/txcache/cs-externals.json
+++ b/input-cache/txcache/cs-externals.json
@ -0,0 +1,3 @@
+{
+  "http://not-a-known-code-system|2.36" : null
+}
--- a/input-cache/txcache/http___not-a-known-code-system.cache
+++ b/input-cache/txcache/http___not-a-known-code-system.cache
@ -1,13 +1,109 @@
 -------------------------------------------------------------------------------------
+{"hierarchical" : false, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "inactive" : false,
+    "include" : [{
+      "system" : "http://not-a-known-code-system",
+      "version" : "2.36",
+      "concept" : [{
+        "code" : "not-known-code"
+      },
+      {
+        "code" : "not-known-code2"
+      }]
+    }]
+  }
+}}####
+e: {
+  "from-server" : true,
+  "error" : "Error from http://tx.fhir.org/r4: Unable to provide support for code system http://not-a-known-code-system version 2.36"
+}
+-------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://not-a-known-code-system",
  "version" : "2.36",
  "code" : "not-known-code"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "exampleOK":"true", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
+  "code" : "not-known-code",
+  "system" : "http://not-a-known-code-system",
+  "version" : "2.36",
  "severity" : "error",
-  "error" : "The code system 'http://not-a-known-code-system' is not known (encountered paired with code = 'not-known-code'); The code provided (http://not-a-known-code-system#not-known-code) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)",
-  "class" : "CODESYSTEM_UNSUPPORTED"
+  "error" : "A definition for CodeSystem 'http://not-a-known-code-system' version '2.36' could not be found, so the code cannot be validated. Valid versions: []",
+  "class" : "CODESYSTEM_UNSUPPORTED_VERSION",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome",
+  "issue" : [{
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "not-found",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-found"
+      }],
+      "text" : "A definition for CodeSystem 'http://not-a-known-code-system' version '2.36' could not be found, so the code cannot be validated. Valid versions: []"
+    },
+    "location" : ["Coding.system"],
+    "expression" : ["Coding.system"]
+  }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://not-a-known-code-system",
+  "version" : "2.36",
+  "code" : "not-known-code2"
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "exampleOK":"true", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "code" : "not-known-code2",
+  "system" : "http://not-a-known-code-system",
+  "version" : "2.36",
+  "severity" : "error",
+  "error" : "A definition for CodeSystem 'http://not-a-known-code-system' version '2.36' could not be found, so the code cannot be validated. Valid versions: []",
+  "class" : "CODESYSTEM_UNSUPPORTED_VERSION",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome",
+  "issue" : [{
+    "extension" : [{
+      "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+      "valueUrl" : "http://tx.fhir.org/r4"
+    }],
+    "severity" : "error",
+    "code" : "not-found",
+    "details" : {
+      "coding" : [{
+        "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+        "code" : "not-found"
+      }],
+      "text" : "A definition for CodeSystem 'http://not-a-known-code-system' version '2.36' could not be found, so the code cannot be validated. Valid versions: []"
+    },
+    "location" : ["Coding.system"],
+    "expression" : ["Coding.system"]
+  }]
+}
+
 }
 -------------------------------------------------------------------------------------
 {"hierarchical" : true, "valueSet" :{
@ -27,11 +123,13 @@ v: {
  }
 }}####
 e: {
-  "error" : "Error from server: Unable to provide support for code system http://not-a-known-code-system"
+  "from-server" : true,
+  "error" : "Error from http://tx.fhir.org/r4: Unable to provide support for code system http://not-a-known-code-system version 2.36"
 }
 -------------------------------------------------------------------------------------
 {"hierarchical" : true, "url": "http://somewhere.org/fhir/uv/myig/ValueSet/valueset-no-codesystem", "version": "0.2.0"}####
 e: {
-  "error" : "Error from server: Unable to provide support for code system http://not-a-known-code-system"
+  "from-server" : true,
+  "error" : "Error from http://tx.fhir.org/r4: Unable to provide support for code system http://not-a-known-code-system version 2.36"
 }
 -------------------------------------------------------------------------------------
--- a/input-cache/txcache/http___unstats.un.org_unsd_methods_m49_m49.htm.cache
+++ b/input-cache/txcache/http___unstats.un.org_unsd_methods_m49_m49.htm.cache
@ -2,50 +2,88 @@
 {"code" : {
  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
  "code" : "001"
-}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--2", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "World",
  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
  "code" : "001"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--2", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "World",
  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
  "code" : "001"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en-US", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "World",
  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
  "code" : "001"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--2", "version": "4.0.1", "langs":"en-US", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "World",
  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
-}
-------------------------------------------------------------------------------------
-{"code" : {
  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "code" : "001"
-}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--2", "version": "4.0.1", "lang":"en-US", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-v: {
-  "display" : "World",
-  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm"
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
--- a/input-cache/txcache/loinc.cache
+++ b/input-cache/txcache/loinc.cache
@ -1,61 +1,208 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "85354-9"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-v: {
-  "display" : "Blood pressure panel with all children optional",
-  "code" : "85354-9",
-  "system" : "http://loinc.org"
-}
-------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://loinc.org",
  "code" : "8480-6"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "Systolic blood pressure",
  "code" : "8480-6",
-  "system" : "http://loinc.org"
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://loinc.org",
  "code" : "8462-4"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "Diastolic blood pressure",
  "code" : "8462-4",
-  "system" : "http://loinc.org"
-}
-------------------------------------------------------------------------------------
-{"code" : {
  "system" : "http://loinc.org",
-  "code" : "8480-6"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-v: {
-  "display" : "Systolic blood pressure",
-  "code" : "8480-6",
-  "system" : "http://loinc.org"
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
 }
-------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "8462-4"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
-v: {
-  "display" : "Diastolic blood pressure",
-  "code" : "8462-4",
-  "system" : "http://loinc.org"
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://loinc.org",
  "code" : "85354-9"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "Blood pressure panel with all children optional",
  "code" : "85354-9",
-  "system" : "http://loinc.org"
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "8480-6"
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Systolic blood pressure",
+  "code" : "8480-6",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "8462-4"
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Diastolic blood pressure",
+  "code" : "8462-4",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "85354-9"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Blood pressure panel with all children optional",
+  "code" : "85354-9",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "8480-6"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Systolic blood pressure",
+  "code" : "8480-6",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "8462-4"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Diastolic blood pressure",
+  "code" : "8462-4",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "85354-9"
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Blood pressure panel with all children optional",
+  "code" : "85354-9",
+  "system" : "http://loinc.org",
+  "version" : "2.78",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
--- a/input-cache/txcache/servers.ini
+++ b/input-cache/txcache/servers.ini
@ -0,0 +1,3 @@
+[servers]
+tx.fhir.org.r4 = http://tx.fhir.org/r4
+
--- a/input-cache/txcache/system-map.json
+++ b/input-cache/txcache/system-map.json
@ -0,0 +1,49 @@
+{
+  "systems" : [
+    {
+      "system" : "http://example.org/some-id-type-system",
+      "authoritative" : [],
+      "candidates" : []
+    },
+    {
+      "system" : "http://example.org/some-system",
+      "authoritative" : [],
+      "candidates" : []
+    },
+    {
+      "system" : "http://loinc.org",
+      "authoritative" : [],
+      "candidates" : ["http://tx.fhir.org/r4", "https://tx.ontoserver.csiro.au/fhir"]
+    },
+    {
+      "system" : "http://not-a-known-code-system",
+      "authoritative" : [],
+      "candidates" : []
+    },
+    {
+      "system" : "http://not-a-known-code-system|2.36",
+      "authoritative" : [],
+      "candidates" : []
+    },
+    {
+      "system" : "http://terminology.hl7.org/CodeSystem/definition-use",
+      "authoritative" : ["http://tx.fhir.org/r4"],
+      "candidates" : ["https://tx.ontoserver.csiro.au/fhir"]
+    },
+    {
+      "system" : "http://unitsofmeasure.org",
+      "authoritative" : [],
+      "candidates" : ["http://tx.fhir.org/r4", "https://tx.ontoserver.csiro.au/fhir"]
+    },
+    {
+      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+      "authoritative" : [],
+      "candidates" : ["http://tx.fhir.org/r4"]
+    },
+    {
+      "system" : "urn:ietf:bcp:13",
+      "authoritative" : [],
+      "candidates" : ["http://tx.fhir.org/r4"]
+    }
+  ]
+}
--- a/input-cache/txcache/ucum.cache
+++ b/input-cache/txcache/ucum.cache
@ -1,31 +1,93 @@
 -------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mm[Hg]"
+}, "valueSet" :null, "langs":"en, en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "mm[Hg]",
+  "code" : "mm[Hg]",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unitsofmeasure.org",
  "code" : "mo"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "mo",
  "code" : "mo",
-  "system" : "http://unitsofmeasure.org"
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unitsofmeasure.org",
  "code" : "mm[Hg]"
-}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "mm[Hg]",
  "code" : "mm[Hg]",
-  "system" : "http://unitsofmeasure.org"
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
  "system" : "http://unitsofmeasure.org",
  "code" : "mm[Hg]"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common", "version": "4.0.1", "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "x-system-cache-id",
+    "valueString" : "dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
 v: {
  "display" : "mm[Hg]",
  "code" : "mm[Hg]",
-  "system" : "http://unitsofmeasure.org"
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "server" : "http://tx.fhir.org/r4",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
--- a/input-cache/txcache/version.ctl
+++ b/input-cache/txcache/version.ctl
@ -1 +1 @@
-2|2.0.12-SNAPSHOT
+4
--- a/input/includes/menu.xml
+++ b/input/includes/menu.xml
@ -19,6 +19,9 @@
      <li>
        <a href="spec.html">Detailed Specification</a>
      </li>
+      <li>
+        <a href="fragments.html">Instance Fragments</a>
+      </li>
    </ul>
  </li>
  <li><a href="artifacts.html">Artifact Index</a></li>
--- a/input/myig.xml
+++ b/input/myig.xml
@ -83,33 +83,6 @@
 </reference>
 </resource> -->
    <resource>
-      <extension url="http://hl7.org/fhir/tools/StructureDefinition/implementationguide-resource-fragment">
-        <extension url="id">
-          <valueId value="demo1"/>
-        </extension>
-        <extension url="base">
-          <valueString value="name.where(use='usual')"/>
-        </extension>
-        <extension url="ellipse">
-          <valueString value="use"/>
-        </extension>
-      </extension>
-      <extension url="http://hl7.org/fhir/tools/StructureDefinition/implementationguide-resource-fragment">
-        <extension url="id">
-          <valueId value="demo2"/>
-        </extension>
-        <extension url="ellipse">
-          <valueString value="meta"/>
-        </extension>
-        <extension url="ellipseExcept">
-          <extension url="base">
-            <valueString value="name.where(use='official')"/>
-          </extension>
-          <extension url="except">
-            <valueString value="family | given.first()"/>
-          </extension>
-        </extension>
-      </extension>
      <reference>
        <reference value="Patient/example"/>
      </reference>
@ -191,6 +164,11 @@
        <nameUrl value="spec.html"/>
        <title value="Detailed Specification"/>
        <generation value="markdown"/>
+        <page>
+          <nameUrl value="fragments.html"/>
+          <title value="Fragments"/>
+          <generation value="html"/>
+        </page>
        <page>
          <nameUrl value="spec2.html"/>
          <title value="Spec sub-page"/>
--- a/input/pagecontent/fragments.xml
+++ b/input/pagecontent/fragments.xml
@ -0,0 +1,47 @@
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hl7.org/fhir ../../input-cache/schemas/R5/fhir-single.xsd">
+	<p>
+    This page describes how to embed 'fragments' of a resource within a page, possibly ellipsing out portions
+    of the instance to only show the portions that are relevant to what the surrounding text needs to talk about.
+  </p>
+  <p>
+    To embed content from an instance, use the following structure:<br/>
+    
+    <code>{% raw %}&#x7b;%&#xA0;fragment <i>ResourceType</i>/<i>id</i> <i>syntax</i> %}{% endraw %}</code><br/>
+    where:
+  </p>
+  <ul>
+    <li><code>ResourceType</code> is 'Patient', 'Observation', etc.  For a logical model instance, this will be 'Binary'.</li>
+    <li><code>id</code> is the unique resource id of the resource within the IG.</li>
+    <li><code>syntax</code> is either 'XML' or 'JSON'.  (TTL is not yet supported.)</li>
+  </ul>
+  <p>For example, <code>{% raw %}&#x7b;%&#xA0;fragment Patient/example XML %}{% endraw %}</code> in this IG evaluates to</p>
+  {% fragment Patient/example XML %}
+  
+  <a name="filtering"> </a>
+  <h3>Filtering</h3>
+  <p>
+    However, often examples can be somewhat sizeable and you don't necessarily want to include the entire example in the flow of your narrative - you only need a portion.  To filter to a limited portion of the specified resource, you need to declare a 'base' element within that resource that will be included as your fragment.  The 'base' is expressed as a FHIRPath expression evaluated against the root of the resource.
+  </p>
+  <p>
+    For example, <code>{% raw %}&#x7b;%&#xA0;fragment Patient/example JSON BASE:name.where(use='usual') %}{% endraw %}</code> will result in the following:
+  </p>
+  {% fragment Patient/example JSON BASE:name.where(use='official').first() %}
+
+  <a name="ellipsing"> </a>
+  <h3>Ellipsing</h3>
+  <p>
+    Sometimes you want to perform more filtering than only selecting an element within your instance.  You want to only show a portion of that element, hiding (ellipsing) the content you don't care about.  There are two ways to do this: you can either define the specific elements you want to ellipse; or you can define the elements you <i>don't</i> want to ellipse.
+  </p>
+  <p>The 'ELLIPSE:' filter can only be specified once, but with FHIRPath '|', you can express as many elements as you like.  For example, <code>{% raw %}&#x7b;%&#xA0;fragment Patient/example XML BASE:name.where(use='official').first() ELLIPSE:use|given[1]|period %}{% endraw %}</code> will look like this:</p>
+  {% fragment Patient/example XML BASE:name.where(use='official').first() ELLIPSE:use|given[1]|period %}
+  
+  <p>
+    'EXCEPT:' works slightly differently.  With Except you identify the elements to retain (be unellipsed) but you can also specify a descendant 'BASE:' element those expressions are evaluated within.  For example, the following expression will return the patient showing only id an names, and within name, will ellipse everything except the family name: <code>{% raw %}&#x7b;%&#xA0;fragment Patient/example XML EXCEPT:id|name EXCEPT:family BASE:name %}{% endraw %}</code>
+  </p>
+  {% fragment Patient/example XML EXCEPT:id|name EXCEPT:family BASE:name %}
+
+  <p>
+    The overall syntax for fragments is as follows:
+    <code>{% raw %}&#x7b;%&#xA0;fragment [resource]/[id] [XML|JSON] (BASE:[base FHIRPath])? (ELLIPSE:[ellipse elements path])? (EXCEPT:[except elements FHIRPath] (BASE:[except base FHIRPath])?)* %}{% endraw %}</code>
+  </p>
+</div>
--- a/input/pagecontent/index.xml
+++ b/input/pagecontent/index.xml
@ -23,6 +23,9 @@
    <li>
      <a href="spec.html">Detailed Specification</a> - The actual stuff implementers are expected to do.  (Could be multiple pages for this.)
    </li>
+    <li>
+      <a href="fragments.html">Fragments</a> - Guidance about how to embed fragments in an IG
+    </li>
    <li>
      <a href="downloads.html">Downloads</a> - Allows downloading a copy of this implementation guide and other useful information
    </li>
--- a/input/pagecontent/spec.md
+++ b/input/pagecontent/spec.md
@ -3,17 +3,3 @@ You can also use markdown if that's your thing

 And an icon: ![resource](icon-resource.png)

-
-You can also embed fragments of examples (or other resources)
-
-As JSON:
-
-{% include Patient-example-demo1-json-html.xhtml %}
-
-{% include Patient-example-demo2-json-html.xhtml %}
-
-or as XML:
-
-{% include Patient-example-demo1-xml-html.xhtml %}
-
-{% include Patient-example-demo2-xml-html.xhtml %}