diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f374e5..15316bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@
 - Sound
     - Music Sample
         - Async playback
+- Options menu
+    - Marker Selection
 
 ## Misc
 - Handling Resolution changes
@@ -42,4 +44,7 @@
 - Handle JCK and special characters
     - Japanese
     - utf8 to sfml conversion
-    - Handle more stuff via ttf merging (omg the cops)
\ No newline at end of file
+    - Handle more stuff via ttf merging (omg the cops)
+- Markers
+    - Eager Loading
+    - Marker Selection Menu
diff --git a/TODO.md b/TODO.md
index 5d4ff04..4a20c0b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,12 +1,10 @@
 # v0.1.0 (MVP)
 ## Misc
-- Markers
 - Fix all executable-relative path issues
 
 ## Music Select Screen
 - Options menu
     - Controller mapping
-    - Marker Selection
 - Visible controls
     - Start Button