diff --git a/.editorconfig b/.editorconfig
index 02e8abc..fd5c354 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,3 +19,13 @@ indent_size = 4
 
 [{Makefile,*.mk,go.mod,go.sum,*.go,.gitmodules}]
 indent_style = tab
+
+# Ignore paths
+[Gemfile.lock]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+generated_code = true
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
index f0985b1..3400f5a 100644
--- a/.github/workflows/jekyll-gh-pages.yml
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -80,10 +80,14 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
       - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarcloud-github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }}
+            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
   # Deployment job
   deploy:
     environment:
diff --git a/.github/workflows/stage-2-test.yaml b/.github/workflows/stage-2-test.yaml
index 8d1fd43..a3a980e 100644
--- a/.github/workflows/stage-2-test.yaml
+++ b/.github/workflows/stage-2-test.yaml
@@ -87,10 +87,14 @@ jobs:
         with:
           fetch-depth: 0 # Full history is needed to improving relevancy of reporting
       - name: Stage 2 Test - Sonar Cloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarcloud-github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          args: >
+            -Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }}
+            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
 #      - name: "Perform static analysis"
 #        uses: ./.github/actions/perform-static-analysis
 #        with:
diff --git a/docs/.vscode/launch.json b/docs/.vscode/launch.json
index 7a0ce95..f0aa0b6 100644
--- a/docs/.vscode/launch.json
+++ b/docs/.vscode/launch.json
@@ -2,10 +2,14 @@
   "version": "0.2.0",
   "configurations": [
     {
+      "name": "Debug",
+      "request": "launch",
+      "runtimeArgs": ["run-script", "debug"],
+      "runtimeExecutable": "npm",
+      "skipFiles": ["<node_internals>/**"],
       "type": "node",
-      "request": "attach",
-      "name": "Attach",
-      "preLaunchTask": "jekyll"
+      "preLaunchTask": "stop-already-running",
+      "console": "integratedTerminal"
     }
   ]
 }
diff --git a/docs/.vscode/tasks.json b/docs/.vscode/tasks.json
index ba15193..fd80f47 100644
--- a/docs/.vscode/tasks.json
+++ b/docs/.vscode/tasks.json
@@ -2,11 +2,11 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "jekyll",
+      "label": "stop-already-running",
       "options": {
         "cwd": "${workspaceFolder}"
-    },
-      "command": "make debug",
+      },
+      "command": "kill $(lsof -ti :4000); exit 0;",
       "type": "shell"
     }
   ]
diff --git a/docs/Gemfile b/docs/Gemfile
index da46d85..e4ff8d8 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -34,3 +34,4 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 
 gem "just-the-docs"
+gem 'jemoji'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index bb1714e..3fbe054 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,11 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     cgi (0.4.1)
     colorator (1.1.0)
     concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -14,7 +28,11 @@ GEM
     eventmachine (1.2.7)
     ffi (1.16.3)
     forwardable-extended (2.6.0)
+    gemoji (4.1.0)
     google-protobuf (3.25.3-x86_64-linux)
+    html-pipeline (2.14.3)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -48,6 +66,10 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0, < 5.0)
     just-the-docs (0.8.2)
       jekyll (>= 3.8.5)
       jekyll-include-cache
@@ -66,6 +88,8 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
+    minitest (5.23.1)
+    mutex_m (0.2.0)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     pathutil (0.16.2)
@@ -86,6 +110,8 @@ GEM
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
 
@@ -97,6 +123,7 @@ DEPENDENCIES
   jekyll (~> 4.3.3)
   jekyll-drawio
   jekyll-feed (~> 0.12)
+  jemoji
   just-the-docs
   minima (~> 2.5)
   tzinfo (>= 1, < 3)
@@ -104,4 +131,4 @@ DEPENDENCIES
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-  2.5.10
+   2.5.10
diff --git a/docs/_config.yml b/docs/_config.yml
index 09a0936..471c9b7 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -119,6 +119,7 @@ just_the_docs:
 theme: just-the-docs
 plugins:
   - jekyll-feed
+  - jemoji
 
 color_scheme: nhs
 mermaid:
diff --git a/docs/_includes/fullscreen.html b/docs/_includes/fullscreen.html
new file mode 100644
index 0000000..49c3710
--- /dev/null
+++ b/docs/_includes/fullscreen.html
@@ -0,0 +1,3 @@
+<button type="button" name="fullScreenButton" id="fullScreenButton" class="btn" onclick="fullScreenToggle()">
+  Full Screen View
+</button>
diff --git a/docs/_includes/nhs-notify-head.html b/docs/_includes/nhs-notify-head.html
new file mode 100644
index 0000000..f066b8a
--- /dev/null
+++ b/docs/_includes/nhs-notify-head.html
@@ -0,0 +1 @@
+<script src="{{ '/assets/js/nhs-notify.js' | relative_url }}"></script>
diff --git a/docs/_includes/page-info-header.html b/docs/_includes/page-info-header.html
index 0664a04..fe6f752 100644
--- a/docs/_includes/page-info-header.html
+++ b/docs/_includes/page-info-header.html
@@ -1,56 +1,58 @@
 {% if page.is_not_draft %}{% else %} {% assign is_draft = true %} {% endif %} {%
-assign wordWarning = 200 %} {% assign wordCount = content | number_of_words%} {%
-assign readTime = wordCount | divided_by: 100.0 | ceil %} {% if page.sub_title
-%}
-<h1>{{ page.title }}</h1>
-<p class="text-medium text-grey-dk-300 mb-0">{{ page.summary }}</p>
-{% else %}
-<h1>{{ page.title }}</h1>
-{% endif %}
+  assign wordWarning = 200 %} {% assign wordCount = content | number_of_words%} {%
+  assign readTime = wordCount | divided_by: 100.0 | ceil %} {% if page.sub_title
+  %}
+  <h1>{{ page.title }}</h1>
+  <p class="text-medium text-grey-dk-300 mb-0">{{ page.summary }}</p>
+  {% else %}
+  <h1>{{ page.title }}</h1>
+  {% endif %}
 
-<div class="page-info">
-  <p class="text-small text-grey-dk-300 mb-0">
-    {% if page.last_modified_date %} {{ page.last_modified_date | date:
-    "%Y-%m-%d"}} | {% else %} 2022-07-01 | {% endif %} 📑 {{ wordCount }} words
-    | ⏱ {{readTime}} mins {% if site.gh_edit_link and site.gh_edit_link_text and
-    site.gh_edit_repository and site.gh_edit_branch and site.gh_edit_view_mode
-    %} |
-    <a
-      href="{{ site.gh_edit_repository }}/commits/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}"
-      id="edit-this-page"
-      >🧾 History</a
-    >
+  <div class="page-info">
+    <p class="text-small text-grey-dk-300 mb-0">
+      {% if page.last_modified_date %} {{ page.last_modified_date | date:
+      "%Y-%m-%d"}} | {% else %} 2022-07-01 | {% endif %} 📑 {{ wordCount }} words
+      | ⏱ {{readTime}} mins {% if site.gh_edit_link and site.gh_edit_link_text and
+      site.gh_edit_repository and site.gh_edit_branch and site.gh_edit_view_mode
+      %} |
+      <a
+        href="{{ site.gh_edit_repository }}/commits/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}"
+        id="edit-this-page"
+        >🧾 History</a
+      >
 
-    {% endif %} | {% if page.author %} ✍ {{page.author}} {% else %} ✍ Ross
-    Buggins {% endif %} | {% if page.owner %} 🔑 {{page.owner}} {% else %} 🔑
-    Ross Buggins {% endif %}
-  </p>
+      {% endif %} | {% if page.author %} ✍ {{page.author}} {% else %} ✍ Ross
+      Buggins {% endif %} | {% if page.owner %} 🔑 {{page.owner}} {% else %} 🔑
+      Ross Buggins {% endif %}
 
-  <p class="text-small text-grey-dk-300 mb-0">
-    {% for tag in page.tags %}<a class="text-small" href="/tags/{{tag}}.html"
-      >{{tag}}</a
-    >,{% endfor %}
-  </p>
+    <p class="text-small text-grey-dk-300 mb-0">
+      {% for tag in page.tags %}<a class="text-small" href="/tags/{{tag}}.html"
+        >{{tag}}</a
+      >,{% endfor %}
+    </p>
 
-  {% if wordCount < wordWarning %}
-  <p class="text-small text-grey-dk-300 mb-0">
-    🚧 This page has less that {{wordWarning}} words. So it looks like this page
-    is still under construction.
-  </p>
-  {% endif %} {% if page.description %}
-  <p class="text-grey-dk-300 mb-0"><i>{{page.description}}</i></p>
-  {% endif %} {% if page.todo or is_draft %}
-  <p class="text-small text-grey-dk-300 mb-0"><b>Known Issues / Todo</b></p>
+    {% if wordCount < wordWarning %}
+    <p class="text-small text-grey-dk-300 mb-0">
+      🚧 This page has less that {{wordWarning}} words. So it looks like this page
+      is still under construction.
+    </p>
+    {% endif %} {% if page.description %}
+    <p class="text-grey-dk-300 mb-0"><i>{{page.description}}</i></p>
+    {% endif %} {% if page.todo or is_draft %}
+    <p class="text-small text-grey-dk-300 mb-0"><b>Known Issues / Todo</b></p>
 
-  <ul>
-    {% if page.is_not_draft %}{% else %}
-    <li class="text-small text-grey-dk-300 mb-0">
-      ⛅ <b>This page is draft</b> and is subject to rapid change, and may not
-      be fully accurate or complete
-    </li>
-    {% endif %} {% for todo in page.todo %}
-    <li class="text-small text-grey-dk-300 mb-0">{{todo}}</li>
-    {% endfor %}
-  </ul>
-  {% endif %}
-</div>
+    <ul>
+      {% if page.is_not_draft %}{% else %}
+      <li class="text-small text-grey-dk-300 mb-0">
+        ⛅ <b>This page is draft</b> and is subject to rapid change, and may not
+        be fully accurate or complete
+      </li>
+      {% endif %} {% for todo in page.todo %}
+      <li class="text-small text-grey-dk-300 mb-0">{{todo}}</li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+  </div>
+  {% include fullscreen.html %}
+  </p>
+  <div></div>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 4eaae58..7165405 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -6,15 +6,17 @@
 
 <html lang="{{ site.lang | default: 'en-US' }}">
 {% include head.html %}
+{% include nhs-notify-head.html %}
+
 <body>
   <a class="skip-to-main" href="#main-content">Skip to main content</a>
   {% include icons/icons.html %}
   {% if page.nav_enabled == true %}
-    {% include components/sidebar.html %}
+  {% include components/sidebar.html %}
   {% elsif layout.nav_enabled == true and page.nav_enabled == nil %}
-    {% include components/sidebar.html %}
+  {% include components/sidebar.html %}
   {% elsif site.nav_enabled != false and layout.nav_enabled == nil and page.nav_enabled == nil %}
-    {% include components/sidebar.html %}
+  {% include components/sidebar.html %}
   {% endif %}
   <div class="main" id="top">
     {% include components/header.html %}
@@ -23,25 +25,29 @@
       <div id="main-content" class="main-content">
         <main>
           {% if site.heading_anchors != false %}
-            {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
+          {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16
+            16\" aria-hidden=\"true\">
+            <use xlink:href=\"#svg-link\"></use>
+          </svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
           {% else %}
-            {{ content }}
+          {{ content }}
           {% endif %}
 
           {% if page.has_children == true and page.has_toc != false %}
-            {% include components/children_nav.html %}
+          {% include components/children_nav.html %}
           {% endif %}
         </main>
         {% include components/footer.html %}
       </div>
     </div>
     {% if site.search_enabled != false %}
-      {% include components/search_footer.html %}
+    {% include components/search_footer.html %}
     {% endif %}
   </div>
 
   {% if site.mermaid %}
-    {% include components/mermaid.html %}
+  {% include components/mermaid.html %}
   {% endif %}
 </body>
+
 </html>
diff --git a/docs/assets/architecture/kruchten_4_1_model.png b/docs/assets/diagrams/architecture/kruchten_4_1_model.png
similarity index 100%
rename from docs/assets/architecture/kruchten_4_1_model.png
rename to docs/assets/diagrams/architecture/kruchten_4_1_model.png
diff --git a/docs/assets/diagrams/architecture/target-architecture/target-architecture.drawio b/docs/assets/diagrams/architecture/target-architecture/target-architecture.drawio
new file mode 100644
index 0000000..107ebfc
--- /dev/null
+++ b/docs/assets/diagrams/architecture/target-architecture/target-architecture.drawio
@@ -0,0 +1,205 @@
+<mxfile host="65bd71144e">
+    <diagram id="nnI5kmmqy38R1dzidA2f" name="Page-1">
+        <mxGraphModel dx="2364" dy="1951" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="69" value="Example Bounded Contexts" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;dashPattern=8 8;align=left;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="-160" y="540" width="990" height="340" as="geometry"/>
+                </mxCell>
+                <mxCell id="46" value="External Services" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="-50" y="905" width="870" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Notify Bounded Context 1" style="rounded=0;whiteSpace=wrap;html=1;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="70" width="210" height="250" as="geometry"/>
+                </mxCell>
+                <mxCell id="6" value="Notify Bounded Context 2" style="rounded=0;whiteSpace=wrap;html=1;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="70" width="210" height="250" as="geometry"/>
+                </mxCell>
+                <mxCell id="7" value="Notify Bounded Context n" style="rounded=0;whiteSpace=wrap;html=1;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="70" width="210" height="250" as="geometry"/>
+                </mxCell>
+                <mxCell id="55" style="edgeStyle=none;html=1;entryX=1;entryY=0;entryDx=0;entryDy=0;fontColor=default;" parent="1" source="8" target="51" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="8" value="" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="30" y="380" width="790" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="40" style="edgeStyle=none;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.063;entryDx=0;entryDy=0;fontColor=default;entryPerimeter=0;" parent="1" source="4" target="39" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="53" style="edgeStyle=none;html=1;entryX=1;entryY=0;entryDx=0;entryDy=0;fontColor=default;" parent="1" source="4" target="52" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="54" style="edgeStyle=none;html=1;entryX=1;entryY=0;entryDx=0;entryDy=0;fontColor=default;" parent="1" source="4" target="50" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="4" value="Notify Event Bus" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=default;gradientColor=#FF4F8B;gradientDirection=north;fillColor=#BC1356;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.eventbridge;" parent="1" vertex="1">
+                    <mxGeometry x="380" y="400" width="78" height="78" as="geometry"/>
+                </mxCell>
+                <mxCell id="31" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.372;entryY=-0.003;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;startArrow=classic;startFill=1;" parent="1" source="9" target="8" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="9" value="Microservice 1 A" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="50" y="90" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="10" value="Microservice 1 B" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="50" y="190" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="32" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontColor=default;startArrow=classic;startFill=1;" parent="1" source="11" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="480" y="380" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="11" value="Microservice 2 A" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="330" y="90" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="12" value="Microservice 2 A" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="330" y="185" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="30" style="edgeStyle=none;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;fontColor=default;startArrow=classic;startFill=1;" parent="1" source="13" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="540" y="380" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="13" value="Microservice n A" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="610" y="90" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="Microservice n&amp;nbsp;A" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;labelPosition=center;verticalLabelPosition=top;align=left;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="610" y="190" width="190" height="70" as="geometry"/>
+                </mxCell>
+                <mxCell id="15" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="60" y="105" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="16" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="60" y="200" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="17" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="341.67" y="100" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="18" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="340" y="195" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="19" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="620" y="100" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="22" style="edgeStyle=none;html=1;fontColor=default;" parent="1" source="20" target="14" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="20" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="620" y="200" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="26" value="" style="edgeStyle=none;html=1;fontColor=default;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.323;entryY=-0.003;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" source="10" target="8" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="23" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.dynamo_db;fillColor=#2E73B8;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="195.56" y="270" width="44.44" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="27" value="" style="edgeStyle=none;html=1;fontColor=default;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="12" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="450" y="380" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="24" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.dynamo_db;fillColor=#2E73B8;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="475.56" y="270" width="44.44" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="28" value="" style="edgeStyle=none;html=1;fontColor=default;exitX=0.75;exitY=1;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="14" target="8" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.dynamo_db;fillColor=#2E73B8;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="755.56" y="270" width="44.44" height="50" as="geometry"/>
+                </mxCell>
+                <mxCell id="33" value="" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=#232F3E;gradientColor=#945DF2;gradientDirection=north;fillColor=#5A30B5;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.api_gateway;" parent="1" vertex="1">
+                    <mxGeometry x="190" y="100" width="48" height="48" as="geometry"/>
+                </mxCell>
+                <mxCell id="34" value="" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=#232F3E;gradientColor=#945DF2;gradientDirection=north;fillColor=#5A30B5;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.api_gateway;" parent="1" vertex="1">
+                    <mxGeometry x="458" y="101" width="48" height="48" as="geometry"/>
+                </mxCell>
+                <mxCell id="35" value="" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=#232F3E;gradientColor=#945DF2;gradientDirection=north;fillColor=#5A30B5;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.api_gateway;" parent="1" vertex="1">
+                    <mxGeometry x="740" y="200" width="48" height="48" as="geometry"/>
+                </mxCell>
+                <mxCell id="37" style="edgeStyle=none;html=1;exitX=0;exitY=0.3333333333333333;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="36" target="33" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="38" style="edgeStyle=none;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="36" target="34" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="70" style="edgeStyle=none;html=1;entryX=0;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.3333333333333333;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="36" target="7">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="36" value="Actor" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="370" y="-110" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="39" value="External Eventing Bounded Context" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;align=left;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="570" y="620" width="240" height="230" as="geometry"/>
+                </mxCell>
+                <mxCell id="47" style="edgeStyle=none;html=1;exitX=0.855;exitY=0.855;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.25;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="41" target="45" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="41" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="590" y="650" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="48" style="edgeStyle=none;html=1;entryX=0.25;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="42" target="45" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="42" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="650" y="650" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="49" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="43" target="45" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="43" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="717.23" y="650" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="45" value="Notification Services" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=default;gradientColor=#FF4F8B;gradientDirection=north;fillColor=#BC1356;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.sqs;" parent="1" vertex="1">
+                    <mxGeometry x="658.33" y="927.5" width="78" height="78" as="geometry"/>
+                </mxCell>
+                <mxCell id="58" style="edgeStyle=none;html=1;fontColor=default;exitX=0.75;exitY=1;exitDx=0;exitDy=0;" parent="1" source="51" target="57" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="62" style="edgeStyle=none;html=1;fontColor=default;" parent="1" source="50" target="61" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="50" value="Analytics Bounded Context" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;align=left;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="75" y="620" width="175" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="51" value="Reporting Bounded Context" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;align=left;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="297.5" y="620" width="175" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="59" style="edgeStyle=none;html=1;entryX=0.75;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;fontColor=default;" parent="1" source="52" target="56" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="52" value="Data Lake Bounded Context" style="rounded=0;whiteSpace=wrap;html=1;fontColor=default;align=left;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="-135" y="620" width="175" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="56" value="Datalake Storage" style="sketch=0;points=[[0,0,0],[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0,0],[0,1,0],[0.25,1,0],[0.5,1,0],[0.75,1,0],[1,1,0],[0,0.25,0],[0,0.5,0],[0,0.75,0],[1,0.25,0],[1,0.5,0],[1,0.75,0]];outlineConnect=0;fontColor=default;gradientColor=#60A337;gradientDirection=north;fillColor=#277116;strokeColor=#ffffff;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;fontSize=12;fontStyle=0;aspect=fixed;shape=mxgraph.aws4.resourceIcon;resIcon=mxgraph.aws4.s3;" parent="1" vertex="1">
+                    <mxGeometry x="75" y="927.5" width="78" height="78" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" value="Power BI" style="aspect=fixed;html=1;points=[];align=center;image;fontSize=12;image=img/lib/azure2/general/Power.svg;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="450" y="932.5" width="44" height="68" as="geometry"/>
+                </mxCell>
+                <mxCell id="61" value="Databricks Data Platform" style="sketch=0;aspect=fixed;html=1;points=[];align=center;image;fontSize=12;image=img/lib/mscae/Databricks.svg;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="251.46" y="924" width="88.54" height="85" as="geometry"/>
+                </mxCell>
+                <mxCell id="63" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="411.66999999999996" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="64" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="330" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="65" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="180" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="66" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="94.84000000000003" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="67" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="-30" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="68" value="" style="outlineConnect=0;dashed=0;verticalLabelPosition=bottom;verticalAlign=top;align=center;html=1;shape=mxgraph.aws3.lambda_function;fillColor=#F58534;gradientColor=none;fontColor=default;" parent="1" vertex="1">
+                    <mxGeometry x="-110" y="640" width="38.33" height="40" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>
diff --git a/docs/assets/userguides/test.drawio b/docs/assets/diagrams/userguides/test.drawio
similarity index 100%
rename from docs/assets/userguides/test.drawio
rename to docs/assets/diagrams/userguides/test.drawio
diff --git a/docs/assets/js/nhs-notify.js b/docs/assets/js/nhs-notify.js
new file mode 100644
index 0000000..cf06374
--- /dev/null
+++ b/docs/assets/js/nhs-notify.js
@@ -0,0 +1,109 @@
+// Quick poc for view full screen
+
+window.addEventListener("load", (event) => {
+  var fullScreenParamName = "fullscreen";
+  var urlParams = new URLSearchParams(document.location.search);
+  var param = urlParams.get(fullScreenParamName);
+  if (param) {
+    tempViewFullScreen();
+  } else {
+    setViewAtStart();
+  }
+});
+
+let nhsNotify = nhsNotifyDefaults();
+
+function nhsNotifyDefaults() {
+  var defaults = {};
+  defaults.storageName = "cb-checked";
+  defaults.buttonName = "fullScreenButton";
+  defaults.standard = "Standard";
+  defaults.fullScreen = "Full Screen";
+  return defaults;
+}
+
+function tempViewFullScreen() {
+  viewFullScreen();
+  var buttons = document.getElementsByName(nhsNotify.buttonName);
+  buttons.forEach((item) => {
+    item.style.display = "none";
+  });
+}
+
+function viewFullScreen() {
+  var sideBar = document.getElementsByClassName("side-bar")[0];
+  var main = document.getElementsByClassName("main")[0];
+  var pageInfo = document.getElementsByClassName("page-info")[0];
+  sideBar.style.display = "none";
+  main.style.maxWidth = "100%";
+  main.style.marginLeft = "0px";
+  if (pageInfo) pageInfo.style.display = "none";
+}
+function setFullScreen() {
+  viewFullScreen();
+  afterChange(nhsNotify.standard, nhsNotify.fullScreen);
+}
+
+function setStandard() {
+  var sideBar = document.getElementsByClassName("side-bar")[0];
+  var main = document.getElementsByClassName("main")[0];
+  var pageInfo = document.getElementsByClassName("page-info")[0];
+  sideBar.style.display = "";
+  main.style.maxWidth = "";
+  main.style.marginLeft = "";
+  pageInfo.style.display = "";
+  afterChange(nhsNotify.fullScreen, nhsNotify.standard);
+}
+
+function setViewAtStart() {
+  var currentStatus = localStorage.getItem(nhsNotify.storageName);
+  if (currentStatus == nhsNotify.fullScreen) makeChange(currentStatus);
+}
+
+function makeChange(newStatus) {
+  if (newStatus == nhsNotify.fullScreen) {
+    setFullScreen();
+  } else {
+    setStandard();
+  }
+}
+
+function afterChange(currentStatus, newStatus) {
+  var storageName = nhsNotify.storageName;
+  var buttonName = nhsNotify.buttonName;
+  var buttons = document.getElementsByName(buttonName);
+  localStorage.setItem(storageName, newStatus);
+
+  buttons.forEach((item) => {
+    item.textContent = currentStatus + " View";
+  });
+}
+
+function fullScreenToggle() {
+  var standard = nhsNotify.standard;
+  var fullScreen = nhsNotify.fullScreen;
+  var storageName = nhsNotify.storageName;
+  var currentStatus = "";
+  var newStatus = "";
+
+  currentStatus = localStorage.getItem(storageName);
+
+  if (
+    currentStatus == "false" ||
+    currentStatus == "undefined" ||
+    currentStatus == null
+  ) {
+    currentStatus = standard;
+    newStatus = fullScreen;
+  }
+
+  if (currentStatus == standard) {
+    newStatus = fullScreen;
+    currentStatus = standard;
+  } else {
+    newStatus = standard;
+    currentStatus = fullScreen;
+  }
+
+  makeChange(newStatus);
+}
diff --git a/docs/collections/_architecture/target-architecture/index.md b/docs/collections/_architecture/target-architecture/index.md
new file mode 100644
index 0000000..a190e4b
--- /dev/null
+++ b/docs/collections/_architecture/target-architecture/index.md
@@ -0,0 +1,33 @@
+---
+title: Target architecture
+description: Notify Application Stack Target Architecture
+summary: Notify Application Stack Target Architecture
+last_modified_date: 2024-03-06
+author: Ross Buggins
+parent: Architecture
+---
+
+## Table of contents
+
+- [Table of contents](#table-of-contents)
+- [Proposed target architecture](#proposed-target-architecture)
+- [Architectural aims and goals](#architectural-aims-and-goals)
+  - [Conceptual example boundaries](#conceptual-example-boundaries)
+
+## Proposed target architecture
+
+With focus on:
+
+- distributed system
+- Event Driven Architecture
+- notify managed Event Bus for inter BC integration events
+- interact with external EDA Event Bus' via subscribing to integration events
+- separate datastore per bounded context
+- multiple microservices per bounded context
+- microservice is the smallest deployable unit
+
+## Architectural aims and goals
+
+### Conceptual example boundaries
+
+{% drawio path="assets/diagrams/architecture/target-architecture/target-architecture.drawio" page_number=0 height=800 %}
diff --git a/docs/collections/_guides/developer-guides/git.md b/docs/collections/_guides/developer-guides/git.md
new file mode 100644
index 0000000..f01dda6
--- /dev/null
+++ b/docs/collections/_guides/developer-guides/git.md
@@ -0,0 +1,7 @@
+---
+title: Git
+parent: Developer Guides
+description: Getting started with Git
+summary: Getting started with Git
+last_modified_date: 2024-05-28
+---
diff --git a/docs/collections/_guides/user-guides/drawio.md b/docs/collections/_guides/user-guides/drawio.md
index f5e49bf..03c64aa 100644
--- a/docs/collections/_guides/user-guides/drawio.md
+++ b/docs/collections/_guides/user-guides/drawio.md
@@ -1,15 +1,14 @@
 ---
-
 title: Draw IO
 parent: User Guides
-
 ---
+
 ## Using Draw io
 
 Reference a drawio file by:
 
 {{ "test.drawio" | relative_url }}
 
-{% drawio path="assets/userguides/test.drawio" page_number=0 height=400 %}
+{% drawio path="assets/diagrams/userguides/test.drawio" page_number=0 height=400 %}
 
 [Something](test.drawio)
diff --git a/docs/collections/_principles/accelerate-dora.md b/docs/collections/_principles/accelerate-dora.md
index 8a3a75b..ac6d57b 100644
--- a/docs/collections/_principles/accelerate-dora.md
+++ b/docs/collections/_principles/accelerate-dora.md
@@ -5,4 +5,3 @@ description: About Accelerate. Devops. Dora.
 summary: About Accelerate. Devops. Dora.
 last_modified_date: 2024-05-28
 ---
-
diff --git a/docs/pages/contributing.md b/docs/pages/contributing.md
new file mode 100644
index 0000000..b50330e
--- /dev/null
+++ b/docs/pages/contributing.md
@@ -0,0 +1,15 @@
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+layout: page
+title: Contributing
+description: Contributing to the documentation
+summary: Contributing to the documentation
+nav_order: 2
+permalink: /contributing
+---
+
+## Contributing
+
+- [Contributing](#contributing)
diff --git a/docs/pages/index.md b/docs/pages/index.md
index 98e6aad..f5f7db3 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -20,10 +20,11 @@ permalink: /
 
 Please visit the [NHS Service Catalogue](https://digital.nhs.uk/services/nhs-notify) for:
 
-- NHS Notify web site.
-- Onboarding guidance.
-- Customer support.
-- Supplier support.
+- Use of the live NHS Notify SaaS
+- NHS Notify web site
+- Onboarding guidance
+- Customer support
+- Supplier support
 
 > ### Who/what is this repository is for?
 >
diff --git a/nhs-notify.code-workspace b/nhs-notify.code-workspace
index 1eed561..93deb15 100644
--- a/nhs-notify.code-workspace
+++ b/nhs-notify.code-workspace
@@ -40,7 +40,8 @@
       "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[html]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
+      "editor.defaultFormatter": "vscode.html-language-features",
+      "files.insertFinalNewline": true
     },
     "[json]": {
       "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/scripts/config/gitleaks.toml b/scripts/config/gitleaks.toml
index af5f0bb..e4b6bc1 100644
--- a/scripts/config/gitleaks.toml
+++ b/scripts/config/gitleaks.toml
@@ -16,4 +16,9 @@ regexes = [
 ]
 
 [allowlist]
-paths = ['''.terraform.lock.hcl''', '''poetry.lock''', '''yarn.lock''']
+paths = [
+  '''.terraform.lock.hcl''',
+  '''poetry.lock''',
+  '''yarn.lock''',
+  '''Gemfile.lock''',
+]
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index 3539908..0000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-sonar.projectKey=NHSDigital_nhs-notify
-sonar.organization=nhsdigital
-
-# This is the name and version displayed in the SonarCloud UI.
-#sonar.projectName=nhs-notify
-#sonar.projectVersion=1.0
-
-
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-#sonar.sources=.
-
-# Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8