diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index d8843bf..b4b4dab 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -10,7 +10,7 @@ assignees: ''
 ### What happened:
 _What you saw_
 
-### What you expected:
+### What was expected:
 _What you expected to see_
 
 ### Steps to reproduce:
@@ -23,7 +23,7 @@ __This may include a build schematic, a video, or detailed instructions to help
 ### Server and GriefPrevention version:
 ___This can be found by running `/version` and `/version GriefPrevention` on your server.___
 Paste of `/version`: 
-Paste of `/version GriefPrevention`:
+Paste of `/version GriefPrevention`: 
 
 ### Stack trace/error or server log
 
@@ -41,10 +41,13 @@ Paste the config.yml right here inside these backticks. Please do not use a past
 
 ```
 
-### Resolutions attempted
-> Replace the `- [ ]` with a `- [x]` if the statement is true
-
-- [ ] Issue still occurs even if GriefPrevention is the only plugin running
-- [ ] Issue still occurs even after testing on a new server
-
 ### Plugin list (if applicable):
+
+
+
+### Debugging steps attempted
+<!--These will be checkboxes you can click after creating the issue)-->
+- [ ] I attempted running only GriefPrevention on the server
+  - [ ] Issue still occurs even if GriefPrevention is the only plugin running
+- [ ] I attempted testing for the issue on a new server
+  - [ ] Issue still occurs even after testing on a new server
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 473776a..4259e73 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -12,3 +12,11 @@ assignees: ''
 **Because** I wanna be the very best, Like no one ever was.
 
 Here's how to increase your chances of your feature request being understood (and potentially considered for implementation): https://content.pivotal.io/blog/how-to-write-well-formed-user-stories
+
+Optional questions:
+
+**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 alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..dd0bb73
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: Question
+about: Got a question?
+title: Summarize your question into a single sentence here
+labels: Question
+assignees: ''
+
+---
+
+The answer to your question may exist in the wiki, go check that out first! 
+
+Wiki: https://github.com/TechFortress/GriefPrevention/wiki
+
+Otherwise, if you have a spigot account, you may have better luck posting in the discussion thread so people who follow the thread may see your question. https://www.spigotmc.org/threads/griefprevention.35615/page-311
+
+Still no luck? Really? Then go ahead and ask here.