diff --git a/TODO.md b/TODO.md
index 0c5625e..db311af 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,57 @@
 # Working TODO
 - [ ] Wave Constant
+- Bounds
+	- [ ] Boundary Conds
+	- [ ] PML
+	- [ ] PEC
+	- [ ] PMC
+	- [ ] Bloch
+	- [ ] Absorbing
+- Sources
+	- [ ] Temporal Shapes / Continuous Wave Temporal Shape
+	- [ ] Temporal Shapes / Symbolic Temporal Shape
+	- [ ] Plane Wave Source
+	- [ ] TFSF Source
+	- [ ] Gaussian Beam Source
+	- [ ] Astig. Gauss Beam
+- Material Data Fitting
+	- [ ] Data File Import
+	- [ ] DataFit Medium
+- Monitors
+	- [ ] EH Field
+	- [ ] Power Flux
+	- [ ] Permittivity
+	- [ ] Diffraction
+- Structures
+	- [ ] Cylinder
+	- [ ] Cylinder Array
+	- [ ] L-Cavity Cylinder
+	- [ ] H-Cavity Cylinder
+	- [ ] FCC Lattice
+	- [ ] BCC Lattice
+- Sim Grid
+	- [ ] Sim Grid
+	- [ ] Auto
+	- [ ] Manual
+	- [ ] Uniform
+	- [ ] Data
+- Mediums
+	- [ ] PEC Medium
+	- [ ] Isotropic Medium
+	- [ ] Sellmeier Medium
+	- [ ] Drude Medium
+	- [ ] Debye Medium
+	- [ ] Anisotropic Medium
+- Tidy3D
+	- [ ] Exporter
+	- [ ] Importer
+- Integration
+	- [ ] Simulation and Analysis of Maxim's Cavity
+- Constants
+	- [ ] Number Constant
+	- [ ] Vector Constant
+	- [ ] Physical Constant
+
 - [ ] Fix many problems by persisting `_enum_cb_cache` and `_str_cb_cache`.
 
 
@@ -178,7 +230,7 @@
 - [ ] Sim Grid Axes / Auto Sim Grid Axis
 - [ ] Sim Grid Axes / Manual Sim Grid Axis
 - [ ] Sim Grid Axes / Uniform Sim Grid Axis
-- [ ] Sim Grid Axes / Array Sim Grid Axis
+- [ ] Sim Grid Axes / Data Sim Grid Axis
 
 ## Utilities
 - [ ] Separate