From 2acb18177993584242031f4977ee4dacd8875e28 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 14:51:21 -0400
Subject: [PATCH 01/23] Feature/129 add initial user feature request form

---
 .../ISSUE_TEMPLATE/user_feature_request.yml   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/user_feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/user_feature_request.yml b/.github/ISSUE_TEMPLATE/user_feature_request.yml
new file mode 100644
index 0000000..5bfc0ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/user_feature_request.yml
@@ -0,0 +1,19 @@
+name: "💡 Suggest a Feature"
+description: "Suggest a new feature or improvement for Hawk"
+title: "Feature: "
+labels: ["enhancement", "triage", "external"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: What problem would this feature solve?
+      placeholder: Clear description of the current limitation/problem
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: How would you like this to work?
+    validations:
+      required: true

From 2b18e31e14a212200aade20ce770d1da10b2df0f Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 14:53:18 -0400
Subject: [PATCH 02/23] feature/129 Add config.yaml

---
 .github/ISSUE_TEMPLATE/config.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yaml

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 0000000..3058a38
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "🐛 Report a Bug"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=user_bug_report.yml
+    about: "Found a bug? Report it here"
+  - name: "💡 Suggest a Feature"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=user_feature_request.yml
+    about: "Have an idea for improvement? Let us know"
+  - name: "📚 Documentation Issue"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
+    about: "Report issues with documentation"

From 8cbca27821d32b4dddcaf9f9d460c8a28772826b Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:15:36 -0400
Subject: [PATCH 03/23] Temporarily disable CI/CD checks

---
 .github/workflows/build.yml    | 42 ++++++++++++++++++++++------------
 .github/workflows/validate.yml | 32 ++++++++++++++++++--------
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e29e8d8..ebfb6fa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,23 +1,35 @@
+# on:
+#   push:
+#     branches:
+#       - master
+
+# jobs:
+#   build:
+
+#     runs-on: windows-2019
+
+#     steps:
+#     - uses: actions/checkout@v1
+#     - name: Install Prerequisites
+#       run: .\build\vsts-prerequisites.ps1
+#       shell: powershell
+#     - name: Validate
+#       run: .\build\vsts-validate.ps1
+#       shell: powershell
+#     - name: Build
+#       run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
+#       shell: powershell
+#       env:
+#         APIKEY: ${{ secrets.ApiKey }}
+
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
-
     runs-on: windows-2019
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Prerequisites
-      run: .\build\vsts-prerequisites.ps1
-      shell: powershell
-    - name: Validate
-      run: .\build\vsts-validate.ps1
-      shell: powershell
-    - name: Build
-      run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
-      shell: powershell
-      env:
-        APIKEY: ${{ secrets.ApiKey }}
\ No newline at end of file
+      - name: Skip Build Checks
+        run: echo "Skipping build steps for temporary bypass"
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 5848717..fd66229 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,15 +1,27 @@
-on: [pull_request]
+# on: [pull_request]
+
+# jobs:
+#   validate:
+
+#     runs-on: windows-2019
+
+#     steps:
+#     - uses: actions/checkout@v1
+#     - name: Install Prerequisites
+#       run: .\build\vsts-prerequisites.ps1
+#       shell: powershell
+#     - name: Validate
+#       run: .\build\vsts-validate.ps1
+#       shell: powershell
+
+on:
+  pull_request:
+    branches:
+      - main
 
 jobs:
   validate:
-
     runs-on: windows-2019
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Install Prerequisites
-      run: .\build\vsts-prerequisites.ps1
-      shell: powershell
-    - name: Validate
-      run: .\build\vsts-validate.ps1
-      shell: powershell
\ No newline at end of file
+      - name: Skip Validation Checks
+        run: echo "Skipping validation steps for temporary bypass"

From ba99d2d9b5eef8b3accb75c0eb0e2a3421139189 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:21:33 -0400
Subject: [PATCH 04/23] Undo changes to build / validate.yml files.

---
 .github/workflows/build.yml    | 41 ++++++++++++----------------------
 .github/workflows/validate.yml | 31 ++++++++-----------------
 2 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ebfb6fa..fc826a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,35 +1,22 @@
-# on:
-#   push:
-#     branches:
-#       - master
-
-# jobs:
-#   build:
-
-#     runs-on: windows-2019
-
-#     steps:
-#     - uses: actions/checkout@v1
-#     - name: Install Prerequisites
-#       run: .\build\vsts-prerequisites.ps1
-#       shell: powershell
-#     - name: Validate
-#       run: .\build\vsts-validate.ps1
-#       shell: powershell
-#     - name: Build
-#       run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
-#       shell: powershell
-#       env:
-#         APIKEY: ${{ secrets.ApiKey }}
-
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
     runs-on: windows-2019
+
     steps:
-      - name: Skip Build Checks
-        run: echo "Skipping build steps for temporary bypass"
+      - uses: actions/checkout@v1
+      - name: Install Prerequisites
+        run: .\build\vsts-prerequisites.ps1
+        shell: powershell
+      - name: Validate
+        run: .\build\vsts-validate.ps1
+        shell: powershell
+      - name: Build
+        run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
+        shell: powershell
+        env:
+          APIKEY: ${{ secrets.ApiKey }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index fd66229..1835e53 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,27 +1,14 @@
-# on: [pull_request]
-
-# jobs:
-#   validate:
-
-#     runs-on: windows-2019
-
-#     steps:
-#     - uses: actions/checkout@v1
-#     - name: Install Prerequisites
-#       run: .\build\vsts-prerequisites.ps1
-#       shell: powershell
-#     - name: Validate
-#       run: .\build\vsts-validate.ps1
-#       shell: powershell
-
-on:
-  pull_request:
-    branches:
-      - main
+on: [pull_request]
 
 jobs:
   validate:
     runs-on: windows-2019
+
     steps:
-      - name: Skip Validation Checks
-        run: echo "Skipping validation steps for temporary bypass"
+      - uses: actions/checkout@v1
+      - name: Install Prerequisites
+        run: .\build\vsts-prerequisites.ps1
+        shell: powershell
+      - name: Validate
+        run: .\build\vsts-validate.ps1
+        shell: powershell

From 8d37e86a94455dfa718fa5f170cdfa8c26766be3 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:24:31 -0400
Subject: [PATCH 05/23] feature/129: Add dev bug report and feature request
 forms. Add user feature request form.

---
 .../.internal/dev_bug_report.yml              | 37 +++++++++++++++++++
 .../.internal/dev_feature_request.yml         | 32 ++++++++++++++++
 .github/ISSUE_TEMPLATE/user_bug_report.yml    | 36 ++++++++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml
 create mode 100644 .github/ISSUE_TEMPLATE/user_bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml b/.github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml
new file mode 100644
index 0000000..09fb74c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml
@@ -0,0 +1,37 @@
+name: "🔧 Internal Bug Report"
+description: "For Hawk team members only"
+title: "Fix: "
+labels: ["bug", "internal"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # Internal Team Members Only
+        This template is for Hawk development team use.
+  - type: input
+    id: external-issue
+    attributes:
+      label: Related External Issue
+      description: Link to user-reported issue (if applicable)
+      placeholder: "#123"
+  - type: textarea
+    id: technical-analysis
+    attributes:
+      label: Technical Analysis
+      description: Root cause analysis
+    validations:
+      required: true
+  - type: textarea
+    id: implementation-plan
+    attributes:
+      label: Implementation Plan
+      description: Proposed fix approach
+    validations:
+      required: true
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: Acceptance Criteria
+      description: What needs to be true for this to be resolved?
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml b/.github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml
new file mode 100644
index 0000000..e9b72b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml
@@ -0,0 +1,32 @@
+name: "⚙️ Feature Implementation"
+description: "For Hawk team members only"
+title: "Implement: "
+labels: ["enhancement", "internal"]
+body:
+  - type: input
+    id: external-issue
+    attributes:
+      label: Related Feature Request
+      description: Link to user feature request (if applicable)
+      placeholder: "#123"
+  - type: textarea
+    id: technical-requirements
+    attributes:
+      label: Technical Requirements
+      description: Detailed feature requirements
+    validations:
+      required: true
+  - type: textarea
+    id: implementation-approach
+    attributes:
+      label: Implementation Approach
+      description: Technical approach and architecture changes
+    validations:
+      required: true
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: Acceptance Criteria
+      description: Specific conditions that must be met
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/user_bug_report.yml b/.github/ISSUE_TEMPLATE/user_bug_report.yml
new file mode 100644
index 0000000..3f37d9a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/user_bug_report.yml
@@ -0,0 +1,36 @@
+name: "🐛 Report a Bug"
+description: "Report a bug or problem with Hawk"
+title: "Bug: "
+labels: ["bug", "triage", "external"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug in Hawk!
+  - type: textarea
+    id: description
+    attributes:
+      label: What happened?
+      description: Describe what you were doing and what went wrong
+      placeholder: Clear, concise description of the issue
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to Reproduce
+      description: How can we reproduce this issue?
+      placeholder: |
+        1. Run command '...'
+        2. With parameters '...'
+        3. See error
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Hawk Version
+      description: What version of Hawk are you running?
+      placeholder: "e.g., 1.2.0"
+    validations:
+      required: true

From ec77e8bd913a2f68e369e35cdfe5e459c574d798 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:44:44 -0400
Subject: [PATCH 06/23] Moved dev feature request form.

---
 .github/ISSUE_TEMPLATE/config.yaml                             | 3 +++
 .github/ISSUE_TEMPLATE/{.internal => }/dev_feature_request.yml | 0
 2 files changed, 3 insertions(+)
 rename .github/ISSUE_TEMPLATE/{.internal => }/dev_feature_request.yml (100%)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 3058a38..8308ee1 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -6,6 +6,9 @@ contact_links:
   - name: "💡 Suggest a Feature"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=user_feature_request.yml
     about: "Have an idea for improvement? Let us know"
+  - name: "💡 Dev Feature Request Form"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=dev_feature_request.yml
+    about: "Have an idea for improvement? Let us know"
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation"
diff --git a/.github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml b/.github/ISSUE_TEMPLATE/dev_feature_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/.internal/dev_feature_request.yml
rename to .github/ISSUE_TEMPLATE/dev_feature_request.yml

From 416ce72311822b715360968ff1ca45eb393ead81 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:55:49 -0400
Subject: [PATCH 07/23] Moved dev bug request form.

---
 .github/ISSUE_TEMPLATE/{.internal => }/dev_bug_report.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/ISSUE_TEMPLATE/{.internal => }/dev_bug_report.yml (100%)

diff --git a/.github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml b/.github/ISSUE_TEMPLATE/dev_bug_report.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/.internal/dev_bug_report.yml
rename to .github/ISSUE_TEMPLATE/dev_bug_report.yml

From 1edc82c18f010c63ad0c4a1ab8a09e40ab722d9e Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 15:56:48 -0400
Subject: [PATCH 08/23] Update config to have dev bug report form.

---
 .github/ISSUE_TEMPLATE/config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 8308ee1..2eba4d5 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -8,6 +8,8 @@ contact_links:
     about: "Have an idea for improvement? Let us know"
   - name: "💡 Dev Feature Request Form"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=dev_feature_request.yml
+  - name: "💡 Dev Feature Request Form"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=dev_bug_report.yml
     about: "Have an idea for improvement? Let us know"
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml

From efa29fc24f5ee4ed2b98c653afbf59fb7da5a752 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:00:54 -0400
Subject: [PATCH 09/23] Combine user and dev feature request form.

---
 .github/ISSUE_TEMPLATE/config.yaml            |  5 ---
 .../ISSUE_TEMPLATE/user_feature_request.yml   | 42 +++++++++++++++++--
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 2eba4d5..3058a38 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -6,11 +6,6 @@ contact_links:
   - name: "💡 Suggest a Feature"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=user_feature_request.yml
     about: "Have an idea for improvement? Let us know"
-  - name: "💡 Dev Feature Request Form"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=dev_feature_request.yml
-  - name: "💡 Dev Feature Request Form"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=dev_bug_report.yml
-    about: "Have an idea for improvement? Let us know"
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation"
diff --git a/.github/ISSUE_TEMPLATE/user_feature_request.yml b/.github/ISSUE_TEMPLATE/user_feature_request.yml
index 5bfc0ba..cf72941 100644
--- a/.github/ISSUE_TEMPLATE/user_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/user_feature_request.yml
@@ -1,19 +1,53 @@
 name: "💡 Suggest a Feature"
 description: "Suggest a new feature or improvement for Hawk"
 title: "Feature: "
-labels: ["enhancement", "triage", "external"]
+labels: ["type/feature", "status/backlog"]
 body:
   - type: textarea
     id: problem
     attributes:
       label: What problem would this feature solve?
-      placeholder: Clear description of the current limitation/problem
+      placeholder: "Clear description of the current limitation/problem"
     validations:
       required: true
   - type: textarea
     id: solution
     attributes:
-      label: Proposed Solution
-      description: How would you like this to work?
+      label: "Proposed Solution"
+      description: "How would you like this to work?"
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: "---
+
+### ⚙️ Developer Section (For Hawk Team Members Only)
+
+*The following sections are for internal use by the Hawk development team. Users can ignore these fields.*"
+  - type: input
+    id: external-issue
+    attributes:
+      label: "Related Feature Request"
+      description: "Link to user feature request (if applicable)"
+      placeholder: "#123"
+  - type: textarea
+    id: technical-requirements
+    attributes:
+      label: "Technical Requirements"
+      description: "Detailed feature requirements"
+    validations:
+      required: false
+  - type: textarea
+    id: implementation-approach
+    attributes:
+      label: "Implementation Approach"
+      description: "Technical approach and architecture changes"
+    validations:
+      required: false
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: "Acceptance Criteria"
+      description: "Specific conditions that must be met"
+    validations:
+      required: false

From 61b3be193651a2ec17d478e7cb581e6e50d68e08 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:03:33 -0400
Subject: [PATCH 10/23] Remove related feature request field

---
 .github/ISSUE_TEMPLATE/user_feature_request.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/user_feature_request.yml b/.github/ISSUE_TEMPLATE/user_feature_request.yml
index cf72941..81e734a 100644
--- a/.github/ISSUE_TEMPLATE/user_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/user_feature_request.yml
@@ -24,12 +24,6 @@ body:
 ### ⚙️ Developer Section (For Hawk Team Members Only)
 
 *The following sections are for internal use by the Hawk development team. Users can ignore these fields.*"
-  - type: input
-    id: external-issue
-    attributes:
-      label: "Related Feature Request"
-      description: "Link to user feature request (if applicable)"
-      placeholder: "#123"
   - type: textarea
     id: technical-requirements
     attributes:

From ad19b38745cf2aa4139a5c95efcdb8a6efba0e80 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:08:04 -0400
Subject: [PATCH 11/23] Update config file.

---
 .github/ISSUE_TEMPLATE/bug_report.yml         | 71 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yaml            |  4 +-
 .../ISSUE_TEMPLATE/dev_feature_request.yml    | 32 ---------
 ...eature_request.yml => feature_request.yml} |  0
 .github/ISSUE_TEMPLATE/user_bug_report.yml    | 36 ----------
 5 files changed, 73 insertions(+), 70 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/dev_feature_request.yml
 rename .github/ISSUE_TEMPLATE/{user_feature_request.yml => feature_request.yml} (100%)
 delete mode 100644 .github/ISSUE_TEMPLATE/user_bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..dc6a11b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,71 @@
+name: "🐛 Report a Bug"
+description: "Report a bug or problem with Hawk"
+title: "Bug: "
+labels: ["type/bug", "status/backlog"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug in Hawk!
+  - type: textarea
+    id: description
+    attributes:
+      label: "What happened?"
+      description: "Describe what you were doing and what went wrong"
+      placeholder: "Clear, concise description of the issue"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: "Steps to Reproduce"
+      description: "How can we reproduce this issue?"
+      placeholder: |
+        1. Run command '...'
+        2. With parameters '...'
+        3. See error
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: "Hawk Version"
+      description: "What version of Hawk are you running?"
+      placeholder: "e.g., 1.2.0"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        ### 🔧 Developer Section (For Hawk Team Members Only)
+
+        *The following sections are for internal use by the Hawk development team. Users can ignore these fields.*
+  - type: input
+    id: external-issue
+    attributes:
+      label: "Related External Issue"
+      description: "Link to user-reported issue (if applicable)"
+      placeholder: "#123"
+  - type: textarea
+    id: technical-analysis
+    attributes:
+      label: "Technical Analysis"
+      description: "Root cause analysis"
+    validations:
+      required: false
+  - type: textarea
+    id: implementation-plan
+    attributes:
+      label: "Implementation Plan"
+      description: "Proposed fix approach"
+    validations:
+      required: false
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: "Acceptance Criteria"
+      description: "What needs to be true for this to be resolved?"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 3058a38..a66e788 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: "🐛 Report a Bug"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=user_bug_report.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=bug_report.yml
     about: "Found a bug? Report it here"
   - name: "💡 Suggest a Feature"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=user_feature_request.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=feature_request.yml
     about: "Have an idea for improvement? Let us know"
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
diff --git a/.github/ISSUE_TEMPLATE/dev_feature_request.yml b/.github/ISSUE_TEMPLATE/dev_feature_request.yml
deleted file mode 100644
index e9b72b3..0000000
--- a/.github/ISSUE_TEMPLATE/dev_feature_request.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "⚙️ Feature Implementation"
-description: "For Hawk team members only"
-title: "Implement: "
-labels: ["enhancement", "internal"]
-body:
-  - type: input
-    id: external-issue
-    attributes:
-      label: Related Feature Request
-      description: Link to user feature request (if applicable)
-      placeholder: "#123"
-  - type: textarea
-    id: technical-requirements
-    attributes:
-      label: Technical Requirements
-      description: Detailed feature requirements
-    validations:
-      required: true
-  - type: textarea
-    id: implementation-approach
-    attributes:
-      label: Implementation Approach
-      description: Technical approach and architecture changes
-    validations:
-      required: true
-  - type: textarea
-    id: acceptance-criteria
-    attributes:
-      label: Acceptance Criteria
-      description: Specific conditions that must be met
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/user_feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/user_feature_request.yml
rename to .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/ISSUE_TEMPLATE/user_bug_report.yml b/.github/ISSUE_TEMPLATE/user_bug_report.yml
deleted file mode 100644
index 3f37d9a..0000000
--- a/.github/ISSUE_TEMPLATE/user_bug_report.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: "🐛 Report a Bug"
-description: "Report a bug or problem with Hawk"
-title: "Bug: "
-labels: ["bug", "triage", "external"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report a bug in Hawk!
-  - type: textarea
-    id: description
-    attributes:
-      label: What happened?
-      description: Describe what you were doing and what went wrong
-      placeholder: Clear, concise description of the issue
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to Reproduce
-      description: How can we reproduce this issue?
-      placeholder: |
-        1. Run command '...'
-        2. With parameters '...'
-        3. See error
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Hawk Version
-      description: What version of Hawk are you running?
-      placeholder: "e.g., 1.2.0"
-    validations:
-      required: true

From bd218726868d65ba693e52b15130347bd2845823 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:08:41 -0400
Subject: [PATCH 12/23] Remove dev bug form

---
 .github/ISSUE_TEMPLATE/dev_bug_report.yml | 37 -----------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/dev_bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/dev_bug_report.yml b/.github/ISSUE_TEMPLATE/dev_bug_report.yml
deleted file mode 100644
index 09fb74c..0000000
--- a/.github/ISSUE_TEMPLATE/dev_bug_report.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: "🔧 Internal Bug Report"
-description: "For Hawk team members only"
-title: "Fix: "
-labels: ["bug", "internal"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Internal Team Members Only
-        This template is for Hawk development team use.
-  - type: input
-    id: external-issue
-    attributes:
-      label: Related External Issue
-      description: Link to user-reported issue (if applicable)
-      placeholder: "#123"
-  - type: textarea
-    id: technical-analysis
-    attributes:
-      label: Technical Analysis
-      description: Root cause analysis
-    validations:
-      required: true
-  - type: textarea
-    id: implementation-plan
-    attributes:
-      label: Implementation Plan
-      description: Proposed fix approach
-    validations:
-      required: true
-  - type: textarea
-    id: acceptance-criteria
-    attributes:
-      label: Acceptance Criteria
-      description: What needs to be true for this to be resolved?
-    validations:
-      required: true

From 330857143921e9a14636b1209cd32dce5df2a2e9 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:09:44 -0400
Subject: [PATCH 13/23] Remove external linked field from bug form

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index dc6a11b..53a0b91 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -42,12 +42,6 @@ body:
         ### 🔧 Developer Section (For Hawk Team Members Only)
 
         *The following sections are for internal use by the Hawk development team. Users can ignore these fields.*
-  - type: input
-    id: external-issue
-    attributes:
-      label: "Related External Issue"
-      description: "Link to user-reported issue (if applicable)"
-      placeholder: "#123"
   - type: textarea
     id: technical-analysis
     attributes:

From e0a52847e730c00b5e98fc7928d97112e88b349a Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:10:29 -0400
Subject: [PATCH 14/23] Remove .md request forms.

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 30 -----------------------
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ---------------
 2 files changed, 50 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 21debcf..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Hawk
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**File (please complete the following information):**
- - File Name: 
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ab32fec..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for Hawk
-title: ''
-labels: Enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

From fc5abf4c9c08c64a8b339a47e4cd509780e5e81e Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:13:11 -0400
Subject: [PATCH 15/23] Add question form.

---
 .github/ISSUE_TEMPLATE/config.yaml       |  3 +++
 .github/ISSUE_TEMPLATE/question_form.yml | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/question_form.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index a66e788..f0dc4bd 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -9,3 +9,6 @@ contact_links:
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation"
+  - name: "❓ Ask a Question"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=question_form.yml
+    about: "Have a question about Hawk? Ask it here!"
diff --git a/.github/ISSUE_TEMPLATE/question_form.yml b/.github/ISSUE_TEMPLATE/question_form.yml
new file mode 100644
index 0000000..a160f2c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question_form.yml
@@ -0,0 +1,13 @@
+name: "❓ Ask a Question"
+description: "Have a question about Hawk? Ask it here!"
+title: "Question: "
+labels: ["type/question", "status/backlog"]
+body:
+  - type: textarea
+    id: question
+    attributes:
+      label: "Your Question"
+      description: "Please provide a clear and concise question."
+      placeholder: "Type your question here..."
+    validations:
+      required: true

From d06db85b3ee01eeeb78419c8a35956d1fc7997d7 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 16:14:39 -0400
Subject: [PATCH 16/23] Remove old question form.

---
 .github/ISSUE_TEMPLATE/question.md | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 2fe910f..0000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Question
-about: Ask a question to the Hawk Owners
-title: ''
-labels: Question
-assignees: ''
-
----
-
-#What is your question?

From f87f5f4c7b2437be7c6cf414965d4923a7a1fa54 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:01:16 -0400
Subject: [PATCH 17/23] Add documentation issue template.

---
 .github/ISSUE_TEMPLATE/config.yaml        |  3 ++
 .github/ISSUE_TEMPLATE/documentation.yaml | 65 +++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.yaml

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index f0dc4bd..19d628f 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -9,6 +9,9 @@ contact_links:
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation"
+  - name: "📚 Documentation Issue"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
+    about: "Report issues with documentation or request updates"
   - name: "❓ Ask a Question"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=question_form.yml
     about: "Have a question about Hawk? Ask it here!"
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
new file mode 100644
index 0000000..894a6bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -0,0 +1,65 @@
+# documentation.yml
+name: "📚 Documentation Update"
+description: "Report issues with documentation or request updates"
+title: "Docs: "
+labels: ["type/documentation", "status/backlog"]
+body:
+  - type: textarea
+    id: documentation-issue
+    attributes:
+      label: "What needs to be updated?"
+      description: "Describe what documentation needs to be added, updated, or fixed"
+      placeholder: "Clear description of documentation changes needed"
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed-changes
+    attributes:
+      label: "Proposed Changes"
+      description: "What changes would you like to see?"
+      placeholder: "Specific suggestions for documentation updates"
+    validations:
+      required: true
+
+  - type: input
+    id: current-page
+    attributes:
+      label: "Current Documentation Link"
+      description: "If this is about existing documentation, provide the link"
+      placeholder: "https://github.com/T0pcyber/Hawk/wiki/page-name"
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        ### 📝 Developer Section (For Hawk Team Members Only)
+
+        *The following sections are for internal use by the Hawk development team. Users can ignore these fields.*
+
+  - type: textarea
+    id: implementation-plan
+    attributes:
+      label: "Implementation Plan"
+      description: "How should these documentation changes be implemented?"
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-resources
+    attributes:
+      label: "Additional Resources"
+      description: "Related documents, screenshots, or examples needed"
+    validations:
+      required: false
+
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: "Acceptance Criteria"
+      description: "What needs to be true for this documentation update to be complete?"
+    validations:
+      required: false

From 334ef7883ed16d6aa2a88603cee1ff9e9cf63bc4 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:10:14 -0400
Subject: [PATCH 18/23] Add documentation issue template.

---
 .github/ISSUE_TEMPLATE/config.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 19d628f..f97ec86 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -6,9 +6,6 @@ contact_links:
   - name: "💡 Suggest a Feature"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=feature_request.yml
     about: "Have an idea for improvement? Let us know"
-  - name: "📚 Documentation Issue"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
-    about: "Report issues with documentation"
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation or request updates"

From 7cc9d9395137f38b6a796be87fa0a62ec16ddba9 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:11:23 -0400
Subject: [PATCH 19/23] Change suggest a feature to request a feature.

---
 .github/ISSUE_TEMPLATE/config.yaml         | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index f97ec86..11763ef 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -3,7 +3,7 @@ contact_links:
   - name: "🐛 Report a Bug"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=bug_report.yml
     about: "Found a bug? Report it here"
-  - name: "💡 Suggest a Feature"
+  - name: "💡 Request a Feature"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=feature_request.yml
     about: "Have an idea for improvement? Let us know"
   - name: "📚 Documentation Issue"
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 81e734a..fc09177 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,4 +1,4 @@
-name: "💡 Suggest a Feature"
+name: "💡 Request a Feature"
 description: "Suggest a new feature or improvement for Hawk"
 title: "Feature: "
 labels: ["type/feature", "status/backlog"]

From ccb7ab1808554ee901b1f6a3df609de2ed7a3dee Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:12:32 -0400
Subject: [PATCH 20/23] Rearange order of requests.

---
 .github/ISSUE_TEMPLATE/{question_form.yml => a_question_form.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/ISSUE_TEMPLATE/{question_form.yml => a_question_form.yml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/question_form.yml b/.github/ISSUE_TEMPLATE/a_question_form.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/question_form.yml
rename to .github/ISSUE_TEMPLATE/a_question_form.yml

From ca03abb455c553b4acb775d686d44a85dbf29e5a Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:17:32 -0400
Subject: [PATCH 21/23] Rearange order of requests in config.yaml

---
 .github/ISSUE_TEMPLATE/config.yaml                     | 10 +++++++---
 .../{a_question_form.yml => question_form.yml}         |  0
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename .github/ISSUE_TEMPLATE/{a_question_form.yml => question_form.yml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 11763ef..8a49778 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -1,14 +1,18 @@
 blank_issues_enabled: false
 contact_links:
-  - name: "🐛 Report a Bug"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=bug_report.yml
-    about: "Found a bug? Report it here"
   - name: "💡 Request a Feature"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=feature_request.yml
     about: "Have an idea for improvement? Let us know"
+    order: 1
+  - name: "🐛 Report a Bug"
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=bug_report.yml
+    about: "Found a bug? Report it here"
+    order: 2
   - name: "📚 Documentation Issue"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
     about: "Report issues with documentation or request updates"
+    order: 3
   - name: "❓ Ask a Question"
     url: https://github.com/T0pcyber/Hawk/issues/new?template=question_form.yml
     about: "Have a question about Hawk? Ask it here!"
+    order: 4
diff --git a/.github/ISSUE_TEMPLATE/a_question_form.yml b/.github/ISSUE_TEMPLATE/question_form.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/a_question_form.yml
rename to .github/ISSUE_TEMPLATE/question_form.yml

From 30c9d31db796dbdb19437a35f67be8fe6b0aea56 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 19:20:11 -0400
Subject: [PATCH 22/23] Rearange order of requests in config.yaml and update
 file names rearrange order.

---
 ...ature_request.yml => 01_feature_request_form.yml} |  0
 .../{bug_report.yml => 02_bug_report_form.yml}       |  0
 ...tation.yaml => 03_documentation_update_form.yaml} |  0
 .../{question_form.yml => 04_question_form.yml}      |  0
 .github/ISSUE_TEMPLATE/config.yaml                   | 12 ++++--------
 5 files changed, 4 insertions(+), 8 deletions(-)
 rename .github/ISSUE_TEMPLATE/{feature_request.yml => 01_feature_request_form.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{bug_report.yml => 02_bug_report_form.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{documentation.yaml => 03_documentation_update_form.yaml} (100%)
 rename .github/ISSUE_TEMPLATE/{question_form.yml => 04_question_form.yml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/01_feature_request_form.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.yml
rename to .github/ISSUE_TEMPLATE/01_feature_request_form.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/02_bug_report_form.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.yml
rename to .github/ISSUE_TEMPLATE/02_bug_report_form.yml
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/03_documentation_update_form.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/documentation.yaml
rename to .github/ISSUE_TEMPLATE/03_documentation_update_form.yaml
diff --git a/.github/ISSUE_TEMPLATE/question_form.yml b/.github/ISSUE_TEMPLATE/04_question_form.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/question_form.yml
rename to .github/ISSUE_TEMPLATE/04_question_form.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 8a49778..2554b54 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -1,18 +1,14 @@
 blank_issues_enabled: false
 contact_links:
   - name: "💡 Request a Feature"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=feature_request.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=01_feature_request_form.yml
     about: "Have an idea for improvement? Let us know"
-    order: 1
   - name: "🐛 Report a Bug"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=bug_report.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=02_bug_report_form.yml
     about: "Found a bug? Report it here"
-    order: 2
   - name: "📚 Documentation Issue"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=documentation.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=03_documentation_update_form.yml
     about: "Report issues with documentation or request updates"
-    order: 3
   - name: "❓ Ask a Question"
-    url: https://github.com/T0pcyber/Hawk/issues/new?template=question_form.yml
+    url: https://github.com/T0pcyber/Hawk/issues/new?template=04_question_form.yml
     about: "Have a question about Hawk? Ask it here!"
-    order: 4

From 83182b3a37ab0e4f3ef81ac6df8cbce7a54071c1 Mon Sep 17 00:00:00 2001
From: Jonathan Butler <xxbutler86xx@gmail.com>
Date: Fri, 1 Nov 2024 20:22:40 -0400
Subject: [PATCH 23/23] Add GITHUB_TOKEN write access test workflow

---
 .github/workflows/test-github-token-write.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/test-github-token-write.yml

diff --git a/.github/workflows/test-github-token-write.yml b/.github/workflows/test-github-token-write.yml
new file mode 100644
index 0000000..f4043e5
--- /dev/null
+++ b/.github/workflows/test-github-token-write.yml
@@ -0,0 +1,17 @@
+name: Test GITHUB_TOKEN Write Access
+
+on:
+  workflow_dispatch: # Allows you to manually trigger this test
+
+jobs:
+  test-write-access:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Test GITHUB_TOKEN Write Access
+        env:
+          ISSUE_NUMBER: 138 # Replace with an existing issue number in your repository
+        run: |
+          curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            -X POST \
+            -d '{"body": "Testing GITHUB_TOKEN write access"}' \
+            "https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/comments"