diff --git a/src/lib/resource-templates/AdvanceDirective.svelte b/src/lib/resource-templates/AdvanceDirective.svelte
index 2b5a395..4336130 100644
--- a/src/lib/resource-templates/AdvanceDirective.svelte
+++ b/src/lib/resource-templates/AdvanceDirective.svelte
@@ -2,6 +2,7 @@
   export let resource; // Define a prop to pass the data to the component
 </script>
 
+<!--
 Type: {resource.resourceType}
 <br />
 Text:
@@ -11,15 +12,42 @@ Text:
   <i>No text provided in resource</i>
 {/if}
 <br />
+-->
+
 Category:
 {#if resource.category && resource.category[0] && resource.category[0].coding && resource.category[0].coding[0]}
-  {resource.category[0].coding[0].display}
+  {resource.category[0].coding[0].display} (LOINC {resource.category[0].coding[0].code})
+{/if}
+<br />
+Type:
+<!-- 42348-3 is for "Advance Directive"; per cthon, it's presence here is redundant w/ category above. -->
+{#if resource.type && resource.type.coding && resource.type.coding[0] && resource.type.coding[0].code != '42348-3'}
+  {resource.type.coding[0].display} (LOINC {resource.type.coding[0].code})
+{/if}
+{#if resource.type && resource.type.coding && resource.type.coding[1] && resource.type.coding[1].code != '42348-3'}
+  {resource.type.coding[1].display} (LOINC {resource.type.coding[1].code}).
+{/if}
+<br />
+Description:
+{#if resource.description}
+  {resource.description}
 {/if}
 <br />
-Intent:
-{#if resource.provision && resource.provision.code && resource.provision.code[0] && resource.provision.code[0].coding && resource.provision.code[0].coding[0]}
-  {resource.provision.code[0].coding[0].display}
+Date:
+{#if resource.date}
+  {resource.date}
 {/if}
+<br />
+Status:
+{#if resource.status}
+  {resource.status}
+{/if}
+<br />
+docStatus:
+{#if resource.docStatus}
+  {resource.docStatus}
+{/if}
+<br />
 {#if resource.description && resource.description.text}
   {resource.description.text}
 {/if}