diff --git a/stepmania/TODO.miryokuteki b/stepmania/TODO.miryokuteki
index ed167d1b47..fd1a20bffb 100644
--- a/stepmania/TODO.miryokuteki
+++ b/stepmania/TODO.miryokuteki
@@ -7,6 +7,7 @@
 Todo List:
   ** Find a way to get the length of a movie being played, so ScreenIntroMovie does not have to have a pre-determined length (I.e: exits when the movie is finished playing)
   ** Finish RANDOM course for Non-Stop mode
+  ** Adding support for "BEGINNER HELP".. The thing that has a character showing where to step during the song, only on beginner mode. IE: Replaces the BG with this dynamic image sequence, showing what arrow to hit as it comes up on screen. You can see this in the BG of a DDRExtreme song if you pick "beginner" difficulty.
 
 
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index d77ffbcc7d..52d09b3506 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -831,7 +831,7 @@ CoursesToShow=Courses/NaokiStandard.crs,Courses/ParanoiaBrothers.crs
 NotesTypesToHide=dance-couple,dance-solo
 
 [ScreenIntroMovie]
-SecondsToShow=0
+SecondsToShow=14
 NextScreen=ScreenDemonstration
 
 [ScreenMemoryCard]
diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp
index 8143d0ba74..354789828c 100644
--- a/stepmania/src/ScreenMachineOptions.cpp
+++ b/stepmania/src/ScreenMachineOptions.cpp
@@ -33,7 +33,7 @@ enum {
 	MO_COIN_MODE,
 	MO_COINS_PER_CREDIT,
 	MO_JOINT_PREMIUM,
-	MO_SONG_OPTIONS,
+	MO_SHOW_SONG_OPTIONS,
 	NUM_MACHINE_OPTIONS_LINES
 };
 /* Hmm.  Ignore JoyAxes and Back Delayed probably belong in "input options",
@@ -154,6 +154,7 @@ void ScreenMachineOptions::ExportOptions()
 	(int&)PREFSMAN->m_CoinMode			= m_iSelectedOption[0][MO_COIN_MODE];
 	PREFSMAN->m_iCoinsPerCredit			= m_iSelectedOption[0][MO_COINS_PER_CREDIT] + 1;
 	PREFSMAN->m_bJointPremium			= m_iSelectedOption[0][MO_JOINT_PREMIUM] == 1;
+	PREFSMAN->m_bShowSongOptions		= (bool&)m_iSelectedOption[0][MO_SHOW_SONG_OPTIONS];
 }
 
 void ScreenMachineOptions::GoToPrevState()