diff --git a/.gitignore b/.gitignore
index abcdb31..2b9365b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,13 @@
-bulk-import.py
 .DS_Store
 Thumbs.db
-/assembler
-# /fsh-generated
-/input-cache
-/node_modules
-/output
-/temp
-/template
-/.vscode
+bulk-import.py
+assembler/
+fsh-generated/fsh-index.*
+fsh-generated/includes/
+input-cache/
+node_modules/
+output/
+temp/
+template/
+.vscode/
 fhir.schema.json
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 261eeb9..855c81c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,371 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+     including for purposes of Section 3(b); and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/bulk-import-ci.py b/bulk-import-ci.py
index ce7129d..fe142d8 100644
--- a/bulk-import-ci.py
+++ b/bulk-import-ci.py
@@ -34,6 +34,17 @@
 
 HEADERS = {"Content-Type": "application/json"}
 
+# Print out more information if an error occurred
+def printErrorAdditionalDetails(e):
+    print(f"{ERROR_RED}*** Additional error details: ***{END_C}")
+    if e.response is not None:
+        print(f"{ERROR_RED}Status Code: {e.response.status_code}{END_C}")
+        print(f"{ERROR_RED}Reason: {e.response.reason}{END_C}")
+        print(f"{ERROR_RED}Response Text: {e.response.text}{END_C}")
+    else:
+        print(f"{ERROR_RED}No additional error information available.{END_C}")
+    print()
+
 # Get questionnaire resources from a defined output directory
 def getQuestionnairesFromLocalIg():
     questionnaires = {}
@@ -99,10 +110,13 @@ def updateRootAndSubquestionnaires(questionnaires, implementationGuide):
                 print(
                     f"{ERROR_RED}ERROR: Fail to find {reference} in local files, questionnaire not updated in server. {END_C}"
                 )
+                printErrorAdditionalDetails(e)
             except requests.exceptions.HTTPError as e:
                 print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}", e, '\n')
+                printErrorAdditionalDetails(e)
             except Exception as e:
                 print(f"{ERROR_RED}ERROR: An error occurred, details:{END_C}", e, '\n')
+                printErrorAdditionalDetails(e)
 
 
 
@@ -126,7 +140,6 @@ def assembleQuestionnaire(questionnaires):
                 f"{OK_GREEN}POST request Questionnaire/$assemble successful at {formsServerEndpoint}: {response.status_code} OK{END_C}"
             )
             assembleOutputParams = response.json()
-            print(assembleOutputParams)
 
             # Return bare questionnaire
             if assembleOutputParams["resourceType"] == "Questionnaire":
@@ -143,6 +156,7 @@ def assembleQuestionnaire(questionnaires):
                     f"{ERROR_RED}ERROR: Unable to retrieve assembled questionnaire from output parameters{END_C}",
                     e, '\n'
                 )
+                printErrorAdditionalDetails(e)
 
         else:
             print(
@@ -151,8 +165,10 @@ def assembleQuestionnaire(questionnaires):
 
     except requests.exceptions.HTTPError as e:
         print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}",e, '\n')
+        printErrorAdditionalDetails(e)
     except Exception as e:
         print(f"{ERROR_RED}ERROR: An error occurred, details:", e, '\n')
+        printErrorAdditionalDetails(e)
 
     return None
 
@@ -183,8 +199,10 @@ def updateAssembledQuestionnaire(questionnaire):
 
     except requests.exceptions.HTTPError as e:
         print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}",e, '\n')
+        printErrorAdditionalDetails(e)
     except Exception as e:
         print(f"{ERROR_RED}ERROR: An error occurred, details:", e, '\n')
+        printErrorAdditionalDetails(e)
 
 
 # Main function
diff --git a/fsh-generated/includes/fsh-link-references.md b/fsh-generated/includes/fsh-link-references.md
deleted file mode 100644
index 674d8a3..0000000
--- a/fsh-generated/includes/fsh-link-references.md
+++ /dev/null
@@ -1,53 +0,0 @@
-[AssemblyInstructions]: Questionnaire-AssemblyInstructions.html
-[AboriginalTorresStraitIslanderHealthCheck]: Questionnaire-AboriginalTorresStraitIslanderHealthCheck.html
-[AboutTheHealthCheck]: Questionnaire-AboutTheHealthCheck.html
-[AbsoluteCVDRiskCalculation]: Questionnaire-AbsoluteCVDRiskCalculation.html
-[AllergiesAdverseReactions]: Questionnaire-AllergiesAdverseReactions.html
-[ChronicDiseaseAgeing]: Questionnaire-ChronicDiseaseAgeing.html
-[Consent]: Questionnaire-Consent.html
-[CurrentPriorities]: Questionnaire-CurrentPriorities.html
-[EarHealthAndHearing]: Questionnaire-EarHealthAndHearing.html
-[Examination]: Questionnaire-Examination.html
-[EyeHealth]: Questionnaire-EyeHealth.html
-[FamilyHistory]: Questionnaire-FamilyHistory.html
-[FinalisingHealthCheck]: Questionnaire-FinalisingHealthCheck.html
-[Gambling]: Questionnaire-Gambling.html
-[HealthPrioritiesSummary]: Questionnaire-HealthPrioritiesSummary.html
-[HealthyEating]: Questionnaire-HealthyEating.html
-[HomeAndFamily]: Questionnaire-HomeAndFamily.html
-[Immunisation]: Questionnaire-Immunisation.html
-[Investigations]: Questionnaire-Investigations.html
-[LearningAndDevelopment]: Questionnaire-LearningAndDevelopment.html
-[LearningAndWork]: Questionnaire-LearningAndWork.html
-[MedicalHistoryCurrentProblems]: Questionnaire-MedicalHistoryCurrentProblems.html
-[MemoryAndThinking]: Questionnaire-MemoryAndThinking.html
-[Mood]: Questionnaire-Mood.html
-[OralAndDentalHealth]: Questionnaire-OralAndDentalHealth.html
-[PatientDetails]: Questionnaire-PatientDetails.html
-[RedFlagsEarlyIdentificationGuide]: Questionnaire-RedFlagsEarlyIdentificationGuide.html
-[RegularMedications]: Questionnaire-RegularMedications.html
-[ScreeningPrograms]: Questionnaire-ScreeningPrograms.html
-[SexualHealth]: Questionnaire-SexualHealth.html
-[Skin]: Questionnaire-Skin.html
-[SocialAndEmotionalWellbeing]: Questionnaire-SocialAndEmotionalWellbeing.html
-[SocialHistoryChild]: Questionnaire-SocialHistoryChild.html
-[SubstanceUse]: Questionnaire-SubstanceUse.html
-[AboriginalTorresStraitIslander]: ValueSet-AboriginalTorresStraitIslander.html
-[AustralianStatesAndTerritories]: ValueSet-australian-states-territories-2.html
-[BiologicalSex]: ValueSet-biological-sex-1.html
-[ConditionClinicalStatusCodes]: ValueSet-condition-clinical.html
-[ContainedResourceReference]: StructureDefinition-ContainedResourceReference.html
-[GenderIdentityResponse]: ValueSet-gender-identity-response-1.html
-[MedicalHistory]: ValueSet-MedicalHistory.html
-[PersonalPronouns]: ValueSet-pronouns.html
-[PhysicalActivityAndScreenTime]: Questionnaire-PhysicalActivityAndScreenTime.html
-[PrimaryCarerParentGrandparent]: ValueSet-PrimaryCarerParentGrandparent.html
-[QuestionnaireItemControlExtended]: CodeSystem-QuestionnaireItemControlExtended.html
-[QuestionnaireItemUIControlCodes]: CodeSystem-questionnaire-item-control.html
-[QuestionnaireItemUIControlCodes]: ValueSet-questionnaire-item-control.html
-[SmartFormsApplication]: CapabilityStatement-SmartFormsApplication.html
-[SmartFormsLauncherServerAboriginalTorresStraitIslanderHealthCheck]: CapabilityStatement-SFLauncherServerAboriginalTorresStraitIslanderHealthCheck.html
-[SmartFormsServer]: CapabilityStatement-SmartFormsServer.html
-[YesNo]: ValueSet-YesNo.html
-[YesNoNA]: ValueSet-YesNoNA.html
-[YesNoNotAskedDeclined]: ValueSet-YesNoNotAskedDeclined.html
\ No newline at end of file
diff --git a/fsh-generated/includes/menu.xml b/fsh-generated/includes/menu.xml
deleted file mode 100644
index 199b0a5..0000000
--- a/fsh-generated/includes/menu.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- menu.xml {% comment %}
-*****************************************************************************************************
-*                                  WARNING: DO NOT EDIT THIS FILE                                   *
-*                                                                                                   *
-* This file is generated by SUSHI. Any edits you make to this file will be overwritten.             *
-*                                                                                                   *
-* To change the contents of this file, edit the "menu" attribute in the tank sushi-config.yaml file *
-* or provide your own menu.xml in the input\includes folder                                         *
-*****************************************************************************************************
-{% endcomment %} -->
-
-<ul xmlns="http://www.w3.org/1999/xhtml" class="nav navbar-nav">
-  <li>
-    <a href="index.html">Home</a>
-  </li>
-  <li class="dropdown">
-    <a data-toggle="dropdown" href="#" class="dropdown-toggle">Guidance
-      <b class="caret"></b>
-    </a>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="reference-implementation.html">Reference Implementation</a>
-      </li>
-      <li>
-        <a href="smart-health-check-application-integration.html">Smart Health Check Application Integration</a>
-      </li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a data-toggle="dropdown" href="#" class="dropdown-toggle">FHIR Artefacts
-      <b class="caret"></b>
-    </a>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="artifacts.html">Artefact Summary</a>
-      </li>
-      <li>
-        <a href="questionnaires.html">Questionnaires</a>
-      </li>
-      <li>
-        <a href="capability-statements.html">Capability Statements</a>
-      </li>
-      <li>
-        <a href="profiles-and-extensions.html">Profiles and Extensions</a>
-      </li>
-      <li>
-        <a href="terminology.html">Terminology</a>
-      </li>
-    </ul>
-  </li>
-  <li>
-    <a href="downloads.html">Downloads</a>
-  </li>
-</ul>
\ No newline at end of file
diff --git a/fsh-generated/resources/CodeSystem-HealthChecksSCTSupplement.json b/fsh-generated/resources/CodeSystem-HealthChecksSCTSupplement.json
new file mode 100644
index 0000000..32c145b
--- /dev/null
+++ b/fsh-generated/resources/CodeSystem-HealthChecksSCTSupplement.json
@@ -0,0 +1,58 @@
+{
+  "resourceType": "CodeSystem",
+  "status": "draft",
+  "content": "supplement",
+  "name": "HealthChecksSCTSupplement",
+  "id": "HealthChecksSCTSupplement",
+  "title": "SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check",
+  "description": "The SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check code system supplement defines consumer friendly terms for use in the health check Questionnaire.",
+  "url": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement",
+  "concept": [
+    {
+      "code": "736595007",
+      "display": "Declined"
+    },
+    {
+      "code": "171154002",
+      "display": "Not required"
+    },
+    {
+      "code": "171155001",
+      "display": "Up to date"
+    },
+    {
+      "code": "48031000119106",
+      "display": "Quit >12 months"
+    },
+    {
+      "code": "735128000",
+      "display": "Quit <12 months"
+    },
+    {
+      "code": "266919005",
+      "display": "Never smoked"
+    },
+    {
+      "code": "77176002",
+      "display": "Current smoker"
+    },
+    {
+      "code": "8517006",
+      "display": "Ex-smoker"
+    },
+    {
+      "code": "16090371000119103",
+      "display": "Exposure to second hand tobacco smoke"
+    },
+    {
+      "code": "394872000",
+      "display": "Wants to quit"
+    },
+    {
+      "code": "713914004",
+      "display": "Other tobacco use"
+    }
+  ],
+  "experimental": false,
+  "supplements": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107"
+}
diff --git a/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json b/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json
index b87f5d2..52d67d9 100644
--- a/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json
+++ b/fsh-generated/resources/ImplementationGuide-csiro.fhir.au.smartforms.json
@@ -2,7 +2,7 @@
   "resourceType": "ImplementationGuide",
   "id": "csiro.fhir.au.smartforms",
   "url": "https://smartforms.csiro.au/ig/ImplementationGuide/csiro.fhir.au.smartforms",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "name": "SmartForms",
   "title": "Smart Forms",
   "status": "draft",
@@ -20,16 +20,16 @@
     }
   ],
   "description": "Smart Forms FHIR Implementation Guide.",
-  "copyright": "CSIRO © 2022+; Licensed under Apache License, Version 2.0",
+  "copyright": "Copyright © 2022+ Australian Government Department of Health and Aged Care - All rights reserved. This content is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. See https://creativecommons.org/licenses/by-sa/4.0/.",
   "packageId": "csiro.fhir.au.smartforms",
-  "license": "Apache-2.0",
+  "license": "CC-BY-SA-4.0",
   "fhirVersion": [
     "4.0.1"
   ],
   "dependsOn": [
     {
       "packageId": "hl7.fhir.au.core",
-      "version": "current",
+      "version": "0.3.0-ballot",
       "uri": "http://hl7.org.au/fhir/core/ImplementationGuide/hl7.fhir.au.core",
       "id": "hl7_fhir_au_core"
     },
@@ -38,6 +38,12 @@
       "version": "3.0.0",
       "uri": "http://hl7.org/fhir/uv/sdc/ImplementationGuide/hl7.fhir.uv.sdc",
       "id": "hl7_fhir_uv_sdc"
+    },
+    {
+      "packageId": "hl7.fhir.uv.smart-app-launch",
+      "version": "2.1.0",
+      "uri": "http://hl7.org/fhir/smart-app-launch/ImplementationGuide/hl7.fhir.uv.smart-app-launch",
+      "id": "hl7_fhir_uv_smart_app_launch"
     }
   ],
   "definition": {
@@ -322,6 +328,22 @@
         "description": "The Aboriginal and/or Torres Strait Islander value set includes the Australian Indigenous statuses for Indigenous people.",
         "exampleBoolean": false
       },
+      {
+        "reference": {
+          "reference": "ValueSet/administrative-gender"
+        },
+        "name": "AdministrativeGender",
+        "description": "The gender of a person used for administrative purposes.",
+        "exampleBoolean": false
+      },
+      {
+        "reference": {
+          "reference": "ValueSet/australian-pronouns-1"
+        },
+        "name": "Australian Pronouns",
+        "description": "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual.",
+        "exampleBoolean": false
+      },
       {
         "reference": {
           "reference": "ValueSet/australian-states-territories-2"
@@ -340,42 +362,42 @@
       },
       {
         "reference": {
-          "reference": "ValueSet/condition-clinical"
+          "reference": "ValueSet/CervicalScreeningStatus-1"
         },
-        "name": "Condition Clinical Status Codes",
-        "description": "Preferred value set for Condition Clinical Status.",
+        "name": "Cervical Screening Status",
+        "description": "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program.",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "StructureDefinition/ContainedResourceReference"
+          "reference": "ValueSet/clinical-condition-1"
         },
-        "name": "Contained Resource Reference",
-        "description": "This extension is intended to be used as a work around to a known bug whereby contained resources that are not referenced with the type, 'Reference' are removed before a resource is created in a HAPI FHIR server. This is problematic when referencing with the type, 'canonical'. The extension can be used to reference contained resources so they are retained when added to a HAPI FHIR server.",
+        "name": "Clinical Condition",
+        "description": "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders.",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "ValueSet/gender-identity-response-1"
+          "reference": "ValueSet/condition-clinical"
         },
-        "name": "Gender Identity Response",
-        "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual’s gender. A person's gender is a social and cultural identity, expression and experience.",
+        "name": "Condition Clinical Status Codes",
+        "description": "Preferred value set for Condition Clinical Status.",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "ValueSet/MedicalHistory"
+          "reference": "StructureDefinition/ContainedResourceReference"
         },
-        "name": "Medical History",
-        "description": "The Medical History value set includes values that may be used to represent medical history, operations and hospital admissions.",
+        "name": "Contained Resource Reference",
+        "description": "This extension is intended to be used as a work around to a known bug whereby contained resources that are not referenced with the type, 'Reference' are removed before a resource is created in a HAPI FHIR server. This is problematic when referencing with the type, 'canonical'. The extension can be used to reference contained resources so they are retained when added to a HAPI FHIR server.",
         "exampleBoolean": false
       },
       {
         "reference": {
-          "reference": "ValueSet/pronouns"
+          "reference": "ValueSet/gender-identity-response-1"
         },
-        "name": "Personal Pronouns",
-        "description": "Codes that indicate the pronouns to be used when communicating with or about an individual.",
+        "name": "Gender Identity Response",
+        "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience.",
         "exampleBoolean": false
       },
       {
@@ -442,6 +464,30 @@
         "exampleBoolean": false,
         "name": "Smart Forms Server"
       },
+      {
+        "reference": {
+          "reference": "ValueSet/SmokingQuitStatus-1"
+        },
+        "name": "Smoking Quit Status",
+        "description": "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking.",
+        "exampleBoolean": false
+      },
+      {
+        "reference": {
+          "reference": "CodeSystem/HealthChecksSCTSupplement"
+        },
+        "name": "SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check",
+        "description": "The SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check code system supplement defines consumer friendly terms for use in the health check Questionnaire.",
+        "exampleBoolean": false
+      },
+      {
+        "reference": {
+          "reference": "ValueSet/TobaccoUseStatus-1"
+        },
+        "name": "Tobacco Use Status",
+        "description": "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status.",
+        "exampleBoolean": false
+      },
       {
         "reference": {
           "reference": "ValueSet/YesNo"
@@ -679,6 +725,10 @@
         "code": "special-url",
         "value": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
       },
+      {
+        "code": "special-url",
+        "value": "http://hl7.org/fhir/ValueSet/administrative-gender"
+      },
       {
         "code": "special-url",
         "value": "http://hl7.org/fhir/ValueSet/condition-clinical"
@@ -689,12 +739,16 @@
       },
       {
         "code": "special-url",
-        "value": "http://terminology.hl7.org/ValueSet/pronouns"
+        "value": "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1"
       },
       {
         "code": "special-url",
         "value": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2"
       },
+      {
+        "code": "special-url",
+        "value": "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1"
+      },
       {
         "code": "apply-publisher",
         "value": "false"
diff --git a/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json b/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json
index ae125c8..e6767ab 100644
--- a/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json
+++ b/fsh-generated/resources/Questionnaire-AboutTheHealthCheck.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-1",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -327,6 +327,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/StructureDefinition/variable",
       "valueExpression": {
@@ -350,7 +370,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json b/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json
index bb1b7d6..da7ba26 100644
--- a/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json
+++ b/fsh-generated/resources/Questionnaire-AbsoluteCVDRiskCalculation.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-2",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -90,25 +90,29 @@
           ]
         },
         {
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <strong>Important:</strong> <em>The patient record may not be updated with information entered here. Information intended for the patient record should be entered there first.</em>\r\n    </div>"
-            }
-          ],
           "linkId": "RecordUpdate-CVDRisk",
           "text": "Important: The patient record may not be updated with information entered here. Information intended for the patient record should be entered there.",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <strong>Important:</strong> <em>The patient record may not be updated with information entered here. Information intended for the patient record should be entered there first.</em>\r\n    </div>"
+              }
+            ]
+          },
           "type": "display"
         },
         {
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <p style=\"font-size:1.2em\">The Australian guideline for assessing and managing cardiovascular disease risk recommends the use of the online <a href=\"https://www.cvdcheck.org.au/calculator\" target=\"_blank\">Australian CVD risk calculator</a>.</p>\r\n        <p>The items included in this section are a subset of variables that can be used as inputs for the online calculator.</p>\r\n        <p>The final CVD risk result can be entered in the item at the bottom of this section.</p>\r\n        </div>"
-            }
-          ],
           "linkId": "Guidance-CVDRisk",
           "text": "Australian CVD risk calculator - https://www.cvdcheck.org.au/calculator",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <p style=\"font-size:1.2em\">The Australian guideline for assessing and managing cardiovascular disease risk recommends the use of the online <a href=\"https://www.cvdcheck.org.au/calculator\" target=\"_blank\">Australian CVD risk calculator</a>.</p>\r\n        <p>The items included in this section are a subset of variables that can be used as inputs for the online calculator.</p>\r\n        <p>The final CVD risk result can be entered in the item at the bottom of this section.</p>\r\n        </div>"
+              }
+            ]
+          },
           "type": "display"
         },
         {
@@ -170,7 +174,7 @@
               "text": "Sex at birth",
               "type": "choice",
               "repeats": false,
-              "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+              "answerValueSet": "#biological-sex-1"
             },
             {
               "extension": [
@@ -192,28 +196,28 @@
                   "valueCoding": {
                     "code": "266919005",
                     "system": "http://snomed.info/sct",
-                    "display": "Never smoked"
+                    "display": "Lifetime non-smoker"
                   }
                 },
                 {
                   "valueCoding": {
                     "code": "77176002",
                     "system": "http://snomed.info/sct",
-                    "display": "Smoker"
+                    "display": "Current smoker"
                   }
                 },
                 {
                   "valueCoding": {
                     "code": "8517006",
                     "system": "http://snomed.info/sct",
-                    "display": "Ex-Smoker"
+                    "display": "Ex-smoker"
                   }
                 },
                 {
                   "valueCoding": {
                     "code": "16090371000119103",
                     "system": "http://snomed.info/sct",
-                    "display": "Environmental exposure to tobacco smoke (home, car, etc)"
+                    "display": "Exposure to second hand tobacco smoke"
                   }
                 },
                 {
@@ -607,6 +611,95 @@
       "repeats": false
     }
   ],
+  "contained": [
+    {
+      "resourceType": "ValueSet",
+      "id": "biological-sex-1",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+        ]
+      },
+      "status": "active",
+      "name": "BiologicalSex",
+      "title": "Biological Sex",
+      "description": "The Biological Sex value set includes values that represent the biological sex of an individual.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10198"
+        }
+      ],
+      "version": "1.0.0",
+      "experimental": false,
+      "date": "2020-12-31",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2020 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+      "expansion": {
+        "identifier": "urn:uuid:e9cff1c2-8743-48cb-9bde-8f4af914544b",
+        "timestamp": "2023-08-30T10:41:59+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "248152002",
+            "display": "Female"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "32570681000036106",
+            "display": "Indeterminate sex"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "32570691000036108",
+            "display": "Intersex"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "248153007",
+            "display": "Male"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "filter": [
+              {
+                "property": "constraint",
+                "op": "=",
+                "value": "^ 32570631000036107|Sex reference set|"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ],
   "extension": [
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assemble-expectation",
@@ -652,6 +745,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -699,7 +812,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json b/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json
index 6ede613..4ffbf13 100644
--- a/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json
+++ b/fsh-generated/resources/Questionnaire-AllergiesAdverseReactions.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-3",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -180,6 +180,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -191,7 +211,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-AssemblyInstructions.json b/fsh-generated/resources/Questionnaire-AssemblyInstructions.json
index 4890a4e..5215a4f 100644
--- a/fsh-generated/resources/Questionnaire-AssemblyInstructions.json
+++ b/fsh-generated/resources/Questionnaire-AssemblyInstructions.json
@@ -312,363 +312,363 @@
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.2.0"
             }
           ],
           "linkId": "cd3303a6-e3b6-4732-80e8-54d2bd740beb",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Consent|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Consent|0.2.0"
             }
           ],
           "linkId": "fab52f87-22a6-4a54-9797-0bb6b0f5d2a2",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Consent|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Consent|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.2.0"
             }
           ],
           "linkId": "1d10910d-c195-4964-bdc6-98310a44719e",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.2.0"
             }
           ],
           "linkId": "7692f28c-7c0a-48ea-b27d-a8489974377d",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.2.0"
             }
           ],
           "linkId": "15f83d80-f49a-4852-a20f-18db9b951e53",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MedicalHistory|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MedicalHistory|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.2.0"
             }
           ],
           "linkId": "3a7151ef-d63b-4818-8367-03d394383a61",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.2.0"
             }
           ],
           "linkId": "334853dc-88d4-4cb1-a119-bb0ff6ea0516",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.2.0"
             }
           ],
           "linkId": "1ab9b519-85ce-48ee-a408-8f0b9b74d112",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.2.0"
             }
           ],
           "linkId": "228b8d31-21e3-49a6-b802-984135908dca",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.2.0"
             }
           ],
           "linkId": "a43517f9-538e-4a4d-8789-b6c3d44206ba",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.2.0"
             }
           ],
           "linkId": "8decf7bf-e24c-4d3d-815c-c53e269f004b",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.2.0"
             }
           ],
           "linkId": "3f554c37-7d0e-4b14-8f7f-a9ec665cc0a6",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.2.0"
             }
           ],
           "linkId": "362bf381-23e5-4eee-963a-3de73e584da5",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Mood|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Mood|0.2.0"
             }
           ],
           "linkId": "51a545fa-907f-40f0-9304-36bcab5a16b8",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Mood|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Mood|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.2.0"
             }
           ],
           "linkId": "4217646d-e8e4-4ac5-baa7-fae28937cda7",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.2.0"
             }
           ],
           "linkId": "070eadcf-9e93-499e-8615-61991ab35b32",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.2.0"
             }
           ],
           "linkId": "56d4bc0b-3bf1-4d47-ac34-5a1de0902de1",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.2.0"
             }
           ],
           "linkId": "e0962739-c506-41d4-afd7-ab1b90db9cb4",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.2.0"
             }
           ],
           "linkId": "63cfb279-cd7d-41ed-a54b-0c17b6efe609",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.2.0"
             }
           ],
           "linkId": "db70690e-2199-495a-9919-53697efaf913",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.2.0"
             }
           ],
           "linkId": "d1f66f56-75fa-4498-9c51-eb98e1644243",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Gambling|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Gambling|0.2.0"
             }
           ],
           "linkId": "ea748251-bf77-4085-b912-e9002dfa02ca",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Gambling|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Gambling|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.2.0"
             }
           ],
           "linkId": "84bd802b-b3e1-4098-aa2c-2133f0e252f4",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.2.0"
             }
           ],
           "linkId": "56ad8128-0e12-4779-8ff4-47dcff6b29b5",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.2.0"
             }
           ],
           "linkId": "a8161e91-7cff-403f-85e6-982a9bc8fca6",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.2.0"
             }
           ],
           "linkId": "fe05d868-aaed-4921-9d49-4e7746bbe143",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Skin|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Skin|0.2.0"
             }
           ],
           "linkId": "64ec4c1c-0824-4b84-8d3f-40f6e066cb80",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Skin|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Skin|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.2.0"
             }
           ],
           "linkId": "595737cd-3a94-442b-8be6-ab461c3181d2",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Immunisation|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Immunisation|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Examination|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Examination|0.2.0"
             }
           ],
           "linkId": "3263611d-5813-4393-a660-d10166acd728",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Examination|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Examination|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.2.0"
             }
           ],
           "linkId": "3a3b0810-e091-48ad-af50-913b0deaf663",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Investigations|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Investigations|0.2.0"
             }
           ],
           "linkId": "302d9437-25b9-41e3-9d66-138c352d32a8",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Investigations|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Investigations|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.2.0"
             }
           ],
           "linkId": "ada45623-5e86-49ea-a00b-be0699364281",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         },
         {
           "extension": [
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
-              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.1.0"
+              "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.2.0"
             }
           ],
           "linkId": "a6395946-872a-4f2e-b697-c74aa1ab9b8d",
-          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.1.0] not available. Unable to display all questions.",
+          "text": "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.2.0] not available. Unable to display all questions.",
           "type": "display"
         }
       ],
@@ -885,22 +885,48 @@
     },
     {
       "resourceType": "ValueSet",
-      "id": "MedicalHistory",
-      "status": "draft",
-      "name": "MedicalHistory",
-      "title": "Medical History",
-      "description": "The Medical History value set includes values that may be used to represent medical history, operations and hospital admissions.",
-      "url": "https://smartforms.csiro.au/ig/ValueSet/MedicalHistory",
+      "id": "clinical-condition-1",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+        ]
+      },
+      "status": "active",
+      "name": "ClinicalCondition",
+      "title": "Clinical Condition",
+      "description": "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10035"
+        }
+      ],
+      "version": "1.0.2",
       "experimental": false,
+      "date": "2020-05-31",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
       "compose": {
         "include": [
           {
             "system": "http://snomed.info/sct",
             "filter": [
               {
-                "property": "constraint",
-                "op": "=",
-                "value": "^32570581000036105|Problem/Diagnosis reference set| OR ^32570141000036105|Procedure foundation reference set|"
+                "property": "concept",
+                "op": "in",
+                "value": "32570581000036105"
               }
             ]
           }
@@ -909,12 +935,109 @@
     },
     {
       "resourceType": "ValueSet",
-      "id": "condition-clinical",
+      "id": "administrative-gender",
       "meta": {
         "profile": [
           "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
         ]
       },
+      "status": "active",
+      "name": "AdministrativeGender",
+      "title": "AdministrativeGender",
+      "description": "The gender of a person used for administrative purposes.",
+      "url": "http://hl7.org/fhir/ValueSet/administrative-gender",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "url",
+              "value": "http://hl7.org/fhir"
+            },
+            {
+              "system": "email",
+              "value": "fhir@lists.hl7.org"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+      "date": "2019-11-01T09:29:23+11:00",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
+          "valueCode": "pa"
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+          "valueCode": "normative"
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
+          "valueInteger": 5
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version",
+          "valueCode": "4.0.0"
+        }
+      ],
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:2.16.840.1.113883.4.642.3.1"
+        }
+      ],
+      "immutable": true,
+      "publisher": "HL7 (FHIR Project)",
+      "version": "4.0.1",
+      "expansion": {
+        "identifier": "urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd",
+        "timestamp": "2024-04-05T12:31:27+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "female",
+            "display": "Female"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "male",
+            "display": "Male"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "other",
+            "display": "Other"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "unknown",
+            "display": "Unknown"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://hl7.org/fhir/administrative-gender"
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "condition-clinical",
       "status": "draft",
       "name": "ConditionClinicalStatusCodes",
       "title": "Condition Clinical Status Codes",
@@ -940,7 +1063,7 @@
           "value": "urn:oid:2.16.840.1.113883.4.642.3.164"
         }
       ],
-      "version": "4.3.0",
+      "version": "4.0.1",
       "experimental": false,
       "publisher": "FHIR Project team",
       "contact": [
@@ -953,24 +1076,36 @@
           ]
         }
       ],
-      "copyright": "Copyright © 2011+ HL7. Creative Commons 'No Rights Reserved' (CC0)",
+      "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+      "date": "2019-11-01T09:29:23+11:00",
       "expansion": {
-        "identifier": "5d4bed14-061a-42c4-853d-e6a624c4f483",
-        "timestamp": "2022-10-20T09:32:48+10:00",
+        "identifier": "urn:uuid:79d21cca-9f34-4cfa-9020-17eee95eeed8",
+        "timestamp": "2024-04-02T14:17:12+10:00",
         "total": 6,
-        "offset": 0,
         "parameter": [
           {
             "name": "version",
             "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           },
           {
-            "name": "count",
-            "valueInteger": 2147483647
+            "name": "used-codesystem",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           },
           {
-            "name": "offset",
-            "valueInteger": 0
+            "name": "warning-draft",
+            "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-trial-use",
+            "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-trial-use",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-draft",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           }
         ],
         "contains": [
@@ -1170,81 +1305,97 @@
     },
     {
       "resourceType": "ValueSet",
-      "id": "pronouns",
-      "meta": {
-        "profile": [
-          "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-        ]
-      },
+      "id": "australian-pronouns-1",
       "status": "active",
-      "name": "PersonalPronouns",
-      "title": "Personal Pronouns",
-      "description": "Codes that indicate the pronouns to be used when communicating with or about an individual.",
-      "url": "http://terminology.hl7.org/ValueSet/pronouns",
-      "extension": [
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
-          "valueCode": "pa"
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
-          "valueCode": "trial-use"
-        },
-        {
-          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
-          "valueInteger": 1
-        }
-      ],
+      "name": "AustralianPronouns",
+      "title": "Australian Pronouns",
+      "description": "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1",
       "identifier": [
         {
           "system": "urn:ietf:rfc:3986",
-          "value": "urn:oid:2.16.840.1.113883.4.642.3.3290"
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10284"
         }
       ],
       "version": "1.0.0",
       "experimental": false,
-      "date": "2023-07-17T22:16:15-06:00",
-      "publisher": "FHIR Project team",
+      "date": "2024-02-29",
+      "publisher": "Australian Digital Health Agency",
       "contact": [
         {
           "telecom": [
             {
-              "system": "url",
-              "value": "http://hl7.org/fhir"
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
             }
           ]
         }
       ],
-      "copyright": "This material contains content from LOINC (http://loinc.org). LOINC is copyright © 1995-2020, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc",
+      "copyright": "Copyright © 2024 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis material contains content from LOINC (http://loinc.org). LOINC is copyright 1995-2024, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc.\n\nThis material contains information which is protected by copyright. You may download, display, print and reproduce any material for your personal, non-commercial use or use within your organisation subject to the following terms and conditions: \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
       "expansion": {
-        "identifier": "urn:uuid:220b830c-6a1b-43e7-81e0-ccf92485fcdf",
-        "timestamp": "2023-10-17T10:42:37+10:00",
-        "total": 3,
+        "identifier": "urn:uuid:ca145c1c-4915-4957-888a-39e69de8b1ad",
+        "timestamp": "2024-04-02T14:25:01+10:00",
+        "total": 7,
         "parameter": [
           {
             "name": "version",
-            "valueUri": "http://loinc.org|2.76"
+            "valueUri": "http://loinc.org|2.77"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://loinc.org|2.77"
+          },
+          {
+            "name": "version",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
           },
           {
             "name": "used-codesystem",
-            "valueUri": "http://loinc.org|2.76"
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
           }
         ],
         "contains": [
           {
             "system": "http://loinc.org",
+            "version": "2.77",
             "code": "LA29518-0",
             "display": "he/him/his/his/himself"
           },
           {
             "system": "http://loinc.org",
+            "version": "2.77",
             "code": "LA29519-8",
             "display": "she/her/her/hers/herself"
           },
           {
             "system": "http://loinc.org",
+            "version": "2.77",
             "code": "LA29520-6",
             "display": "they/them/their/theirs/themselves"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "asked-declined",
+            "display": "Asked But Declined"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "asked-unknown",
+            "display": "Asked But Unknown"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "not-asked",
+            "display": "Not Asked"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "unknown",
+            "display": "Unknown"
           }
         ]
       },
@@ -1266,6 +1417,23 @@
                 "display": "they/them/their/theirs/themselves"
               }
             ]
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "concept": [
+              {
+                "code": "unknown"
+              },
+              {
+                "code": "asked-declined"
+              },
+              {
+                "code": "not-asked"
+              },
+              {
+                "code": "asked-unknown"
+              }
+            ]
           }
         ]
       }
@@ -1412,16 +1580,10 @@
     {
       "resourceType": "ValueSet",
       "id": "gender-identity-response-1",
-      "meta": {
-        "profile": [
-          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
-          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
-        ]
-      },
       "status": "active",
       "name": "GenderIdentityResponse",
       "title": "Gender Identity Response",
-      "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual’s gender. A person's gender is a social and cultural identity, expression and experience.",
+      "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience.",
       "url": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1",
       "identifier": [
         {
@@ -1429,9 +1591,9 @@
           "value": "urn:oid:1.2.36.1.2001.1004.201.10271"
         }
       ],
-      "version": "1.0.0",
+      "version": "1.1.0",
       "experimental": false,
-      "date": "2022-09-30",
+      "date": "2024-02-29",
       "publisher": "Australian Digital Health Agency",
       "contact": [
         {
@@ -1443,45 +1605,45 @@
           ]
         }
       ],
-      "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data.",
+      "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.\n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data. \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
       "expansion": {
-        "identifier": "urn:uuid:85c2e561-69ac-41f6-8e9e-07b3072ef48f",
-        "timestamp": "2023-08-30T10:18:47+10:00",
-        "total": 5,
+        "identifier": "urn:uuid:a35fc104-184f-476e-a7a2-e3f3af66a3eb",
+        "timestamp": "2024-04-02T14:21:20+10:00",
+        "total": 6,
         "parameter": [
           {
             "name": "version",
-            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
           },
           {
             "name": "used-codesystem",
-            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
           },
           {
             "name": "version",
-            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
           },
           {
             "name": "used-codesystem",
-            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
           }
         ],
         "contains": [
           {
             "system": "http://snomed.info/sct",
-            "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
             "code": "446151000124109",
             "display": "Identifies as male gender"
           },
           {
             "system": "http://snomed.info/sct",
-            "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
             "code": "446141000124107",
             "display": "Identifies as female gender"
           },
           {
             "system": "http://snomed.info/sct",
-            "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
             "code": "33791000087105",
             "display": "Identifies as nonbinary gender"
           },
@@ -1496,6 +1658,12 @@
             "version": "5.0.0-ballot",
             "code": "asked-declined",
             "display": "Asked But Declined"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "not-asked",
+            "display": "Not Asked"
           }
         ]
       },
@@ -1523,6 +1691,9 @@
               },
               {
                 "code": "asked-declined"
+              },
+              {
+                "code": "not-asked"
               }
             ]
           }
@@ -1615,6 +1786,239 @@
           }
         ]
       }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "SmokingQuitStatus-1",
+      "status": "draft",
+      "name": "SmokingQuitStatus",
+      "title": "Smoking Quit Status",
+      "description": "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/SmokingQuitStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:86b4329d-aca5-4e54-9b5e-67296c7ce9db",
+        "timestamp": "2024-04-08T12:56:59+10:00",
+        "total": 2,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "48031000119106",
+            "display": "Quit >12 months"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "735128000",
+            "display": "Quit <12 months"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "48031000119106",
+                "display": "Quit >12 months"
+              },
+              {
+                "code": "735128000",
+                "display": "Quit <12 months"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "TobaccoUseStatus-1",
+      "status": "draft",
+      "name": "TobaccoUseStatus",
+      "title": "Tobacco Use Status",
+      "description": "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/TobaccoUseStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:577a997d-bacd-499f-bae4-aa6efdcca45e",
+        "timestamp": "2024-11-29T10:37:34+10:00",
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "266919005",
+            "display": "Never smoked"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "77176002",
+            "display": "Current smoker"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "8517006",
+            "display": "Ex-smoker"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "16090371000119103",
+            "display": "Exposure to second hand tobacco smoke"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "394872000",
+            "display": "Wants to quit"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "713914004",
+            "display": "Other tobacco use"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "266919005",
+                "display": "Never smoked"
+              },
+              {
+                "code": "77176002",
+                "display": "Current smoker"
+              },
+              {
+                "code": "8517006",
+                "display": "Ex-smoker"
+              },
+              {
+                "code": "16090371000119103",
+                "display": "Exposure to second hand tobacco smoke"
+              },
+              {
+                "code": "394872000",
+                "display": "Wants to quit"
+              },
+              {
+                "code": "713914004",
+                "display": "Other tobacco use"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "CervicalScreeningStatus-1",
+      "status": "draft",
+      "name": "CervicalScreeningStatus",
+      "title": "Cervical Screening Status",
+      "description": "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/CervicalScreeningStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:7642a243-4f23-4b17-933d-57b448902d5d",
+        "timestamp": "2024-04-08T10:41:42+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "736595007",
+            "display": "Declined"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "410527000",
+            "display": "Offered"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "171154002",
+            "display": "Not required"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "171155001",
+            "display": "Up to date"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "736595007",
+                "display": "Declined"
+              },
+              {
+                "code": "410527000",
+                "display": "Offered"
+              },
+              {
+                "code": "171154002",
+                "display": "Not required"
+              },
+              {
+                "code": "171155001",
+                "display": "Up to date"
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "extension": [
@@ -1662,6 +2066,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/StructureDefinition/variable",
       "valueExpression": {
@@ -1699,7 +2123,13 @@
     {
       "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
       "valueReference": {
-        "reference": "#MedicalHistory"
+        "reference": "#clinical-condition-1"
+      }
+    },
+    {
+      "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+      "valueReference": {
+        "reference": "#administrative-gender"
       }
     },
     {
@@ -1723,7 +2153,7 @@
     {
       "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
       "valueReference": {
-        "reference": "#pronouns"
+        "reference": "#australian-pronouns-1"
       }
     },
     {
@@ -1743,16 +2173,33 @@
       "valueReference": {
         "reference": "#biological-sex-1"
       }
+    },
+    {
+      "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+      "valueReference": {
+        "reference": "#SmokingQuitStatus-1"
+      }
+    },
+    {
+      "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+      "valueReference": {
+        "reference": "#TobaccoUseStatus-1"
+      }
+    },
+    {
+      "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+      "valueReference": {
+        "reference": "#CervicalScreeningStatus-1"
+      }
     }
   ],
-  "version": "0.1.0",
   "name": "AboriginalTorresStraitIslanderHealthCheck",
   "status": "draft",
   "experimental": false,
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json b/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json
index 3643a52..b25c3fd 100644
--- a/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json
+++ b/fsh-generated/resources/Questionnaire-ChronicDiseaseAgeing.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-4",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -94,10 +94,6 @@
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
               "valueString": "Assessment of chronic disease associated with ageing"
-            },
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>For older people with chronic disease and/or conditions associated with ageing, consider assessing:</div>\r\n    <ul>\r\n      <li>Osteoporosis risk</li>\r\n      <li>Falls risk</li>\r\n      <li>Balance, coordination and mobility</li>\r\n      <li>Pain</li>\r\n      <li>Nutrition</li>\r\n      <li>Regularity of chronic disease management and review</li>\r\n    </ul>\r\n    </div>"
             }
           ],
           "item": [
@@ -122,6 +118,14 @@
           ],
           "linkId": "12e244c0-2887-4230-8792-9521d4f1ab33",
           "text": "For older people with chronic disease and/or conditions associated with ageing, consider assessing: Osteoporosis risk; Falls risk; Balance, coordination and mobility; Pain; Nutrition; Regularity of chronic disease management and review",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>For older people with chronic disease and/or conditions associated with ageing, consider assessing:</div>\r\n    <ul>\r\n      <li>Osteoporosis risk</li>\r\n      <li>Falls risk</li>\r\n      <li>Balance, coordination and mobility</li>\r\n      <li>Pain</li>\r\n      <li>Nutrition</li>\r\n      <li>Regularity of chronic disease management and review</li>\r\n    </ul>\r\n    </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -197,6 +201,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -208,7 +232,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Consent.json b/fsh-generated/resources/Questionnaire-Consent.json
index 89e93a1..6165c99 100644
--- a/fsh-generated/resources/Questionnaire-Consent.json
+++ b/fsh-generated/resources/Questionnaire-Consent.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-30",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -269,8 +269,7 @@
           "linkId": "84162f36-f4af-4509-b178-ef2a3849d0b6",
           "text": "Date",
           "type": "date",
-          "repeats": false,
-          "required": true
+          "repeats": false
         },
         {
           "linkId": "0f92eb2d-4629-4215-96f8-46722a2efa73",
@@ -391,7 +390,7 @@
               "valueCoding": {
                 "code": "413817003",
                 "system": "http://snomed.info/sct",
-                "display": "Early learning centre"
+                "display": "Child day care centre"
               }
             }
           ]
@@ -527,6 +526,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -538,7 +557,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-CurrentPriorities.json b/fsh-generated/resources/Questionnaire-CurrentPriorities.json
index 706f083..df617f1 100644
--- a/fsh-generated/resources/Questionnaire-CurrentPriorities.json
+++ b/fsh-generated/resources/Questionnaire-CurrentPriorities.json
@@ -55,8 +55,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-5",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -80,7 +80,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -427,6 +427,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -438,7 +458,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json b/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json
index 605579d..c50c776 100644
--- a/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json
+++ b/fsh-generated/resources/Questionnaire-EarHealthAndHearing.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-6",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -751,6 +751,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -762,7 +782,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Examination.json b/fsh-generated/resources/Questionnaire-Examination.json
index 36c67c1..1c583dc 100644
--- a/fsh-generated/resources/Questionnaire-Examination.json
+++ b/fsh-generated/resources/Questionnaire-Examination.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-7",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -644,14 +644,14 @@
                       "valueCoding": {
                         "code": "271636001",
                         "system": "http://snomed.info/sct",
-                        "display": "Pulse Regular"
+                        "display": "Pulse regular"
                       }
                     },
                     {
                       "valueCoding": {
                         "code": "61086009",
                         "system": "http://snomed.info/sct",
-                        "display": "Pulse Irregular"
+                        "display": "Pulse irregular"
                       }
                     }
                   ]
@@ -957,6 +957,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "ObsBloodPressure"
@@ -1028,7 +1048,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-EyeHealth.json b/fsh-generated/resources/Questionnaire-EyeHealth.json
index 34e8c71..0f9c8de 100644
--- a/fsh-generated/resources/Questionnaire-EyeHealth.json
+++ b/fsh-generated/resources/Questionnaire-EyeHealth.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-8",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -328,7 +328,7 @@
                       "valueCoding": {
                         "code": "95726001",
                         "system": "http://snomed.info/sct",
-                        "display": "Corneal scarring"
+                        "display": "Corneal scar"
                       }
                     }
                   ]
@@ -363,7 +363,7 @@
                       "valueCoding": {
                         "code": "95726001",
                         "system": "http://snomed.info/sct",
-                        "display": "Corneal scarring"
+                        "display": "Corneal scar"
                       }
                     }
                   ]
@@ -508,6 +508,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -519,7 +539,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-FamilyHistory.json b/fsh-generated/resources/Questionnaire-FamilyHistory.json
index c659b22..1619e64 100644
--- a/fsh-generated/resources/Questionnaire-FamilyHistory.json
+++ b/fsh-generated/resources/Questionnaire-FamilyHistory.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-9",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -235,6 +235,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -246,7 +266,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json b/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json
index d90eb09..07d47dc 100644
--- a/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json
+++ b/fsh-generated/resources/Questionnaire-FinalisingHealthCheck.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-31",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -1044,6 +1044,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -1055,7 +1075,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Gambling.json b/fsh-generated/resources/Questionnaire-Gambling.json
index c093635..3bfea2f 100644
--- a/fsh-generated/resources/Questionnaire-Gambling.json
+++ b/fsh-generated/resources/Questionnaire-Gambling.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-10",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -265,6 +265,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -276,7 +296,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json b/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json
index d43cd86..95eae1a 100644
--- a/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json
+++ b/fsh-generated/resources/Questionnaire-HealthPrioritiesSummary.json
@@ -828,6 +828,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -963,7 +983,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-HealthyEating.json b/fsh-generated/resources/Questionnaire-HealthyEating.json
index 7b7c1cf..95676a9 100644
--- a/fsh-generated/resources/Questionnaire-HealthyEating.json
+++ b/fsh-generated/resources/Questionnaire-HealthyEating.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-11",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -385,10 +385,6 @@
                 "language": "text/fhirpath",
                 "expression": "%age <= 5"
               }
-            },
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about age-appropriate healthy eating, which could include:</div>\r\n    <ul>\r\n      <li>current diet</li>\r\n      <li>transition to solids</li>\r\n      <li>dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks</li>\r\n    </ul>\r\n    </div>"
             }
           ],
           "item": [
@@ -413,6 +409,14 @@
           ],
           "linkId": "9f6adf74-f240-41a2-a509-d216d5308911",
           "text": "Document conversation about age-appropriate healthy eating, which could include: current diet; transition to solids; dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about age-appropriate healthy eating, which could include:</div>\r\n    <ul>\r\n      <li>current diet</li>\r\n      <li>transition to solids</li>\r\n      <li>dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks</li>\r\n    </ul>\r\n    </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -424,10 +428,6 @@
                 "language": "text/fhirpath",
                 "expression": "%age > 5"
               }
-            },
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about health eating which could include:</div>\r\n    <ul>\r\n      <li>current diet including food and drinks</li>\r\n      <li>recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)</li>\r\n    </ul>\r\n    </div>"
             }
           ],
           "item": [
@@ -452,6 +452,14 @@
           ],
           "linkId": "7a22a4c4-6611-4687-af00-37c80c3f8fc0",
           "text": "Document conversation about health eating which could include: current diet including food and drinks; recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about health eating which could include:</div>\r\n    <ul>\r\n      <li>current diet including food and drinks</li>\r\n      <li>recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)</li>\r\n    </ul>\r\n    </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -631,6 +639,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -642,7 +670,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-HomeAndFamily.json b/fsh-generated/resources/Questionnaire-HomeAndFamily.json
index bd9cc93..8d62fe0 100644
--- a/fsh-generated/resources/Questionnaire-HomeAndFamily.json
+++ b/fsh-generated/resources/Questionnaire-HomeAndFamily.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-12",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -339,6 +339,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -350,7 +370,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Immunisation.json b/fsh-generated/resources/Questionnaire-Immunisation.json
index fd8fbf5..92e73c3 100644
--- a/fsh-generated/resources/Questionnaire-Immunisation.json
+++ b/fsh-generated/resources/Questionnaire-Immunisation.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-13",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -351,6 +351,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -362,7 +382,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Investigations.json b/fsh-generated/resources/Questionnaire-Investigations.json
index e37a140..18c835f 100644
--- a/fsh-generated/resources/Questionnaire-Investigations.json
+++ b/fsh-generated/resources/Questionnaire-Investigations.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-14",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -222,6 +222,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -233,7 +253,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json b/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json
index f4f1ea7..bc8a3f4 100644
--- a/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json
+++ b/fsh-generated/resources/Questionnaire-LearningAndDevelopment.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-15",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -493,6 +493,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -504,7 +524,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-LearningAndWork.json b/fsh-generated/resources/Questionnaire-LearningAndWork.json
index 77754cc..12c4a3e 100644
--- a/fsh-generated/resources/Questionnaire-LearningAndWork.json
+++ b/fsh-generated/resources/Questionnaire-LearningAndWork.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-33",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -292,8 +292,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-16",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -317,7 +317,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -565,6 +565,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -576,7 +596,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json b/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json
index 4d18274..9f11a9e 100644
--- a/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json
+++ b/fsh-generated/resources/Questionnaire-MedicalHistoryCurrentProblems.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-17",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -233,7 +233,7 @@
               "linkId": "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e",
               "text": "Condition",
               "type": "open-choice",
-              "answerValueSet": "#MedicalHistory"
+              "answerValueSet": "#clinical-condition-1"
             },
             {
               "extension": [
@@ -259,7 +259,7 @@
               "linkId": "88bcfad7-386b-4d87-b34b-2e50482e4d2c",
               "text": "Clinical Status",
               "type": "choice",
-              "answerValueSet": "http://hl7.org/fhir/ValueSet/condition-clinical"
+              "answerValueSet": "#condition-clinical"
             },
             {
               "extension": [
@@ -335,7 +335,7 @@
               "linkId": "2da85994-2d5e-42f1-8a81-abf44f397468",
               "text": "Condition",
               "type": "open-choice",
-              "answerValueSet": "#MedicalHistory"
+              "answerValueSet": "#clinical-condition-1"
             },
             {
               "extension": [
@@ -354,7 +354,7 @@
               "linkId": "a7e056be-fb6f-4f7f-b04d-5b809e1e18e3",
               "text": "Clinical Status",
               "type": "choice",
-              "answerValueSet": "http://hl7.org/fhir/ValueSet/condition-clinical"
+              "answerValueSet": "#condition-clinical"
             },
             {
               "linkId": "e4524654-f6de-4717-b288-34919394d46b",
@@ -400,38 +400,9 @@
     }
   ],
   "contained": [
-    {
-      "resourceType": "ValueSet",
-      "id": "MedicalHistory",
-      "status": "draft",
-      "name": "MedicalHistory",
-      "title": "Medical History",
-      "description": "The Medical History value set includes values that may be used to represent medical history, operations and hospital admissions.",
-      "url": "https://smartforms.csiro.au/ig/ValueSet/MedicalHistory",
-      "experimental": false,
-      "compose": {
-        "include": [
-          {
-            "system": "http://snomed.info/sct",
-            "filter": [
-              {
-                "property": "constraint",
-                "op": "=",
-                "value": "^32570581000036105|Problem/Diagnosis reference set| OR ^32570141000036105|Procedure foundation reference set|"
-              }
-            ]
-          }
-        ]
-      }
-    },
     {
       "resourceType": "ValueSet",
       "id": "condition-clinical",
-      "meta": {
-        "profile": [
-          "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-        ]
-      },
       "status": "draft",
       "name": "ConditionClinicalStatusCodes",
       "title": "Condition Clinical Status Codes",
@@ -457,7 +428,7 @@
           "value": "urn:oid:2.16.840.1.113883.4.642.3.164"
         }
       ],
-      "version": "4.3.0",
+      "version": "4.0.1",
       "experimental": false,
       "publisher": "FHIR Project team",
       "contact": [
@@ -470,24 +441,36 @@
           ]
         }
       ],
-      "copyright": "Copyright © 2011+ HL7. Creative Commons 'No Rights Reserved' (CC0)",
+      "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+      "date": "2019-11-01T09:29:23+11:00",
       "expansion": {
-        "identifier": "5d4bed14-061a-42c4-853d-e6a624c4f483",
-        "timestamp": "2022-10-20T09:32:48+10:00",
+        "identifier": "urn:uuid:79d21cca-9f34-4cfa-9020-17eee95eeed8",
+        "timestamp": "2024-04-02T14:17:12+10:00",
         "total": 6,
-        "offset": 0,
         "parameter": [
           {
             "name": "version",
             "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           },
           {
-            "name": "count",
-            "valueInteger": 2147483647
+            "name": "used-codesystem",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-draft",
+            "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-trial-use",
+            "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+          },
+          {
+            "name": "warning-trial-use",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           },
           {
-            "name": "offset",
-            "valueInteger": 0
+            "name": "warning-draft",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
           }
         ],
         "contains": [
@@ -530,6 +513,56 @@
           }
         ]
       }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "clinical-condition-1",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+        ]
+      },
+      "status": "active",
+      "name": "ClinicalCondition",
+      "title": "Clinical Condition",
+      "description": "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10035"
+        }
+      ],
+      "version": "1.0.2",
+      "experimental": false,
+      "date": "2020-05-31",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "filter": [
+              {
+                "property": "concept",
+                "op": "in",
+                "value": "32570581000036105"
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "extension": [
@@ -577,6 +610,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -592,7 +645,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-MemoryAndThinking.json b/fsh-generated/resources/Questionnaire-MemoryAndThinking.json
index bbc7d9c..dc1b433 100644
--- a/fsh-generated/resources/Questionnaire-MemoryAndThinking.json
+++ b/fsh-generated/resources/Questionnaire-MemoryAndThinking.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-18",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -339,6 +339,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -350,7 +370,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Mood.json b/fsh-generated/resources/Questionnaire-Mood.json
index 804732d..36700b6 100644
--- a/fsh-generated/resources/Questionnaire-Mood.json
+++ b/fsh-generated/resources/Questionnaire-Mood.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-19",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -245,6 +245,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -256,7 +276,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json b/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json
index 620639b..2aa68c0 100644
--- a/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json
+++ b/fsh-generated/resources/Questionnaire-OralAndDentalHealth.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-20",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -389,6 +389,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -400,7 +420,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-PatientDetails.json b/fsh-generated/resources/Questionnaire-PatientDetails.json
index 67b2b85..49de3e9 100644
--- a/fsh-generated/resources/Questionnaire-PatientDetails.json
+++ b/fsh-generated/resources/Questionnaire-PatientDetails.json
@@ -42,8 +42,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-32",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -67,7 +67,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -131,7 +131,7 @@
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
               "valueExpression": {
                 "language": "text/fhirpath",
-                "expression": "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns').extension.where(url='value').value.coding"
+                "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
               }
             },
             {
@@ -151,7 +151,7 @@
           "type": "choice",
           "repeats": false,
           "readOnly": true,
-          "answerValueSet": "http://terminology.hl7.org/ValueSet/pronouns"
+          "answerValueSet": "#australian-pronouns-1"
         },
         {
           "extension": [
@@ -159,7 +159,7 @@
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
               "valueExpression": {
                 "language": "text/fhirpath",
-                "expression": "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/patient-genderIdentity').value.coding"
+                "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-genderIdentity') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
               }
             },
             {
@@ -179,7 +179,7 @@
           "type": "choice",
           "repeats": false,
           "readOnly": true,
-          "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1"
+          "answerValueSet": "#gender-identity-response-1"
         },
         {
           "extension": [
@@ -210,7 +210,7 @@
           "text": "Administrative gender",
           "type": "choice",
           "repeats": false,
-          "answerValueSet": "http://hl7.org/fhir/ValueSet/administrative-gender"
+          "answerValueSet": "#administrative-gender"
         },
         {
           "extension": [
@@ -218,7 +218,7 @@
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
               "valueExpression": {
                 "language": "text/fhirpath",
-                "expression": "%ObsSex.entry.resource.value.coding"
+                "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-recordedSexOrGender' and extension.where(exists(url='type' and value.coding.code='1515311000168102')) and extension.where(url='effectivePeriod').value.end.empty())).extension.where(url='value').value.coding"
               }
             },
             {
@@ -238,7 +238,7 @@
           "type": "choice",
           "repeats": false,
           "readOnly": true,
-          "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+          "answerValueSet": "#biological-sex-1"
         },
         {
           "extension": [
@@ -524,7 +524,7 @@
                   "definition": "http://hl7.org.au/fhir/StructureDefinition/au-address#Address.state",
                   "text": "State",
                   "type": "choice",
-                  "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2",
+                  "answerValueSet": "#australian-states-territories-2",
                   "repeats": false
                 },
                 {
@@ -661,7 +661,7 @@
               "definition": "http://hl7.org.au/fhir/StructureDefinition/au-address#Address.state",
               "text": "State",
               "type": "choice",
-              "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2",
+              "answerValueSet": "#australian-states-territories-2",
               "repeats": false
             },
             {
@@ -726,6 +726,16 @@
           "repeats": true
         },
         {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext",
+              "valueExpression": {
+                "name": "EmergencyContactRepeat",
+                "language": "text/fhirpath",
+                "expression": "%patient.contact.where(relationship.coding.exists(code = 'C'))"
+              }
+            }
+          ],
           "item": [
             {
               "extension": [
@@ -733,7 +743,7 @@
                   "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                   "valueExpression": {
                     "language": "text/fhirpath",
-                    "expression": "%patient.contact.where(relationship.coding.exists(code = 'C')).name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
+                    "expression": "%EmergencyContactRepeat.name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
                   }
                 }
               ],
@@ -778,7 +788,7 @@
                   "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                   "valueExpression": {
                     "language": "text/fhirpath",
-                    "expression": "%patient.contact.where(relationship.coding.exists(code = 'C')).telecom.value"
+                    "expression": "%EmergencyContactRepeat.telecom.value"
                   }
                 }
               ],
@@ -1602,6 +1612,592 @@
           }
         ]
       }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "administrative-gender",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
+        ]
+      },
+      "status": "active",
+      "name": "AdministrativeGender",
+      "title": "AdministrativeGender",
+      "description": "The gender of a person used for administrative purposes.",
+      "url": "http://hl7.org/fhir/ValueSet/administrative-gender",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "url",
+              "value": "http://hl7.org/fhir"
+            },
+            {
+              "system": "email",
+              "value": "fhir@lists.hl7.org"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+      "date": "2019-11-01T09:29:23+11:00",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
+          "valueCode": "pa"
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+          "valueCode": "normative"
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
+          "valueInteger": 5
+        },
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version",
+          "valueCode": "4.0.0"
+        }
+      ],
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:2.16.840.1.113883.4.642.3.1"
+        }
+      ],
+      "immutable": true,
+      "publisher": "HL7 (FHIR Project)",
+      "version": "4.0.1",
+      "expansion": {
+        "identifier": "urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd",
+        "timestamp": "2024-04-05T12:31:27+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "female",
+            "display": "Female"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "male",
+            "display": "Male"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "other",
+            "display": "Other"
+          },
+          {
+            "system": "http://hl7.org/fhir/administrative-gender",
+            "code": "unknown",
+            "display": "Unknown"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://hl7.org/fhir/administrative-gender"
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "australian-pronouns-1",
+      "status": "active",
+      "name": "AustralianPronouns",
+      "title": "Australian Pronouns",
+      "description": "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10284"
+        }
+      ],
+      "version": "1.0.0",
+      "experimental": false,
+      "date": "2024-02-29",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2024 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis material contains content from LOINC (http://loinc.org). LOINC is copyright 1995-2024, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc.\n\nThis material contains information which is protected by copyright. You may download, display, print and reproduce any material for your personal, non-commercial use or use within your organisation subject to the following terms and conditions: \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
+      "expansion": {
+        "identifier": "urn:uuid:ca145c1c-4915-4957-888a-39e69de8b1ad",
+        "timestamp": "2024-04-02T14:25:01+10:00",
+        "total": 7,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://loinc.org|2.77"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://loinc.org|2.77"
+          },
+          {
+            "name": "version",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://loinc.org",
+            "version": "2.77",
+            "code": "LA29518-0",
+            "display": "he/him/his/his/himself"
+          },
+          {
+            "system": "http://loinc.org",
+            "version": "2.77",
+            "code": "LA29519-8",
+            "display": "she/her/her/hers/herself"
+          },
+          {
+            "system": "http://loinc.org",
+            "version": "2.77",
+            "code": "LA29520-6",
+            "display": "they/them/their/theirs/themselves"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "asked-declined",
+            "display": "Asked But Declined"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "asked-unknown",
+            "display": "Asked But Unknown"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "not-asked",
+            "display": "Not Asked"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "unknown",
+            "display": "Unknown"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://loinc.org",
+            "concept": [
+              {
+                "code": "LA29518-0",
+                "display": "he/him/his/his/himself"
+              },
+              {
+                "code": "LA29519-8",
+                "display": "she/her/her/hers/herself"
+              },
+              {
+                "code": "LA29520-6",
+                "display": "they/them/their/theirs/themselves"
+              }
+            ]
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "concept": [
+              {
+                "code": "unknown"
+              },
+              {
+                "code": "asked-declined"
+              },
+              {
+                "code": "not-asked"
+              },
+              {
+                "code": "asked-unknown"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "gender-identity-response-1",
+      "status": "active",
+      "name": "GenderIdentityResponse",
+      "title": "Gender Identity Response",
+      "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10271"
+        }
+      ],
+      "version": "1.1.0",
+      "experimental": false,
+      "date": "2024-02-29",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.\n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data. \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
+      "expansion": {
+        "identifier": "urn:uuid:a35fc104-184f-476e-a7a2-e3f3af66a3eb",
+        "timestamp": "2024-04-02T14:21:20+10:00",
+        "total": 6,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "version",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+            "code": "446151000124109",
+            "display": "Identifies as male gender"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+            "code": "446141000124107",
+            "display": "Identifies as female gender"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+            "code": "33791000087105",
+            "display": "Identifies as nonbinary gender"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "unknown",
+            "display": "Unknown"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "asked-declined",
+            "display": "Asked But Declined"
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "version": "5.0.0-ballot",
+            "code": "not-asked",
+            "display": "Not Asked"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "446151000124109"
+              },
+              {
+                "code": "446141000124107"
+              },
+              {
+                "code": "33791000087105"
+              }
+            ]
+          },
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+            "concept": [
+              {
+                "code": "unknown"
+              },
+              {
+                "code": "asked-declined"
+              },
+              {
+                "code": "not-asked"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "biological-sex-1",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+        ]
+      },
+      "status": "active",
+      "name": "BiologicalSex",
+      "title": "Biological Sex",
+      "description": "The Biological Sex value set includes values that represent the biological sex of an individual.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10198"
+        }
+      ],
+      "version": "1.0.0",
+      "experimental": false,
+      "date": "2020-12-31",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2020 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+      "expansion": {
+        "identifier": "urn:uuid:e9cff1c2-8743-48cb-9bde-8f4af914544b",
+        "timestamp": "2023-08-30T10:41:59+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "248152002",
+            "display": "Female"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "32570681000036106",
+            "display": "Indeterminate sex"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "32570691000036108",
+            "display": "Intersex"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "248153007",
+            "display": "Male"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "filter": [
+              {
+                "property": "constraint",
+                "op": "=",
+                "value": "^ 32570631000036107|Sex reference set|"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "australian-states-territories-2",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+          "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+        ]
+      },
+      "status": "active",
+      "name": "AustralianStatesAndTerritories",
+      "title": "Australian States and Territories",
+      "description": "The Australian States and Territories value set includes values that represent the Australian states and territories.",
+      "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2",
+      "identifier": [
+        {
+          "system": "urn:ietf:rfc:3986",
+          "value": "urn:oid:1.2.36.1.2001.1004.201.10026"
+        }
+      ],
+      "version": "2.0.2",
+      "experimental": false,
+      "date": "2020-05-31",
+      "publisher": "Australian Digital Health Agency",
+      "contact": [
+        {
+          "telecom": [
+            {
+              "system": "email",
+              "value": "help@digitalhealth.gov.au"
+            }
+          ]
+        }
+      ],
+      "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+      "expansion": {
+        "identifier": "e9439195-c1d8-4069-a349-98c1d552a351",
+        "timestamp": "2023-06-20T04:20:58+00:00",
+        "total": 9,
+        "offset": 0,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1|1.1.3"
+          },
+          {
+            "name": "count",
+            "valueInteger": 2147483647
+          },
+          {
+            "name": "offset",
+            "valueInteger": 0
+          }
+        ],
+        "contains": [
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "ACT",
+            "display": "Australian Capital Territory"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "NSW",
+            "display": "New South Wales"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "NT",
+            "display": "Northern Territory"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "OTHER",
+            "display": "Other territories"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "QLD",
+            "display": "Queensland"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "SA",
+            "display": "South Australia"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "TAS",
+            "display": "Tasmania"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "VIC",
+            "display": "Victoria"
+          },
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "code": "WA",
+            "display": "Western Australia"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+            "concept": [
+              {
+                "code": "ACT"
+              },
+              {
+                "code": "NSW"
+              },
+              {
+                "code": "NT"
+              },
+              {
+                "code": "OTHER"
+              },
+              {
+                "code": "QLD"
+              },
+              {
+                "code": "SA"
+              },
+              {
+                "code": "TAS"
+              },
+              {
+                "code": "VIC"
+              },
+              {
+                "code": "WA"
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "extension": [
@@ -1649,6 +2245,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -1676,7 +2292,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json b/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json
index 2a3ac0e..7b02002 100644
--- a/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json
+++ b/fsh-generated/resources/Questionnaire-PhysicalActivityAndScreenTime.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-34",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -386,8 +386,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-21",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -411,7 +411,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -626,6 +626,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -637,7 +657,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json b/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json
index 5d0375d..d256b2a 100644
--- a/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json
+++ b/fsh-generated/resources/Questionnaire-RedFlagsEarlyIdentificationGuide.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-22",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -1337,6 +1337,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -1348,7 +1368,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-RegularMedications.json b/fsh-generated/resources/Questionnaire-RegularMedications.json
index e93bc62..edcba17 100644
--- a/fsh-generated/resources/Questionnaire-RegularMedications.json
+++ b/fsh-generated/resources/Questionnaire-RegularMedications.json
@@ -55,8 +55,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-23",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -80,7 +80,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -168,7 +168,6 @@
           "text": "Up to date in the health record?",
           "type": "boolean",
           "repeats": false,
-          "required": true,
           "enableWhen": [
             {
               "question": "6eb59145-ed9a-4184-af83-3506d47e4d4e",
@@ -200,7 +199,6 @@
           "text": "Medication understanding and adherence has been checked with patient",
           "type": "boolean",
           "repeats": false,
-          "required": true,
           "enableWhen": [
             {
               "question": "6eb59145-ed9a-4184-af83-3506d47e4d4e",
@@ -349,6 +347,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -360,7 +378,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-ScreeningPrograms.json b/fsh-generated/resources/Questionnaire-ScreeningPrograms.json
index bab7789..537bf88 100644
--- a/fsh-generated/resources/Questionnaire-ScreeningPrograms.json
+++ b/fsh-generated/resources/Questionnaire-ScreeningPrograms.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-24",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -342,6 +342,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -353,7 +373,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-SexualHealth.json b/fsh-generated/resources/Questionnaire-SexualHealth.json
index d5620cc..baf879a 100644
--- a/fsh-generated/resources/Questionnaire-SexualHealth.json
+++ b/fsh-generated/resources/Questionnaire-SexualHealth.json
@@ -55,8 +55,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-36",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -80,7 +80,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -143,10 +143,6 @@
         },
         {
           "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menstruation (including risk of anaemia)</li>\r\n        <li>current sexual activity</li>\r\n        <li>contraception</li>\r\n        <li>safe sex practice (eg use of condoms)</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n      </ul>\r\n      </div>"
-            },
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
               "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -154,6 +150,14 @@
           ],
           "linkId": "0fba3972-faa3-4f40-940c-c2f1c9b55329",
           "text": "Consider discussing as relevant to age/sex/gender: menstruation (including risk of anaemia); current sexual activity; contraception; safe sex practice (eg use of condoms); sexually transmitted infection symptoms and screening; blood-borne virus screening",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menstruation (including risk of anaemia)</li>\r\n        <li>current sexual activity</li>\r\n        <li>contraception</li>\r\n        <li>safe sex practice (eg use of condoms)</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n      </ul>\r\n      </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -222,8 +226,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-35",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -247,7 +251,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -328,36 +332,7 @@
               "text": "Cervical screening status",
               "type": "choice",
               "repeats": false,
-              "answerOption": [
-                {
-                  "valueCoding": {
-                    "code": "736595007",
-                    "system": "http://snomed.info/sct",
-                    "display": "Declined"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "410527000",
-                    "system": "http://snomed.info/sct",
-                    "display": "Offered"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "171154002",
-                    "system": "http://snomed.info/sct",
-                    "display": "Not required"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "171155001",
-                    "system": "http://snomed.info/sct",
-                    "display": "Up to date"
-                  }
-                }
-              ]
+              "answerValueSet": "#CervicalScreeningStatus-1"
             },
             {
               "linkId": "f93eb998-1502-4d8a-88a4-986117a387c5",
@@ -379,10 +354,6 @@
         },
         {
           "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>contraception</li>\r\n        <li>menstruation</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n        <li>continence</li>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n      </ul>\r\n      </div>"
-            },
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
               "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -390,6 +361,14 @@
           ],
           "linkId": "39b02169-ea34-4af9-aa35-1c47f7f39333",
           "text": "Consider discussing as relevant to age/sex/gender: contraception; menstruation; sexually transmitted infection symptoms and screening; blood-borne virus screening; continence; menopause; erectile dysfunction",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>contraception</li>\r\n        <li>menstruation</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n        <li>continence</li>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n      </ul>\r\n      </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -458,8 +437,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-25",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -483,7 +462,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -594,10 +573,6 @@
         },
         {
           "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-              "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n        <li>prostatic symptoms</li>\r\n      </ul>\r\n\t    </div>"
-            },
             {
               "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
               "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -605,6 +580,14 @@
           ],
           "linkId": "8d75d1f1-290b-41fc-8e32-ad0681c650bb",
           "text": "Consider discussing as relevant to age/sex/gender: menopause; erectile dysfunction; prostatic symptoms",
+          "_text": {
+            "extension": [
+              {
+                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n        <li>prostatic symptoms</li>\r\n      </ul>\r\n\t    </div>"
+              }
+            ]
+          },
           "type": "text",
           "repeats": false
         },
@@ -778,6 +761,84 @@
           }
         ]
       }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "CervicalScreeningStatus-1",
+      "status": "draft",
+      "name": "CervicalScreeningStatus",
+      "title": "Cervical Screening Status",
+      "description": "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/CervicalScreeningStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:7642a243-4f23-4b17-933d-57b448902d5d",
+        "timestamp": "2024-04-08T10:41:42+10:00",
+        "total": 4,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "736595007",
+            "display": "Declined"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "410527000",
+            "display": "Offered"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "171154002",
+            "display": "Not required"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "171155001",
+            "display": "Up to date"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "736595007",
+                "display": "Declined"
+              },
+              {
+                "code": "410527000",
+                "display": "Offered"
+              },
+              {
+                "code": "171154002",
+                "display": "Not required"
+              },
+              {
+                "code": "171155001",
+                "display": "Up to date"
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "extension": [
@@ -825,6 +886,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -836,7 +917,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-Skin.json b/fsh-generated/resources/Questionnaire-Skin.json
index dba7f03..f85dd75 100644
--- a/fsh-generated/resources/Questionnaire-Skin.json
+++ b/fsh-generated/resources/Questionnaire-Skin.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-26",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -375,6 +375,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -386,7 +406,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json b/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json
index 1c343f3..42c6ca1 100644
--- a/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json
+++ b/fsh-generated/resources/Questionnaire-SocialAndEmotionalWellbeing.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-27",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -314,6 +314,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -325,7 +345,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-SocialHistoryChild.json b/fsh-generated/resources/Questionnaire-SocialHistoryChild.json
index 05ede03..46618cc 100644
--- a/fsh-generated/resources/Questionnaire-SocialHistoryChild.json
+++ b/fsh-generated/resources/Questionnaire-SocialHistoryChild.json
@@ -55,8 +55,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-28",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -80,7 +80,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -330,6 +330,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -341,7 +361,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/Questionnaire-SubstanceUse.json b/fsh-generated/resources/Questionnaire-SubstanceUse.json
index 8236141..edbece7 100644
--- a/fsh-generated/resources/Questionnaire-SubstanceUse.json
+++ b/fsh-generated/resources/Questionnaire-SubstanceUse.json
@@ -51,8 +51,8 @@
           "enableWhen": [
             {
               "question": "MarkComplete-29",
-              "operator": "=",
-              "answerBoolean": false
+              "operator": "!=",
+              "answerBoolean": true
             }
           ]
         },
@@ -76,7 +76,7 @@
             "extension": [
               {
                 "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
               }
             ]
           },
@@ -129,42 +129,7 @@
               "text": "Smoking status",
               "type": "choice",
               "repeats": false,
-              "answerOption": [
-                {
-                  "valueCoding": {
-                    "code": "266919005",
-                    "system": "http://snomed.info/sct",
-                    "display": "Never smoked"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "77176002",
-                    "system": "http://snomed.info/sct",
-                    "display": "Smoker"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "8517006",
-                    "system": "http://snomed.info/sct",
-                    "display": "Ex-Smoker"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "16090371000119103",
-                    "system": "http://snomed.info/sct",
-                    "display": "Environmental exposure to tobacco smoke (home, car, etc)"
-                  }
-                },
-                {
-                  "valueString": "Wants to quit"
-                },
-                {
-                  "valueString": "Other tobacco use"
-                }
-              ]
+              "answerValueSet": "#TobaccoUseStatus-1"
             },
             {
               "extension": [
@@ -194,22 +159,7 @@
                   }
                 }
               ],
-              "answerOption": [
-                {
-                  "valueCoding": {
-                    "code": "48031000119106",
-                    "system": "http://snomed.info/sct",
-                    "display": "Quit >=12 months"
-                  }
-                },
-                {
-                  "valueCoding": {
-                    "code": "735128000",
-                    "system": "http://snomed.info/sct",
-                    "display": "Quit <12 months"
-                  }
-                }
-              ]
+              "answerValueSet": "#SmokingQuitStatus-1"
             },
             {
               "linkId": "9e86387d-1be4-4c26-9047-9dd6b03e1ee0",
@@ -236,7 +186,10 @@
                 {
                   "question": "b639a3a8-f476-4cc8-b5c7-f5d2abb23511",
                   "operator": "=",
-                  "answerString": "Wants to quit"
+                  "answerCoding": {
+                    "code": "394872000",
+                    "system": "http://snomed.info/sct"
+                  }
                 }
               ],
               "enableBehavior": "any"
@@ -265,7 +218,10 @@
                 {
                   "question": "b639a3a8-f476-4cc8-b5c7-f5d2abb23511",
                   "operator": "=",
-                  "answerString": "Wants to quit"
+                  "answerCoding": {
+                    "code": "394872000",
+                    "system": "http://snomed.info/sct"
+                  }
                 }
               ],
               "enableBehavior": "any"
@@ -280,10 +236,6 @@
           "item": [
             {
               "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                  "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <div>Quantity and frequency of:</div>\r\n        <ul>\r\n          <li>alcohol</li>\r\n          <li>caffeine (coffee, soft drinks, iced coffee)</li>\r\n          <li>cannabis/yarndi/gunja</li>\r\n          <li>other substance use: IVDU, methamphetamine, opiates, solvents, other</li>\r\n        </ul>\r\n\t      </div>"
-                },
                 {
                   "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                   "valueString": "Quantity and frequency of substance use"
@@ -311,6 +263,14 @@
               ],
               "linkId": "ea73d52c-f831-46be-a45d-2c42250a5210",
               "text": "Quantity and frequency of: alcohol; caffeine (coffee, soft drinks, iced coffee); cannabis/yarndi/gunja; other substance use: IVDU, methamphetamine, opiates, solvents, other",
+              "_text": {
+                "extension": [
+                  {
+                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <div>Quantity and frequency of:</div>\r\n        <ul>\r\n          <li>alcohol</li>\r\n          <li>caffeine (coffee, soft drinks, iced coffee)</li>\r\n          <li>cannabis/yarndi/gunja</li>\r\n          <li>other substance use: IVDU, methamphetamine, opiates, solvents, other</li>\r\n        </ul>\r\n\t      </div>"
+                  }
+                ]
+              },
               "type": "text",
               "repeats": false
             }
@@ -347,6 +307,163 @@
       "repeats": false
     }
   ],
+  "contained": [
+    {
+      "resourceType": "ValueSet",
+      "id": "SmokingQuitStatus-1",
+      "status": "draft",
+      "name": "SmokingQuitStatus",
+      "title": "Smoking Quit Status",
+      "description": "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/SmokingQuitStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:86b4329d-aca5-4e54-9b5e-67296c7ce9db",
+        "timestamp": "2024-04-08T12:56:59+10:00",
+        "total": 2,
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "48031000119106",
+            "display": "Quit >12 months"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "735128000",
+            "display": "Quit <12 months"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "48031000119106",
+                "display": "Quit >12 months"
+              },
+              {
+                "code": "735128000",
+                "display": "Quit <12 months"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "resourceType": "ValueSet",
+      "id": "TobaccoUseStatus-1",
+      "status": "draft",
+      "name": "TobaccoUseStatus",
+      "title": "Tobacco Use Status",
+      "description": "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status.",
+      "url": "https://smartforms.csiro.au/ig/ValueSet/TobaccoUseStatus-1",
+      "experimental": false,
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+          "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+        }
+      ],
+      "expansion": {
+        "identifier": "urn:uuid:577a997d-bacd-499f-bae4-aa6efdcca45e",
+        "timestamp": "2024-11-29T10:37:34+10:00",
+        "parameter": [
+          {
+            "name": "version",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+          },
+          {
+            "name": "used-codesystem",
+            "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+          }
+        ],
+        "contains": [
+          {
+            "system": "http://snomed.info/sct",
+            "code": "266919005",
+            "display": "Never smoked"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "77176002",
+            "display": "Current smoker"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "8517006",
+            "display": "Ex-smoker"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "16090371000119103",
+            "display": "Exposure to second hand tobacco smoke"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "394872000",
+            "display": "Wants to quit"
+          },
+          {
+            "system": "http://snomed.info/sct",
+            "code": "713914004",
+            "display": "Other tobacco use"
+          }
+        ]
+      },
+      "compose": {
+        "include": [
+          {
+            "system": "http://snomed.info/sct",
+            "concept": [
+              {
+                "code": "266919005",
+                "display": "Never smoked"
+              },
+              {
+                "code": "77176002",
+                "display": "Current smoker"
+              },
+              {
+                "code": "8517006",
+                "display": "Ex-smoker"
+              },
+              {
+                "code": "16090371000119103",
+                "display": "Exposure to second hand tobacco smoke"
+              },
+              {
+                "code": "394872000",
+                "display": "Wants to quit"
+              },
+              {
+                "code": "713914004",
+                "display": "Other tobacco use"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ],
   "extension": [
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assemble-expectation",
@@ -392,6 +509,26 @@
         }
       ]
     },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+      "extension": [
+        {
+          "url": "name",
+          "valueCoding": {
+            "code": "encounter",
+            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext"
+          }
+        },
+        {
+          "url": "type",
+          "valueCode": "Encounter"
+        },
+        {
+          "url": "description",
+          "valueString": "The encounter that is to be used to pre-populate the form"
+        }
+      ]
+    },
     {
       "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
       "valueString": "age"
@@ -411,7 +548,7 @@
   "subjectType": [
     "Patient"
   ],
-  "date": "2022-05-24",
+  "date": "2024-04-02",
   "jurisdiction": [
     {
       "coding": [
diff --git a/fsh-generated/resources/StructureDefinition-ContainedResourceReference.json b/fsh-generated/resources/StructureDefinition-ContainedResourceReference.json
index 30d3351..9a836e2 100644
--- a/fsh-generated/resources/StructureDefinition-ContainedResourceReference.json
+++ b/fsh-generated/resources/StructureDefinition-ContainedResourceReference.json
@@ -7,13 +7,6 @@
   "status": "draft",
   "description": "This extension is intended to be used as a work around to a known bug whereby contained resources that are not referenced with the type, 'Reference' are removed before a resource is created in a HAPI FHIR server. This is problematic when referencing with the type, 'canonical'. The extension can be used to reference contained resources so they are retained when added to a HAPI FHIR server.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    }
-  ],
   "kind": "complex-type",
   "abstract": false,
   "context": [
diff --git a/fsh-generated/resources/ValueSet-CervicalScreeningStatus-1.json b/fsh-generated/resources/ValueSet-CervicalScreeningStatus-1.json
new file mode 100644
index 0000000..bf91ab4
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-CervicalScreeningStatus-1.json
@@ -0,0 +1,78 @@
+{
+  "resourceType": "ValueSet",
+  "status": "draft",
+  "name": "CervicalScreeningStatus",
+  "id": "CervicalScreeningStatus-1",
+  "title": "Cervical Screening Status",
+  "description": "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program.",
+  "url": "https://smartforms.csiro.au/ig/ValueSet/CervicalScreeningStatus-1",
+  "experimental": false,
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+      "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+    }
+  ],
+  "expansion": {
+    "identifier": "urn:uuid:7642a243-4f23-4b17-933d-57b448902d5d",
+    "timestamp": "2024-04-08T10:41:42+10:00",
+    "total": 4,
+    "parameter": [
+      {
+        "name": "version",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://snomed.info/sct",
+        "code": "736595007",
+        "display": "Declined"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "410527000",
+        "display": "Offered"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "171154002",
+        "display": "Not required"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "171155001",
+        "display": "Up to date"
+      }
+    ]
+  },
+  "compose": {
+    "include": [
+      {
+        "system": "http://snomed.info/sct",
+        "concept": [
+          {
+            "code": "736595007",
+            "display": "Declined"
+          },
+          {
+            "code": "410527000",
+            "display": "Offered"
+          },
+          {
+            "code": "171154002",
+            "display": "Not required"
+          },
+          {
+            "code": "171155001",
+            "display": "Up to date"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-MedicalHistory.json b/fsh-generated/resources/ValueSet-MedicalHistory.json
deleted file mode 100644
index c58959e..0000000
--- a/fsh-generated/resources/ValueSet-MedicalHistory.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "resourceType": "ValueSet",
-  "status": "draft",
-  "name": "MedicalHistory",
-  "id": "MedicalHistory",
-  "title": "Medical History",
-  "description": "The Medical History value set includes values that may be used to represent medical history, operations and hospital admissions.",
-  "url": "https://smartforms.csiro.au/ig/ValueSet/MedicalHistory",
-  "experimental": false,
-  "compose": {
-    "include": [
-      {
-        "system": "http://snomed.info/sct",
-        "filter": [
-          {
-            "property": "constraint",
-            "op": "=",
-            "value": "^32570581000036105|Problem/Diagnosis reference set| OR ^32570141000036105|Procedure foundation reference set|"
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/fsh-generated/resources/ValueSet-SmokingQuitStatus-1.json b/fsh-generated/resources/ValueSet-SmokingQuitStatus-1.json
new file mode 100644
index 0000000..2fa6ec9
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-SmokingQuitStatus-1.json
@@ -0,0 +1,60 @@
+{
+  "resourceType": "ValueSet",
+  "status": "draft",
+  "name": "SmokingQuitStatus",
+  "id": "SmokingQuitStatus-1",
+  "title": "Smoking Quit Status",
+  "description": "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking.",
+  "url": "https://smartforms.csiro.au/ig/ValueSet/SmokingQuitStatus-1",
+  "experimental": false,
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+      "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+    }
+  ],
+  "expansion": {
+    "identifier": "urn:uuid:86b4329d-aca5-4e54-9b5e-67296c7ce9db",
+    "timestamp": "2024-04-08T12:56:59+10:00",
+    "total": 2,
+    "parameter": [
+      {
+        "name": "version",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://snomed.info/sct",
+        "code": "48031000119106",
+        "display": "Quit >12 months"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "735128000",
+        "display": "Quit <12 months"
+      }
+    ]
+  },
+  "compose": {
+    "include": [
+      {
+        "system": "http://snomed.info/sct",
+        "concept": [
+          {
+            "code": "48031000119106",
+            "display": "Quit >12 months"
+          },
+          {
+            "code": "735128000",
+            "display": "Quit <12 months"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-TobaccoUseStatus-1.json b/fsh-generated/resources/ValueSet-TobaccoUseStatus-1.json
new file mode 100644
index 0000000..626e21f
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-TobaccoUseStatus-1.json
@@ -0,0 +1,95 @@
+{
+  "resourceType": "ValueSet",
+  "status": "draft",
+  "name": "TobaccoUseStatus",
+  "id": "TobaccoUseStatus-1",
+  "title": "Tobacco Use Status",
+  "description": "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status.",
+  "url": "https://smartforms.csiro.au/ig/ValueSet/TobaccoUseStatus-1",
+  "experimental": false,
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+      "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+    }
+  ],
+  "expansion": {
+    "identifier": "urn:uuid:577a997d-bacd-499f-bae4-aa6efdcca45e",
+    "timestamp": "2024-11-29T10:37:34+10:00",
+    "parameter": [
+      {
+        "name": "version",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://snomed.info/sct",
+        "code": "266919005",
+        "display": "Never smoked"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "77176002",
+        "display": "Current smoker"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "8517006",
+        "display": "Ex-smoker"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "16090371000119103",
+        "display": "Exposure to second hand tobacco smoke"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "394872000",
+        "display": "Wants to quit"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "code": "713914004",
+        "display": "Other tobacco use"
+      }
+    ]
+  },
+  "compose": {
+    "include": [
+      {
+        "system": "http://snomed.info/sct",
+        "concept": [
+          {
+            "code": "266919005",
+            "display": "Never smoked"
+          },
+          {
+            "code": "77176002",
+            "display": "Current smoker"
+          },
+          {
+            "code": "8517006",
+            "display": "Ex-smoker"
+          },
+          {
+            "code": "16090371000119103",
+            "display": "Exposure to second hand tobacco smoke"
+          },
+          {
+            "code": "394872000",
+            "display": "Wants to quit"
+          },
+          {
+            "code": "713914004",
+            "display": "Other tobacco use"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-administrative-gender.json b/fsh-generated/resources/ValueSet-administrative-gender.json
new file mode 100644
index 0000000..e093138
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-administrative-gender.json
@@ -0,0 +1,102 @@
+{
+  "resourceType": "ValueSet",
+  "status": "active",
+  "name": "AdministrativeGender",
+  "id": "administrative-gender",
+  "title": "AdministrativeGender",
+  "description": "The gender of a person used for administrative purposes.",
+  "url": "http://hl7.org/fhir/ValueSet/administrative-gender",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "http://hl7.org/fhir"
+        },
+        {
+          "system": "email",
+          "value": "fhir@lists.hl7.org"
+        }
+      ]
+    }
+  ],
+  "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+  "date": "2019-11-01T09:29:23+11:00",
+  "experimental": false,
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
+      "valueCode": "pa"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+      "valueCode": "normative"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
+      "valueInteger": 5
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version",
+      "valueCode": "4.0.0"
+    }
+  ],
+  "identifier": [
+    {
+      "system": "urn:ietf:rfc:3986",
+      "value": "urn:oid:2.16.840.1.113883.4.642.3.1"
+    }
+  ],
+  "immutable": true,
+  "meta": {
+    "profile": [
+      "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
+    ]
+  },
+  "publisher": "HL7 (FHIR Project)",
+  "version": "4.0.1",
+  "expansion": {
+    "identifier": "urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd",
+    "timestamp": "2024-04-05T12:31:27+10:00",
+    "total": 4,
+    "parameter": [
+      {
+        "name": "version",
+        "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://hl7.org/fhir/administrative-gender",
+        "code": "female",
+        "display": "Female"
+      },
+      {
+        "system": "http://hl7.org/fhir/administrative-gender",
+        "code": "male",
+        "display": "Male"
+      },
+      {
+        "system": "http://hl7.org/fhir/administrative-gender",
+        "code": "other",
+        "display": "Other"
+      },
+      {
+        "system": "http://hl7.org/fhir/administrative-gender",
+        "code": "unknown",
+        "display": "Unknown"
+      }
+    ]
+  },
+  "compose": {
+    "include": [
+      {
+        "system": "http://hl7.org/fhir/administrative-gender"
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-australian-pronouns-1.json b/fsh-generated/resources/ValueSet-australian-pronouns-1.json
new file mode 100644
index 0000000..b5db4c2
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-australian-pronouns-1.json
@@ -0,0 +1,135 @@
+{
+  "resourceType": "ValueSet",
+  "status": "active",
+  "name": "AustralianPronouns",
+  "id": "australian-pronouns-1",
+  "title": "Australian Pronouns",
+  "description": "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual.",
+  "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1",
+  "identifier": [
+    {
+      "system": "urn:ietf:rfc:3986",
+      "value": "urn:oid:1.2.36.1.2001.1004.201.10284"
+    }
+  ],
+  "version": "1.0.0",
+  "experimental": false,
+  "date": "2024-02-29",
+  "publisher": "Australian Digital Health Agency",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "email",
+          "value": "help@digitalhealth.gov.au"
+        }
+      ]
+    }
+  ],
+  "copyright": "Copyright © 2024 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis material contains content from LOINC (http://loinc.org). LOINC is copyright 1995-2024, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc.\n\nThis material contains information which is protected by copyright. You may download, display, print and reproduce any material for your personal, non-commercial use or use within your organisation subject to the following terms and conditions: \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
+  "expansion": {
+    "identifier": "urn:uuid:ca145c1c-4915-4957-888a-39e69de8b1ad",
+    "timestamp": "2024-04-02T14:25:01+10:00",
+    "total": 7,
+    "parameter": [
+      {
+        "name": "version",
+        "valueUri": "http://loinc.org|2.77"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://loinc.org|2.77"
+      },
+      {
+        "name": "version",
+        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+      },
+      {
+        "name": "used-codesystem",
+        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://loinc.org",
+        "version": "2.77",
+        "code": "LA29518-0",
+        "display": "he/him/his/his/himself"
+      },
+      {
+        "system": "http://loinc.org",
+        "version": "2.77",
+        "code": "LA29519-8",
+        "display": "she/her/her/hers/herself"
+      },
+      {
+        "system": "http://loinc.org",
+        "version": "2.77",
+        "code": "LA29520-6",
+        "display": "they/them/their/theirs/themselves"
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "version": "5.0.0-ballot",
+        "code": "asked-declined",
+        "display": "Asked But Declined"
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "version": "5.0.0-ballot",
+        "code": "asked-unknown",
+        "display": "Asked But Unknown"
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "version": "5.0.0-ballot",
+        "code": "not-asked",
+        "display": "Not Asked"
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "version": "5.0.0-ballot",
+        "code": "unknown",
+        "display": "Unknown"
+      }
+    ]
+  },
+  "compose": {
+    "include": [
+      {
+        "system": "http://loinc.org",
+        "concept": [
+          {
+            "code": "LA29518-0",
+            "display": "he/him/his/his/himself"
+          },
+          {
+            "code": "LA29519-8",
+            "display": "she/her/her/hers/herself"
+          },
+          {
+            "code": "LA29520-6",
+            "display": "they/them/their/theirs/themselves"
+          }
+        ]
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "concept": [
+          {
+            "code": "unknown"
+          },
+          {
+            "code": "asked-declined"
+          },
+          {
+            "code": "not-asked"
+          },
+          {
+            "code": "asked-unknown"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-clinical-condition-1.json b/fsh-generated/resources/ValueSet-clinical-condition-1.json
new file mode 100644
index 0000000..59e94ca
--- /dev/null
+++ b/fsh-generated/resources/ValueSet-clinical-condition-1.json
@@ -0,0 +1,50 @@
+{
+  "resourceType": "ValueSet",
+  "status": "active",
+  "name": "ClinicalCondition",
+  "id": "clinical-condition-1",
+  "title": "Clinical Condition",
+  "description": "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders.",
+  "url": "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1",
+  "meta": {
+    "profile": [
+      "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+      "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+    ]
+  },
+  "identifier": [
+    {
+      "system": "urn:ietf:rfc:3986",
+      "value": "urn:oid:1.2.36.1.2001.1004.201.10035"
+    }
+  ],
+  "version": "1.0.2",
+  "experimental": false,
+  "date": "2020-05-31",
+  "publisher": "Australian Digital Health Agency",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "email",
+          "value": "help@digitalhealth.gov.au"
+        }
+      ]
+    }
+  ],
+  "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+  "compose": {
+    "include": [
+      {
+        "system": "http://snomed.info/sct",
+        "filter": [
+          {
+            "property": "concept",
+            "op": "in",
+            "value": "32570581000036105"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/fsh-generated/resources/ValueSet-condition-clinical.json b/fsh-generated/resources/ValueSet-condition-clinical.json
index 19f83de..1b971b8 100644
--- a/fsh-generated/resources/ValueSet-condition-clinical.json
+++ b/fsh-generated/resources/ValueSet-condition-clinical.json
@@ -6,11 +6,6 @@
   "title": "Condition Clinical Status Codes",
   "description": "Preferred value set for Condition Clinical Status.",
   "url": "http://hl7.org/fhir/ValueSet/condition-clinical",
-  "meta": {
-    "profile": [
-      "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-    ]
-  },
   "extension": [
     {
       "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
@@ -31,7 +26,7 @@
       "value": "urn:oid:2.16.840.1.113883.4.642.3.164"
     }
   ],
-  "version": "4.3.0",
+  "version": "4.0.1",
   "experimental": false,
   "publisher": "FHIR Project team",
   "contact": [
@@ -44,24 +39,36 @@
       ]
     }
   ],
-  "copyright": "Copyright © 2011+ HL7. Creative Commons 'No Rights Reserved' (CC0)",
+  "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+  "date": "2019-11-01T09:29:23+11:00",
   "expansion": {
-    "identifier": "5d4bed14-061a-42c4-853d-e6a624c4f483",
-    "timestamp": "2022-10-20T09:32:48+10:00",
+    "identifier": "urn:uuid:79d21cca-9f34-4cfa-9020-17eee95eeed8",
+    "timestamp": "2024-04-02T14:17:12+10:00",
     "total": 6,
-    "offset": 0,
     "parameter": [
       {
         "name": "version",
         "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
       },
       {
-        "name": "count",
-        "valueInteger": 2147483647
+        "name": "used-codesystem",
+        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+      },
+      {
+        "name": "warning-draft",
+        "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
       },
       {
-        "name": "offset",
-        "valueInteger": 0
+        "name": "warning-trial-use",
+        "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+      },
+      {
+        "name": "warning-trial-use",
+        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+      },
+      {
+        "name": "warning-draft",
+        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
       }
     ],
     "contains": [
diff --git a/fsh-generated/resources/ValueSet-gender-identity-response-1.json b/fsh-generated/resources/ValueSet-gender-identity-response-1.json
index 7865e4b..f2f3517 100644
--- a/fsh-generated/resources/ValueSet-gender-identity-response-1.json
+++ b/fsh-generated/resources/ValueSet-gender-identity-response-1.json
@@ -4,23 +4,17 @@
   "name": "GenderIdentityResponse",
   "id": "gender-identity-response-1",
   "title": "Gender Identity Response",
-  "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual’s gender. A person's gender is a social and cultural identity, expression and experience.",
+  "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience.",
   "url": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1",
-  "meta": {
-    "profile": [
-      "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
-      "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
-    ]
-  },
   "identifier": [
     {
       "system": "urn:ietf:rfc:3986",
       "value": "urn:oid:1.2.36.1.2001.1004.201.10271"
     }
   ],
-  "version": "1.0.0",
+  "version": "1.1.0",
   "experimental": false,
-  "date": "2022-09-30",
+  "date": "2024-02-29",
   "publisher": "Australian Digital Health Agency",
   "contact": [
     {
@@ -32,45 +26,45 @@
       ]
     }
   ],
-  "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data.",
+  "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.\n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data. \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
   "expansion": {
-    "identifier": "urn:uuid:85c2e561-69ac-41f6-8e9e-07b3072ef48f",
-    "timestamp": "2023-08-30T10:18:47+10:00",
-    "total": 5,
+    "identifier": "urn:uuid:a35fc104-184f-476e-a7a2-e3f3af66a3eb",
+    "timestamp": "2024-04-02T14:21:20+10:00",
+    "total": 6,
     "parameter": [
       {
         "name": "version",
-        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
       },
       {
         "name": "used-codesystem",
-        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
       },
       {
         "name": "version",
-        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
       },
       {
         "name": "used-codesystem",
-        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
       }
     ],
     "contains": [
       {
         "system": "http://snomed.info/sct",
-        "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
         "code": "446151000124109",
         "display": "Identifies as male gender"
       },
       {
         "system": "http://snomed.info/sct",
-        "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
         "code": "446141000124107",
         "display": "Identifies as female gender"
       },
       {
         "system": "http://snomed.info/sct",
-        "version": "http://snomed.info/sct/32506021000036107/version/20230831",
+        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
         "code": "33791000087105",
         "display": "Identifies as nonbinary gender"
       },
@@ -85,6 +79,12 @@
         "version": "5.0.0-ballot",
         "code": "asked-declined",
         "display": "Asked But Declined"
+      },
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+        "version": "5.0.0-ballot",
+        "code": "not-asked",
+        "display": "Not Asked"
       }
     ]
   },
@@ -112,6 +112,9 @@
           },
           {
             "code": "asked-declined"
+          },
+          {
+            "code": "not-asked"
           }
         ]
       }
diff --git a/fsh-generated/resources/ValueSet-pronouns.json b/fsh-generated/resources/ValueSet-pronouns.json
deleted file mode 100644
index 3234563..0000000
--- a/fsh-generated/resources/ValueSet-pronouns.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "resourceType": "ValueSet",
-  "status": "active",
-  "name": "PersonalPronouns",
-  "id": "pronouns",
-  "title": "Personal Pronouns",
-  "description": "Codes that indicate the pronouns to be used when communicating with or about an individual.",
-  "url": "http://terminology.hl7.org/ValueSet/pronouns",
-  "meta": {
-    "profile": [
-      "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-    ]
-  },
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
-      "valueCode": "pa"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
-      "valueCode": "trial-use"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
-      "valueInteger": 1
-    }
-  ],
-  "identifier": [
-    {
-      "system": "urn:ietf:rfc:3986",
-      "value": "urn:oid:2.16.840.1.113883.4.642.3.3290"
-    }
-  ],
-  "version": "1.0.0",
-  "experimental": false,
-  "date": "2023-07-17T22:16:15-06:00",
-  "publisher": "FHIR Project team",
-  "contact": [
-    {
-      "telecom": [
-        {
-          "system": "url",
-          "value": "http://hl7.org/fhir"
-        }
-      ]
-    }
-  ],
-  "copyright": "This material contains content from LOINC (http://loinc.org). LOINC is copyright © 1995-2020, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc",
-  "expansion": {
-    "identifier": "urn:uuid:220b830c-6a1b-43e7-81e0-ccf92485fcdf",
-    "timestamp": "2023-10-17T10:42:37+10:00",
-    "total": 3,
-    "parameter": [
-      {
-        "name": "version",
-        "valueUri": "http://loinc.org|2.76"
-      },
-      {
-        "name": "used-codesystem",
-        "valueUri": "http://loinc.org|2.76"
-      }
-    ],
-    "contains": [
-      {
-        "system": "http://loinc.org",
-        "code": "LA29518-0",
-        "display": "he/him/his/his/himself"
-      },
-      {
-        "system": "http://loinc.org",
-        "code": "LA29519-8",
-        "display": "she/her/her/hers/herself"
-      },
-      {
-        "system": "http://loinc.org",
-        "code": "LA29520-6",
-        "display": "they/them/their/theirs/themselves"
-      }
-    ]
-  },
-  "compose": {
-    "include": [
-      {
-        "system": "http://loinc.org",
-        "concept": [
-          {
-            "code": "LA29518-0",
-            "display": "he/him/his/his/himself"
-          },
-          {
-            "code": "LA29519-8",
-            "display": "she/her/her/hers/herself"
-          },
-          {
-            "code": "LA29520-6",
-            "display": "they/them/their/theirs/themselves"
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/input/fsh/715-AboutTheHealthCheck.fsh b/input/fsh/715-AboutTheHealthCheck.fsh
index 024046b..dd51462 100644
--- a/input/fsh/715-AboutTheHealthCheck.fsh
+++ b/input/fsh/715-AboutTheHealthCheck.fsh
@@ -43,6 +43,17 @@ Description: "About The Health Check sub-questionnaire for Aboriginal and Torres
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
 
 //fhir query variables
 * extension[+]
@@ -67,7 +78,7 @@ Description: "About The Health Check sub-questionnaire for Aboriginal and Torres
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+] 
@@ -86,13 +97,13 @@ Description: "About The Health Check sub-questionnaire for Aboriginal and Torres
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-1" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-1"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-1" // Section complete item
diff --git a/input/fsh/715-AssemblyInstructions.fsh b/input/fsh/715-AssemblyInstructions.fsh
index 997aca6..d291217 100644
--- a/input/fsh/715-AssemblyInstructions.fsh
+++ b/input/fsh/715-AssemblyInstructions.fsh
@@ -12,18 +12,24 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
 * contained[+] = YesNo
 * contained[+] = YesNoNA
 * contained[+] = YesNoNotAskedDeclined
-* contained[+] = MedicalHistory
-/** contained[+] = MedicalHistoryShortListInfants
+* contained[+] = clinical-condition-1
+/** contained[+] = MedicalHistory
+* contained[+] = MedicalHistoryShortListInfants
 * contained[+] = MedicalHistoryShortListPrimarySchool
 * contained[+] = MedicalHistoryShortListAdolescents
 * contained[+] = MedicalHistoryShortListAdultsAndOlderPeople*/
+* contained[+] = administrative-gender
 * contained[+] = condition-clinical
 * contained[+] = AboriginalTorresStraitIslander
 * contained[+] = PrimaryCarerParentGrandparent
-* contained[+] = pronouns
+* contained[+] = australian-pronouns-1
 * contained[+] = australian-states-territories-2
 * contained[+] = gender-identity-response-1
 * contained[+] = biological-sex-1
+* contained[+] = SmokingQuitStatus-1
+* contained[+] = TobaccoUseStatus-1
+* contained[+] = CervicalScreeningStatus-1
+
 
 //assemble expectation
 * extension[+]
@@ -53,6 +59,17 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
 
 //Prepop query
 //* extension[sdc-questionnaire-sourceQueries].valueReference = Reference(PrePopQuery)
@@ -85,8 +102,12 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
   * valueReference.reference = "#YesNoNotAskedDeclined"
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
-  * valueReference.reference = "#MedicalHistory"
+  * valueReference.reference = "#clinical-condition-1"
+  
 /** extension[+]
+  * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
+  * valueReference.reference = "#MedicalHistory"
+* extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
   * valueReference.reference = "#MedicalHistoryShortListInfants"
 * extension[+]
@@ -98,6 +119,9 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
   * valueReference.reference = "#MedicalHistoryShortListAdultsAndOlderPeople"*/
+* extension[+]
+  * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
+  * valueReference.reference = "#administrative-gender"
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
   * valueReference.reference = "#condition-clinical"
@@ -109,7 +133,7 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
   * valueReference.reference = "#PrimaryCarerParentGrandparent"
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
-  * valueReference.reference = "#pronouns"
+  * valueReference.reference = "#australian-pronouns-1"
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
   * valueReference.reference = "#australian-states-territories-2"
@@ -119,19 +143,27 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
 * extension[+]
   * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
   * valueReference.reference = "#biological-sex-1"
+* extension[+]
+  * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
+  * valueReference.reference = "#SmokingQuitStatus-1"
+* extension[+]
+  * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
+  * valueReference.reference = "#TobaccoUseStatus-1"
+* extension[+]
+  * url = "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference"
+  * valueReference.reference = "#CervicalScreeningStatus-1"
 
 
 * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render"
 * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular"
 * meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp"
 * url = "http://www.health.gov.au/assessments/mbs/715"
-* version = "0.1.0"
 * name = "AboriginalTorresStraitIslanderHealthCheck"
 * title = "Aboriginal and Torres Strait Islander Health Check"
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // Root 
@@ -378,201 +410,201 @@ Description: "Aboriginal and Torres Strait Islander Health Check assessment form
 
   // About The Health Check
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.2.0"
     * linkId = "cd3303a6-e3b6-4732-80e8-54d2bd740beb"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Consent
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Consent|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Consent|0.2.0"
     * linkId = "fab52f87-22a6-4a54-9797-0bb6b0f5d2a2"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Consent|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Consent|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Patient Details
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.2.0"
     * linkId = "1d10910d-c195-4964-bdc6-98310a44719e"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Current Priorities
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.2.0"
     * linkId = "7692f28c-7c0a-48ea-b27d-a8489974377d"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Medical History and Current Problems
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.2.0"
     * linkId = "15f83d80-f49a-4852-a20f-18db9b951e53"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MedicalHistory|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MedicalHistory|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Regular Medications
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.2.0"
     * linkId = "3a7151ef-d63b-4818-8367-03d394383a61"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Allergies Adverse Reactions
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.2.0"
     * linkId = "334853dc-88d4-4cb1-a119-bb0ff6ea0516"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Family History
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.2.0"
     * linkId = "1ab9b519-85ce-48ee-a408-8f0b9b74d112"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Social And Emotional Wellbeing
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.2.0"
     * linkId = "228b8d31-21e3-49a6-b802-984135908dca"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Social History Child
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.2.0"
     * linkId = "a43517f9-538e-4a4d-8789-b6c3d44206ba"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Home And Family
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.2.0"
     * linkId = "8decf7bf-e24c-4d3d-815c-c53e269f004b"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Learning And Development
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.2.0"
     * linkId = "3f554c37-7d0e-4b14-8f7f-a9ec665cc0a6"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Learning And Work
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.2.0"
     * linkId = "362bf381-23e5-4eee-963a-3de73e584da5"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Mood
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Mood|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Mood|0.2.0"
     * linkId = "51a545fa-907f-40f0-9304-36bcab5a16b8"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Mood|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Mood|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Memory And Thinking
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.2.0"
     * linkId = "4217646d-e8e4-4ac5-baa7-fae28937cda7"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Chronic Disease Ageing
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.2.0"
     * linkId = "070eadcf-9e93-499e-8615-61991ab35b32"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Screening Programs
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.2.0"
     * linkId = "56d4bc0b-3bf1-4d47-ac34-5a1de0902de1"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Healthy Eating
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.2.0"
     * linkId = "e0962739-c506-41d4-afd7-ab1b90db9cb4"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Physical Activity And Screen Time
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.2.0"
     * linkId = "63cfb279-cd7d-41ed-a54b-0c17b6efe609"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Red Flags Early Identification Guide For Children
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.2.0"
     * linkId = "db70690e-2199-495a-9919-53697efaf913"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.2.0] not available. Unable to display all questions."
     * type = #display
     
   // Substance Use
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.2.0"
     * linkId = "d1f66f56-75fa-4498-9c51-eb98e1644243"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Gambling
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Gambling|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Gambling|0.2.0"
     * linkId = "ea748251-bf77-4085-b912-e9002dfa02ca"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Gambling|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Gambling|0.2.0] not available. Unable to display all questions."
     * type = #display
   // SexualHealth
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.2.0"
     * linkId = "84bd802b-b3e1-4098-aa2c-2133f0e252f4"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Eye Health
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.2.0"
     * linkId = "56ad8128-0e12-4779-8ff4-47dcff6b29b5"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Ear Health And Hearing
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.2.0"
     * linkId = "a8161e91-7cff-403f-85e6-982a9bc8fca6"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Oral And Dental Health
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.2.0"
     * linkId = "fe05d868-aaed-4921-9d49-4e7746bbe143"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Skin
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Skin|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Skin|0.2.0"
     * linkId = "64ec4c1c-0824-4b84-8d3f-40f6e066cb80"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Skin|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Skin|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Immunisation
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.2.0"
     * linkId = "595737cd-3a94-442b-8be6-ab461c3181d2"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Immunisation|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Immunisation|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Examination
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Examination|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Examination|0.2.0"
     * linkId = "3263611d-5813-4393-a660-d10166acd728"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Examination|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Examination|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Absolute CVD Risk Calculation
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.2.0"
     * linkId = "3a3b0810-e091-48ad-af50-913b0deaf663"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Investigations
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Investigations|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/Investigations|0.2.0"
     * linkId = "302d9437-25b9-41e3-9d66-138c352d32a8"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Investigations|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/Investigations|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Health Priorities Summary
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.2.0"
     * linkId = "ada45623-5e86-49ea-a00b-be0699364281"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.2.0] not available. Unable to display all questions."
     * type = #display
   // Finalising Health Check
   * item[+] 
-    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.1.0"
+    * extension[sdc-questionnaire-subQuestionnaire].valueCanonical = "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.2.0"
     * linkId = "a6395946-872a-4f2e-b697-c74aa1ab9b8d"
-    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.1.0] not available. Unable to display all questions."
+    * text = "Sub-questionnaire [http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.2.0] not available. Unable to display all questions."
     * type = #display
   
\ No newline at end of file
diff --git a/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh b/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh
index 556e41b..63bc485 100644
--- a/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh
+++ b/input/fsh/715-Assessment-AbsoluteCVDRiskCalculation.fsh
@@ -9,6 +9,9 @@ Title: "Aboriginal and Torres Strait Islander Health Check - Absolute Cardiovasc
 Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire for Aboriginal and Torres Strait Islander Health Check."
 
 
+* contained[+] = biological-sex-1
+
+
 //assemble expectation
 * extension[+]
   * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assemble-expectation"
@@ -37,6 +40,17 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
 
 //assemble context
 * extension[+]
@@ -81,7 +95,7 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -101,13 +115,13 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-2" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-2"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-2" // Section complete item
@@ -116,14 +130,14 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
   * item[+]
     * linkId = "RecordUpdate-CVDRisk"
     * text = "Important: The patient record may not be updated with information entered here. Information intended for the patient record should be entered there."
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
     <strong>Important:</strong> <em>The patient record may not be updated with information entered here. Information intended for the patient record should be entered there first.</em>
     </div>"    
     * type = #display 
   * item[+]
     * linkId = "Guidance-CVDRisk"
     * text = "Australian CVD risk calculator - https://www.cvdcheck.org.au/calculator"
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
         <p style=\"font-size:1.2em\">The Australian guideline for assessing and managing cardiovascular disease risk recommends the use of the online <a href=\"https://www.cvdcheck.org.au/calculator\" target=\"_blank\">Australian CVD risk calculator</a>.</p>
         <p>The items included in this section are a subset of variables that can be used as inputs for the online calculator.</p>
         <p>The final CVD risk result can be entered in the item at the bottom of this section.</p>
@@ -158,7 +172,7 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
       * text = "Sex at birth"
       * type = #choice
       * repeats = false
-      * answerValueSet = "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+      * answerValueSet = "#biological-sex-1"
     * item[+]
       * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression].valueExpression
         * description = "CVD Risk Smoking Status"
@@ -169,10 +183,10 @@ Description: "Absolute Cardiovascular Disease Risk Calculation sub-questionnaire
       * type = #choice
       * repeats = false
       // better as a standard answerValueSet when missing concepts are available
-      * answerOption[+].valueCoding = http://snomed.info/sct#266919005 "Never smoked"
-      * answerOption[+].valueCoding = http://snomed.info/sct#77176002 "Smoker"
-      * answerOption[+].valueCoding = http://snomed.info/sct#8517006 "Ex-Smoker"
-      * answerOption[+].valueCoding = http://snomed.info/sct#16090371000119103 "Environmental exposure to tobacco smoke (home, car, etc)"
+      * answerOption[+].valueCoding = http://snomed.info/sct#266919005 "Lifetime non-smoker"
+      * answerOption[+].valueCoding = http://snomed.info/sct#77176002 "Current smoker"
+      * answerOption[+].valueCoding = http://snomed.info/sct#8517006 "Ex-smoker"
+      * answerOption[+].valueCoding = http://snomed.info/sct#16090371000119103 "Exposure to second hand tobacco smoke"
       * answerOption[+].valueString = "Wants to quit"
       * answerOption[+].valueString = "Other tobacco use"
 
diff --git a/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh b/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh
index a29be3c..c8bb6c5 100644
--- a/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh
+++ b/input/fsh/715-Assessment-AllergiesAdverseReactions.fsh
@@ -36,6 +36,17 @@ Description: "Allergies/Adverse Reactions sub-questionnaire for Aboriginal and T
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -51,7 +62,7 @@ Description: "Allergies/Adverse Reactions sub-questionnaire for Aboriginal and T
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -70,13 +81,13 @@ Description: "Allergies/Adverse Reactions sub-questionnaire for Aboriginal and T
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-3" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-3"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-3" // Section complete item
diff --git a/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh b/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh
index 78b9443..012de4c 100644
--- a/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh
+++ b/input/fsh/715-Assessment-ChronicDiseaseAgeing.fsh
@@ -37,6 +37,17 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -52,7 +63,7 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -71,13 +82,13 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-4" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-4"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-4" // Section complete item
@@ -85,7 +96,9 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres
       * answerBoolean = true
   * item[+]
     * extension[sdc-questionnaire-shortText].valueString = "Assessment of chronic disease associated with ageing"
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * linkId = "12e244c0-2887-4230-8792-9521d4f1ab33"
+    * text = "For older people with chronic disease and/or conditions associated with ageing, consider assessing: Osteoporosis risk; Falls risk; Balance, coordination and mobility; Pain; Nutrition; Regularity of chronic disease management and review"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
     <div>For older people with chronic disease and/or conditions associated with ageing, consider assessing:</div>
     <ul>
       <li>Osteoporosis risk</li>
@@ -96,8 +109,6 @@ Description: "Chronic Disease Ageing sub-questionnaire for Aboriginal and Torres
       <li>Regularity of chronic disease management and review</li>
     </ul>
     </div>"
-    * linkId = "12e244c0-2887-4230-8792-9521d4f1ab33"
-    * text = "For older people with chronic disease and/or conditions associated with ageing, consider assessing: Osteoporosis risk; Falls risk; Balance, coordination and mobility; Pain; Nutrition; Regularity of chronic disease management and review"
     * type = #text
     * repeats = false
     * item[+]
diff --git a/input/fsh/715-Assessment-CurrentPriorities.fsh b/input/fsh/715-Assessment-CurrentPriorities.fsh
index 6b716c6..667d708 100644
--- a/input/fsh/715-Assessment-CurrentPriorities.fsh
+++ b/input/fsh/715-Assessment-CurrentPriorities.fsh
@@ -38,6 +38,17 @@ Description: "Current Priorities sub-questionnaire for Aboriginal and Torres Str
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Current Priorities sub-questionnaire for Aboriginal and Torres Str
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -73,13 +84,13 @@ Description: "Current Priorities sub-questionnaire for Aboriginal and Torres Str
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-5" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-5"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-5" // Section complete item
diff --git a/input/fsh/715-Assessment-EarHealthAndHearing.fsh b/input/fsh/715-Assessment-EarHealthAndHearing.fsh
index 477952b..cc411d2 100644
--- a/input/fsh/715-Assessment-EarHealthAndHearing.fsh
+++ b/input/fsh/715-Assessment-EarHealthAndHearing.fsh
@@ -38,6 +38,17 @@ Description: "Ear Health And Hearing sub-questionnaire for Aboriginal and Torres
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Ear Health And Hearing sub-questionnaire for Aboriginal and Torres
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Ear Health And Hearing sub-questionnaire for Aboriginal and Torres
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-6" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-6"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-6" // Section complete item
diff --git a/input/fsh/715-Assessment-Examination.fsh b/input/fsh/715-Assessment-Examination.fsh
index 9e9654f..8a9eba9 100644
--- a/input/fsh/715-Assessment-Examination.fsh
+++ b/input/fsh/715-Assessment-Examination.fsh
@@ -37,6 +37,17 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
 
 //assemble context
 * extension[+]
@@ -105,7 +116,7 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -125,13 +136,13 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-7" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-7"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-7" // Section complete item
@@ -367,8 +378,8 @@ Description: "Examination sub-questionnaire for Aboriginal and Torres Strait Isl
         * text = "Value"
         * type = #choice
         * repeats = false
-        * answerOption[+].valueCoding = $SCT#271636001 "Pulse Regular"
-        * answerOption[+].valueCoding = $SCT#61086009 "Pulse Irregular"
+        * answerOption[+].valueCoding = $SCT#271636001 "Pulse regular"
+        * answerOption[+].valueCoding = $SCT#61086009 "Pulse irregular"
       * item[+]
         * linkId = "eeb56682-0eae-4428-9c37-0e63852026c0"
         * text = "Date performed"
diff --git a/input/fsh/715-Assessment-EyeHealth.fsh b/input/fsh/715-Assessment-EyeHealth.fsh
index 8b6c689..4633833 100644
--- a/input/fsh/715-Assessment-EyeHealth.fsh
+++ b/input/fsh/715-Assessment-EyeHealth.fsh
@@ -38,6 +38,17 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-8" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-8"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-8" // Section complete item
@@ -202,7 +213,7 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla
         * type = #choice
         * repeats = false
         * answerOption[+].valueCoding = $SCT#60332004 "Trichiasis"
-        * answerOption[+].valueCoding = $SCT#95726001 "Corneal scarring"
+        * answerOption[+].valueCoding = $SCT#95726001 "Corneal scar"
       * item[+]
         * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#check-box
         * linkId = "6ae69487-345e-46a0-a8db-b1356671ee59"
@@ -210,7 +221,7 @@ Description: "Eye Health sub-questionnaire for Aboriginal and Torres Strait Isla
         * type = #choice
         * repeats = false
         * answerOption[+].valueCoding = $SCT#60332004 "Trichiasis"
-        * answerOption[+].valueCoding = $SCT#95726001 "Corneal scarring"
+        * answerOption[+].valueCoding = $SCT#95726001 "Corneal scar"
 
 
   * item[+]
diff --git a/input/fsh/715-Assessment-FamilyHistory.fsh b/input/fsh/715-Assessment-FamilyHistory.fsh
index 092059f..ef04ad9 100644
--- a/input/fsh/715-Assessment-FamilyHistory.fsh
+++ b/input/fsh/715-Assessment-FamilyHistory.fsh
@@ -37,6 +37,17 @@ Description: "Family History sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -52,7 +63,7 @@ Description: "Family History sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -71,13 +82,13 @@ Description: "Family History sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-9" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-9"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-9" // Section complete item
diff --git a/input/fsh/715-Assessment-Gambling.fsh b/input/fsh/715-Assessment-Gambling.fsh
index c92a93d..3dad3da 100644
--- a/input/fsh/715-Assessment-Gambling.fsh
+++ b/input/fsh/715-Assessment-Gambling.fsh
@@ -38,6 +38,17 @@ Description: "Gambling sub-questionnaire for Aboriginal and Torres Strait Island
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Gambling sub-questionnaire for Aboriginal and Torres Strait Island
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Gambling sub-questionnaire for Aboriginal and Torres Strait Island
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-10" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-10"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-10" // Section complete item
diff --git a/input/fsh/715-Assessment-HealthyEating.fsh b/input/fsh/715-Assessment-HealthyEating.fsh
index 06b6bd9..9b3f4b1 100644
--- a/input/fsh/715-Assessment-HealthyEating.fsh
+++ b/input/fsh/715-Assessment-HealthyEating.fsh
@@ -38,6 +38,17 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -73,13 +84,13 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-11" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-11"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-11" // Section complete item
@@ -210,7 +221,9 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
     * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression].valueExpression
       * language = #text/fhirpath
       * expression = "%age <= 5"
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * linkId = "9f6adf74-f240-41a2-a509-d216d5308911"
+    * text = "Document conversation about age-appropriate healthy eating, which could include: current diet; transition to solids; dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
     <div>Document conversation about age-appropriate healthy eating, which could include:</div>
     <ul>
       <li>current diet</li>
@@ -218,8 +231,6 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
       <li>dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks</li>
     </ul>
     </div>"
-    * linkId = "9f6adf74-f240-41a2-a509-d216d5308911"
-    * text = "Document conversation about age-appropriate healthy eating, which could include: current diet; transition to solids; dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks"
     * type = #text
     * repeats = false
     * item[+]
@@ -231,15 +242,15 @@ Description: "Healthy Eating sub-questionnaire for Aboriginal and Torres Strait
     * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression].valueExpression
       * language = #text/fhirpath
       * expression = "%age > 5"
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * linkId = "7a22a4c4-6611-4687-af00-37c80c3f8fc0"
+    * text = "Document conversation about health eating which could include: current diet including food and drinks; recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
     <div>Document conversation about health eating which could include:</div>
     <ul>
       <li>current diet including food and drinks</li>
       <li>recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)</li>
     </ul>
     </div>"
-    * linkId = "7a22a4c4-6611-4687-af00-37c80c3f8fc0"
-    * text = "Document conversation about health eating which could include: current diet including food and drinks; recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)"
     * type = #text
     * repeats = false
     * item[+]
diff --git a/input/fsh/715-Assessment-HomeAndFamily.fsh b/input/fsh/715-Assessment-HomeAndFamily.fsh
index a6bb939..d1b48c7 100644
--- a/input/fsh/715-Assessment-HomeAndFamily.fsh
+++ b/input/fsh/715-Assessment-HomeAndFamily.fsh
@@ -38,6 +38,17 @@ Description: "Home And Family sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Home And Family sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // for adolescents and up
@@ -73,13 +84,13 @@ Description: "Home And Family sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-12" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-12"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-12" // Section complete item
diff --git a/input/fsh/715-Assessment-Immunisation.fsh b/input/fsh/715-Assessment-Immunisation.fsh
index 2fa9ec2..a945a33 100644
--- a/input/fsh/715-Assessment-Immunisation.fsh
+++ b/input/fsh/715-Assessment-Immunisation.fsh
@@ -38,6 +38,17 @@ Description: "Immunisation sub-questionnaire for Aboriginal and Torres Strait Is
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Immunisation sub-questionnaire for Aboriginal and Torres Strait Is
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Immunisation sub-questionnaire for Aboriginal and Torres Strait Is
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-13" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-13"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-13" // Section complete item
diff --git a/input/fsh/715-Assessment-Investigations.fsh b/input/fsh/715-Assessment-Investigations.fsh
index 0acce3f..6e52630 100644
--- a/input/fsh/715-Assessment-Investigations.fsh
+++ b/input/fsh/715-Assessment-Investigations.fsh
@@ -37,6 +37,17 @@ Description: "Investigations sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -52,7 +63,7 @@ Description: "Investigations sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -73,13 +84,13 @@ Description: "Investigations sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-14" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-14"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-14" // Section complete item
diff --git a/input/fsh/715-Assessment-LearningAndDevelopment.fsh b/input/fsh/715-Assessment-LearningAndDevelopment.fsh
index 46899d2..5883ad5 100644
--- a/input/fsh/715-Assessment-LearningAndDevelopment.fsh
+++ b/input/fsh/715-Assessment-LearningAndDevelopment.fsh
@@ -36,6 +36,17 @@ Description: "Learning And Development sub-questionnaire for Aboriginal and Torr
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -51,7 +62,7 @@ Description: "Learning And Development sub-questionnaire for Aboriginal and Torr
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // This questionnaire attempts to somewhat harmonise the infant and adolescent templates but there are differences that will require confirmation.
@@ -71,13 +82,13 @@ Description: "Learning And Development sub-questionnaire for Aboriginal and Torr
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-15" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-15"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-15" // Section complete item
diff --git a/input/fsh/715-Assessment-LearningAndWork.fsh b/input/fsh/715-Assessment-LearningAndWork.fsh
index ef7ba75..6c99e49 100644
--- a/input/fsh/715-Assessment-LearningAndWork.fsh
+++ b/input/fsh/715-Assessment-LearningAndWork.fsh
@@ -39,6 +39,17 @@ Description: "Learning And Work sub-questionnaire for Aboriginal and Torres Stra
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -54,7 +65,7 @@ Description: "Learning And Work sub-questionnaire for Aboriginal and Torres Stra
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // adolescents and adults
@@ -74,13 +85,13 @@ Description: "Learning And Work sub-questionnaire for Aboriginal and Torres Stra
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-33" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-33"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-33" // Section complete item
@@ -180,13 +191,13 @@ Description: "Learning And Work sub-questionnaire for Aboriginal and Torres Stra
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-16" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-16"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-16" // Section complete item
diff --git a/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh b/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh
index a778de4..9064642 100644
--- a/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh
+++ b/input/fsh/715-Assessment-MedicalHistoryCurrentProblems.fsh
@@ -8,14 +8,15 @@ Usage: #definition
 Title: "Aboriginal and Torres Strait Islander Health Check - Medical History"
 Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait Islander Health Check."
 
-* contained[+] = MedicalHistory
+* contained[+] = condition-clinical
+* contained[+] = clinical-condition-1
 /*
+* contained[+] = MedicalHistory
 * contained[+] = MedicalHistoryShortListInfants
 * contained[+] = MedicalHistoryShortListPrimarySchool
 * contained[+] = MedicalHistoryShortListAdolescents
 * contained[+] = MedicalHistoryShortListAdultsAndOlderPeople
 */
-* contained[+] = condition-clinical
 
 //assemble expectation
 * extension[+]
@@ -45,6 +46,17 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
 
 //assemble context
 * extension[+]
@@ -63,7 +75,7 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -82,13 +94,13 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-17" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-17"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-17" // Section complete item
@@ -234,7 +246,7 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
       * linkId = "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e"
       * text = "Condition"
       * type = #open-choice
-      * answerValueSet = "#MedicalHistory"
+      * answerValueSet = "#clinical-condition-1"
     * item[+]
       * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#drop-down
       * extension[sdc-questionnaire-initialExpression].valueExpression
@@ -243,7 +255,7 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
       * linkId = "88bcfad7-386b-4d87-b34b-2e50482e4d2c"
       * text = "Clinical Status"
       * type = #choice
-      * answerValueSet = "http://hl7.org/fhir/ValueSet/condition-clinical"
+      * answerValueSet = "#condition-clinical"
     * item[+]
       * extension[sdc-questionnaire-initialExpression].valueExpression
         * language = #text/fhirpath
@@ -271,13 +283,13 @@ Description: "Medical History sub-questionnaire for Aboriginal and Torres Strait
       * linkId = "2da85994-2d5e-42f1-8a81-abf44f397468"
       * text = "Condition"
       * type = #open-choice
-      * answerValueSet = "#MedicalHistory"
+      * answerValueSet = "#clinical-condition-1"
     * item[+]
       * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#drop-down
       * linkId = "a7e056be-fb6f-4f7f-b04d-5b809e1e18e3"
       * text = "Clinical Status"
       * type = #choice
-      * answerValueSet = "http://hl7.org/fhir/ValueSet/condition-clinical"
+      * answerValueSet = "#condition-clinical"
     * item[+]
       * linkId = "e4524654-f6de-4717-b288-34919394d46b"
       * text = "Onset Date"
diff --git a/input/fsh/715-Assessment-MemoryAndThinking.fsh b/input/fsh/715-Assessment-MemoryAndThinking.fsh
index f1a551e..c8223c7 100644
--- a/input/fsh/715-Assessment-MemoryAndThinking.fsh
+++ b/input/fsh/715-Assessment-MemoryAndThinking.fsh
@@ -38,6 +38,17 @@ Description: "Memory And Thinking sub-questionnaire for Aboriginal and Torres St
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Memory And Thinking sub-questionnaire for Aboriginal and Torres St
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Memory And Thinking sub-questionnaire for Aboriginal and Torres St
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-18" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-18"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-18" // Section complete item
diff --git a/input/fsh/715-Assessment-Mood.fsh b/input/fsh/715-Assessment-Mood.fsh
index edf6874..b2f604d 100644
--- a/input/fsh/715-Assessment-Mood.fsh
+++ b/input/fsh/715-Assessment-Mood.fsh
@@ -37,6 +37,17 @@ Description: "Mood sub-questionnaire for Aboriginal and Torres Strait Islander H
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -52,7 +63,7 @@ Description: "Mood sub-questionnaire for Aboriginal and Torres Strait Islander H
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -71,13 +82,13 @@ Description: "Mood sub-questionnaire for Aboriginal and Torres Strait Islander H
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-19" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-19"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-19" // Section complete item
diff --git a/input/fsh/715-Assessment-OralAndDentalHealth.fsh b/input/fsh/715-Assessment-OralAndDentalHealth.fsh
index e1ef634..18e1492 100644
--- a/input/fsh/715-Assessment-OralAndDentalHealth.fsh
+++ b/input/fsh/715-Assessment-OralAndDentalHealth.fsh
@@ -38,6 +38,17 @@ Description: "Oral And Dental Health sub-questionnaire for Aboriginal and Torres
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Oral And Dental Health sub-questionnaire for Aboriginal and Torres
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Oral And Dental Health sub-questionnaire for Aboriginal and Torres
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-20" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-20"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-20" // Section complete item
diff --git a/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh b/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh
index 8b91070..8d80c60 100644
--- a/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh
+++ b/input/fsh/715-Assessment-PhysicalActivityAndScreenTime.fsh
@@ -38,6 +38,17 @@ Description: "Physical Activity And Screen Time sub-questionnaire for Aboriginal
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Physical Activity And Screen Time sub-questionnaire for Aboriginal
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -74,13 +85,13 @@ Description: "Physical Activity And Screen Time sub-questionnaire for Aboriginal
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-34" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-34"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-34" // Section complete item
@@ -216,13 +227,13 @@ Description: "Physical Activity And Screen Time sub-questionnaire for Aboriginal
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-21" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-21"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-21" // Section complete item
diff --git a/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh b/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh
index cbc5245..f28068f 100644
--- a/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh
+++ b/input/fsh/715-Assessment-RedFlagsEarlyIdentificationGuide.fsh
@@ -36,6 +36,17 @@ Description: "Red Flags Early Identification Guide For Children sub-questionnair
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -51,7 +62,7 @@ Description: "Red Flags Early Identification Guide For Children sub-questionnair
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -70,13 +81,13 @@ Description: "Red Flags Early Identification Guide For Children sub-questionnair
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-22" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-22"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-22" // Section complete item
diff --git a/input/fsh/715-Assessment-RegularMedications.fsh b/input/fsh/715-Assessment-RegularMedications.fsh
index b5c34b3..c6a1c1f 100644
--- a/input/fsh/715-Assessment-RegularMedications.fsh
+++ b/input/fsh/715-Assessment-RegularMedications.fsh
@@ -38,6 +38,17 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]  
@@ -73,13 +84,13 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-23" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-23"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-23" // Section complete item
@@ -114,7 +125,6 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St
     * text = "Up to date in the health record?"
     * type = #boolean
     * repeats = false
-    * required = true
     * enableWhen[+]
       * question = "6eb59145-ed9a-4184-af83-3506d47e4d4e"
       * operator = #=
@@ -130,7 +140,6 @@ Description: "Regular Medications sub-questionnaire for Aboriginal and Torres St
     * extension[sdc-questionnaire-shortText].valueString = "Understanding and adherence checked"
     * type = #boolean
     * repeats = false
-    * required = true
     * enableWhen[+]
       * question = "6eb59145-ed9a-4184-af83-3506d47e4d4e"
       * operator = #=
diff --git a/input/fsh/715-Assessment-ScreeningPrograms.fsh b/input/fsh/715-Assessment-ScreeningPrograms.fsh
index 611da9d..62e76be 100644
--- a/input/fsh/715-Assessment-ScreeningPrograms.fsh
+++ b/input/fsh/715-Assessment-ScreeningPrograms.fsh
@@ -36,6 +36,17 @@ Description: "Screening Programs sub-questionnaire for Aboriginal and Torres Str
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -51,7 +62,7 @@ Description: "Screening Programs sub-questionnaire for Aboriginal and Torres Str
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -72,13 +83,13 @@ Description: "Screening Programs sub-questionnaire for Aboriginal and Torres Str
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-24" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-24"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-24" // Section complete item
diff --git a/input/fsh/715-Assessment-SexualHealth.fsh b/input/fsh/715-Assessment-SexualHealth.fsh
index 369e054..185dbac 100644
--- a/input/fsh/715-Assessment-SexualHealth.fsh
+++ b/input/fsh/715-Assessment-SexualHealth.fsh
@@ -10,6 +10,7 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
 
 * contained[+] = YesNo
 * contained[+] = YesNoNotAskedDeclined
+* contained[+] = CervicalScreeningStatus-1
 
 //assemble expectation
 * extension[+]
@@ -39,6 +40,17 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -54,7 +66,7 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // Adolescents
@@ -75,13 +87,13 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-36" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-36"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-36" // Section complete item
@@ -125,7 +137,10 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
         * operator = #=
         * answerCoding = http://terminology.hl7.org/CodeSystem/v2-0136#Y
   * item[+]
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
+    * linkId = "0fba3972-faa3-4f40-940c-c2f1c9b55329"
+    * text = "Consider discussing as relevant to age/sex/gender: menstruation (including risk of anaemia); current sexual activity; contraception; safe sex practice (eg use of condoms); sexually transmitted infection symptoms and screening; blood-borne virus screening"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
       <div>Consider discussing as relevant to age/sex/gender:</div>
       <ul>
         <li>menstruation (including risk of anaemia)</li>
@@ -136,9 +151,6 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
         <li>blood-borne virus screening</li>
       </ul>
       </div>"
-    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
-    * linkId = "0fba3972-faa3-4f40-940c-c2f1c9b55329"
-    * text = "Consider discussing as relevant to age/sex/gender: menstruation (including risk of anaemia); current sexual activity; contraception; safe sex practice (eg use of condoms); sexually transmitted infection symptoms and screening; blood-borne virus screening"
     * type = #text
     * repeats = false
 
@@ -174,13 +186,13 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-35" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-35"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-35" // Section complete item
@@ -219,10 +231,7 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
       * text = "Cervical screening status"
       * type = #choice
       * repeats = false
-      * answerOption[+].valueCoding = $SCT#736595007 "Declined"
-      * answerOption[+].valueCoding = http://snomed.info/sct#410527000 "Offered" // a better concept is required
-      * answerOption[+].valueCoding = $SCT#171154002 "Not required"
-      * answerOption[+].valueCoding = $SCT#171155001 "Up to date"
+      * answerValueSet = "#CervicalScreeningStatus-1"
     * item[+]
       * linkId = "f93eb998-1502-4d8a-88a4-986117a387c5"
       * text = "Next due"
@@ -234,7 +243,10 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
       * type = #text
       * repeats = false
   * item[+]
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
+    * linkId = "39b02169-ea34-4af9-aa35-1c47f7f39333"
+    * text = "Consider discussing as relevant to age/sex/gender: contraception; menstruation; sexually transmitted infection symptoms and screening; blood-borne virus screening; continence; menopause; erectile dysfunction"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
       <div>Consider discussing as relevant to age/sex/gender:</div>
       <ul>
         <li>contraception</li>
@@ -246,9 +258,6 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
         <li>erectile dysfunction</li>
       </ul>
       </div>"
-    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
-    * linkId = "39b02169-ea34-4af9-aa35-1c47f7f39333"
-    * text = "Consider discussing as relevant to age/sex/gender: contraception; menstruation; sexually transmitted infection symptoms and screening; blood-borne virus screening; continence; menopause; erectile dysfunction"
     * type = #text
     * repeats = false
 
@@ -284,13 +293,13 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-25" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-25"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-25" // Section complete item
@@ -341,7 +350,10 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
         * operator = #=
         * answerCoding = http://terminology.hl7.org/CodeSystem/v2-0136#Y
   * item[+]
-    * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
+    * linkId = "8d75d1f1-290b-41fc-8e32-ad0681c650bb"
+    * text = "Consider discussing as relevant to age/sex/gender: menopause; erectile dysfunction; prostatic symptoms"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
       <div>Consider discussing as relevant to age/sex/gender:</div>
       <ul>
         <li>menopause</li>
@@ -349,9 +361,6 @@ Description: "Sexual Health sub-questionnaire for Aboriginal and Torres Strait I
         <li>prostatic symptoms</li>
       </ul>
 	    </div>"
-    * extension[sdc-questionnaire-shortText].valueString = "Consider discussing items relevant to age/sex/gender"
-    * linkId = "8d75d1f1-290b-41fc-8e32-ad0681c650bb"
-    * text = "Consider discussing as relevant to age/sex/gender: menopause; erectile dysfunction; prostatic symptoms"
     * type = #text
     * repeats = false
   
diff --git a/input/fsh/715-Assessment-Skin.fsh b/input/fsh/715-Assessment-Skin.fsh
index 4e0a6ec..c3de969 100644
--- a/input/fsh/715-Assessment-Skin.fsh
+++ b/input/fsh/715-Assessment-Skin.fsh
@@ -38,6 +38,17 @@ Description: "Skin sub-questionnaire for Aboriginal and Torres Strait Islander H
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Skin sub-questionnaire for Aboriginal and Torres Strait Islander H
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -73,13 +84,13 @@ Description: "Skin sub-questionnaire for Aboriginal and Torres Strait Islander H
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-26" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-26"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-26" // Section complete item
diff --git a/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh b/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh
index 6d4d362..9b62797 100644
--- a/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh
+++ b/input/fsh/715-Assessment-SocialAndEmotionalWellbeing.fsh
@@ -38,6 +38,17 @@ Description: "Social And Emotional Wellbeing sub-questionnaire for Aboriginal an
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Social And Emotional Wellbeing sub-questionnaire for Aboriginal an
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -72,13 +83,13 @@ Description: "Social And Emotional Wellbeing sub-questionnaire for Aboriginal an
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-27" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-27"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-27" // Section complete item
diff --git a/input/fsh/715-Assessment-SocialHistoryChild.fsh b/input/fsh/715-Assessment-SocialHistoryChild.fsh
index b41ecc6..d584ef9 100644
--- a/input/fsh/715-Assessment-SocialHistoryChild.fsh
+++ b/input/fsh/715-Assessment-SocialHistoryChild.fsh
@@ -38,6 +38,17 @@ Description: "Social History Child sub-questionnaire for Aboriginal and Torres S
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -53,7 +64,7 @@ Description: "Social History Child sub-questionnaire for Aboriginal and Torres S
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -73,13 +84,13 @@ Description: "Social History Child sub-questionnaire for Aboriginal and Torres S
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-28" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-28"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-28" // Section complete item
diff --git a/input/fsh/715-Assessment-SubstanceUse.fsh b/input/fsh/715-Assessment-SubstanceUse.fsh
index 1e4e9b0..4b4755c 100644
--- a/input/fsh/715-Assessment-SubstanceUse.fsh
+++ b/input/fsh/715-Assessment-SubstanceUse.fsh
@@ -8,6 +8,8 @@ Usage: #definition
 Title: "Aboriginal and Torres Strait Islander Health Check - Substance Use"
 Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait Islander Health Check."
 
+* contained[+] = SmokingQuitStatus-1
+* contained[+] = TobaccoUseStatus-1
 
 //assemble expectation
 * extension[+]
@@ -37,6 +39,17 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -60,7 +73,7 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // some linkIds maintained from full assessment questionnaire
@@ -80,13 +93,13 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-29" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-29"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-29" // Section complete item
@@ -113,13 +126,7 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
       * text = "Smoking status"
       * type = #choice
       * repeats = false
-      // better as a standard answerValueSet when missing concepts are available or national standard adoption
-      * answerOption[+].valueCoding = http://snomed.info/sct#266919005 "Never smoked"
-      * answerOption[+].valueCoding = http://snomed.info/sct#77176002 "Smoker"
-      * answerOption[+].valueCoding = http://snomed.info/sct#8517006 "Ex-Smoker"
-      * answerOption[+].valueCoding = http://snomed.info/sct#16090371000119103 "Environmental exposure to tobacco smoke (home, car, etc)"
-      * answerOption[+].valueString = "Wants to quit"
-      * answerOption[+].valueString = "Other tobacco use"
+      * answerValueSet = "#TobaccoUseStatus-1"
     * item[+]
       * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#radio-button
       * linkId = "96dc7c22-d003-459c-8a56-f6cd182fc077"
@@ -130,9 +137,7 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
         * question = "b639a3a8-f476-4cc8-b5c7-f5d2abb23511"
         * operator = #=
         * answerCoding = http://snomed.info/sct#8517006
-      * answerOption[+].valueCoding = http://snomed.info/sct#48031000119106 "Quit >=12 months"
-      * answerOption[+].valueCoding = http://snomed.info/sct#735128000 "Quit <12 months"
-      
+      * answerValueSet = "#SmokingQuitStatus-1"      
     * item[+]
       * linkId = "9e86387d-1be4-4c26-9047-9dd6b03e1ee0"
       * text = "How many?"
@@ -149,7 +154,7 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
       * enableWhen[+]
         * question = "b639a3a8-f476-4cc8-b5c7-f5d2abb23511"
         * operator = #=
-        * answerString = "Wants to quit"
+        * answerCoding = http://snomed.info/sct#394872000
       * enableBehavior = #any
     * item[+]
       * linkId = "32e71641-f660-4ca2-af99-dff8917f07be"
@@ -166,7 +171,7 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
       * enableWhen[+]
         * question = "b639a3a8-f476-4cc8-b5c7-f5d2abb23511"
         * operator = #=
-        * answerString = "Wants to quit"
+        * answerCoding = http://snomed.info/sct#394872000
       * enableBehavior = #any
   * item[+]
     * linkId = "34feaee8-8088-43ee-991d-9729990b5550"
@@ -174,7 +179,10 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
     * type = #group
     * repeats = false
     * item[+]
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
+      * extension[sdc-questionnaire-shortText].valueString = "Quantity and frequency of substance use" 
+      * linkId = "ea73d52c-f831-46be-a45d-2c42250a5210"
+      * text = "Quantity and frequency of: alcohol; caffeine (coffee, soft drinks, iced coffee); cannabis/yarndi/gunja; other substance use: IVDU, methamphetamine, opiates, solvents, other"
+        * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div xmlns=\"http://www.w3.org/1999/xhtml\">
         <div>Quantity and frequency of:</div>
         <ul>
           <li>alcohol</li>
@@ -183,9 +191,6 @@ Description: "Substance Use sub-questionnaire for Aboriginal and Torres Strait I
           <li>other substance use: IVDU, methamphetamine, opiates, solvents, other</li>
         </ul>
 	      </div>"
-      * extension[sdc-questionnaire-shortText].valueString = "Quantity and frequency of substance use" 
-      * linkId = "ea73d52c-f831-46be-a45d-2c42250a5210"
-      * text = "Quantity and frequency of: alcohol; caffeine (coffee, soft drinks, iced coffee); cannabis/yarndi/gunja; other substance use: IVDU, methamphetamine, opiates, solvents, other"
       * type = #text
       * repeats = false
       * item[+]
diff --git a/input/fsh/715-Consent.fsh b/input/fsh/715-Consent.fsh
index 5d7b99f..3db3dcc 100644
--- a/input/fsh/715-Consent.fsh
+++ b/input/fsh/715-Consent.fsh
@@ -40,6 +40,17 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -55,7 +66,7 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -74,13 +85,13 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-30" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-30"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-30" // Section complete item
@@ -163,7 +174,6 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande
     * text = "Date"
     * type = #date
     * repeats = false
-    * required = true
   * item[+]
     * linkId = "0f92eb2d-4629-4215-96f8-46722a2efa73"
     * text = "Doctor"
@@ -204,7 +214,7 @@ Description: "Consent sub-questionnaire for Aboriginal and Torres Strait Islande
     * repeats = false
     * answerOption[+].valueCoding = $SCT#257585005 "Clinic"
     * answerOption[+].valueCoding = $SCT#264362003 "Home"
-    * answerOption[+].valueCoding = $SCT#413817003 "Early learning centre" //concept id for child day care. Would be better with a new specific SCTAU concept. Could even remove conditional questioning and create a single value set to support the answer. 
+    * answerOption[+].valueCoding = $SCT#413817003 "Child day care centre" //may require more specific "Early learning centre" concept created
 
 
 
diff --git a/input/fsh/715-FinalisingHealthCheck.fsh b/input/fsh/715-FinalisingHealthCheck.fsh
index 99d8245..32a7947 100644
--- a/input/fsh/715-FinalisingHealthCheck.fsh
+++ b/input/fsh/715-FinalisingHealthCheck.fsh
@@ -37,6 +37,17 @@ Description: "Finalising the Health Check sub-questionnaire for Aboriginal and T
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -52,7 +63,7 @@ Description: "Finalising the Health Check sub-questionnaire for Aboriginal and T
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 
@@ -72,13 +83,13 @@ Description: "Finalising the Health Check sub-questionnaire for Aboriginal and T
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-31" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-31"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-31" // Section complete item
diff --git a/input/fsh/715-HealthPrioritiesSummary.fsh b/input/fsh/715-HealthPrioritiesSummary.fsh
index 01fb665..6878f01 100644
--- a/input/fsh/715-HealthPrioritiesSummary.fsh
+++ b/input/fsh/715-HealthPrioritiesSummary.fsh
@@ -37,6 +37,17 @@ Description: "Health Priorities, Actions And Follow-Up Summary sub-questionnaire
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -146,7 +157,7 @@ Description: "Health Priorities, Actions And Follow-Up Summary sub-questionnaire
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 // some linkIds maintained from full assessment questionnaire
diff --git a/input/fsh/715-PatientDetails.fsh b/input/fsh/715-PatientDetails.fsh
index 278c154..978e0ad 100644
--- a/input/fsh/715-PatientDetails.fsh
+++ b/input/fsh/715-PatientDetails.fsh
@@ -11,6 +11,11 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
 * contained[+] = YesNoNA
 * contained[+] = AboriginalTorresStraitIslander
 * contained[+] = PrimaryCarerParentGrandparent
+* contained[+] = administrative-gender
+* contained[+] = australian-pronouns-1
+* contained[+] = gender-identity-response-1
+* contained[+] = biological-sex-1
+* contained[+] = australian-states-territories-2
 
 //assemble expectation
 * extension[+]
@@ -40,6 +45,17 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
   * extension[+]
     * url = "description"
     * valueString = "The practitioner user that is to be used to pre-populate the form"
+* extension[+]
+  * url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext"
+  * extension[+]
+    * url = "name"
+    * valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#encounter
+  * extension[+]
+    * url = "type"
+    * valueCode = #Encounter
+  * extension[+]
+    * url = "description"
+    * valueString = "The encounter that is to be used to pre-populate the form"
     
 //assemble context
 * extension[+]
@@ -72,7 +88,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
 * status = #draft
 * experimental = false
 * subjectType[+] = #Patient
-* date = "2022-05-24"
+* date = "2024-04-02"
 * jurisdiction.coding = urn:iso:std:iso:3166#AU
 
 * item[+]
@@ -88,13 +104,13 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-32" // Section complete item
-      * operator = #=
-      * answerBoolean = false  
+      * operator = #!=
+      * answerBoolean = true  
   * item[+] //complete
     * extension[questionnaire-itemControl].valueCodeableConcept = https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended#context-display
     * linkId = "CD-complete-32"
     * text = "Complete"
-      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+      * extension[http://hl7.org/fhir/StructureDefinition/rendering-xhtml].valueString = "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
     * type = #display
     * enableWhen[+]
       * question = "MarkComplete-32" // Section complete item
@@ -128,25 +144,25 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
   * item[+]
     * extension[sdc-questionnaire-initialExpression].valueExpression
       * language = #text/fhirpath
-      * expression = "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns').extension.where(url='value').value.coding"
+      * expression = "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
     * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#drop-down
     * linkId = "540b1034-7c9a-4aba-a9ef-afb77d445a58"
     * text = "Preferred pronouns"
     * type = #choice
     * repeats = false
     * readOnly = true
-    * answerValueSet = "http://terminology.hl7.org/ValueSet/pronouns"
+    * answerValueSet = "#australian-pronouns-1"
   * item[+]
     * extension[sdc-questionnaire-initialExpression].valueExpression
       * language = #text/fhirpath
-      * expression = "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/patient-genderIdentity').value.coding"
+      * expression = "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-genderIdentity') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
     * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#drop-down
     * linkId = "f669a4fe-4818-429a-8847-d20da88d2bb3"
     * text = "Gender identity"
     * type = #choice
     * repeats = false
     * readOnly = true
-    * answerValueSet = "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1"
+    * answerValueSet = "#gender-identity-response-1"
   * item[+]
     * extension[sdc-questionnaire-initialExpression].valueExpression
       * language = #text/fhirpath
@@ -157,18 +173,18 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * text = "Administrative gender"
     * type = #choice
     * repeats = false
-    * answerValueSet = "http://hl7.org/fhir/ValueSet/administrative-gender"
+    * answerValueSet = "#administrative-gender"
   * item[+]
     * extension[sdc-questionnaire-initialExpression].valueExpression
       * language = #text/fhirpath
-      * expression = "%ObsSex.entry.resource.value.coding"
+      * expression = "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-recordedSexOrGender' and extension.where(exists(url='type' and value.coding.code='1515311000168102')) and extension.where(url='effectivePeriod').value.end.empty())).extension.where(url='value').value.coding"
     * extension[questionnaire-itemControl].valueCodeableConcept = http://hl7.org/fhir/questionnaire-item-control#drop-down
     * linkId = "56ef44bb-3d1d-4972-aad1-834b69185d61"
     * text = "Sex assigned at birth"
     * type = #choice
     * repeats = false
     * readOnly = true
-    * answerValueSet = "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+    * answerValueSet = "#biological-sex-1"
   
 
   * item[+]
@@ -199,7 +215,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * type = #choice
     * repeats = false
     * readOnly = true
-    * answerValueSet[+] = "#AboriginalTorresStraitIslander"
+    * answerValueSet = "#AboriginalTorresStraitIslander"
   * item[+]
     * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression].valueExpression
       * language = #text/fhirpath
@@ -209,7 +225,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * text = "Parents/primary carer/s"
     * type = #choice
     * repeats = true
-    * answerValueSet[+] = "#PrimaryCarerParentGrandparent"
+    * answerValueSet = "#PrimaryCarerParentGrandparent"
   * item[+]
     * extension[http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression].valueExpression
       * language = #text/fhirpath
@@ -308,7 +324,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
         * definition = "http://hl7.org.au/fhir/StructureDefinition/au-address#Address.state"
         * text = "State"
         * type = #choice
-        * answerValueSet = "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2"
+        * answerValueSet = "#australian-states-territories-2"
         * repeats = false
       * item[+]
         * extension[sdc-questionnaire-initialExpression].valueExpression
@@ -370,7 +386,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
       * definition = "http://hl7.org.au/fhir/StructureDefinition/au-address#Address.state"
       * text = "State"
       * type = #choice
-      * answerValueSet = "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2"
+      * answerValueSet = "#australian-states-territories-2"
       * repeats = false
     * item[+]
       * extension[sdc-questionnaire-initialExpression].valueExpression
@@ -400,6 +416,10 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * type = #string
     * repeats = true
   * item[+]
+    * extension[sdc-questionnaire-itemPopulationContext].valueExpression
+      * name = "EmergencyContactRepeat"
+      * language = #text/fhirpath
+      * expression = "%patient.contact.where(relationship.coding.exists(code = 'C'))"
     * linkId = "c22390d3-1be6-4fd1-b775-6443b7239a6b"
     * text = "Emergency contact"
     * type = #group
@@ -407,7 +427,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * item[+]
       * extension[sdc-questionnaire-initialExpression].valueExpression
         * language = #text/fhirpath
-        * expression = "%patient.contact.where(relationship.coding.exists(code = 'C')).name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
+        * expression = "%EmergencyContactRepeat.name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
       * linkId = "d7f2dd75-20c8-480f-8c22-71d604ebee8d"
       * text = "Name"
       * type = #string
@@ -431,7 +451,7 @@ Description: "Patient Details sub-questionnaire for Aboriginal and Torres Strait
     * item[+]
       * extension[sdc-questionnaire-initialExpression].valueExpression
         * language = #text/fhirpath
-        * expression = "%patient.contact.where(relationship.coding.exists(code = 'C')).telecom.value"
+        * expression = "%EmergencyContactRepeat.telecom.value"
       * linkId = "626e3723-6310-4b99-81c1-525676b027c8"
       * text = "Phone"
       * type = #string
diff --git a/input/fsh/capability.fsh b/input/fsh/capability.fsh
index a6cc06c..5fd4cc4 100644
--- a/input/fsh/capability.fsh
+++ b/input/fsh/capability.fsh
@@ -36,7 +36,7 @@ Usage: #definition
 * implementationGuide[=].extension[0].valueCode = #SHOULD
 
 * rest.mode = #server
-* rest.documentation = "<div><p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol><li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol></div>"
+* rest.documentation = "<div><p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol></div>"
 
 * rest.security.cors = true
 * rest.security.cors.extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
@@ -123,9 +123,6 @@ Usage: #definition
 * rest.resource[=].extension[=].extension[+].url = "required"
 * rest.resource[=].extension[=].extension[=].valueString = "_sort"
 * rest.resource[=].type = #Observation
-* rest.resource[=].profile = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation"
-* rest.resource[=].profile.extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
-* rest.resource[=].profile.extension[0].valueCode = #SHALL
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus"
 * rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
 * rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
@@ -135,10 +132,7 @@ Usage: #definition
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight"
 * rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
 * rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi"
-* rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
-* rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum"
+* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview"
 * rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
 * rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum"
@@ -150,7 +144,7 @@ Usage: #definition
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate"
 * rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
 * rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result"
+* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview"
 * rest.resource[=].supportedProfile[=].extension[0].url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"
 * rest.resource[=].supportedProfile[=].extension[0].valueCode = #SHALL
 * rest.resource[=].documentation = "<div> <p>The server <strong>SHALL</strong> support the Observation resource, the AU Core profiles listed and the conformance expectations for the Observation resource.</p></div>"
@@ -398,18 +392,14 @@ Usage: #definition
 * rest.resource[=].extension[=].extension[+].url = "required"
 * rest.resource[=].extension[=].extension[=].valueString = "_sort"
 * rest.resource[=].type = #Observation
-* rest.resource[=].profile = "http://hl7.org/fhir/StructureDefinition/Observation"
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight"
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi"
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum"
+* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure"
 * rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate"
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result"
-* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth"
+* rest.resource[=].supportedProfile[+] = "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview"
 * rest.resource[=].interaction[0].code = #search-type
 * rest.resource[=].searchParam[+].name = "patient"
 * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-patient"
@@ -527,5 +517,4 @@ Usage: #definition
 * rest.interaction[+].code = #transaction
 * rest.interaction[+].code = #batch
 
-
 */
\ No newline at end of file
diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh
index 3de8254..f6e9b3c 100644
--- a/input/fsh/terminology.fsh
+++ b/input/fsh/terminology.fsh
@@ -169,6 +169,27 @@ Description: "The Primary Carer Of Parent Or Grandparent value set includes valu
 * $v3-NullFlavor#NA
 
 
+ValueSet: ClinicalCondition
+Id: clinical-condition-1
+Title: "Clinical Condition"
+Description: "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders."
+
+* ^meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
+* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+* ^url = "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1"
+* ^identifier.system = "urn:ietf:rfc:3986"
+* ^identifier.value = "urn:oid:1.2.36.1.2001.1004.201.10035"
+* ^version = "1.0.2"
+* ^status = #active
+* ^experimental = false
+* ^date = "2020-05-31"
+* ^publisher = "Australian Digital Health Agency"
+* ^contact.telecom.system = #email
+* ^contact.telecom.value = "help@digitalhealth.gov.au"
+* ^copyright = "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement."
+* include codes from system $SCT where concept in "32570581000036105"
+
+/*
 ValueSet: MedicalHistory
 Id: MedicalHistory
 Title: "Medical History"
@@ -176,7 +197,7 @@ Description: "The Medical History value set includes values that may be used to
 * ^experimental = false
 
 * include codes from system $SCT where constraint = "^32570581000036105|Problem/Diagnosis reference set| OR ^32570141000036105|Procedure foundation reference set|"
-
+*/
 /* Agreed to replace picklists with medical history table. Commenting out for now.
 ValueSet: MedicalHistoryShortListInfants
 Id: MedicalHistoryShortListInfants
@@ -439,12 +460,61 @@ Description: "The Medical History Short List for Adults and Older People value s
 * $SCT#413307004 // "Mental health"
 */
 
+Alias: $administrative-gender = http://hl7.org/fhir/administrative-gender
+
+ValueSet: AdministrativeGender
+Id: administrative-gender
+Title: "AdministrativeGender"
+Description: "The gender of a person used for administrative purposes."
+
+* ^url = "http://hl7.org/fhir/ValueSet/administrative-gender"
+* ^contact.telecom[0].system = #url
+* ^contact.telecom[=].value = "http://hl7.org/fhir"
+* ^contact.telecom[+].system = #email
+* ^contact.telecom[=].value = "fhir@lists.hl7.org"
+* ^copyright = "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\"."
+* ^date = "2019-11-01T09:29:23+11:00"
+* ^experimental = false
+* ^extension[0].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg"
+* ^extension[=].valueCode = #pa
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status"
+* ^extension[=].valueCode = #normative
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm"
+* ^extension[=].valueInteger = 5
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version"
+* ^extension[=].valueCode = #4.0.0
+* ^identifier.system = "urn:ietf:rfc:3986"
+* ^identifier.value = "urn:oid:2.16.840.1.113883.4.642.3.1"
+* ^immutable = true
+* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
+* ^publisher = "HL7 (FHIR Project)"
+* ^status = #active
+* ^version = "4.0.1"
+* ^expansion.identifier = "urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd"
+* ^expansion.timestamp = "2024-04-05T12:31:27+10:00"
+* ^expansion.total = 4
+* ^expansion.parameter[0].name = "version"
+* ^expansion.parameter[=].valueUri = "http://hl7.org/fhir/administrative-gender|4.0.1"
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://hl7.org/fhir/administrative-gender|4.0.1"
+* ^expansion.contains[0].system = "http://hl7.org/fhir/administrative-gender"
+* ^expansion.contains[=].code = #female 
+* ^expansion.contains[=].display = "Female"
+* ^expansion.contains[+].system = "http://hl7.org/fhir/administrative-gender"
+* ^expansion.contains[=].code = #male
+* ^expansion.contains[=].display = "Male"
+* ^expansion.contains[+].system = "http://hl7.org/fhir/administrative-gender"
+* ^expansion.contains[=].code = #other
+* ^expansion.contains[=].display = "Other"
+* ^expansion.contains[+].system = "http://hl7.org/fhir/administrative-gender"
+* ^expansion.contains[=].code = #unknown
+* ^expansion.contains[=].display = "Unknown"
+* include codes from system $administrative-gender
 
 ValueSet: ConditionClinicalStatusCodes
 Id: condition-clinical
 Title: "Condition Clinical Status Codes"
 Description: "Preferred value set for Condition Clinical Status."
-* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
 * ^extension[0].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg"
 * ^extension[=].valueCode = #pc
 * ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status"
@@ -454,23 +524,29 @@ Description: "Preferred value set for Condition Clinical Status."
 * ^url = "http://hl7.org/fhir/ValueSet/condition-clinical"
 * ^identifier.system = "urn:ietf:rfc:3986"
 * ^identifier.value = "urn:oid:2.16.840.1.113883.4.642.3.164"
-* ^version = "4.3.0"
+* ^version = "4.0.1"
 * ^status = #draft
 * ^experimental = false
 * ^publisher = "FHIR Project team"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://hl7.org/fhir"
-* ^copyright = "Copyright © 2011+ HL7. Creative Commons 'No Rights Reserved' (CC0)"
-* ^expansion.identifier = "5d4bed14-061a-42c4-853d-e6a624c4f483"
-* ^expansion.timestamp = "2022-10-20T09:32:48+10:00"
+* ^copyright = "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\"."
+* ^date = "2019-11-01T09:29:23+11:00"
+* ^expansion.identifier = "urn:uuid:79d21cca-9f34-4cfa-9020-17eee95eeed8"
+* ^expansion.timestamp = "2024-04-02T14:17:12+10:00"
 * ^expansion.total = 6
-* ^expansion.offset = 0
 * ^expansion.parameter[0].name = "version"
 * ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
-* ^expansion.parameter[+].name = "count"
-* ^expansion.parameter[=].valueInteger = 2147483647
-* ^expansion.parameter[+].name = "offset"
-* ^expansion.parameter[=].valueInteger = 0
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+* ^expansion.parameter[+].name = "warning-draft"
+* ^expansion.parameter[=].valueUri = "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+* ^expansion.parameter[+].name = "warning-trial-use"
+* ^expansion.parameter[=].valueUri = "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+* ^expansion.parameter[+].name = "warning-trial-use"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+* ^expansion.parameter[+].name = "warning-draft"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
 * ^expansion.contains[0].system = "http://terminology.hl7.org/CodeSystem/condition-clinical"
 * ^expansion.contains[=].code = #active
 * ^expansion.contains[=].display = "Active"
@@ -491,7 +567,6 @@ Description: "Preferred value set for Condition Clinical Status."
 * ^expansion.contains[=].display = "Resolved"
 * include codes from system ConditionClinicalStatusCodes
 
-
 Alias: $australian-states-territories-1 = https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1
 
 ValueSet: AustralianStatesAndTerritories
@@ -562,41 +637,39 @@ Description: "The Australian States and Territories value set includes values th
 ValueSet: GenderIdentityResponse
 Id: gender-identity-response-1
 Title: "Gender Identity Response"
-Description: "The Gender Identity Response value set includes values that may be used to represent a response for an individual’s gender. A person's gender is a social and cultural identity, expression and experience."
-* ^meta.profile[0] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+Description: "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience."
 * ^url = "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1"
 * ^identifier.system = "urn:ietf:rfc:3986"
 * ^identifier.value = "urn:oid:1.2.36.1.2001.1004.201.10271"
-* ^version = "1.0.0"
+* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2022-09-30"
+* ^date = "2024-02-29"
 * ^publisher = "Australian Digital Health Agency"
 * ^contact.telecom.system = #email
 * ^contact.telecom.value = "help@digitalhealth.gov.au"
-* ^copyright = "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data."
-* ^expansion.identifier = "urn:uuid:85c2e561-69ac-41f6-8e9e-07b3072ef48f"
-* ^expansion.timestamp = "2023-08-30T10:18:47+10:00"
-* ^expansion.total = 5
+* ^copyright = "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.\n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data. \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license."
+* ^expansion.identifier = "urn:uuid:a35fc104-184f-476e-a7a2-e3f3af66a3eb"
+* ^expansion.timestamp = "2024-04-02T14:21:20+10:00"
+* ^expansion.total = 6
 * ^expansion.parameter[0].name = "version"
-* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
 * ^expansion.parameter[+].name = "used-codesystem"
-* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
 * ^expansion.parameter[+].name = "version"
-* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
 * ^expansion.parameter[+].name = "used-codesystem"
-* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
 * ^expansion.contains[0].system = "http://snomed.info/sct"
-* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20230831"
+* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20240331"
 * ^expansion.contains[=].code = #446151000124109
 * ^expansion.contains[=].display = "Identifies as male gender"
 * ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20230831"
+* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20240331"
 * ^expansion.contains[=].code = #446141000124107
 * ^expansion.contains[=].display = "Identifies as female gender"
 * ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20230831"
+* ^expansion.contains[=].version = "http://snomed.info/sct/32506021000036107/version/20240331"
 * ^expansion.contains[=].code = #33791000087105
 * ^expansion.contains[=].display = "Identifies as nonbinary gender"
 * ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -607,53 +680,78 @@ Description: "The Gender Identity Response value set includes values that may be
 * ^expansion.contains[=].version = "5.0.0-ballot"
 * ^expansion.contains[=].code = #asked-declined
 * ^expansion.contains[=].display = "Asked But Declined"
+* ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
+* ^expansion.contains[=].version = "5.0.0-ballot"
+* ^expansion.contains[=].code = #not-asked
+* ^expansion.contains[=].display = "Not Asked"
 * $SCT#446151000124109
 * $SCT#446141000124107
 * $SCT#33791000087105
 * DataAbsentReason#unknown
 * DataAbsentReason#asked-declined
+* DataAbsentReason#not-asked
 
-ValueSet: PersonalPronouns
-Id: pronouns
-Title: "Personal Pronouns"
-Description: "Codes that indicate the pronouns to be used when communicating with or about an individual."
-* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^extension[0].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg"
-* ^extension[=].valueCode = #pa
-* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status"
-* ^extension[=].valueCode = #trial-use
-* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm"
-* ^extension[=].valueInteger = 1
-* ^url = "http://terminology.hl7.org/ValueSet/pronouns"
+ValueSet: AustralianPronouns
+Id: australian-pronouns-1
+Title: "Australian Pronouns"
+Description: "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual."
+* ^url = "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1"
 * ^identifier.system = "urn:ietf:rfc:3986"
-* ^identifier.value = "urn:oid:2.16.840.1.113883.4.642.3.3290"
+* ^identifier.value = "urn:oid:1.2.36.1.2001.1004.201.10284"
 * ^version = "1.0.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2023-07-17T22:16:15-06:00"
-* ^publisher = "FHIR Project team"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://hl7.org/fhir"
-* ^copyright = "This material contains content from LOINC (http://loinc.org). LOINC is copyright © 1995-2020, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc"
-* ^expansion.identifier = "urn:uuid:220b830c-6a1b-43e7-81e0-ccf92485fcdf"
-* ^expansion.timestamp = "2023-10-17T10:42:37+10:00"
-* ^expansion.total = 3
+* ^date = "2024-02-29"
+* ^publisher = "Australian Digital Health Agency"
+* ^contact.telecom.system = #email
+* ^contact.telecom.value = "help@digitalhealth.gov.au"
+* ^copyright = "Copyright © 2024 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis material contains content from LOINC (http://loinc.org). LOINC is copyright 1995-2024, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc.\n\nThis material contains information which is protected by copyright. You may download, display, print and reproduce any material for your personal, non-commercial use or use within your organisation subject to the following terms and conditions: \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license."
+* ^expansion.identifier = "urn:uuid:ca145c1c-4915-4957-888a-39e69de8b1ad"
+* ^expansion.timestamp = "2024-04-02T14:25:01+10:00"
+* ^expansion.total = 7
 * ^expansion.parameter[0].name = "version"
-* ^expansion.parameter[=].valueUri = "http://loinc.org|2.76"
+* ^expansion.parameter[=].valueUri = "http://loinc.org|2.77"
 * ^expansion.parameter[+].name = "used-codesystem"
-* ^expansion.parameter[=].valueUri = "http://loinc.org|2.76"
+* ^expansion.parameter[=].valueUri = "http://loinc.org|2.77"
+* ^expansion.parameter[+].name = "version"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
 * ^expansion.contains[0].system = "http://loinc.org"
+* ^expansion.contains[=].version = "2.77"
 * ^expansion.contains[=].code = #LA29518-0
 * ^expansion.contains[=].display = "he/him/his/his/himself"
 * ^expansion.contains[+].system = "http://loinc.org"
+* ^expansion.contains[=].version = "2.77"
 * ^expansion.contains[=].code = #LA29519-8
 * ^expansion.contains[=].display = "she/her/her/hers/herself"
 * ^expansion.contains[+].system = "http://loinc.org"
+* ^expansion.contains[=].version = "2.77"
 * ^expansion.contains[=].code = #LA29520-6
 * ^expansion.contains[=].display = "they/them/their/theirs/themselves"
+* ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
+* ^expansion.contains[=].version = "5.0.0-ballot"
+* ^expansion.contains[=].code = #asked-declined
+* ^expansion.contains[=].display = "Asked But Declined"
+* ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
+* ^expansion.contains[=].version = "5.0.0-ballot"
+* ^expansion.contains[=].code = #asked-unknown
+* ^expansion.contains[=].display = "Asked But Unknown"
+* ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
+* ^expansion.contains[=].version = "5.0.0-ballot"
+* ^expansion.contains[=].code = #not-asked
+* ^expansion.contains[=].display = "Not Asked"
+* ^expansion.contains[+].system = "http://terminology.hl7.org/CodeSystem/data-absent-reason"
+* ^expansion.contains[=].version = "5.0.0-ballot"
+* ^expansion.contains[=].code = #unknown
+* ^expansion.contains[=].display = "Unknown"
 * LOINC#LA29518-0 "he/him/his/his/himself"
 * LOINC#LA29519-8 "she/her/her/hers/herself"
 * LOINC#LA29520-6 "they/them/their/theirs/themselves"
+* DataAbsentReason#unknown
+* DataAbsentReason#asked-declined
+* DataAbsentReason#not-asked
+* DataAbsentReason#asked-unknown
 
 ValueSet: BiologicalSex
 Id: biological-sex-1
@@ -693,3 +791,118 @@ Description: "The Biological Sex value set includes values that represent the bi
 * ^expansion.contains[=].display = "Male"
 * include codes from system $SCT
     where constraint = "^ 32570631000036107|Sex reference set|"
+
+
+CodeSystem: HealthChecksSCTSupplement
+Id: HealthChecksSCTSupplement
+Title: "SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check"
+Description: "The SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check code system supplement defines consumer friendly terms for use in the health check Questionnaire."
+* ^experimental = false
+* ^content = #supplement
+* ^supplements = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107"
+* #736595007 "Declined"
+* #171154002 "Not required"
+* #171155001 "Up to date"
+* #48031000119106 "Quit >12 months"
+* #735128000 "Quit <12 months"
+* #266919005 "Never smoked"
+* #77176002 "Current smoker"
+* #8517006 "Ex-smoker"
+* #16090371000119103 "Exposure to second hand tobacco smoke"
+* #394872000 "Wants to quit"
+* #713914004 "Other tobacco use"
+
+
+ValueSet: CervicalScreeningStatus
+Id: CervicalScreeningStatus-1
+Title: "Cervical Screening Status"
+Description: "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program."
+* ^experimental = false
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/valueset-supplement"
+* ^extension[=].valueCanonical = "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+* $SCT#736595007 "Declined"
+* $SCT#410527000 "Offered" // a better concept is required
+* $SCT#171154002 "Not required"
+* $SCT#171155001 "Up to date"
+* ^expansion.identifier = "urn:uuid:7642a243-4f23-4b17-933d-57b448902d5d"
+* ^expansion.timestamp = "2024-04-08T10:41:42+10:00"
+* ^expansion.total = 4
+* ^expansion.parameter[0].name = "version"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+* ^expansion.contains[0].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #736595007
+* ^expansion.contains[=].display = "Declined"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #410527000
+* ^expansion.contains[=].display = "Offered"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #171154002
+* ^expansion.contains[=].display = "Not required"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #171155001
+* ^expansion.contains[=].display = "Up to date"
+
+ValueSet: SmokingQuitStatus
+Id: SmokingQuitStatus-1
+Title: "Smoking Quit Status"
+Description: "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking."
+* ^experimental = false
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/valueset-supplement"
+* ^extension[=].valueCanonical = "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+* ^expansion.identifier = "urn:uuid:86b4329d-aca5-4e54-9b5e-67296c7ce9db"
+* ^expansion.timestamp = "2024-04-08T12:56:59+10:00"
+* ^expansion.total = 2
+* ^expansion.parameter[0].name = "version"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+* ^expansion.contains[0].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #48031000119106
+* ^expansion.contains[=].display = "Quit >12 months"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #735128000
+* ^expansion.contains[=].display = "Quit <12 months"
+* $SCT#48031000119106 "Quit >12 months"
+* $SCT#735128000 "Quit <12 months"
+
+
+ValueSet: TobaccoUseStatus
+Id: TobaccoUseStatus-1
+Title: "Tobacco Use Status"
+Description: "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status."
+* ^experimental = false
+* ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/valueset-supplement"
+* ^extension[=].valueCanonical = "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+* ^expansion.identifier = "urn:uuid:577a997d-bacd-499f-bae4-aa6efdcca45e"
+* ^expansion.timestamp = "2024-11-29T10:37:34+10:00"
+* ^expansion.parameter[0].name = "version"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+* ^expansion.parameter[+].name = "used-codesystem"
+* ^expansion.parameter[=].valueUri = "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
+* ^expansion.contains[0].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #266919005
+* ^expansion.contains[=].display = "Never smoked"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #77176002
+* ^expansion.contains[=].display = "Current smoker"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #8517006
+* ^expansion.contains[=].display = "Ex-smoker"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #16090371000119103
+* ^expansion.contains[=].display = "Exposure to second hand tobacco smoke"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #394872000
+* ^expansion.contains[=].display = "Wants to quit"
+* ^expansion.contains[+].system = "http://snomed.info/sct"
+* ^expansion.contains[=].code = #713914004
+* ^expansion.contains[=].display = "Other tobacco use"
+* $SCT#266919005 "Never smoked"
+* $SCT#77176002 "Current smoker"
+* $SCT#8517006 "Ex-smoker"
+* $SCT#16090371000119103 "Exposure to second hand tobacco smoke"
+* $SCT#394872000 "Wants to quit"
+* $SCT#713914004 "Other tobacco use"
+
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index d03142b..7cf39fe 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -2,4 +2,46 @@
 
 # Add warning and/or information messages here after you've confirmed that they aren't really a problem
 # (And include comments like this justifying why)
-# See https://github.com/FHIR/sample-ig/blob/master/input/ignoreWarnings.txt for examples
\ No newline at end of file
+# See https://github.com/FHIR/sample-ig/blob/master/input/ignoreWarnings.txt for examples
+
+# Slice matching - There are several extensions used that either match slices in other profiles stated in meta or are permitted for use by the extension itself.
+This element does not match any known slice defined in the profile http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render|3.0.0
+This element does not match any known slice defined in the profile http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-modular|3.0.0
+This element does not match any known slice defined in the profile http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp|3.0.0
+
+# Slice matching - CapabilityStatement
+This element does not match any known slice defined in the profile http://hl7.org/fhir/StructureDefinition/capabilitystatement-search-parameter-combination%
+
+# EnableWhen target comes after the question - This is intentional design for marking Questionnaire sections as complete
+The target of this enableWhen rule (MarkComplete-%
+
+# ContainedResourceReference extension defined as intended
+Review the extension type for ContainedResourceReference: extensions should not have a context of Element unless it's really intended that they can be used anywhere
+
+# Modular Questionnaire - URL of assembled questionnaire SHALL be the same as its base questionnnaire
+The URL 'http://www.health.gov.au/assessments/mbs/715' has already been used by AssemblyInstructions%
+The URL 'http://www.health.gov.au/assessments/mbs/715' is also used by AboriginalTorresStraitIslanderHealthCheck%
+
+# Draft code systems referenced as intended
+Reference to draft CodeSystem http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext|3.0.0
+Reference to draft CodeSystem https://smartforms.csiro.au/ig/CodeSystem/QuestionnaireItemControlExtended%
+Reference to draft CodeSystem http://hl7.org/fhir/questionnaire-item-control|4.0.1
+Reference to draft CodeSystem http://hl7.org/fhir/questionnaire-display-category|4.0.1
+Reference to draft CodeSystem http://hl7.org/fhir/choice-list-orientation|5.1.0
+
+# Embedded HTML warnings checked
+The string value contains text that looks like embedded HTML tags. If this content is rendered to HTML without appropriate post-processing, it may be a security risk
+
+# Invalid errors - invariant bug
+The extension http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory is not allowed to be used at this point (based on context invariant 'type!='display'')
+
+# HL7 core warnings
+WARNING: 1: The HTML fragment 'ip-statements.xhtml' is not included anywhere in the produced implementation guide
+WARNING: 2: An HTML fragment from the set [cross-version-analysis.xhtml, cross-version-analysis-inline.xhtml] is not included anywhere in the produced implementation guide
+WARNING: 4: The HTML fragment 'globals-table.xhtml' is not included anywhere in the produced implementation guide
+The resource status 'draft' and the standards status 'trial-use' may not be consistent and should be reviewed
+The nominated WG 'pc' means that the publisher should be 'HL7 International / Patient Care' but 'FHIR Project team' was found
+The nominated WG 'pc' means that the contact url should be 'http://www.hl7.org/Special/committees/patientcare' but it was not found
+The nominated WG 'fhir' means that the contact url should be 'http://www.hl7.org/Special/committees/fiwg' but it was not found
+The nominated WG 'pa' means that the publisher should be 'HL7 International / Patient Administration' but 'HL7 (FHIR Project)' was found
+The nominated WG 'pa' means that the contact url should be 'http://www.hl7.org/Special/committees/pafm' but it was not found
diff --git a/input/images/CSIRO-SmartHealthCheck-PMSIntegration_20240409.pdf b/input/images/CSIRO-SmartHealthCheck-PMSIntegration_20240409.pdf
new file mode 100644
index 0000000..676c5bf
Binary files /dev/null and b/input/images/CSIRO-SmartHealthCheck-PMSIntegration_20240409.pdf differ
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index 4f094ef..f9962a6 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -7,12 +7,9 @@ See [Reference Implementation](reference-implementation.html).
 
 ### Dependencies
 
-Smart Forms is dependent on:
-- [FHIR R4](http://hl7.org/fhir/R4/)
-- [HL7 Terminology](https://terminology.hl7.org/5.0.0/)
-- [Structured Data Capture](http://build.fhir.org/ig/HL7/sdc/index.html)
-- [AU Base](http://build.fhir.org/ig/hl7au/au-fhir-base/)
-- [AU Core](https://build.fhir.org/ig/hl7au/au-fhir-core/)
+{% include dependency-table.xhtml %}
+
+Smart Forms is also dependent on:
 - Terminology published in Australia's [National Clinical Terminology Service](https://www.healthterminologies.gov.au/access-clinical-terminology/access-fhir-terminology-resources/)
 
 In addition, the following FHIR implementation guides are referenced:
diff --git a/input/pagecontent/reference-implementation.md b/input/pagecontent/reference-implementation.md
index 5c80531..15f51a5 100644
--- a/input/pagecontent/reference-implementation.md
+++ b/input/pagecontent/reference-implementation.md
@@ -15,7 +15,7 @@ If you are interested in using the rendering engine in your projects, a standalo
 
 #### Smart Forms Server
 
-Publicly available endpoint here: <https://api.smartforms.io/fhir>
+Publicly available endpoint here: <https://smartforms.csiro.au/api/fhir>
 
 A Questionnaire-hosting Forms Server API that supports the [$assemble](http://hl7.org/fhir/uv/sdc/OperationDefinition-Questionnaire-assemble.html) operation. This API is built on the [HAPI-FHIR Starter Project](https://github.com/hapifhir/hapi-fhir-jpaserver-starter).
 
diff --git a/input/pagecontent/smart-health-check-application-integration.xml b/input/pagecontent/smart-health-check-application-integration.xml
index 7cb8090..ecd6d09 100644
--- a/input/pagecontent/smart-health-check-application-integration.xml
+++ b/input/pagecontent/smart-health-check-application-integration.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 	<head>
 		<title>Smart Health Check Application Integration</title>
 	</head>
     <body> 
         <center>
-            <object width="900" height="700" type="application/pdf" data= "CSIRO-SmartHealthCheck-PMSIntegration_20231025.pdf"></object> 
+            <object width="900" height="700" type="application/pdf" data= "CSIRO-SmartHealthCheck-PMSIntegration_20240409.pdf"></object> 
         </center>
     </body>
 </html>
diff --git a/input/pagecontent/terminology.md b/input/pagecontent/terminology.md
index e040505..9ec025f 100644
--- a/input/pagecontent/terminology.md
+++ b/input/pagecontent/terminology.md
@@ -17,19 +17,23 @@ See the [FHIR terminology section]({{site.data.fhir.path}}terminologies-systems.
 **Value sets contained in the Aboriginal and Torres Strait Islander Health Check Questionnaire**
 - [Aboriginal and/or Torres Strait Islander](ValueSet-AboriginalTorresStraitIslander.html)
 - [Condition Clinical Status Codes](ValueSet-condition-clinical.html)
-- [Medical History](ValueSet-MedicalHistory.html)
-<!--- [Medical History Short List for Infants](ValueSet-MedicalHistoryShortListInfants.html)
-- [Medical History Short List for Primary School Children](ValueSet-MedicalHistoryShortListPrimarySchool.html)
-- [Medical History Short List for Adolescents](ValueSet-MedicalHistoryShortListAdolescents.html)
-- [Medical History Short List for Adults and Older People](ValueSet-MedicalHistoryShortListAdultsAndOlderPeople.html)-->
+- [Clinical condition](ValueSet-clinical-condition-1.html)
+<!-- - [Medical History](ValueSet-MedicalHistory.html)-->
+<!-- - [Medical History Short List for Infants](ValueSet-MedicalHistoryShortListInfants.html)-->
+<!-- - [Medical History Short List for Primary School Children](ValueSet-MedicalHistoryShortListPrimarySchool.html)-->
+<!-- - [Medical History Short List for Adolescents](ValueSet-MedicalHistoryShortListAdolescents.html)-->
+<!-- - [Medical History Short List for Adults and Older People](ValueSet-MedicalHistoryShortListAdultsAndOlderPeople.html)-->
 - [Primary Carer Of Parent Or Grandparent](ValueSet-PrimaryCarerParentGrandparent.html)
 - [Yes/No](ValueSet-YesNo.html)
 - [Yes/No/NA](ValueSet-YesNoNA.html)
 - [Yes/No/Not Asked/Asked But Declined](ValueSet-YesNoNotAskedDeclined.html)
 - [Australian States and Territories](ValueSet-australian-states-territories-2.html)
-- [Personal Pronouns](ValueSet-pronouns.html)
+- [Australian Pronouns](ValueSet-australian-pronouns-1.html)
 - [Gender Identity Response](ValueSet-gender-identity-response-1.html)
 - [Biological Sex](ValueSet-biological-sex-1.html)
+- [AdministrativeGender](ValueSet-administrative-gender.html)
+- [Cervical Screening Status](ValueSet-CervicalScreeningStatus-1.html)
+- [Smoking Quit Status](ValueSet-SmokingQuitStatus-1.html)
 
 
 ### Code systems
diff --git a/input/resources/CapabilityStatement-SFLauncherServerAboriginalTorresStraitIslanderHealthCheck.json b/input/resources/CapabilityStatement-SFLauncherServerAboriginalTorresStraitIslanderHealthCheck.json
index f88b41f..7b804a4 100644
--- a/input/resources/CapabilityStatement-SFLauncherServerAboriginalTorresStraitIslanderHealthCheck.json
+++ b/input/resources/CapabilityStatement-SFLauncherServerAboriginalTorresStraitIslanderHealthCheck.json
@@ -3,7 +3,7 @@
   "id": "SFLauncherServerAboriginalTorresStraitIslanderHealthCheck",
   "text": {
       "status": "extensions",
-      "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"> <h2>Smart Forms Launcher Server for the Aboriginal and Torres Strait Islander Health Check Capability Statement</h2> <ul> <li>Kind of capability statement: Requirements</li><li>FHIR Version: 4.0.1</li><li>Supported Formats: <strong>SHALL</strong> support <code>json</code></li><li>Published by: AEHRC CSIRO</li></ul> <blockquote class=\"impl-note\"> <p><strong>Note to Implementers: FHIR Capabilities</strong></p><p>Any FHIR capability may be 'allowed' by the system unless explicitly marked as &quot;SHALL NOT&quot;. Some items might be marked as MAY in the Implementation Guide to highlight their potential relevance to the use case. </p></blockquote> <h3 id=\"shallIGs\">SHALL Support the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/smart-app-launch/STU2.1/\">SMART App Launch</a> </li></ul> <h3 id=\"shouldIGs\">SHOULD Support the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/\">Structured Data Capture</a> </li></ul> <h3 id=\"shallCSs\">SHALL Implement the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/CapabilityStatement-au-core-server.html\">AU Core Server</a> </li></ul> <h3 id=\"shouldCSs\">SHOULD Implement the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-response-manager.html\">SDC Form Response Manager</a> </li><li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-archiver.html\">SDC Form Archiver</a> </li></ul> <h2 id=\"rest\">FHIR RESTful Capabilities</h2> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h3 id=\"mode1\" class=\"panel-title\">Mode: <code>server</code></h3> </div><div class=\"panel-body\"> <div> <p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Support the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">SDC Questionnaire Response</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol> </div><div class=\"lead\"><em>Security</em></div><blockquote> <div> <p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol> <li>Support CORS headers</li><li>Support SMART on FHIR security services</li></ol> <p>See the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/security.html\">Structured Data Capture Security Details</a> section for general considerations and recommendations.</p></div></blockquote> </div></div><h3 id=\"resourcesCap1\">Capabilities by Resource/Profile</h3> <h4 id=\"resourcesSummary1\">Summary</h4> <p>The summary table lists the resources that are part of this configuration, and for each resource it lists:</p><ul> <li>The relevant profiles (if any)</li><li>The interactions supported by each resource (<b><span class=\"bg-info\">R</span></b>ead, <b><span class=\"bg-info\">S</span></b>earch, <b><span class=\"bg-info\">U</span></b>pdate, and <b><span class=\"bg-info\">C</span></b>reate, are always shown, while <b><span class=\"bg-info\">VR</span></b>ead, <b><span class=\"bg-info\">P</span></b>atch, <b><span class=\"bg-info\">D</span></b>elete, <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">I</span></b>nstance, or <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">T</span></b>ype are only present if at least one of the resources has support for them.</li><li><span>The required, recommended, and some optional search parameters (if any). </span></li><li>The linked resources enabled for <code>_include</code></li><li>The other resources enabled for <code>_revinclude</code></li><li>The operations on the resource (if any)</li></ul> <div class=\"table-responsive\"> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th><b>Resource Type</b></th> <th><b>Profile</b></th> <th class=\"text-center\"><b title=\"GET a resource (read interaction)\">R</b></th> <th class=\"text-center\"><b title=\"GET all set of resources of the type (search interaction)\">S</b></th> <th class=\"text-center\"><b title=\"PUT a new resource version (update interaction)\">U</b></th> <th class=\"text-center\"><b title=\"POST a new resource (create interaction)\">C</b></th> <th><b title=\"Required and recommended search parameters\">Searches</b></th> <th><code><b>_include</b></code></th> <th><code><b>_revinclude</b></code></th> <th><b>Operations</b></th> </tr></thead> <tbody> <tr> <td><a href=\"#Patient1\">Patient</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Practitioner1\">Practitioner</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Encounter1\">Encounter</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Condition1\">Condition</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>patient, clinical-status, patient+clinical-status</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Observation1\">Observation</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-observation.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation</a><br/><em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bmi.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result</a> </li><li><a href=\"https://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-sexassignedatbirth.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth</a> </li></ul> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>code, patient, _count, _sort, code+patient+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#QuestionnaireResponse1\">QuestionnaireResponse</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </td><td>y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td>patient, questionnaire, status, _count, _sort, patient+_count+_sort, patient+questionnaire+_count+_sort, patient+status+_count+_sort</td><td></td><td></td><td></td></tr></tbody> </table> </div><hr/> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Patient1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Patient</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Patient resource, AU Core profile and the conformance expectations for the Patient resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Practitioner1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Practitioner</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Practitioner resource, AU Core profile and the conformance expectations for the Practitioner resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Encounter1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Encounter</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Encounter resource, AU Core profile and the conformance expectations for the Encounter resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Condition1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Condition</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Condition resource, the AU Core profile and the conformance expectations for the Condition resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a> </td><td><code>reference</code>+<code>token</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Observation1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Observation</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-observation.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bmi.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result</a> </li><li><a href=\"https://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-sexassignedatbirth.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth</a> </li></ul> </div><div class=\"col-lg-6\"><span class=\"lead\">Supported Profiles Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Observation resource, the AU Core profiles listed and the conformance expectations for the Observation resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least an id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result limiting.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client server <strong>SHALL</strong> support search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"QuestionnaireResponse1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>QuestionnaireResponse</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>, <code>search-type</code>, <code>update</code>, <code>create</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Versioning</span> <blockquote> <div> <p><em>VersionId tracked fully</em></p><p>The server <strong>SHALL</strong> correctly track and populate the versionId meta-property on resources and support using e-tags and If-Match header for version integrity in the API.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the QuestionnaireResponse resource, Structured Data Capture profile and the conformance expectations for the QuestionnaireResponse resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result limiting.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result sorting by authored and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div></div>"
+      "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"> <h2>Smart Forms Launcher Server for the Aboriginal and Torres Strait Islander Health Check Capability Statement</h2> <ul> <li>Kind of capability statement: Requirements</li><li>FHIR Version: 4.0.1</li><li>Supported Formats: <strong>SHALL</strong> support <code>json</code></li><li>Published by: AEHRC CSIRO</li></ul> <blockquote class=\"impl-note\"> <p><strong>Note to Implementers: FHIR Capabilities</strong></p><p>Any FHIR capability may be 'allowed' by the system unless explicitly marked as &quot;SHALL NOT&quot;. Some items might be marked as MAY in the Implementation Guide to highlight their potential relevance to the use case. </p></blockquote> <h3 id=\"shallIGs\">SHALL Support the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/smart-app-launch/STU2.1/\">SMART App Launch</a> </li></ul> <h3 id=\"shouldIGs\">SHOULD Support the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/\">Structured Data Capture</a> </li></ul> <h3 id=\"shallCSs\">SHALL Implement the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/CapabilityStatement-au-core-server.html\">AU Core Server</a> </li></ul> <h3 id=\"shouldCSs\">SHOULD Implement the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-response-manager.html\">SDC Form Response Manager</a> </li><li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-archiver.html\">SDC Form Archiver</a> </li></ul> <h2 id=\"rest\">FHIR RESTful Capabilities</h2> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h3 id=\"mode1\" class=\"panel-title\">Mode: <code>server</code></h3> </div><div class=\"panel-body\"> <div> <p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Support the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">SDC Questionnaire Response</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol> </div><div class=\"lead\"><em>Security</em></div><blockquote> <div> <p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol> <li>Support CORS headers</li><li>Support SMART on FHIR security services</li></ol> <p>See the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/security.html\">Structured Data Capture Security Details</a> section for general considerations and recommendations.</p></div></blockquote> </div></div><h3 id=\"resourcesCap1\">Capabilities by Resource/Profile</h3> <h4 id=\"resourcesSummary1\">Summary</h4> <p>The summary table lists the resources that are part of this configuration, and for each resource it lists:</p><ul> <li>The relevant profiles (if any)</li><li>The interactions supported by each resource (<b><span class=\"bg-info\">R</span></b>ead, <b><span class=\"bg-info\">S</span></b>earch, <b><span class=\"bg-info\">U</span></b>pdate, and <b><span class=\"bg-info\">C</span></b>reate, are always shown, while <b><span class=\"bg-info\">VR</span></b>ead, <b><span class=\"bg-info\">P</span></b>atch, <b><span class=\"bg-info\">D</span></b>elete, <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">I</span></b>nstance, or <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">T</span></b>ype are only present if at least one of the resources has support for them.</li><li><span>The required, recommended, and some optional search parameters (if any). </span></li><li>The linked resources enabled for <code>_include</code></li><li>The other resources enabled for <code>_revinclude</code></li><li>The operations on the resource (if any)</li></ul> <div class=\"table-responsive\"> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th><b>Resource Type</b></th> <th><b>Profile</b></th> <th class=\"text-center\"><b title=\"GET a resource (read interaction)\">R</b></th> <th class=\"text-center\"><b title=\"GET all set of resources of the type (search interaction)\">S</b></th> <th class=\"text-center\"><b title=\"PUT a new resource version (update interaction)\">U</b></th> <th class=\"text-center\"><b title=\"POST a new resource (create interaction)\">C</b></th> <th><b title=\"Required and recommended search parameters\">Searches</b></th> <th><code><b>_include</b></code></th> <th><code><b>_revinclude</b></code></th> <th><b>Operations</b></th> </tr></thead> <tbody> <tr> <td><a href=\"#Patient1\">Patient</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Practitioner1\">Practitioner</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Encounter1\">Encounter</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </td><td>y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Condition1\">Condition</a></td><td><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>patient, clinical-status, patient+clinical-status</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Observation1\">Observation</a></td><td><em>Supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview</a> </li></ul> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>code, patient, _count, _sort, code+patient+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#QuestionnaireResponse1\">QuestionnaireResponse</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </td><td>y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td>patient, questionnaire, status, _count, _sort, patient+_count+_sort, patient+questionnaire+_count+_sort, patient+status+_count+_sort</td><td></td><td></td><td></td></tr></tbody> </table> </div><hr/> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Patient1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Patient</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Patient resource, AU Core profile and the conformance expectations for the Patient resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Practitioner1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Practitioner</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Practitioner resource, AU Core profile and the conformance expectations for the Practitioner resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Encounter1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Encounter</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Encounter resource, AU Core profile and the conformance expectations for the Encounter resource.</p></div></blockquote> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Condition1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Condition</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Condition resource, the AU Core profile and the conformance expectations for the Condition resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a> </td><td><code>reference</code>+<code>token</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Observation1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>Observation</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview</a> </li></ul> </div><div class=\"col-lg-6\"><span class=\"lead\">Supported Profiles Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the Observation resource, the AU Core profiles listed and the conformance expectations for the Observation resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least an id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result limiting.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client server <strong>SHALL</strong> support search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"QuestionnaireResponse1\" class=\"panel-title\"><span style=\"float: right;\">Resource Conformance: SHALL</span>QuestionnaireResponse</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </div><div class=\"col-lg-3\"><span class=\"lead\">Profile Conformance</span><br/><b>SHALL</b></div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li><strong>SHALL</strong> support <code>read</code>, <code>search-type</code>, <code>update</code>, <code>create</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Versioning</span> <blockquote> <div> <p><em>VersionId tracked fully</em></p><p>The server <strong>SHALL</strong> correctly track and populate the versionId meta-property on resources and support using e-tags and If-Match header for version integrity in the API.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Documentation</span> <blockquote> <div> <p>The server <strong>SHALL</strong> support the QuestionnaireResponse resource, Structured Data Capture profile and the conformance expectations for the QuestionnaireResponse resource.</p></div></blockquote> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result limiting.</p></div></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support search result sorting by authored and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Conformance</th> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><b>SHALL</b></td><td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div></div>"
     },
   "url": "https://smartforms.csiro.au/ig/CapabilityStatement/SFLauncherServerAboriginalTorresStraitIslanderHealthCheck",
   "name": "SmartFormsLauncherServerAboriginalTorresStraitIslanderHealthCheck",
@@ -94,7 +94,7 @@
   "rest": [
     {
       "mode": "server",
-      "documentation": "<div><p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol><li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li> <li>Support the <a href=\"https://build.fhir.org/ig/hl7au/au-fhir-core/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol></div>",
+      "documentation": "<div><p>A Smart Forms Launcher Server <strong>SHALL</strong>:</p><ol><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">AU Core Patient resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">AU Core Practitioner resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">AU Core Encounter resource profile</a>.</li><li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">AU Core Condition resource profile</a>.</li> <li>Support the <a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/profiles-and-extensions.html#observation\">AU Core Observation resource profiles</a>.</li><li>Implement the RESTful behavior according to the FHIR specification.</li><li>Support JSON source formats for all interactions.</li></ol></div>",
       "security": {
         "cors": true,
         "_cors": {
@@ -320,25 +320,15 @@
             }
           ],
           "type": "Observation",
-          "profile": "http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation",
-          "_profile": {
-            "extension": [
-              {
-                "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                "valueCode": "SHALL"
-              }
-            ]
-          },
           "supportedProfile": [
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum",
+            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result"
+            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview"
           ],
           "_supportedProfile": [
             {
@@ -397,14 +387,6 @@
                 }
               ]
             },
-            {
-              "extension": [
-                {
-                  "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation",
-                  "valueCode": "SHALL"
-                }
-              ]
-            },
             {
               "extension": [
                 {
diff --git a/input/resources/CapabilityStatement-SmartFormsApplication.json b/input/resources/CapabilityStatement-SmartFormsApplication.json
index e02873a..83034c3 100644
--- a/input/resources/CapabilityStatement-SmartFormsApplication.json
+++ b/input/resources/CapabilityStatement-SmartFormsApplication.json
@@ -3,7 +3,7 @@
   "id": "SmartFormsApplication",
   "text": {
       "status": "extensions",
-      "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"> <h2>Smart Forms Application Capability Statement</h2> <ul> <li>Kind of capability statement: capability</li><li>FHIR Version: 4.0.1</li><li>Supported Formats: <code>json</code></li><li>Published by: AEHRC CSIRO</li></ul> <blockquote class=\"impl-note\"> <p><strong>Note to Implementers: FHIR Capabilities</strong></p><p>Additional FHIR capabilities may be 'allowed' by the system. Only the capabilities relevant to Smart Forms have been included in this capability statement.</p></blockquote> <h3 id=\"IGs\">Supports the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/smart-app-launch/STU2.1/\">SMART App Launch</a> </li></ul> <h3 id=\"CSs\">Implements a Subset of the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-filler.html\">SDC Form Filler</a> </li></ul> <h2 id=\"rest\">FHIR RESTful Capabilities</h2> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h3 id=\"mode1\" class=\"panel-title\">Mode: <code>client</code></h3> </div><div class=\"panel-body\"> <div> <p>The Smart Forms Application performs interactions to support SMART App Launch, form prepopulation and form filling.</p></div><div class=\"lead\"><em>Security</em></div><blockquote> <div> <ul><li>TBD requirements and deployment considerations.</li><li>See the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/security.html\">Structured Data Capture Security Details</a> section for general considerations and recommendations.</li></ul> <p></p></div></blockquote> <div class=\"lead\"><em>Summary of System-wide Interactions</em></div><blockquote> <div> <ul> <li>Supports the <code>transaction</code> interaction.</li><li>Supports the <code>batch</code> interaction.</li></ul> </div></blockquote> </div></div><h3 id=\"resourcesCap1\">Capabilities by Resource/Profile</h3> <h4 id=\"resourcesSummary1\">Summary</h4> <p>The summary table lists the resources that are part of this configuration, and for each resource it lists:</p><ul> <li>The relevant profiles (if any)</li><li>The interactions supported by each resource (<b><span class=\"bg-info\">R</span></b>ead, <b><span class=\"bg-info\">S</span></b>earch, <b><span class=\"bg-info\">U</span></b>pdate, and <b><span class=\"bg-info\">C</span></b>reate, are always shown, while <b><span class=\"bg-info\">VR</span></b>ead, <b><span class=\"bg-info\">P</span></b>atch, <b><span class=\"bg-info\">D</span></b>elete, <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">I</span></b>nstance, or <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">T</span></b>ype are only present if at least one of the resources has support for them.</li><li><span>The required, recommended, and some optional search parameters (if any). </span></li><li>The linked resources enabled for <code>_include</code></li><li>The other resources enabled for <code>_revinclude</code></li><li>The operations on the resource (if any)</li></ul> <div class=\"table-responsive\"> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th><b>Resource Type</b></th> <th><b>Profile</b></th> <th class=\"text-center\"><b title=\"GET a resource (read interaction)\">R</b></th> <th class=\"text-center\"><b title=\"GET all set of resources of the type (search interaction)\">S</b></th> <th class=\"text-center\"><b title=\"PUT a new resource version (update interaction)\">U</b></th> <th class=\"text-center\"><b title=\"POST a new resource (create interaction)\">C</b></th> <th><b title=\"Required and recommended search parameters\">Searches</b></th> <th><code><b>_include</b></code></th> <th><code><b>_revinclude</b></code></th> <th><b>Operations</b></th> </tr></thead> <tbody> <tr> <td><a href=\"#Patient1\">Patient</a></td><td><a href=\"http://hl7.org/fhir/R4/patient.html\">http://hl7.org/fhir/StructureDefinition/Patient</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Practitioner1\">Practitioner</a></td><td><a href=\"http://hl7.org/fhir/R4/practitioner.html\">http://hl7.org/fhir/StructureDefinition/Practitioner</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Encounter1\">Encounter</a></td><td><a href=\"http://hl7.org/fhir/R4/encounter.html\">http://hl7.org/fhir/StructureDefinition/Encounter</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Condition1\">Condition</a></td><td><a href=\"http://hl7.org/fhir/R4/condition.html\">http://hl7.org/fhir/StructureDefinition/Condition</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a></li></ul> </td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>patient, clinical-status, patient+clinical-status</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Observation1\">Observation</a></td><td><a href=\"http://hl7.org/fhir/R4/observation.html\">http://hl7.org/fhir/StructureDefinition/Observation</a><br/> <em>Additional supported profiles:</em> <ul> <li> <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-observation.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bmi.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result</a> </li><li><a href=\"https://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-sexassignedatbirth.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth</a> </li></ul> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>code, patient, _count, _sort, code+patient+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Questionnaire1\">Questionnaire</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaire.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire</a> </td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td>url, version, title, _count, _sort, url+version, _count+_sort, title+_count+_sort</td><td></td><td></td><td><code>$assemble</code>, <code>$populate</code></td></tr><tr> <td><a href=\"#QuestionnaireResponse1\">QuestionnaireResponse</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td>patient, questionnaire, questionnaire.title, status, _count, _sort, patient+_count+_sort, patient+questionnaire+_count+_sort, patient+questionnaire.title+_count+_sort, patient+status+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#ValueSet1\">ValueSet</a></td><td><a href=\"https://hl7.org/fhir/r4/valueset.html\">http://hl7.org/fhir/StructureDefinition/ValueSet</a> </td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td><code>$expand</code></td></tr></tbody> </table> </div><hr/> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Patient1\" class=\"panel-title\">Patient</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/patient.html\">http://hl7.org/fhir/StructureDefinition/Patient</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Practitioner1\" class=\"panel-title\">Practitioner</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/practitioner.html\">http://hl7.org/fhir/StructureDefinition/Practitioner</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Encounter1\" class=\"panel-title\">Encounter</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/encounter.html\">http://hl7.org/fhir/StructureDefinition/Encounter</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Condition1\" class=\"panel-title\">Condition</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/condition.html\">http://hl7.org/fhir/StructureDefinition/Condition</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a> </td><td><code>reference</code>+<code>token</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Observation1\" class=\"panel-title\">Observation</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/observation.html\">http://hl7.org/fhir/StructureDefinition/Observation</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li> <a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-observation.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bmi.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result</a> </li><li><a href=\"https://hl7.org.au/fhir/core/0.2.0-preview/StructureDefinition-au-core-sexassignedatbirth.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least an id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Questionnaire1\" class=\"panel-title\">Questionnaire</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaire.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire</a> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>, <code>create</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">url</a></td><td><code>uri</code></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">version</a></td><td><code>token</code></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">title</a></td><td><code>string</code></td><td> <div> <p>The client supports search using the :contains modifier.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">url</a>+ <a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">version</a> </td><td><code>uri</code>+<code>token</code></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">title</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>string</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Operations</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Operation</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/OperationDefinition-Questionnaire-assemble.html\">$assemble</a></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/OperationDefinition-Questionnaire-populate.html\">$populate</a></td><td> <div> <p></p></div></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"QuestionnaireResponse1\" class=\"panel-title\">QuestionnaireResponse</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>, <code>search-type</code>, <code>update</code>, <code>create</code>.</li><li>All search requests <strong>SHALL</strong> at least include the <code>patient</code> parameter.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">questionnaire.title</a> </td><td><code>string</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support chained search questionnaire.title using the search modifier :contains.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by authored and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire.title</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>string</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"ValueSet1\" class=\"panel-title\">ValueSet</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"https://hl7.org/fhir/r4/valueset.html\">http://hl7.org/fhir/StructureDefinition/ValueSet</a> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Operations</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Operation</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"https://hl7.org/fhir/r4/operation-valueset-expand.html\">$expand</a></td><td> <div> <p></p></div></td></tr></tbody> </table> </div></div></div></div></div></div>"
+      "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"> <h2>Smart Forms Application Capability Statement</h2> <ul> <li>Kind of capability statement: capability</li><li>FHIR Version: 4.0.1</li><li>Supported Formats: <code>json</code></li><li>Published by: AEHRC CSIRO</li></ul> <blockquote class=\"impl-note\"> <p><strong>Note to Implementers: FHIR Capabilities</strong></p><p>Additional FHIR capabilities may be 'allowed' by the system. Only the capabilities relevant to Smart Forms have been included in this capability statement.</p></blockquote> <h3 id=\"IGs\">Supports the Following Implementation Guides</h3> <ul> <li><a href=\"http://hl7.org/fhir/smart-app-launch/STU2.1/\">SMART App Launch</a> </li></ul> <h3 id=\"CSs\">Implements a Subset of the Following Capability Statements:</h3> <ul> <li><a href=\"http://hl7.org/fhir/uv/sdc/STU3/CapabilityStatement-sdc-form-filler.html\">SDC Form Filler</a> </li></ul> <h2 id=\"rest\">FHIR RESTful Capabilities</h2> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h3 id=\"mode1\" class=\"panel-title\">Mode: <code>client</code></h3> </div><div class=\"panel-body\"> <div> <p>The Smart Forms Application performs interactions to support SMART App Launch, form prepopulation and form filling.</p></div><div class=\"lead\"><em>Security</em></div><blockquote> <div> <ul><li>TBD requirements and deployment considerations.</li><li>See the <a href=\"http://hl7.org/fhir/uv/sdc/STU3/security.html\">Structured Data Capture Security Details</a> section for general considerations and recommendations.</li></ul> <p></p></div></blockquote> <div class=\"lead\"><em>Summary of System-wide Interactions</em></div><blockquote> <div> <ul> <li>Supports the <code>transaction</code> interaction.</li><li>Supports the <code>batch</code> interaction.</li></ul> </div></blockquote> </div></div><h3 id=\"resourcesCap1\">Capabilities by Resource/Profile</h3> <h4 id=\"resourcesSummary1\">Summary</h4> <p>The summary table lists the resources that are part of this configuration, and for each resource it lists:</p><ul> <li>The relevant profiles (if any)</li><li>The interactions supported by each resource (<b><span class=\"bg-info\">R</span></b>ead, <b><span class=\"bg-info\">S</span></b>earch, <b><span class=\"bg-info\">U</span></b>pdate, and <b><span class=\"bg-info\">C</span></b>reate, are always shown, while <b><span class=\"bg-info\">VR</span></b>ead, <b><span class=\"bg-info\">P</span></b>atch, <b><span class=\"bg-info\">D</span></b>elete, <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">I</span></b>nstance, or <b><span class=\"bg-info\">H</span></b>istory on <b><span class=\"bg-info\">T</span></b>ype are only present if at least one of the resources has support for them.</li><li><span>The required, recommended, and some optional search parameters (if any). </span></li><li>The linked resources enabled for <code>_include</code></li><li>The other resources enabled for <code>_revinclude</code></li><li>The operations on the resource (if any)</li></ul> <div class=\"table-responsive\"> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th><b>Resource Type</b></th> <th><b>Profile</b></th> <th class=\"text-center\"><b title=\"GET a resource (read interaction)\">R</b></th> <th class=\"text-center\"><b title=\"GET all set of resources of the type (search interaction)\">S</b></th> <th class=\"text-center\"><b title=\"PUT a new resource version (update interaction)\">U</b></th> <th class=\"text-center\"><b title=\"POST a new resource (create interaction)\">C</b></th> <th><b title=\"Required and recommended search parameters\">Searches</b></th> <th><code><b>_include</b></code></th> <th><code><b>_revinclude</b></code></th> <th><b>Operations</b></th> </tr></thead> <tbody> <tr> <td><a href=\"#Patient1\">Patient</a></td><td><a href=\"http://hl7.org/fhir/R4/patient.html\">http://hl7.org/fhir/StructureDefinition/Patient</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Practitioner1\">Practitioner</a></td><td><a href=\"http://hl7.org/fhir/R4/practitioner.html\">http://hl7.org/fhir/StructureDefinition/Practitioner</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Encounter1\">Encounter</a></td><td><a href=\"http://hl7.org/fhir/R4/encounter.html\">http://hl7.org/fhir/StructureDefinition/Encounter</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a></li></ul> </td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Condition1\">Condition</a></td><td><a href=\"http://hl7.org/fhir/R4/condition.html\">http://hl7.org/fhir/StructureDefinition/Condition</a><br/> <em>Additional supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a></li></ul> </td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>patient, clinical-status, patient+clinical-status</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Observation1\">Observation</a></td><td><em>Supported profiles:</em> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview</a> </li></ul> </td><td></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\"></td><td>code, patient, _count, _sort, code+patient+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#Questionnaire1\">Questionnaire</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaire.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire</a> </td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td class=\"text-center\"></td><td class=\"text-center\">y</td><td>url, version, title, _count, _sort, url+version, _count+_sort, title+_count+_sort</td><td></td><td></td><td><code>$assemble</code>, <code>$populate</code></td></tr><tr> <td><a href=\"#QuestionnaireResponse1\">QuestionnaireResponse</a></td><td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td class=\"text-center\">y</td><td>patient, questionnaire, questionnaire.title, status, _count, _sort, patient+_count+_sort, patient+questionnaire+_count+_sort, patient+questionnaire.title+_count+_sort, patient+status+_count+_sort</td><td></td><td></td><td></td></tr><tr> <td><a href=\"#ValueSet1\">ValueSet</a></td><td><a href=\"https://hl7.org/fhir/r4/valueset.html\">http://hl7.org/fhir/StructureDefinition/ValueSet</a> </td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td class=\"text-center\"></td><td></td><td></td><td></td><td><code>$expand</code></td></tr></tbody> </table> </div><hr/> <div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Patient1\" class=\"panel-title\">Patient</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/patient.html\">http://hl7.org/fhir/StructureDefinition/Patient</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-patient.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Practitioner1\" class=\"panel-title\">Practitioner</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/practitioner.html\">http://hl7.org/fhir/StructureDefinition/Practitioner</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-practitioner.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-practitioner</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Encounter1\" class=\"panel-title\">Encounter</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/encounter.html\">http://hl7.org/fhir/StructureDefinition/Encounter</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-encounter.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>.</li></ul> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Condition1\" class=\"panel-title\">Condition</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"http://hl7.org/fhir/R4/condition.html\">http://hl7.org/fhir/StructureDefinition/Condition</a> </div></div><div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-condition.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/condition.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/condition.html#search\">clinical-status</a> </td><td><code>reference</code>+<code>token</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Observation1\" class=\"panel-title\">Observation</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-6\"><span class=\"lead\">Supported Profiles</span> <ul> <li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-smokingstatus.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyheight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bodyweight.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-headcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-waistcircum.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-bloodpressure.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.3.0-ballot/StructureDefinition-au-core-heartrate.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate</a> </li><li><a href=\"http://hl7.org.au/fhir/core/0.2.2-preview/StructureDefinition-au-core-lipid-result.html\">http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview</a> </li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a></td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least an id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/observation.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/observation.html#search\">code</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"Questionnaire1\" class=\"panel-title\">Questionnaire</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaire.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire</a> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>search-type</code>, <code>create</code>.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">url</a></td><td><code>uri</code></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">version</a></td><td><code>token</code></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">title</a></td><td><code>string</code></td><td> <div> <p>The client supports search using the :contains modifier.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by date and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">url</a>+ <a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">version</a> </td><td><code>uri</code>+<code>token</code></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">title</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a> </td><td><code>string</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Operations</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Operation</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/OperationDefinition-Questionnaire-assemble.html\">$assemble</a></td><td> <div> <p></p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/uv/sdc/STU3/OperationDefinition-Questionnaire-populate.html\">$populate</a></td><td> <div> <p></p></div></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"QuestionnaireResponse1\" class=\"panel-title\">QuestionnaireResponse</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/><a href=\"http://hl7.org/fhir/uv/sdc/STU3/StructureDefinition-sdc-questionnaireresponse.html\">http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse</a> </div></div><div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Interaction summary</span><br/> <ul> <li>Supports <code>read</code>, <code>search-type</code>, <code>update</code>, <code>create</code>.</li><li>All search requests <strong>SHALL</strong> at least include the <code>patient</code> parameter.</li></ul> </div></div><div class=\"row\"> <div class=\"col-lg-7\"><span class=\"lead\">Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameter</th> <th>Type</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both. </p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a> </td><td><code>reference</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a id value and <strong>MAY</strong> provide both the Type and id values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaire.html#search\">questionnaire.title</a> </td><td><code>string</code></td><td> <div> <p>The client and server <strong>SHALL</strong> support chained search questionnaire.title using the search modifier :contains.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a></td><td><code>token</code></td><td> <div> <p>The client <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the code and system values. The server <strong>SHALL</strong> support both.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a></td><td><code>number</code></td><td> <div> <p>The client supports search result limiting.</p></div></td></tr><tr> <td><a href=\"http://hl7.org/fhir/R4/search.html#_sort\">_sort</a></td><td><code>string</code></td><td> <div> <p>The client supports search result sorting by authored and <strong>MAY</strong> support other values.</p></div></td></tr></tbody> </table> </div><div class=\"col-lg-5\"><span class=\"lead\">Combined Search Parameters</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Parameters</th> <th>Types</th> </tr></thead> <tbody> <tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>reference</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">questionnaire.title</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>string</code>+<code>number</code>+<code>string</code></td></tr><tr> <td><a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">patient</a>+ <a href=\"https://hl7.org/fhir/R4/questionnaireresponse.html#search\">status</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#count\">_count</a>+ <a href=\"http://hl7.org/fhir/R4/search.html#sort\">_sort</a> </td><td><code>reference</code>+<code>token</code>+<code>number</code>+<code>string</code></td></tr></tbody> </table> </div></div></div></div></div><div class=\"panel panel-default\"> <div class=\"panel-heading\"> <h4 id=\"ValueSet1\" class=\"panel-title\">ValueSet</h4> </div><div class=\"panel-body\"> <div class=\"container\"> <div class=\"row\"> <div class=\"col-lg-6\"><span class=\"lead\">Base System Profile</span><br/> <a href=\"https://hl7.org/fhir/r4/valueset.html\">http://hl7.org/fhir/StructureDefinition/ValueSet</a> </div></div><div class=\"row\"> <div class=\"col-12\"><span class=\"lead\">Operations</span> <table class=\"table table-condensed table-hover\"> <thead> <tr> <th>Operation</th> <th>Documentation</th> </tr></thead> <tbody> <tr> <td><a href=\"https://hl7.org/fhir/r4/operation-valueset-expand.html\">$expand</a></td><td> <div> <p></p></div></td></tr></tbody> </table> </div></div></div></div></div></div>"
     },
   "url": "https://smartforms.csiro.au/ig/CapabilityStatement/SmartFormsApplication",
   "name": "SmartFormsApplication",
@@ -148,19 +148,15 @@
             }
           ],
           "type": "Observation",
-          "profile": "http://hl7.org/fhir/StructureDefinition/Observation",
           "supportedProfile": [
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-observation",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-smokingstatus",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyheight",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bodyweight",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bmi",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum",
+            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum|0.2.2-preview",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-waistcircum",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-bloodpressure",
             "http://hl7.org.au/fhir/core/StructureDefinition/au-core-heartrate",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result",
-            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-sexassignedatbirth"
+            "http://hl7.org.au/fhir/core/StructureDefinition/au-core-lipid-result|0.2.2-preview"
           ],
           "interaction": [
             {
diff --git a/input/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheck-assembled.json b/input/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheck-assembled.json
index 6de4220..d87d554 100644
--- a/input/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheck-assembled.json
+++ b/input/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheck-assembled.json
@@ -2,9 +2,6 @@
     "resourceType": "Questionnaire",
     "id": "AboriginalTorresStraitIslanderHealthCheck",
     "meta": {
-        "versionId": "4",
-        "lastUpdated": "2023-11-28T03:38:57.707+00:00",
-        "source": "#9xfyZ38CzEZ8Ewgn",
         "profile": [
             "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp",
             "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-render"
@@ -228,6 +225,592 @@
                 ]
             }
         },
+        {
+            "resourceType": "ValueSet",
+            "id": "administrative-gender",
+            "meta": {
+                "profile": [
+                    "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
+                ]
+            },
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
+                    "valueCode": "pa"
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+                    "valueCode": "normative"
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm",
+                    "valueInteger": 5
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version",
+                    "valueCode": "4.0.0"
+                }
+            ],
+            "url": "http://hl7.org/fhir/ValueSet/administrative-gender",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:2.16.840.1.113883.4.642.3.1"
+                }
+            ],
+            "version": "4.0.1",
+            "name": "AdministrativeGender",
+            "title": "AdministrativeGender",
+            "status": "active",
+            "experimental": false,
+            "date": "2019-11-01T09:29:23+11:00",
+            "publisher": "HL7 (FHIR Project)",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "url",
+                            "value": "http://hl7.org/fhir"
+                        },
+                        {
+                            "system": "email",
+                            "value": "fhir@lists.hl7.org"
+                        }
+                    ]
+                }
+            ],
+            "description": "The gender of a person used for administrative purposes.",
+            "immutable": true,
+            "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://hl7.org/fhir/administrative-gender"
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd",
+                "timestamp": "2024-04-05T12:31:27+10:00",
+                "total": 4,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://hl7.org/fhir/administrative-gender|4.0.1"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://hl7.org/fhir/administrative-gender",
+                        "code": "female",
+                        "display": "Female"
+                    },
+                    {
+                        "system": "http://hl7.org/fhir/administrative-gender",
+                        "code": "male",
+                        "display": "Male"
+                    },
+                    {
+                        "system": "http://hl7.org/fhir/administrative-gender",
+                        "code": "other",
+                        "display": "Other"
+                    },
+                    {
+                        "system": "http://hl7.org/fhir/administrative-gender",
+                        "code": "unknown",
+                        "display": "Unknown"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "australian-pronouns-1",
+            "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:1.2.36.1.2001.1004.201.10284"
+                }
+            ],
+            "version": "1.0.0",
+            "name": "AustralianPronouns",
+            "title": "Australian Pronouns",
+            "status": "active",
+            "experimental": false,
+            "date": "2024-02-29",
+            "publisher": "Australian Digital Health Agency",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "email",
+                            "value": "help@digitalhealth.gov.au"
+                        }
+                    ]
+                }
+            ],
+            "description": "The Australian Pronouns value set includes values that indicate the pronouns to be used when communicating with or about an individual.",
+            "copyright": "Copyright © 2024 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis material contains content from LOINC (http://loinc.org). LOINC is copyright 1995-2024, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc.\n\nThis material contains information which is protected by copyright. You may download, display, print and reproduce any material for your personal, non-commercial use or use within your organisation subject to the following terms and conditions: \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://loinc.org",
+                        "concept": [
+                            {
+                                "code": "LA29518-0",
+                                "display": "he/him/his/his/himself"
+                            },
+                            {
+                                "code": "LA29519-8",
+                                "display": "she/her/her/hers/herself"
+                            },
+                            {
+                                "code": "LA29520-6",
+                                "display": "they/them/their/theirs/themselves"
+                            }
+                        ]
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "concept": [
+                            {
+                                "code": "unknown"
+                            },
+                            {
+                                "code": "asked-declined"
+                            },
+                            {
+                                "code": "not-asked"
+                            },
+                            {
+                                "code": "asked-unknown"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:ca145c1c-4915-4957-888a-39e69de8b1ad",
+                "timestamp": "2024-04-02T14:25:01+10:00",
+                "total": 7,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://loinc.org|2.77"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://loinc.org|2.77"
+                    },
+                    {
+                        "name": "version",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://loinc.org",
+                        "version": "2.77",
+                        "code": "LA29518-0",
+                        "display": "he/him/his/his/himself"
+                    },
+                    {
+                        "system": "http://loinc.org",
+                        "version": "2.77",
+                        "code": "LA29519-8",
+                        "display": "she/her/her/hers/herself"
+                    },
+                    {
+                        "system": "http://loinc.org",
+                        "version": "2.77",
+                        "code": "LA29520-6",
+                        "display": "they/them/their/theirs/themselves"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "asked-declined",
+                        "display": "Asked But Declined"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "asked-unknown",
+                        "display": "Asked But Unknown"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "not-asked",
+                        "display": "Not Asked"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "unknown",
+                        "display": "Unknown"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "gender-identity-response-1",
+            "url": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:1.2.36.1.2001.1004.201.10271"
+                }
+            ],
+            "version": "1.1.0",
+            "name": "GenderIdentityResponse",
+            "title": "Gender Identity Response",
+            "status": "active",
+            "experimental": false,
+            "date": "2024-02-29",
+            "publisher": "Australian Digital Health Agency",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "email",
+                            "value": "help@digitalhealth.gov.au"
+                        }
+                    ]
+                }
+            ],
+            "description": "The Gender Identity Response value set includes values that may be used to represent a response for an individual's gender. A person's gender is a social and cultural identity, expression and experience.",
+            "copyright": "Copyright © 2022 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/.\n\n\"This resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. This resource includes material that is based on Australian Bureau of Statistics data. \n\nThis resource also includes all or a portion of material from the HL7 Terminology (THO). THO is copyright ©1989+ Health Level Seven International and is made available under the CC0 designation. For more licensing information see: https://terminology.hl7.org/license.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "concept": [
+                            {
+                                "code": "446151000124109"
+                            },
+                            {
+                                "code": "446141000124107"
+                            },
+                            {
+                                "code": "33791000087105"
+                            }
+                        ]
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "concept": [
+                            {
+                                "code": "unknown"
+                            },
+                            {
+                                "code": "asked-declined"
+                            },
+                            {
+                                "code": "not-asked"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:a35fc104-184f-476e-a7a2-e3f3af66a3eb",
+                "timestamp": "2024-04-02T14:21:20+10:00",
+                "total": 6,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    },
+                    {
+                        "name": "version",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/data-absent-reason|5.0.0-ballot"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+                        "code": "446151000124109",
+                        "display": "Identifies as male gender"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+                        "code": "446141000124107",
+                        "display": "Identifies as female gender"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "version": "http://snomed.info/sct/32506021000036107/version/20240331",
+                        "code": "33791000087105",
+                        "display": "Identifies as nonbinary gender"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "unknown",
+                        "display": "Unknown"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "asked-declined",
+                        "display": "Asked But Declined"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/data-absent-reason",
+                        "version": "5.0.0-ballot",
+                        "code": "not-asked",
+                        "display": "Not Asked"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "biological-sex-1",
+            "meta": {
+                "profile": [
+                    "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+                    "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+                ]
+            },
+            "url": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:1.2.36.1.2001.1004.201.10198"
+                }
+            ],
+            "version": "1.0.0",
+            "name": "BiologicalSex",
+            "title": "Biological Sex",
+            "status": "active",
+            "experimental": false,
+            "date": "2020-12-31",
+            "publisher": "Australian Digital Health Agency",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "email",
+                            "value": "help@digitalhealth.gov.au"
+                        }
+                    ]
+                }
+            ],
+            "description": "The Biological Sex value set includes values that represent the biological sex of an individual.",
+            "copyright": "Copyright © 2020 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "filter": [
+                            {
+                                "property": "constraint",
+                                "op": "=",
+                                "value": "^ 32570631000036107|Sex reference set|"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:e9cff1c2-8743-48cb-9bde-8f4af914544b",
+                "timestamp": "2023-08-30T10:41:59+10:00",
+                "total": 4,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20230831"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "248152002",
+                        "display": "Female"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "32570681000036106",
+                        "display": "Indeterminate sex"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "32570691000036108",
+                        "display": "Intersex"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "248153007",
+                        "display": "Male"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "australian-states-territories-2",
+            "meta": {
+                "profile": [
+                    "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+                    "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+                ]
+            },
+            "url": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:1.2.36.1.2001.1004.201.10026"
+                }
+            ],
+            "version": "2.0.2",
+            "name": "AustralianStatesAndTerritories",
+            "title": "Australian States and Territories",
+            "status": "active",
+            "experimental": false,
+            "date": "2020-05-31",
+            "publisher": "Australian Digital Health Agency",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "email",
+                            "value": "help@digitalhealth.gov.au"
+                        }
+                    ]
+                }
+            ],
+            "description": "The Australian States and Territories value set includes values that represent the Australian states and territories.",
+            "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes material that is based on Australian Institute of Health and Welfare material. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "concept": [
+                            {
+                                "code": "ACT"
+                            },
+                            {
+                                "code": "NSW"
+                            },
+                            {
+                                "code": "NT"
+                            },
+                            {
+                                "code": "OTHER"
+                            },
+                            {
+                                "code": "QLD"
+                            },
+                            {
+                                "code": "SA"
+                            },
+                            {
+                                "code": "TAS"
+                            },
+                            {
+                                "code": "VIC"
+                            },
+                            {
+                                "code": "WA"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "e9439195-c1d8-4069-a349-98c1d552a351",
+                "timestamp": "2023-06-20T04:20:58+00:00",
+                "total": 9,
+                "offset": 0,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1|1.1.3"
+                    },
+                    {
+                        "name": "count",
+                        "valueInteger": 2147483647
+                    },
+                    {
+                        "name": "offset",
+                        "valueInteger": 0
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "ACT",
+                        "display": "Australian Capital Territory"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "NSW",
+                        "display": "New South Wales"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "NT",
+                        "display": "Northern Territory"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "OTHER",
+                        "display": "Other territories"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "QLD",
+                        "display": "Queensland"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "SA",
+                        "display": "South Australia"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "TAS",
+                        "display": "Tasmania"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "VIC",
+                        "display": "Victoria"
+                    },
+                    {
+                        "system": "https://healthterminologies.gov.au/fhir/CodeSystem/australian-states-territories-1",
+                        "code": "WA",
+                        "display": "Western Australia"
+                    }
+                ]
+            }
+        },
         {
             "resourceType": "ValueSet",
             "id": "YesNo",
@@ -282,38 +865,9 @@
                 ]
             }
         },
-        {
-            "resourceType": "ValueSet",
-            "id": "MedicalHistory",
-            "url": "https://smartforms.csiro.au/ig/ValueSet/MedicalHistory",
-            "name": "MedicalHistory",
-            "title": "Medical History",
-            "status": "draft",
-            "experimental": false,
-            "description": "The Medical History value set includes values that may be used to represent medical history, operations and hospital admissions.",
-            "compose": {
-                "include": [
-                    {
-                        "system": "http://snomed.info/sct",
-                        "filter": [
-                            {
-                                "property": "constraint",
-                                "op": "=",
-                                "value": "^32570581000036105|Problem/Diagnosis reference set| OR ^32570141000036105|Procedure foundation reference set|"
-                            }
-                        ]
-                    }
-                ]
-            }
-        },
         {
             "resourceType": "ValueSet",
             "id": "condition-clinical",
-            "meta": {
-                "profile": [
-                    "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-                ]
-            },
             "extension": [
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg",
@@ -335,11 +889,12 @@
                     "value": "urn:oid:2.16.840.1.113883.4.642.3.164"
                 }
             ],
-            "version": "4.3.0",
+            "version": "4.0.1",
             "name": "ConditionClinicalStatusCodes",
             "title": "Condition Clinical Status Codes",
             "status": "draft",
             "experimental": false,
+            "date": "2019-11-01T09:29:23+11:00",
             "publisher": "FHIR Project team",
             "contact": [
                 {
@@ -352,63 +907,279 @@
                 }
             ],
             "description": "Preferred value set for Condition Clinical Status.",
-            "copyright": "Copyright © 2011+ HL7. Creative Commons 'No Rights Reserved' (CC0)",
+            "copyright": "Copyright © 2011+ HL7. Licensed under Creative Commons \"No Rights Reserved\".",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical"
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:79d21cca-9f34-4cfa-9020-17eee95eeed8",
+                "timestamp": "2024-04-02T14:17:12+10:00",
+                "total": 6,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+                    },
+                    {
+                        "name": "warning-draft",
+                        "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+                    },
+                    {
+                        "name": "warning-trial-use",
+                        "valueUri": "http://hl7.org/fhir/ValueSet/condition-clinical|4.0.1"
+                    },
+                    {
+                        "name": "warning-trial-use",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+                    },
+                    {
+                        "name": "warning-draft",
+                        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "active",
+                        "display": "Active"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "inactive",
+                        "display": "Inactive"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "recurrence",
+                        "display": "Recurrence"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "relapse",
+                        "display": "Relapse"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "remission",
+                        "display": "Remission"
+                    },
+                    {
+                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+                        "code": "resolved",
+                        "display": "Resolved"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "clinical-condition-1",
+            "meta": {
+                "profile": [
+                    "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+                    "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"
+                ]
+            },
+            "url": "https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1",
+            "identifier": [
+                {
+                    "system": "urn:ietf:rfc:3986",
+                    "value": "urn:oid:1.2.36.1.2001.1004.201.10035"
+                }
+            ],
+            "version": "1.0.2",
+            "name": "ClinicalCondition",
+            "title": "Clinical Condition",
+            "status": "active",
+            "experimental": false,
+            "date": "2020-05-31",
+            "publisher": "Australian Digital Health Agency",
+            "contact": [
+                {
+                    "telecom": [
+                        {
+                            "system": "email",
+                            "value": "help@digitalhealth.gov.au"
+                        }
+                    ]
+                }
+            ],
+            "description": "The Clinical Condition value set includes values that cover a broad range of clinical concepts to support the representation of conditions, including problems, diagnoses and disorders.",
+            "copyright": "Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource includes SNOMED Clinical Terms™ (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO). All rights reserved. SNOMED CT®, was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. \n\nThe rights to use and implement or implementation of SNOMED CT content are limited to the extent it is necessary to allow for the end use of this material.  No further rights are granted in respect of the International Release and no further use of any SNOMED CT content by any other party is permitted. \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "filter": [
+                            {
+                                "property": "concept",
+                                "op": "in",
+                                "value": "32570581000036105"
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "SmokingQuitStatus-1",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+                    "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+                }
+            ],
+            "url": "https://smartforms.csiro.au/ig/ValueSet/SmokingQuitStatus-1",
+            "name": "SmokingQuitStatus",
+            "title": "Smoking Quit Status",
+            "status": "draft",
+            "experimental": false,
+            "description": "The Smoking Quit Status value set includes values that can indicate how long ago an individual quit smoking.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "concept": [
+                            {
+                                "code": "48031000119106",
+                                "display": "Quit >12 months"
+                            },
+                            {
+                                "code": "735128000",
+                                "display": "Quit <12 months"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:86b4329d-aca5-4e54-9b5e-67296c7ce9db",
+                "timestamp": "2024-04-08T12:56:59+10:00",
+                "total": 2,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "48031000119106",
+                        "display": "Quit >12 months"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "735128000",
+                        "display": "Quit <12 months"
+                    }
+                ]
+            }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "TobaccoUseStatus-1",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+                    "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+                }
+            ],
+            "url": "https://smartforms.csiro.au/ig/ValueSet/TobaccoUseStatus-1",
+            "name": "TobaccoUseStatus",
+            "title": "Tobacco Use Status",
+            "status": "draft",
+            "experimental": false,
+            "description": "The Tobacco Use Status value set includes values that may be used to represent an individual's current tobacco use and exposure status.",
             "compose": {
                 "include": [
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical"
+                        "system": "http://snomed.info/sct",
+                        "concept": [
+                            {
+                                "code": "266919005",
+                                "display": "Never smoked"
+                            },
+                            {
+                                "code": "77176002",
+                                "display": "Current smoker"
+                            },
+                            {
+                                "code": "8517006",
+                                "display": "Ex-smoker"
+                            },
+                            {
+                                "code": "16090371000119103",
+                                "display": "Exposure to second hand tobacco smoke"
+                            },
+                            {
+                                "code": "394872000",
+                                "display": "Wants to quit"
+                            },
+                            {
+                                "code": "713914004",
+                                "display": "Other tobacco use"
+                            }
+                        ]
                     }
                 ]
             },
             "expansion": {
-                "identifier": "5d4bed14-061a-42c4-853d-e6a624c4f483",
-                "timestamp": "2022-10-20T09:32:48+10:00",
-                "total": 6,
-                "offset": 0,
+                "identifier": "urn:uuid:577a997d-bacd-499f-bae4-aa6efdcca45e",
+                "timestamp": "2024-11-29T10:37:34+10:00",
                 "parameter": [
                     {
                         "name": "version",
-                        "valueUri": "http://terminology.hl7.org/CodeSystem/condition-clinical|4.0.1"
-                    },
-                    {
-                        "name": "count",
-                        "valueInteger": 2147483647
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
                     },
                     {
-                        "name": "offset",
-                        "valueInteger": 0
+                        "name": "used-codesystem",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20241130"
                     }
                 ],
                 "contains": [
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "active",
-                        "display": "Active"
+                        "system": "http://snomed.info/sct",
+                        "code": "266919005",
+                        "display": "Never smoked"
                     },
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "inactive",
-                        "display": "Inactive"
+                        "system": "http://snomed.info/sct",
+                        "code": "77176002",
+                        "display": "Current smoker"
                     },
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "recurrence",
-                        "display": "Recurrence"
+                        "system": "http://snomed.info/sct",
+                        "code": "8517006",
+                        "display": "Ex-smoker"
                     },
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "relapse",
-                        "display": "Relapse"
+                        "system": "http://snomed.info/sct",
+                        "code": "16090371000119103",
+                        "display": "Exposure to second hand tobacco smoke"
                     },
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "remission",
-                        "display": "Remission"
+                        "system": "http://snomed.info/sct",
+                        "code": "394872000",
+                        "display": "Wants to quit"
                     },
                     {
-                        "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
-                        "code": "resolved",
-                        "display": "Resolved"
+                        "system": "http://snomed.info/sct",
+                        "code": "713914004",
+                        "display": "Other tobacco use"
                     }
                 ]
             }
@@ -501,6 +1272,84 @@
                     }
                 ]
             }
+        },
+        {
+            "resourceType": "ValueSet",
+            "id": "CervicalScreeningStatus-1",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/valueset-supplement",
+                    "valueCanonical": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement"
+                }
+            ],
+            "url": "https://smartforms.csiro.au/ig/ValueSet/CervicalScreeningStatus-1",
+            "name": "CervicalScreeningStatus",
+            "title": "Cervical Screening Status",
+            "status": "draft",
+            "experimental": false,
+            "description": "The Cervical Screening Status value set includes values that can be used to represent the status of an individual's participation in a cervical screening program.",
+            "compose": {
+                "include": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "concept": [
+                            {
+                                "code": "736595007",
+                                "display": "Declined"
+                            },
+                            {
+                                "code": "410527000",
+                                "display": "Offered"
+                            },
+                            {
+                                "code": "171154002",
+                                "display": "Not required"
+                            },
+                            {
+                                "code": "171155001",
+                                "display": "Up to date"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "expansion": {
+                "identifier": "urn:uuid:7642a243-4f23-4b17-933d-57b448902d5d",
+                "timestamp": "2024-04-08T10:41:42+10:00",
+                "total": 4,
+                "parameter": [
+                    {
+                        "name": "version",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    },
+                    {
+                        "name": "used-codesystem",
+                        "valueUri": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107/version/20240331"
+                    }
+                ],
+                "contains": [
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "736595007",
+                        "display": "Declined"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "410527000",
+                        "display": "Offered"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "171154002",
+                        "display": "Not required"
+                    },
+                    {
+                        "system": "http://snomed.info/sct",
+                        "code": "171155001",
+                        "display": "Up to date"
+                    }
+                ]
+            }
         }
     ],
     "extension": [
@@ -541,7 +1390,13 @@
         {
             "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
             "valueReference": {
-                "reference": "#MedicalHistory"
+                "reference": "#clinical-condition-1"
+            }
+        },
+        {
+            "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+            "valueReference": {
+                "reference": "#administrative-gender"
             }
         },
         {
@@ -565,7 +1420,7 @@
         {
             "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
             "valueReference": {
-                "reference": "#pronouns"
+                "reference": "#australian-pronouns-1"
             }
         },
         {
@@ -586,6 +1441,24 @@
                 "reference": "#biological-sex-1"
             }
         },
+        {
+            "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+            "valueReference": {
+                "reference": "#SmokingQuitStatus-1"
+            }
+        },
+        {
+            "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+            "valueReference": {
+                "reference": "#TobaccoUseStatus-1"
+            }
+        },
+        {
+            "url": "https://smartforms.csiro.au/ig/StructureDefinition/ContainedResourceReference",
+            "valueReference": {
+                "reference": "#CervicalScreeningStatus-1"
+            }
+        },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
             "extension": [
@@ -626,141 +1499,161 @@
                 }
             ]
         },
+        {
+            "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
+            "extension": [
+                {
+                    "url": "name",
+                    "valueCoding": {
+                        "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
+                        "code": "encounter"
+                    }
+                },
+                {
+                    "url": "type",
+                    "valueCode": "Encounter"
+                },
+                {
+                    "url": "description",
+                    "valueString": "The encounter that is to be used to pre-populate the form"
+                }
+            ]
+        },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AboutTheHealthCheck|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Consent|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Consent|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PatientDetails|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/CurrentPriorities|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MedicalHistoryCurrentProblems|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RegularMedications|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AllergiesAdverseReactions|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FamilyHistory|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialAndEmotionalWellbeing|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SocialHistoryChild|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HomeAndFamily|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndDevelopment|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/LearningAndWork|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Mood|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Mood|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/MemoryAndThinking|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ChronicDiseaseAgeing|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/ScreeningPrograms|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthyEating|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/PhysicalActivityAndScreenTime|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/RedFlagsEarlyIdentificationGuide|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SubstanceUse|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Gambling|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Gambling|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/SexualHealth|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EyeHealth|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/EarHealthAndHearing|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/OralAndDentalHealth|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Skin|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Skin|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Immunisation|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Examination|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Examination|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/AbsoluteCVDRiskCalculation|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Investigations|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/Investigations|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/HealthPrioritiesSummary|0.2.0"
         },
         {
             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom",
-            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.1.0"
+            "valueCanonical": "http://www.health.gov.au/assessments/mbs/715/FinalisingHealthCheck|0.2.0"
         }
     ],
     "url": "http://www.health.gov.au/assessments/mbs/715",
-    "version": "0.1.0-assembled",
+    "version": "0.2.0-assembled",
     "name": "AboriginalTorresStraitIslanderHealthCheck",
     "title": "Aboriginal and Torres Strait Islander Health Check",
     "status": "draft",
@@ -768,7 +1661,7 @@
     "subjectType": [
         "Patient"
     ],
-    "date": "2022-05-24",
+    "date": "2024-04-02",
     "publisher": "AEHRC CSIRO",
     "contact": [
         {
@@ -782,17 +1675,7 @@
         }
     ],
     "description": "Aboriginal and Torres Strait Islander Health Check assessment form.",
-    "jurisdiction": [
-        {
-            "coding": [
-                {
-                    "system": "urn:iso:std:iso:3166",
-                    "code": "AU"
-                }
-            ]
-        }
-    ],
-    "copyright": "CSIRO © 2022+; Licensed under Apache License, Version 2.0",
+    "copyright": "Copyright © 2022+ Australian Government Department of Health and Aged Care - All rights reserved. This content is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. See https://creativecommons.org/licenses/by-sa/4.0/.",
     "item": [
         {
             "extension": [
@@ -1087,6 +1970,118 @@
                         "language": "text/fhirpath",
                         "expression": "item.where(linkId='918f7f32-cdaf-4742-b33a-8254eda2d8bd').item.where(linkId='96a8d946-6078-4c85-9de8-3bf18d2c8150').answer.value"
                     }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "QuestionnaireResponseLatestCompleted",
+                        "language": "application/x-fhir-query",
+                        "expression": "QuestionnaireResponse?status=completed&_count=1&_sort=-authored&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "QuestionnaireResponseLatest",
+                        "language": "application/x-fhir-query",
+                        "expression": "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsSex",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=1515311000168102&status=final&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "PostalAddress",
+                        "language": "text/fhirpath",
+                        "expression": "%patient.address.where(type='postal')"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsTobaccoSmokingStatus",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=72166-2&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsWaistCircumference",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=8280-0&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsHeartRate",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=8867-4&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsBodyHeight",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=8302-2&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsBodyWeight",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=29463-7&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsHeadCircumference",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=9843-4&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "weight",
+                        "language": "text/fhirpath",
+                        "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='97ed4c86-8820-4e4d-9234-0e0e8b6ca44a').item.where(linkId='443bd584-684a-449c-ab6e-9d07da4df9fa').answer.value"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "height",
+                        "language": "text/fhirpath",
+                        "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='6226a5c5-b5c3-4ebb-a689-2b286322cfe0').item.where(linkId='7035c7e7-ada3-4c6b-9ea8-f39666f5d4ea').answer.value"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsTotalCholesterol",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=14647-2&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/variable",
+                    "valueExpression": {
+                        "name": "ObsHDLCholesterol",
+                        "language": "application/x-fhir-query",
+                        "expression": "Observation?code=14646-4&_count=1&_sort=-date&patient={{%patient.id}}"
+                    }
                 }
             ],
             "linkId": "fd5af92e-c248-497a-8007-ee0952ccd4d9",
@@ -1100,22 +2095,6 @@
                                 "language": "text/fhirpath",
                                 "expression": "%age.exists()"
                             }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "QuestionnaireResponseLatestCompleted",
-                                "language": "application/x-fhir-query",
-                                "expression": "QuestionnaireResponse?status=completed&_count=1&_sort=-authored&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "QuestionnaireResponseLatest",
-                                "language": "application/x-fhir-query",
-                                "expression": "QuestionnaireResponse?_count=1&_sort=-authored&patient={{%patient.id}}"
-                            }
                         }
                     ],
                     "linkId": "2e82032a-dc28-45f2-916e-862303d39fe5",
@@ -1151,8 +2130,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-1",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -1176,7 +2155,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -1351,8 +2330,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-30",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -1376,7 +2355,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -1569,7 +2548,6 @@
                             "linkId": "84162f36-f4af-4509-b178-ef2a3849d0b6",
                             "text": "Date",
                             "type": "date",
-                            "required": true,
                             "repeats": false
                         },
                         {
@@ -1691,7 +2669,7 @@
                                     "valueCoding": {
                                         "system": "http://snomed.info/sct",
                                         "code": "413817003",
-                                        "display": "Early learning centre"
+                                        "display": "Child day care centre"
                                     }
                                 }
                             ]
@@ -1713,24 +2691,6 @@
                     ]
                 },
                 {
-                    "extension": [
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsSex",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=1515311000168102&status=final&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "PostalAddress",
-                                "language": "text/fhirpath",
-                                "expression": "%patient.address.where(type='postal')"
-                            }
-                        }
-                    ],
                     "linkId": "5b224753-9365-44e3-823b-9c17e7394005",
                     "text": "Patient Details",
                     "type": "group",
@@ -1764,8 +2724,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-32",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -1789,7 +2749,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -1853,7 +2813,7 @@
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                                     "valueExpression": {
                                         "language": "text/fhirpath",
-                                        "expression": "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns').extension.where(url='value').value.coding"
+                                        "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-pronouns') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
                                     }
                                 },
                                 {
@@ -1873,7 +2833,7 @@
                             "type": "choice",
                             "repeats": false,
                             "readOnly": true,
-                            "answerValueSet": "http://terminology.hl7.org/ValueSet/pronouns"
+                            "answerValueSet": "#australian-pronouns-1"
                         },
                         {
                             "extension": [
@@ -1881,7 +2841,7 @@
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                                     "valueExpression": {
                                         "language": "text/fhirpath",
-                                        "expression": "%patient.extension.where(url='http://hl7.org/fhir/StructureDefinition/patient-genderIdentity').value.coding"
+                                        "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-genderIdentity') and extension.where(url='period').value.end.empty()).extension.where(url='value').value.coding"
                                     }
                                 },
                                 {
@@ -1901,7 +2861,7 @@
                             "type": "choice",
                             "repeats": false,
                             "readOnly": true,
-                            "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1"
+                            "answerValueSet": "#gender-identity-response-1"
                         },
                         {
                             "extension": [
@@ -1932,7 +2892,7 @@
                             "text": "Administrative gender",
                             "type": "choice",
                             "repeats": false,
-                            "answerValueSet": "http://hl7.org/fhir/ValueSet/administrative-gender"
+                            "answerValueSet": "#administrative-gender"
                         },
                         {
                             "extension": [
@@ -1940,7 +2900,7 @@
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                                     "valueExpression": {
                                         "language": "text/fhirpath",
-                                        "expression": "%ObsSex.entry.resource.value.coding"
+                                        "expression": "%patient.extension.where(exists(url='http://hl7.org/fhir/StructureDefinition/individual-recordedSexOrGender' and extension.where(exists(url='type' and value.coding.code='1515311000168102')) and extension.where(url='effectivePeriod').value.end.empty())).extension.where(url='value').value.coding"
                                     }
                                 },
                                 {
@@ -1960,7 +2920,7 @@
                             "type": "choice",
                             "repeats": false,
                             "readOnly": true,
-                            "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+                            "answerValueSet": "#biological-sex-1"
                         },
                         {
                             "extension": [
@@ -2261,7 +3221,7 @@
                                             "text": "State",
                                             "type": "choice",
                                             "repeats": false,
-                                            "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2"
+                                            "answerValueSet": "#australian-states-territories-2"
                                         },
                                         {
                                             "extension": [
@@ -2389,7 +3349,7 @@
                                     "text": "State",
                                     "type": "choice",
                                     "repeats": false,
-                                    "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2"
+                                    "answerValueSet": "#australian-states-territories-2"
                                 },
                                 {
                                     "extension": [
@@ -2448,6 +3408,16 @@
                             "repeats": true
                         },
                         {
+                            "extension": [
+                                {
+                                    "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext",
+                                    "valueExpression": {
+                                        "name": "EmergencyContactRepeat",
+                                        "language": "text/fhirpath",
+                                        "expression": "%patient.contact.where(relationship.coding.exists(code = 'C'))"
+                                    }
+                                }
+                            ],
                             "linkId": "c22390d3-1be6-4fd1-b775-6443b7239a6b",
                             "text": "Emergency contact",
                             "type": "group",
@@ -2459,7 +3429,7 @@
                                             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                                             "valueExpression": {
                                                 "language": "text/fhirpath",
-                                                "expression": "%patient.contact.where(relationship.coding.exists(code = 'C')).name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
+                                                "expression": "%EmergencyContactRepeat.name.select((family | (given | prefix).join(' ')).join(', ').where($this != '') | text)"
                                             }
                                         }
                                     ],
@@ -2504,7 +3474,7 @@
                                             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
                                             "valueExpression": {
                                                 "language": "text/fhirpath",
-                                                "expression": "%patient.contact.where(relationship.coding.exists(code = 'C')).telecom.value"
+                                                "expression": "%EmergencyContactRepeat.telecom.value"
                                             }
                                         }
                                     ],
@@ -3149,8 +4119,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-5",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -3174,7 +4144,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -3458,8 +4428,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-17",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -3483,7 +4453,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -3652,7 +4622,7 @@
                                     "linkId": "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e",
                                     "text": "Condition",
                                     "type": "open-choice",
-                                    "answerValueSet": "#MedicalHistory"
+                                    "answerValueSet": "#clinical-condition-1"
                                 },
                                 {
                                     "extension": [
@@ -3678,7 +4648,7 @@
                                     "linkId": "88bcfad7-386b-4d87-b34b-2e50482e4d2c",
                                     "text": "Clinical Status",
                                     "type": "choice",
-                                    "answerValueSet": "http://hl7.org/fhir/ValueSet/condition-clinical"
+                                    "answerValueSet": "#condition-clinical"
                                 },
                                 {
                                     "extension": [
@@ -3746,7 +4716,7 @@
                                     "linkId": "2da85994-2d5e-42f1-8a81-abf44f397468",
                                     "text": "Condition",
                                     "type": "open-choice",
-                                    "answerValueSet": "#MedicalHistory"
+                                    "answerValueSet": "#clinical-condition-1"
                                 },
                                 {
                                     "extension": [
@@ -3765,7 +4735,7 @@
                                     "linkId": "a7e056be-fb6f-4f7f-b04d-5b809e1e18e3",
                                     "text": "Clinical Status",
                                     "type": "choice",
-                                    "answerValueSet": "http://hl7.org/fhir/ValueSet/condition-clinical"
+                                    "answerValueSet": "#condition-clinical"
                                 },
                                 {
                                     "linkId": "e4524654-f6de-4717-b288-34919394d46b",
@@ -3848,8 +4818,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-23",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -3873,7 +4843,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -3979,7 +4949,6 @@
                                 }
                             ],
                             "enableBehavior": "any",
-                            "required": true,
                             "repeats": false
                         },
                         {
@@ -4011,7 +4980,6 @@
                                 }
                             ],
                             "enableBehavior": "any",
-                            "required": true,
                             "repeats": false
                         },
                         {
@@ -4079,8 +5047,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-3",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -4104,7 +5072,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -4201,8 +5169,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-9",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -4226,7 +5194,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -4378,8 +5346,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-27",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -4403,7 +5371,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -4582,8 +5550,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-28",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -4607,7 +5575,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -4794,8 +5762,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-12",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -4819,7 +5787,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -5019,8 +5987,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-15",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -5044,7 +6012,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -5454,8 +6422,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-33",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -5479,7 +6447,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -5695,8 +6663,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-16",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -5720,7 +6688,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -5842,8 +6810,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-19",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -5867,7 +6835,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -6029,8 +6997,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-18",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -6054,7 +7022,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -6254,8 +7222,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-4",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -6279,7 +7247,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -6297,14 +7265,18 @@
                                 {
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                                     "valueString": "Assessment of chronic disease associated with ageing"
-                                },
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>For older people with chronic disease and/or conditions associated with ageing, consider assessing:</div>\r\n    <ul>\r\n      <li>Osteoporosis risk</li>\r\n      <li>Falls risk</li>\r\n      <li>Balance, coordination and mobility</li>\r\n      <li>Pain</li>\r\n      <li>Nutrition</li>\r\n      <li>Regularity of chronic disease management and review</li>\r\n    </ul>\r\n    </div>"
                                 }
                             ],
                             "linkId": "12e244c0-2887-4230-8792-9521d4f1ab33",
                             "text": "For older people with chronic disease and/or conditions associated with ageing, consider assessing: Osteoporosis risk; Falls risk; Balance, coordination and mobility; Pain; Nutrition; Regularity of chronic disease management and review",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>For older people with chronic disease and/or conditions associated with ageing, consider assessing:</div>\r\n    <ul>\r\n      <li>Osteoporosis risk</li>\r\n      <li>Falls risk</li>\r\n      <li>Balance, coordination and mobility</li>\r\n      <li>Pain</li>\r\n      <li>Nutrition</li>\r\n      <li>Regularity of chronic disease management and review</li>\r\n    </ul>\r\n    </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false,
                             "item": [
@@ -6393,8 +7365,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-24",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -6418,7 +7390,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -6677,8 +7649,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-11",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -6702,7 +7674,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -7011,14 +7983,18 @@
                                         "language": "text/fhirpath",
                                         "expression": "%age <= 5"
                                     }
-                                },
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about age-appropriate healthy eating, which could include:</div>\r\n    <ul>\r\n      <li>current diet</li>\r\n      <li>transition to solids</li>\r\n      <li>dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks</li>\r\n    </ul>\r\n    </div>"
                                 }
                             ],
                             "linkId": "9f6adf74-f240-41a2-a509-d216d5308911",
                             "text": "Document conversation about age-appropriate healthy eating, which could include: current diet; transition to solids; dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about age-appropriate healthy eating, which could include:</div>\r\n    <ul>\r\n      <li>current diet</li>\r\n      <li>transition to solids</li>\r\n      <li>dietary recommendations re fruit and vegetable intake, iron-rich foods, avoiding sugary drinks</li>\r\n    </ul>\r\n    </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false,
                             "item": [
@@ -7050,14 +8026,18 @@
                                         "language": "text/fhirpath",
                                         "expression": "%age > 5"
                                     }
-                                },
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about health eating which could include:</div>\r\n    <ul>\r\n      <li>current diet including food and drinks</li>\r\n      <li>recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)</li>\r\n    </ul>\r\n    </div>"
                                 }
                             ],
                             "linkId": "7a22a4c4-6611-4687-af00-37c80c3f8fc0",
                             "text": "Document conversation about health eating which could include: current diet including food and drinks; recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <div>Document conversation about health eating which could include:</div>\r\n    <ul>\r\n      <li>current diet including food and drinks</li>\r\n      <li>recommendations about fruit and vegetable intake, water as the main drink, avoiding sugary drinks, avoiding highly processed foods (including supermarket-bought and take-away like KFC, Maccas, etc)</li>\r\n    </ul>\r\n    </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false,
                             "item": [
@@ -7194,8 +8174,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-34",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -7219,7 +8199,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -7529,8 +8509,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-21",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -7554,7 +8534,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -7706,8 +8686,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-22",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -7731,7 +8711,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -8950,14 +9930,6 @@
                                 "language": "text/fhirpath",
                                 "expression": "%age >= 12"
                             }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsTobaccoSmokingStatus",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=72166-2&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
                         }
                     ],
                     "linkId": "14a9fb5f-5b0e-4862-b143-08a11cd3ebf0",
@@ -8993,8 +9965,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-29",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -9018,7 +9990,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -9075,42 +10047,7 @@
                                     "text": "Smoking status",
                                     "type": "choice",
                                     "repeats": false,
-                                    "answerOption": [
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "266919005",
-                                                "display": "Never smoked"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "77176002",
-                                                "display": "Smoker"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "8517006",
-                                                "display": "Ex-Smoker"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "16090371000119103",
-                                                "display": "Environmental exposure to tobacco smoke (home, car, etc)"
-                                            }
-                                        },
-                                        {
-                                            "valueString": "Wants to quit"
-                                        },
-                                        {
-                                            "valueString": "Other tobacco use"
-                                        }
-                                    ]
+                                    "answerValueSet": "#TobaccoUseStatus-1"
                                 },
                                 {
                                     "extension": [
@@ -9140,22 +10077,7 @@
                                         }
                                     ],
                                     "repeats": false,
-                                    "answerOption": [
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "48031000119106",
-                                                "display": "Quit >=12 months"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "735128000",
-                                                "display": "Quit <12 months"
-                                            }
-                                        }
-                                    ]
+                                    "answerValueSet": "#SmokingQuitStatus-1"
                                 },
                                 {
                                     "linkId": "9e86387d-1be4-4c26-9047-9dd6b03e1ee0",
@@ -9181,7 +10103,10 @@
                                         {
                                             "question": "b639a3a8-f476-4cc8-b5c7-f5d2abb23511",
                                             "operator": "=",
-                                            "answerString": "Wants to quit"
+                                            "answerCoding": {
+                                                "system": "http://snomed.info/sct",
+                                                "code": "394872000"
+                                            }
                                         }
                                     ],
                                     "enableBehavior": "any",
@@ -9211,7 +10136,10 @@
                                         {
                                             "question": "b639a3a8-f476-4cc8-b5c7-f5d2abb23511",
                                             "operator": "=",
-                                            "answerString": "Wants to quit"
+                                            "answerCoding": {
+                                                "system": "http://snomed.info/sct",
+                                                "code": "394872000"
+                                            }
                                         }
                                     ],
                                     "enableBehavior": "any"
@@ -9226,10 +10154,6 @@
                             "item": [
                                 {
                                     "extension": [
-                                        {
-                                            "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                            "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <div>Quantity and frequency of:</div>\r\n        <ul>\r\n          <li>alcohol</li>\r\n          <li>caffeine (coffee, soft drinks, iced coffee)</li>\r\n          <li>cannabis/yarndi/gunja</li>\r\n          <li>other substance use: IVDU, methamphetamine, opiates, solvents, other</li>\r\n        </ul>\r\n\t      </div>"
-                                        },
                                         {
                                             "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                                             "valueString": "Quantity and frequency of substance use"
@@ -9237,6 +10161,14 @@
                                     ],
                                     "linkId": "ea73d52c-f831-46be-a45d-2c42250a5210",
                                     "text": "Quantity and frequency of: alcohol; caffeine (coffee, soft drinks, iced coffee); cannabis/yarndi/gunja; other substance use: IVDU, methamphetamine, opiates, solvents, other",
+                                    "_text": {
+                                        "extension": [
+                                            {
+                                                "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                                "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <div>Quantity and frequency of:</div>\r\n        <ul>\r\n          <li>alcohol</li>\r\n          <li>caffeine (coffee, soft drinks, iced coffee)</li>\r\n          <li>cannabis/yarndi/gunja</li>\r\n          <li>other substance use: IVDU, methamphetamine, opiates, solvents, other</li>\r\n        </ul>\r\n\t      </div>"
+                                            }
+                                        ]
+                                    },
                                     "type": "text",
                                     "repeats": false,
                                     "item": [
@@ -9327,8 +10259,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-10",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -9352,7 +10284,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -9482,8 +10414,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-36",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -9507,7 +10439,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -9570,10 +10502,6 @@
                         },
                         {
                             "extension": [
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menstruation (including risk of anaemia)</li>\r\n        <li>current sexual activity</li>\r\n        <li>contraception</li>\r\n        <li>safe sex practice (eg use of condoms)</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n      </ul>\r\n      </div>"
-                                },
                                 {
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                                     "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -9581,6 +10509,14 @@
                             ],
                             "linkId": "0fba3972-faa3-4f40-940c-c2f1c9b55329",
                             "text": "Consider discussing as relevant to age/sex/gender: menstruation (including risk of anaemia); current sexual activity; contraception; safe sex practice (eg use of condoms); sexually transmitted infection symptoms and screening; blood-borne virus screening",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menstruation (including risk of anaemia)</li>\r\n        <li>current sexual activity</li>\r\n        <li>contraception</li>\r\n        <li>safe sex practice (eg use of condoms)</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n      </ul>\r\n      </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false
                         },
@@ -9649,8 +10585,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-35",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -9674,7 +10610,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -9759,36 +10695,7 @@
                                     "text": "Cervical screening status",
                                     "type": "choice",
                                     "repeats": false,
-                                    "answerOption": [
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "736595007",
-                                                "display": "Declined"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "410527000",
-                                                "display": "Offered"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "171154002",
-                                                "display": "Not required"
-                                            }
-                                        },
-                                        {
-                                            "valueCoding": {
-                                                "system": "http://snomed.info/sct",
-                                                "code": "171155001",
-                                                "display": "Up to date"
-                                            }
-                                        }
-                                    ]
+                                    "answerValueSet": "#CervicalScreeningStatus-1"
                                 },
                                 {
                                     "linkId": "f93eb998-1502-4d8a-88a4-986117a387c5",
@@ -9806,10 +10713,6 @@
                         },
                         {
                             "extension": [
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>contraception</li>\r\n        <li>menstruation</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n        <li>continence</li>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n      </ul>\r\n      </div>"
-                                },
                                 {
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                                     "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -9817,6 +10720,14 @@
                             ],
                             "linkId": "39b02169-ea34-4af9-aa35-1c47f7f39333",
                             "text": "Consider discussing as relevant to age/sex/gender: contraception; menstruation; sexually transmitted infection symptoms and screening; blood-borne virus screening; continence; menopause; erectile dysfunction",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>contraception</li>\r\n        <li>menstruation</li>\r\n        <li>sexually transmitted infection symptoms and screening</li>\r\n        <li>blood-borne virus screening</li>\r\n        <li>continence</li>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n      </ul>\r\n      </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false
                         },
@@ -9885,8 +10796,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-25",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -9910,7 +10821,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -10021,10 +10932,6 @@
                         },
                         {
                             "extension": [
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n        <li>prostatic symptoms</li>\r\n      </ul>\r\n\t    </div>"
-                                },
                                 {
                                     "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-shortText",
                                     "valueString": "Consider discussing items relevant to age/sex/gender"
@@ -10032,6 +10939,14 @@
                             ],
                             "linkId": "8d75d1f1-290b-41fc-8e32-ad0681c650bb",
                             "text": "Consider discussing as relevant to age/sex/gender: menopause; erectile dysfunction; prostatic symptoms",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n      <div>Consider discussing as relevant to age/sex/gender:</div>\r\n      <ul>\r\n        <li>menopause</li>\r\n        <li>erectile dysfunction</li>\r\n        <li>prostatic symptoms</li>\r\n      </ul>\r\n\t    </div>"
+                                    }
+                                ]
+                            },
                             "type": "text",
                             "repeats": false
                         },
@@ -10100,8 +11015,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-8",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -10125,7 +11040,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -10385,7 +11300,7 @@
                                                     "valueCoding": {
                                                         "system": "http://snomed.info/sct",
                                                         "code": "95726001",
-                                                        "display": "Corneal scarring"
+                                                        "display": "Corneal scar"
                                                     }
                                                 }
                                             ]
@@ -10420,7 +11335,7 @@
                                                     "valueCoding": {
                                                         "system": "http://snomed.info/sct",
                                                         "code": "95726001",
-                                                        "display": "Corneal scarring"
+                                                        "display": "Corneal scar"
                                                     }
                                                 }
                                             ]
@@ -10494,8 +11409,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-6",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -10519,7 +11434,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -11131,8 +12046,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-20",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -11156,7 +12071,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -11406,8 +12321,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-26",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -11431,7 +12346,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -11667,8 +12582,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-13",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -11692,7 +12607,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -11869,62 +12784,6 @@
                                 "language": "text/fhirpath",
                                 "expression": "%age.exists()"
                             }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsWaistCircumference",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=8280-0&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsHeartRate",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=8867-4&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsBodyHeight",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=8302-2&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsBodyWeight",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=29463-7&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsHeadCircumference",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=9843-4&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "weight",
-                                "language": "text/fhirpath",
-                                "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='97ed4c86-8820-4e4d-9234-0e0e8b6ca44a').item.where(linkId='443bd584-684a-449c-ab6e-9d07da4df9fa').answer.value"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "height",
-                                "language": "text/fhirpath",
-                                "expression": "item.where(linkId='c587e3b6-b91a-40dc-9a16-179342d001e9').item.where(linkId='53d5d5a6-3198-4bec-92ac-03fe7d77fb68').item.where(linkId='6226a5c5-b5c3-4ebb-a689-2b286322cfe0').item.where(linkId='7035c7e7-ada3-4c6b-9ea8-f39666f5d4ea').answer.value"
-                            }
                         }
                     ],
                     "linkId": "c587e3b6-b91a-40dc-9a16-179342d001e9",
@@ -11960,8 +12819,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-7",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -11985,7 +12844,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -12560,14 +13419,14 @@
                                                     "valueCoding": {
                                                         "system": "http://snomed.info/sct",
                                                         "code": "271636001",
-                                                        "display": "Pulse Regular"
+                                                        "display": "Pulse regular"
                                                     }
                                                 },
                                                 {
                                                     "valueCoding": {
                                                         "system": "http://snomed.info/sct",
                                                         "code": "61086009",
-                                                        "display": "Pulse Irregular"
+                                                        "display": "Pulse irregular"
                                                     }
                                                 }
                                             ]
@@ -12824,22 +13683,6 @@
                                 "language": "text/fhirpath",
                                 "expression": "%age >= 25"
                             }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsTotalCholesterol",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=14647-2&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
-                        },
-                        {
-                            "url": "http://hl7.org/fhir/StructureDefinition/variable",
-                            "valueExpression": {
-                                "name": "ObsHDLCholesterol",
-                                "language": "application/x-fhir-query",
-                                "expression": "Observation?code=14646-4&_count=1&_sort=-date&patient={{%patient.id}}"
-                            }
                         }
                     ],
                     "linkId": "d95abe99-8ef2-4b97-bc88-a2901e2ebc9c",
@@ -12875,8 +13718,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-2",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -12900,7 +13743,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -12914,25 +13757,29 @@
                             ]
                         },
                         {
-                            "extension": [
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <strong>Important:</strong> <em>The patient record may not be updated with information entered here. Information intended for the patient record should be entered there first.</em>\r\n    </div>"
-                                }
-                            ],
                             "linkId": "RecordUpdate-CVDRisk",
                             "text": "Important: The patient record may not be updated with information entered here. Information intended for the patient record should be entered there.",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <strong>Important:</strong> <em>The patient record may not be updated with information entered here. Information intended for the patient record should be entered there first.</em>\r\n    </div>"
+                                    }
+                                ]
+                            },
                             "type": "display"
                         },
                         {
-                            "extension": [
-                                {
-                                    "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                    "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <p style=\"font-size:1.2em\">The Australian guideline for assessing and managing cardiovascular disease risk recommends the use of the online <a href=\"https://www.cvdcheck.org.au/calculator\" target=\"_blank\">Australian CVD risk calculator</a>.</p>\r\n        <p>The items included in this section are a subset of variables that can be used as inputs for the online calculator.</p>\r\n        <p>The final CVD risk result can be entered in the item at the bottom of this section.</p>\r\n        </div>"
-                                }
-                            ],
                             "linkId": "Guidance-CVDRisk",
                             "text": "Australian CVD risk calculator - https://www.cvdcheck.org.au/calculator",
+                            "_text": {
+                                "extension": [
+                                    {
+                                        "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
+                                        "valueString": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\r\n        <p style=\"font-size:1.2em\">The Australian guideline for assessing and managing cardiovascular disease risk recommends the use of the online <a href=\"https://www.cvdcheck.org.au/calculator\" target=\"_blank\">Australian CVD risk calculator</a>.</p>\r\n        <p>The items included in this section are a subset of variables that can be used as inputs for the online calculator.</p>\r\n        <p>The final CVD risk result can be entered in the item at the bottom of this section.</p>\r\n        </div>"
+                                    }
+                                ]
+                            },
                             "type": "display"
                         },
                         {
@@ -12999,7 +13846,7 @@
                                     "text": "Sex at birth",
                                     "type": "choice",
                                     "repeats": false,
-                                    "answerValueSet": "https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1"
+                                    "answerValueSet": "#biological-sex-1"
                                 },
                                 {
                                     "extension": [
@@ -13021,28 +13868,28 @@
                                             "valueCoding": {
                                                 "system": "http://snomed.info/sct",
                                                 "code": "266919005",
-                                                "display": "Never smoked"
+                                                "display": "Lifetime non-smoker"
                                             }
                                         },
                                         {
                                             "valueCoding": {
                                                 "system": "http://snomed.info/sct",
                                                 "code": "77176002",
-                                                "display": "Smoker"
+                                                "display": "Current smoker"
                                             }
                                         },
                                         {
                                             "valueCoding": {
                                                 "system": "http://snomed.info/sct",
                                                 "code": "8517006",
-                                                "display": "Ex-Smoker"
+                                                "display": "Ex-smoker"
                                             }
                                         },
                                         {
                                             "valueCoding": {
                                                 "system": "http://snomed.info/sct",
                                                 "code": "16090371000119103",
-                                                "display": "Environmental exposure to tobacco smoke (home, car, etc)"
+                                                "display": "Exposure to second hand tobacco smoke"
                                             }
                                         },
                                         {
@@ -13469,8 +14316,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-14",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -13494,7 +14341,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -14403,8 +15250,8 @@
                             "enableWhen": [
                                 {
                                     "question": "MarkComplete-31",
-                                    "operator": "=",
-                                    "answerBoolean": false
+                                    "operator": "!=",
+                                    "answerBoolean": true
                                 }
                             ]
                         },
@@ -14428,7 +15275,7 @@
                                 "extension": [
                                     {
                                         "url": "http://hl7.org/fhir/StructureDefinition/rendering-xhtml",
-                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>\r\n"
+                                        "valueString": "<div title=\"Section completed\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n\t<div style=\"display: flex; flex-direction: row;\">\r\n\t\t<img width='24' height='24' src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiMyZTdkMzIiIGQ9Ik0yMCAxMmE4IDggMCAwIDEtOCA4YTggOCAwIDAgMS04LThhOCA4IDAgMCAxIDgtOGMuNzYgMCAxLjUuMTEgMi4yLjMxbDEuNTctMS41N0E5LjgyMiA5LjgyMiAwIDAgMCAxMiAyQTEwIDEwIDAgMCAwIDIgMTJhMTAgMTAgMCAwIDAgMTAgMTBhMTAgMTAgMCAwIDAgMTAtMTBNNy45MSAxMC4wOEw2LjUgMTEuNUwxMSAxNkwyMSA2bC0xLjQxLTEuNDJMMTEgMTMuMTdsLTMuMDktMy4wOVoiLz48L3N2Zz4='\r\n\t\tstyle=\"align-self: center;\"/>\r\n\t</div>\r\n</div>"
                                     }
                                 ]
                             },
@@ -15349,4 +16196,4 @@
             ]
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/publication-request.json b/publication-request.json
new file mode 100644
index 0000000..91ec866
--- /dev/null
+++ b/publication-request.json
@@ -0,0 +1,10 @@
+{
+  "package-id" : "csiro.fhir.au.smartforms",
+  "version" : "0.x.0-draft",
+  "path" : "https://smartforms.csiro.au/ig/0.x.0-draft",
+  "mode" : "working",
+  "status" : "draft",
+  "sequence" : "R1",
+  "desc" : "This draft is published for trial use and review.",
+  "first" : false
+}
\ No newline at end of file
diff --git a/smartforms-template/package/.index.db b/smartforms-template/package/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/.index.db and b/smartforms-template/package/.index.db differ
diff --git a/smartforms-template/package/.index.json b/smartforms-template/package/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/.index.json
+++ b/smartforms-template/package/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/smartforms-template/package/content/.index.db b/smartforms-template/package/content/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/content/.index.db and b/smartforms-template/package/content/.index.db differ
diff --git a/smartforms-template/package/content/.index.json b/smartforms-template/package/content/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/content/.index.json
+++ b/smartforms-template/package/content/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/smartforms-template/package/content/assets/.index.db b/smartforms-template/package/content/assets/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/content/assets/.index.db and b/smartforms-template/package/content/assets/.index.db differ
diff --git a/smartforms-template/package/content/assets/.index.json b/smartforms-template/package/content/assets/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/content/assets/.index.json
+++ b/smartforms-template/package/content/assets/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/smartforms-template/package/content/assets/css/.index.db b/smartforms-template/package/content/assets/css/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/content/assets/css/.index.db and b/smartforms-template/package/content/assets/css/.index.db differ
diff --git a/smartforms-template/package/content/assets/css/.index.json b/smartforms-template/package/content/assets/css/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/content/assets/css/.index.json
+++ b/smartforms-template/package/content/assets/css/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/smartforms-template/package/content/assets/images/.index.db b/smartforms-template/package/content/assets/images/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/content/assets/images/.index.db and b/smartforms-template/package/content/assets/images/.index.db differ
diff --git a/smartforms-template/package/content/assets/images/.index.json b/smartforms-template/package/content/assets/images/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/content/assets/images/.index.json
+++ b/smartforms-template/package/content/assets/images/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/smartforms-template/package/includes/.index.db b/smartforms-template/package/includes/.index.db
index acb32ab..504ff47 100644
Binary files a/smartforms-template/package/includes/.index.db and b/smartforms-template/package/includes/.index.db differ
diff --git a/smartforms-template/package/includes/.index.json b/smartforms-template/package/includes/.index.json
index dbe759e..7ee6e2c 100644
--- a/smartforms-template/package/includes/.index.json
+++ b/smartforms-template/package/includes/.index.json
@@ -1,4 +1,4 @@
-{
+{
   "index-version" : 2,
   "files" : []
 }
diff --git a/sushi-config.yaml b/sushi-config.yaml
index c42b568..3482bf4 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -9,11 +9,11 @@ name: SmartForms
 title: Smart Forms
 description: Smart Forms FHIR Implementation Guide. 
 status: draft # draft | active | retired | unknown
-version: 0.1.0
+version: 0.2.0
 fhirVersion: 4.0.1 # https://www.hl7.org/fhir/valueset-FHIR-version.html
 copyrightYear: 2022+
 releaseLabel: ci-build # ci-build | draft | qa-preview | ballot | trial-use | release | update | normative+trial-use
-license: Apache-2.0 # https://www.hl7.org/fhir/valueset-spdx-license.html
+license: CC-BY-SA-4.0 # https://www.hl7.org/fhir/valueset-spdx-license.html
 # jurisdiction: urn:iso:std:iso:3166#US "United States of America" # https://www.hl7.org/fhir/valueset-jurisdiction.html
 publisher:
   name: AEHRC CSIRO
@@ -26,8 +26,9 @@ publisher:
 #
 dependencies:
 
-  hl7.fhir.au.core: current
+  hl7.fhir.au.core: 0.3.0-ballot
   hl7.fhir.uv.sdc: 3.0.0
+  hl7.fhir.uv.smart-app-launch: 2.1.0
 #
 #
 # The pages property corresponds to IG.definition.page. SUSHI can
@@ -99,10 +100,13 @@ parameters:
     - 'http://hl7.org/fhir/questionnaire-item-control'
     - 'http://hl7.org/fhir/ValueSet/questionnaire-item-control'
     - 'https://healthterminologies.gov.au/fhir/ValueSet/biological-sex-1'
+    - 'http://hl7.org/fhir/ValueSet/administrative-gender'
     - 'http://hl7.org/fhir/ValueSet/condition-clinical'
     - 'https://healthterminologies.gov.au/fhir/ValueSet/gender-identity-response-1'
-    - 'http://terminology.hl7.org/ValueSet/pronouns'
+    - 'https://healthterminologies.gov.au/fhir/ValueSet/australian-pronouns-1'
     - 'https://healthterminologies.gov.au/fhir/ValueSet/australian-states-territories-2'
+    - 'https://healthterminologies.gov.au/fhir/ValueSet/clinical-condition-1'
+
   apply-publisher: false
   default-publisher: true
   apply-version: false
@@ -239,7 +243,7 @@ menu:
 # * modifierExtension
 experimental: false
 # * useContext
-copyright: CSIRO © 2022+; Licensed under Apache License, Version 2.0
+copyright: Copyright © 2022+ Australian Government Department of Health and Aged Care - All rights reserved. This content is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. See https://creativecommons.org/licenses/by-sa/4.0/.
 packageId: csiro.fhir.au.smartforms
 #
 #