diff --git a/TODO.md b/TODO.md
index 409dd3b..e030168 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,19 +1,78 @@
-## Basic
-* See if we can split things across multiple files for readability
-* Graphics
-* Dialogue, make in function
-* __Story__
-
 ## Game Mechanics
-* Scavenging (random num 1-100, items based on that)
-* POI Menu (talk with people, trade, map, etc)
-* Stop Menu (scavenge, change settings)
-* River crossing menu
-* Random Encounters
-* Trading
-* Movement/Time (day counter that multiplies stats by certain amt)
-* POI Chosing based on location in world (NCR bases in Cali, Legion in CO, BOS in Midwest)
-* Hunting minigame (only if we can make the terminal blankout and not just add lines)
+- POI's and Factions
+    - Art for locations
+        - Raven Rock
+        - Whitespring
+        - Brotherhood Bunkers
+        - Tibbets
+        - Flagstaff
+        - New Vegas
+        - NCR Cities
+        - Lost Hills
+        - Sierra Madre
+        - Divide
+        - Eureka
+        - Navarro
+    - Logic for faction armor
+    - Logic for calling locations at right location point (incl. different paths)
+        - Use the Google Earth Project for location points
+    - Logic for path split
+    - Trade menus for locations
+        - Raven Rock
+        - Whitespring
+        - Brotherhood Bunkers
+        - Tibbets
+        - Flagstaff
+        - New Vegas
+        - NCR Cities
+        - Sierra Madre
+        - Divide
+        - Eureka
+        - Navarro
+    - Dialogue for locations
+        - Raven Rock
+        - Whitespring
+        - Brotherhood Bunkers
+        - Tibbets
+        - Flagstaff
+        - New Vegas
+        - NCR Cities
+        - Lost Hills
+        - Sierra Madre
+        - Divide
+        - Eureka
+        - Navarro
+    - Combat for locations (Can be negated with faction armor unless stated)
+        - Brotherhood Bunker Delta - Easy Radiers(No faction armor)
+        - Tibbets - Medium Raiders(No faction armor)
+        - Flagstaff - Medium Legion
+        - NCR Cities - Hard NCR
+            - Shady Sands - Hard NCR (no faction armor)
+            - New Reno and Redding (no combat)
+        - Lost Hills - Hard BOS (no faction armor)
+        - Sierra Madre - Hard Abominations
+        - Divide - Hard Abominations
+        - Navarro - Difficult NCR
+
+- Random Encounters
+    - Very Rare Wild Wasteland encounter chance
+    - Rare trader encounters
+    - 5 Areas
+        - The Forest
+            - Tutorial Encounters
+        - The Midwest
+            - Easy Encounters
+        - The Rockies
+            - Medium Encounters
+        - Legion Territory
+            - Medium Faction Encounters, can be negated with faction armor
+        - Lower NCR
+            - Hard Faction Encounters, difficult but can be negated with faction armor (not Lost Hills)
+        - Upper NCR
+            - Hard Encounters
+
+- Gameplay Mechanics
+    
 
 ## Misc
 * Credit Bethesda if needed