diff --git a/.github/ISSUE_TEMPLATE/issue-default.yml b/.github/ISSUE_TEMPLATE/issue-default.yml
new file mode 100644
index 000000000..ecfa56140
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue-default.yml
@@ -0,0 +1,37 @@
+name: Standard Issue Tempalte
+description: Create an Issue
+title: "[Issue]:"
+labels: ["research"]
+assignees:
+  - kitsushadow
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill this out best you can
+  - type: textarea
+    id: why
+    attributes:
+      label: Why or Acceptance Criteria
+      description: What is the reason we determined we need an issue.
+      placeholder: This issue is a product of...
+      value: "While working on X or researching Y it was discovered that Z was an issue that need captured."
+    validations:
+      required: true
+  - type: dropdown
+    id: type
+    attributes:
+      label: Issue Type
+      description: What type of issue is this
+      options:
+        - research (Default)
+        - dev
+        - product
+    validations:
+      required: true
+  - type: textarea
+    id: Dependencies
+    attributes:
+      label: Link dependent issues
+      description: If this ticket is dependent on another issue or blocks a current issue, please link.
+      render: shell
diff --git a/docs/developer/database-access.md b/docs/developer/database-access.md
index 8fc5d4617..9d615c477 100644
--- a/docs/developer/database-access.md
+++ b/docs/developer/database-access.md
@@ -12,19 +12,34 @@ to get a `psql` shell on the sandbox environment's database.
 
 ## Running Migrations
 
-When new code changes the database schema, we need to apply Django's migrations.
+When new code changes the database schema (ie, you change a model or pull some
+code that has), we need to apply Django's migrations.
+
+### On Local
+
+```shell
+docker-compose exec app bash
+./manage.py makemigrations
+```
+
+Then perform docker-compose down & docker-compose up to run with the new migrations.
+
+### On Cloud.gov
+
 We can run these using CloudFoundry's tasks to run the `manage.py migrate`
 command in the correct environment. For any developer environment, developers
 can manually run the task with
 
 ```shell
-cf run-task getgov-ENVIRONMENT --command 'python manage.py migrate' --name migrate
+cf run-task getgov-ENVIRONMENT --wait --command 'python manage.py migrate' --name migrate
 ```
 
+(The optional 'wait' argument will wait until the environment is stable)
+
 Optionally, load data from fixtures as well
 
 ```shell
-cf run-task getgov-ENVIRONMENT --command 'python manage.py load' --name loaddata
+cf run-task getgov-ENVIRONMENT --wait --command 'python manage.py load' --name loaddata
 ```
 
 For the `stable` environment, developers don't have credentials so we need to
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index ebfe160fa..46a87ba76 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -21,6 +21,15 @@
         </a>
       </li>
 
+      <li class="usa-sidenav__item">
+        {% url 'todo' as url %}
+        <a href="{{ url }}"
+          {% if request.path == url %}class="usa-current"{% endif %}
+        >
+            Organization name and mailing address
+        </a>
+      </li>      
+
       <li class="usa-sidenav__item">
         {% url 'todo' as url %}
         <a href="{{ url }}"