diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..16e4bbad
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.obsidian/plugins/obsidian-pandoc-reference-list/data.json
+.obsidian/workspace.json
diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json
index 0e4514ab..91074e17 100755
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@@ -1,6 +1,6 @@
 {
   "cssTheme": "AnuPpuccin",
-  "interfaceFontFamily": "Bodoni 72",
+  "interfaceFontFamily": "Bahnschrift,Inter,Bodoni 72",
   "textFontFamily": "Times New Roman,FreeSans,Bodoni 72",
   "monospaceFontFamily": "CodeNewRoman Nerd Font",
   "accentColor": "",
diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index 569be124..7baac91b 100755
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -88,6 +88,6 @@
   "repelStrength": 11.7708333333333,
   "linkStrength": 1,
   "linkDistance": 160,
-  "scale": 0.0932966681948352,
+  "scale": 0.38381946838370173,
   "close": true
 }
\ No newline at end of file
diff --git a/.obsidian/hotkeys.json b/.obsidian/hotkeys.json
index 45a63f50..308f1a7c 100755
--- a/.obsidian/hotkeys.json
+++ b/.obsidian/hotkeys.json
@@ -202,5 +202,13 @@
       ],
       "key": "P"
     }
+  ],
+  "templater-obsidian:1000s Templates/This Past Week Template.md": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "W"
+    }
   ]
 }
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
index 355a4860..46ee1120 100755
--- a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
+++ b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json
@@ -1,6 +1,7 @@
 {
   "pathToPandoc": "/app/bin/pandoc",
   "tooltipDelay": 400,
+<<<<<<< HEAD
   "zoteroGroups": [
     {
       "id": 1,
@@ -8,11 +9,10 @@
       "lastUpdate": 1725567832585
     }
   ],
+=======
+  "zoteroGroups": [],
+>>>>>>> origin/master
   "renderCitations": true,
   "renderCitationsReadingMode": true,
-  "renderLinkCitations": true,
-  "pathToBibliography": "/home/danesabo/Documents/1. Obsidian/Dane's Vault/200. Library Papers/My Library.bib",
-  "pullFromZotero": true,
-  "cslStyleURL": "https://raw.githubusercontent.com/citation-style-language/styles/master/ieee.csl",
-  "enableCiteKeyCompletion": true
+  "renderLinkCitations": true
 }
\ No newline at end of file
diff --git a/.obsidian/plugins/templater-obsidian/data.json b/.obsidian/plugins/templater-obsidian/data.json
index b147c609..953ef261 100755
--- a/.obsidian/plugins/templater-obsidian/data.json
+++ b/.obsidian/plugins/templater-obsidian/data.json
@@ -24,7 +24,8 @@
   "enabled_templates_hotkeys": [
     "1000s Templates/Daily Note Template.md",
     "1000s Templates/New Note Template.md",
-    "1000s Templates/Heilmeier Catechism.md"
+    "1000s Templates/Heilmeier Catechism.md",
+    "1000s Templates/This Past Week Template.md"
   ],
   "startup_templates": [
     "1000s Templates/New Note Template.md"
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index ca281318..1f806657 100755
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -18,8 +18,21 @@
                 "source": true
               }
             }
+          },
+          {
+            "id": "6c501be11a22f89b",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              }
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -114,7 +127,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "2024-09-06.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -131,7 +144,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "2024-09-06.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -154,7 +167,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "2024-09-06.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           }
@@ -193,11 +206,15 @@
       "obsidian-full-calendar:Open Full Calendar": false
     }
   },
-  "active": "19ebc28149aabcd9",
+  "active": "6c501be11a22f89b",
   "lastOpenFiles": [
+    "2024-09-06.md",
+    "conflict-files-obsidian-git.md",
+    "Weekly Note 2024-08-29.md",
+    "2024-08-18.md",
+    "2. Cole Group Meeting Notes/Weekly Note 2024-09-04.md",
     "2024-09-09.md",
     "1000s Templates/Daily Note Template.md",
-    "2024-09-06.md",
     "1. Daily Notes/2024/9. September/2024-09-05.md",
     "2024-09-16.md",
     "2024-09-13.md",
@@ -221,10 +238,6 @@
     "200. Library Papers/Kry10TechnicalOverview.md",
     "200. Library Papers/nguyenFuzzyControlSystems2019.md",
     "\"[Full.md",
-    "300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-08-27 Introduction.md",
-    "[Full.md",
-    "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
-    "{uri}.md",
     "200. Library Papers/My Library.bib",
     "4. Qualifying Exam/2. Writing/Untitled.bib",
     "4. Qualifying Exam/2. Writing/test.bib",
diff --git a/1. Daily Notes/2024/8. August/2024-08-05.md b/1. Daily Notes/2024/8. August/2024-08-05.md
index b54f4663..6759435f 100755
--- a/1. Daily Notes/2024/8. August/2024-08-05.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-05.md	
@@ -1,6 +1,5 @@
 ---
-tags:
-  - DailyNote
+tags: []
 ---
 
 ## Tasks for today
diff --git a/1. Daily Notes/2024/8. August/2024-08-06.md b/1. Daily Notes/2024/8. August/2024-08-06.md
index 71b42bc9..f613882d 100755
--- a/1. Daily Notes/2024/8. August/2024-08-06.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-06.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-06
 modification date: Tuesday 6th August 2024 09:32:18
-tags:
-  - DailyNote
+tags: []
 ---
 << [[2024-08-05]] | [[2024-08-07]] >>
 Error generating daily quote
diff --git a/1. Daily Notes/2024/8. August/2024-08-07.md b/1. Daily Notes/2024/8. August/2024-08-07.md
index 4e2e8e14..6fa77df2 100755
--- a/1. Daily Notes/2024/8. August/2024-08-07.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-07.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-07
 modification date: Wednesday 7th August 2024 09:40:17
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
 << [[2024-08-06]] | [[2024-08-08]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-08.md b/1. Daily Notes/2024/8. August/2024-08-08.md
index 48b5288e..3fa3766b 100755
--- a/1. Daily Notes/2024/8. August/2024-08-08.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-08.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-08
 modification date: Thursday 8th August 2024 09:03:55
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
 << [[2024-08-07]] | [[2024-08-09]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-09.md b/1. Daily Notes/2024/8. August/2024-08-09.md
index 7832d5ea..e7edfc3c 100755
--- a/1. Daily Notes/2024/8. August/2024-08-09.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-09.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-09
 modification date: Friday 9th August 2024 10:37:19
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-08]] | [[2024-08-12]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-12.md b/1. Daily Notes/2024/8. August/2024-08-12.md
index 7870920a..2d833212 100755
--- a/1. Daily Notes/2024/8. August/2024-08-12.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-12.md	
@@ -1,8 +1,7 @@
 ---
 creation_date: 2024-08-12
 modification date: Monday 12th August 2024 09:56:31
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-09]] | [[2024-08-13]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-13.md b/1. Daily Notes/2024/8. August/2024-08-13.md
index 987e8fba..bd2a7c4c 100755
--- a/1. Daily Notes/2024/8. August/2024-08-13.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-13.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-13
 modification date: Tuesday 13th August 2024 09:07:48
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-12]] | [[2024-08-14]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-14.md b/1. Daily Notes/2024/8. August/2024-08-14.md
index 7d1f2939..1f0aeaa1 100755
--- a/1. Daily Notes/2024/8. August/2024-08-14.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-14.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-14
 modification date: Wednesday 14th August 2024 08:48:52
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-13]] | [[2024-08-15]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-15.md b/1. Daily Notes/2024/8. August/2024-08-15.md
index 4bf03101..a3724e11 100755
--- a/1. Daily Notes/2024/8. August/2024-08-15.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-15.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-15
 modification date: Thursday 15th August 2024 08:09:13
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-14]] | [[2024-08-16]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-16.md b/1. Daily Notes/2024/8. August/2024-08-16.md
index aa7b2ad8..ad7c2c35 100755
--- a/1. Daily Notes/2024/8. August/2024-08-16.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-16.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-16
 modification date: Friday 16th August 2024 09:04:10
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-15]] | [[2024-08-19]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-19.md b/1. Daily Notes/2024/8. August/2024-08-19.md
index 3459ca00..3882b2bb 100755
--- a/1. Daily Notes/2024/8. August/2024-08-19.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-19.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-19
 modification date: Monday 19th August 2024 08:55:24
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-18]] | [[2024-08-20]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-20.md b/1. Daily Notes/2024/8. August/2024-08-20.md
index 8d5c84f8..d4d3a976 100755
--- a/1. Daily Notes/2024/8. August/2024-08-20.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-20.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-20
 modification date: Tuesday 20th August 2024 10:51:39
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-19]] | [[2024-08-21]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-21.md b/1. Daily Notes/2024/8. August/2024-08-21.md
index 498b73e7..ab5000b5 100755
--- a/1. Daily Notes/2024/8. August/2024-08-21.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-21.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-21
 modification date: Wednesday 21st August 2024 09:07:32
-tags:
-  - DailyNote
+tags: []
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-20]] | [[2024-08-22]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-22.md b/1. Daily Notes/2024/8. August/2024-08-22.md
index bacd87a3..c338e494 100755
--- a/1. Daily Notes/2024/8. August/2024-08-22.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-22.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-22
+date: 2024-08-22
 modification date: Thursday 22nd August 2024 09:00:24
 tags:
-  - DailyNote
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-21]] | [[2024-08-23]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-23.md b/1. Daily Notes/2024/8. August/2024-08-23.md
index 73b1e984..88d6b2c8 100644
--- a/1. Daily Notes/2024/8. August/2024-08-23.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-23.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-23
+date: 2024-08-23
 modification date: Friday 23rd August 2024 09:00:33
 tags:
-  - DailyNote
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-22]] | [[2024-08-26]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-26.md b/1. Daily Notes/2024/8. August/2024-08-26.md
index d8e0f776..2bc87f99 100644
--- a/1. Daily Notes/2024/8. August/2024-08-26.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-26.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-26
+date: 2024-08-26
 modification date: 08/26
 tags:
-  - DailyNote
 ---
 #### Yesterday | Tomorrow
  << [[2024-08-23]] | [[2024-08-27]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-27.md b/1. Daily Notes/2024/8. August/2024-08-27.md
index d94e0fe5..8d6fcbb7 100644
--- a/1. Daily Notes/2024/8. August/2024-08-27.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-27.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-27
+date: 2024-08-27
 modification date: Tuesday 27th August 2024 09:35:39
 tags:
-  - DailyNote
 ---
 # Yesterday | Tomorrow
  << [[2024-08-26]] | [[2024-08-28]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-28.md b/1. Daily Notes/2024/8. August/2024-08-28.md
index fb6255bf..e04d9b90 100644
--- a/1. Daily Notes/2024/8. August/2024-08-28.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-28.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-28
+date: 2024-08-28
 modification date: Wednesday 28th August 2024 08:35:19
 tags:
-  - DailyNote
 ---
 # Yesterday | Tomorrow
  << [[2024-08-27]] | [[2024-08-29]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-29.md b/1. Daily Notes/2024/8. August/2024-08-29.md
index 4cfda968..675da830 100644
--- a/1. Daily Notes/2024/8. August/2024-08-29.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-29.md	
@@ -1,8 +1,7 @@
 ---
-creation date: 2024-08-29
+date: 2024-08-29
 modification date: Thursday 29th August 2024 08:45:50
 tags:
-  - DailyNote
 ---
 # Yesterday | Tomorrow
  << [[2024-08-28]] | [[2024-08-30]] >>
diff --git a/1. Daily Notes/2024/8. August/2024-08-30.md b/1. Daily Notes/2024/8. August/2024-08-30.md
index 065faab6..3e2764c5 100644
--- a/1. Daily Notes/2024/8. August/2024-08-30.md	
+++ b/1. Daily Notes/2024/8. August/2024-08-30.md	
@@ -1,8 +1,7 @@
 ---
-creation_date: 2024-08-30
+date: 2024-08-30
 modification_date: Friday 30th August 2024 08:35:10
 tags:
-  - DailyNote
 ---
 # Yesterday | Tomorrow
  << [[2024-08-29]] | [[2024-09-03]] >>
diff --git a/1. Daily Notes/2024/9. September/2024-09-03.md b/1. Daily Notes/2024/9. September/2024-09-03.md
index 81d7e053..e1074195 100644
--- a/1. Daily Notes/2024/9. September/2024-09-03.md	
+++ b/1. Daily Notes/2024/9. September/2024-09-03.md	
@@ -1,8 +1,7 @@
 ---
-creation_date: 2024-09-03
+date: 2024-09-03
 modification_date: Tuesday 3rd September 2024 08:55:03
 tags:
-  - DailyNote
 ---
 # Yesterday | Tomorrow
  << [[2024-08-30]] | [[2024-09-04]] >>
diff --git a/1. Daily Notes/2024/9. September/2024-09-04.md b/1. Daily Notes/2024/9. September/2024-09-04.md
index dba367dc..a9b9e58b 100644
--- a/1. Daily Notes/2024/9. September/2024-09-04.md	
+++ b/1. Daily Notes/2024/9. September/2024-09-04.md	
@@ -1,8 +1,7 @@
 ---
 creation_date: 2024-09-04
 modification_date: Wednesday 4th September 2024 08:32:57
-tags:
-  - DailyNote
+tags: []
 ---
 # Yesterday | Tomorrow
  << [[2024-09-03]] | [[2024-09-05]] >>
diff --git a/1. Daily Notes/2024/9. September/2024-09-05.md b/1. Daily Notes/2024/9. September/2024-09-05.md
index 83b7ed20..02b3850d 100644
--- a/1. Daily Notes/2024/9. September/2024-09-05.md	
+++ b/1. Daily Notes/2024/9. September/2024-09-05.md	
@@ -1,21 +1,20 @@
 ---
 creation_date: 2024-09-05
 modification_date: Thursday 5th September 2024 09:21:54
-tags:
-  - DailyNote
+tags: []
 ---
 # Yesterday | Tomorrow
  << [[2024-09-04]] | [[2024-09-06]] >>
 # This Week's Weekly Note
-[[Weekly Note 2024-08-07]]
+[[Weekly Note 2024-08-30]]
 
 # Tasks for today
 ## Big Task
- - [ ] 
+ - [ ] QE Management pages creation
 ## Medium Tasks
-- [ ] 
-- [ ] 
-- [ ] 
+- [ ] [[Weekly Note 2024-09-04]]
+- [x] Fix weekly note template ✅ 2024-09-05
+- [x] [[2024-09-05 Model-Based Design of Coatings for Gas Turbine Engines  - R. Wesley Jackson]]
 ## Small Tasks
 - [ ] 
 - [ ] 
diff --git a/1000s Templates/Daily Note Template.md b/1000s Templates/Daily Note Template.md
index 024799ed..3be99827 100755
--- a/1000s Templates/Daily Note Template.md	
+++ b/1000s Templates/Daily Note Template.md	
@@ -1,11 +1,11 @@
 ---
-modification_date: <% tp.file.last_modified_date("dddd Do MMMM YYYY HH:mm:ss") %>
-tags: []
+date: <% tp.file.title %>
+tags:
 ---
 # Yesterday | Tomorrow
  << [[<%*if (tp.date.weekday("YYYY-MM-DD", 1, tp.file.title, "YYYY-MM-DD") == tp.file.title) { tR += tp.date.now("YYYY-MM-DD", -3, tp.file.title, "YYYY-MM-DD"); } else { tR += tp.date.now("YYYY-MM-DD", -1, tp.file.title, "YYYY-MM-DD");} %>]] | [[<%*if (tp.date.weekday("YYYY-MM-DD", 5, tp.file.title, "YYYY-MM-DD") == tp.file.title) { tR += tp.date.now("YYYY-MM-DD", +3, tp.file.title, "YYYY-MM-DD"); } else { tR += tp.date.now("YYYY-MM-DD", +1, tp.file.title, "YYYY-MM-DD");} %> ]] >>
 # This Week's Weekly Note
-[[<%*if (tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD") >= tp.file.title) {tR += tp.date.weekday("YYYY-MM-DD", -4, tp.file.title, "YYYY-MM-DD"); } else {tR += tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD"); } %>]]
+[[ Weekly Note <%*if (tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD") >= tp.file.title) {tR += tp.date.weekday("YYYY-MM-DD", -4, tp.file.title, "YYYY-MM-DD"); } else {tR += tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD"); } %>]]
 
 # Tasks for today
 ## Big Task
diff --git a/1000s Templates/This Past Week Template.md b/1000s Templates/This Past Week Template.md
index e5158031..118886a2 100755
--- a/1000s Templates/This Past Week Template.md	
+++ b/1000s Templates/This Past Week Template.md	
@@ -1,5 +1,5 @@
 ---
-creation_date: <% tp.date.now() %>
+date: <% tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0] %>
 modification date: <% tp.file.last_modified_date("dddd Do MMMM YYYY HH:mm:ss") %>
 tags:
   - WeeklyNote
@@ -7,19 +7,18 @@ tags:
 << [[Weekly Note <% tp.date.now("YYYY-MM-DD", -7) %>]] | [[Weekly Note <% tp.date.now("YYYY-MM-DD", 7) %>]] >>
 
 ## This Week's Daily Notes
-[[<% tp.date.now("YYYY-MM-DD", -7) %>]]
-[[<% tp.date.now("YYYY-MM-DD", -6) %>]]
-[[<% tp.date.now("YYYY-MM-DD", -5) %>]]
-[[<% tp.date.now("YYYY-MM-DD", -2) %>]]
-[[<% tp.date.now("YYYY-MM-DD", -1) %>]]
-
+[[<% tp.date.now("YYYY-MM-DD", -7, tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0], "YYYY-MM-DD") %>]]
+[[<% tp.date.now("YYYY-MM-DD", -6, tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0], "YYYY-MM-DD") %>]]
+[[<% tp.date.now("YYYY-MM-DD", -5, tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0], "YYYY-MM-DD") %>]]
+[[<% tp.date.now("YYYY-MM-DD", -2, tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0], "YYYY-MM-DD") %>]]
+[[<% tp.date.now("YYYY-MM-DD", -1, tp.file.title.match(/\d{4}-\d{2}-\d{2}/)[0], "YYYY-MM-DD") %>]]
 ## Last Week's Plan
 ## Accomplishments
 ### Tasks and Notes From This Past Week
 
 ```dataview
 TASK
-where completed and file.mtime >= this.file.mday - dur(7 days)
+where completed and file.title >= this.file.mday - dur(7 days)
 group by file.link
 sort rows.file.mtime asc
 
@@ -27,7 +26,7 @@ sort rows.file.mtime asc
 ### Papers read this past week
 ```dataview
 table title as "Title", dateread as "Date Read"
-where readstatus and dateread => this.creation_date-dur(7)
+where readstatus and dateread => this.date-dur(7)
 
 ```
 ### Remarks
diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-08-07.md b/2. Cole Group Meeting Notes/Weekly Note 2024-08-07.md
index 7d494bbc..0ef32001 100755
--- a/2. Cole Group Meeting Notes/Weekly Note 2024-08-07.md	
+++ b/2. Cole Group Meeting Notes/Weekly Note 2024-08-07.md	
@@ -1,8 +1,7 @@
 ---
 creation date: 2024-08-07
 modification date: Wednesday 7th August 2024 09:45:29
-tags:
-  - WeeklyNote
+tags: []
 ---
 << [[Weekly Note 2024-07-31]] | [[Weekly Note 2024-08-14]] >>
 
diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-08-14.md b/2. Cole Group Meeting Notes/Weekly Note 2024-08-14.md
index b6e9f441..801e200c 100755
--- a/2. Cole Group Meeting Notes/Weekly Note 2024-08-14.md	
+++ b/2. Cole Group Meeting Notes/Weekly Note 2024-08-14.md	
@@ -1,8 +1,7 @@
 ---
 creation_date: 2024-08-14
 modification date: Wednesday 14th August 2024 13:20:25
-tags:
-  - WeeklyNote
+tags: []
 ---
 << [[Weekly Note 2024-08-07]] | [[Weekly Note 2024-08-21]] >>
 
diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md b/2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md
index 734058a1..4cc94d7f 100755
--- a/2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md	
+++ b/2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md	
@@ -1,8 +1,7 @@
 ---
 creation_date: 2024-08-21
 modification date: Wednesday 21st August 2024 14:16:41
-tags:
-  - WeeklyNote
+tags: []
 ---
 << [[Weekly Note 2024-08-14]] | [[Weekly Note 2024-08-28]] >>
 
diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md b/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md
index a1d7428d..c0dca6fe 100644
--- a/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md	
+++ b/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md	
@@ -1,8 +1,7 @@
 ---
 creation_date: 2024-08-30
 modification date: Friday 30th August 2024 08:41:30
-tags:
-  - WeeklyNote
+tags: []
 ---
 << [[Weekly Note 2024-08-21]] | [[Weekly Note 2024-09-04]] >>
 
diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-09-04.md b/2. Cole Group Meeting Notes/Weekly Note 2024-09-04.md
new file mode 100644
index 00000000..2ca8ba2c
--- /dev/null
+++ b/2. Cole Group Meeting Notes/Weekly Note 2024-09-04.md	
@@ -0,0 +1,61 @@
+---
+date: 2024-09-04
+modification date: Thursday 5th September 2024 13:51:03
+tags: []
+---
+<< [[Weekly Note 2024-08-30]] | [[Weekly Note 2024-09-11]] >>
+
+# This Week's Daily Notes
+[[2024-08-28]]
+[[2024-08-29]]
+[[2024-08-30]]
+[[2024-09-02]]
+[[2024-09-03]]
+[[2024-09-04]]
+# Last Week's Plan
+## BAD 2 THE BONE
+Get pymodbus server running on the bone.
+Start integrating Robert's FHE code.
+Asynchronous?
+## Zotero Web Server
+Write instructions
+## Qualifying Exam
+Finish abstract like today so Dan can 'consult'
+# Accomplishments
+### Tasks and Notes From This Past Week
+
+```dataview
+TASK
+where completed and completion >= this.date - dur(7 days)
+group by file.link
+sort rows.file.mtime asc
+
+```
+### Papers read this past week
+```dataview
+table title as "Title", dateread as "Date Read"
+where readstatus and dateread => this.date-dur(7)
+
+```
+## Remarks
+### BeagleBone ARCADE
+1. Worked with Murphy some talking about how ARCADE calls to memory.
+2. Got Patrick onto the GitHub I have set up
+### Qualifying Exam
+1. Outlined all the requirements from the guidelines document that was sent out. Synthesized things with what we've been talking about.
+2. Wrote technical abstract that's due on [September 11th](2024-09-11 Qualifying Exam Abstract Due)
+3. Built out some project management stuff for the QE. I've got Zotero working very nicely with Obsidian.
+4. Organized all the papers that I have read
+### Other stuff
+1. Expense report debacle
+2. Learned about the chart of the nuclides
+# This Week's Plan
+## BeagleBone ARCADE
+1. Bone on ARCADE this week???? Moving towards FHE implementation
+## Qualifying Exam
+1. Review and submit abstract
+2. Game on.
+## Other Stuff
+1. Get expense report solved. Very annoying.
+2. The Curve of Binding Energy - John McPhea
+3. Natural Number Game adam math hhu de
\ No newline at end of file
diff --git a/Weekly Note 2024-09-04.md b/2024-08-18.md
similarity index 100%
rename from Weekly Note 2024-09-04.md
rename to 2024-08-18.md
diff --git a/2024-09-06.md b/2024-09-06.md
index 709b0a18..5d210cb3 100644
--- a/2024-09-06.md
+++ b/2024-09-06.md
@@ -1,11 +1,11 @@
 ---
-modification_date: Thursday 5th September 2024 10:02:36
-tags: []
+date: 2024-09-06
+tags:
 ---
 # Yesterday | Tomorrow
  << [[2024-09-05]] | [[2024-09-09 ]] >>
 # This Week's Weekly Note
-[[2024-09-04]]
+[[ Weekly Note 2024-09-04]]
 
 # Tasks for today
 ## Big Task
diff --git a/2024-09-09.md b/2024-09-09.md
deleted file mode 100644
index 1ca34b6b..00000000
--- a/2024-09-09.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-modification_date: Thursday 5th September 2024 10:06:32
-tags: []
----
-# Yesterday | Tomorrow
- << [[2024-09-06]] | [[2024-09-10 ]] >>
-# This Week's Weekly Note
-[[2024-09-04]]
-
-# Tasks for today
-## Big Task
- - [ ] 
-## Medium Tasks
-- [ ] 
-- [ ] 
-- [ ] 
-## Small Tasks
-- [ ] 
-- [ ] 
-- [ ] 
-- [ ] 
-- [ ] 
-
-# Calendar Tasks
\ No newline at end of file
diff --git a/Weekly Note 2024-08-29.md b/Weekly Note 2024-08-29.md
new file mode 100644
index 00000000..e69de29b
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 00000000..34b81467
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,18 @@
+pace.json Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .obsidian/plugins/obsidian-pandoc-reference-list/data.json
+- Not a file: .obsidian/workspace.json
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```
\ No newline at end of file