diff --git a/_includes/wai-evaluation-tools-list/liquid/list-submission-form.liquid b/_includes/wai-evaluation-tools-list/liquid/list-submission-form.liquid
deleted file mode 100644
index 999b1d02..00000000
--- a/_includes/wai-evaluation-tools-list/liquid/list-submission-form.liquid
+++ /dev/null
@@ -1,53 +0,0 @@
-{% comment %}
-  Netlify form integation to submit a list entry form and great a PR with the form data as JSON. 
-
-  The netlify function is posted the form contents and in turn invokes a GitHub Action to create the PR
-
-      start - begining of form
-
-        name - form name - required
-        version - version of form - recommended
-        action - url to send to - defaults to '/.netlify/functions/form-action'
-        method - http verb  for submission - get or post (default post)
-        onsubmit - function to call for onsubmit event
-        ref - unique form ref (default added by netlify function)
-        success - url to redirect to when succeeded - requiured
-        failure - url to redirect to when failed - required
-        repository - repository containing the action - required
-
-      end - end of form
-
-{% endcomment %}
-
-{%- if include.type == 'start' -%}
-
-  {%- if include.action == nil -%}
-    {% assign action = "/.netlify/functions/form-action" %}
-  {% else %}
-    {% assign action = include.action %}
-  {%- endif -%}
-  {%- if include.method == nil -%}
-    {% assign method = "post" %}
-  {% else %}
-    {% assign method = include.method %}
-  {% endif -%}
-
-  {% capture args %}
-    {% if include.version %}form_version:{{include.version}}, {% endif %}
-    {% if include.ref %}submission_ref:{{include.ref}}, {% endif %}
-    success:{{include.success}}, 
-    failure:{{include.failure}}, 
-    repository:{{include.repository}}{% endcapture %}
-  {%- include html-form.liquid type="start"
-                                    name=include.name
-                                    version=include.version
-                                    action=action
-                                    method=method
-                                    onsubmit=include.onsubmit
-                                    args=args -%}
-
-{%- elsif include.type == 'end' -%}
-
-  {%- include html-form.liquid type="end" -%}
-
-{% endif -%}
diff --git a/content/submit-a-tool.md b/content/submit-a-tool.md
index bf7656a5..ee005e59 100644
--- a/content/submit-a-tool.md
+++ b/content/submit-a-tool.md
@@ -19,6 +19,16 @@ footer: >
 ---
 <!-- markdownlint-disable no-inline-html -->
 
+{% comment %}
+  To DEBUG set any of the following to true.
+  NB!! ensure to reset all to false before committing
+
+  DEBUG_FUNCTION - pass DEBUG to submission function, causes function to return JSON rather than submitting to GitHub
+  DEBUG_USE_LOCAL_FUNCTION - use local/domain function rather than live one exposed by the Netlify wai-website deploy
+{% endcomment %}
+{% assign DEBUG_SUBMISSION_FUNCTION = false %}
+{% assign DEBUG_USE_LOCAL_SUBMISSION_FUNCTION = false %}
+
 <div style="grid-column: 4 / span 4">
 
 <style>
@@ -64,12 +74,17 @@ main > header { grid-column: 4 / span 4; }
   </ul>
 </div>
 
-{%- include wai-evaluation-tools-list/liquid/list-submission-form.liquid type="start"
+{% capture success_page %}{{ page.dir }}success.html{% endcapture %}
+{% capture failure_page %}{{ page.dir }}failure.html{% endcapture %}
+{%- include list-submission-form.liquid type="start"
                                    name="submission"
                                    version="1"
-                                   success="/success.html"
-                                   failure="/failure.html"
-                                   repository="wai-evaluation-tools-list" -%}
+                                   success=success_page
+                                   failure=failure_page
+                                   repository="wai-evaluation-tools-list"
+                                   onsubmit="onSubmit"
+                                   DEBUG_SUBMISSION_FUNCTION=DEBUG_SUBMISSION_FUNCTION
+                                   DEBUG_USE_LOCAL_SUBMISSION_FUNCTION=DEBUG_USE_LOCAL_SUBMISSION_FUNCTION -%}
 
 <div class="radio-field external-checkbox">
   <input type="checkbox" id="readterms" name="readterms" required>