diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris
index c26a77100a..62326af771 100644
--- a/stepmania/TODO.chris
+++ b/stepmania/TODO.chris
@@ -2,6 +2,10 @@
 Fix
 /////////////////////////
 
+effect codes
+
+sort by light difficulty
+
 more traditional particle system in BGAnimationLayer?
 - fog
 - particle lifetime
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index ad25847a30..19738c7cb2 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -126,6 +126,7 @@ Desc: Animates the 1p/2p selection
 ************************************/
 void ScreenSelectMode::Update( float fDeltaTime )
 {
+	m_BGAnimations[ m_ScrollingList.GetSelection() ].Update( fDeltaTime );
 	Screen::Update( fDeltaTime );
 }
 
@@ -137,6 +138,7 @@ Desc: Draws the screen =P
 void ScreenSelectMode::DrawPrimitives()
 {
 	m_Menu.DrawBottomLayer();
+	m_BGAnimations[ m_ScrollingList.GetSelection() ].Draw();
 	Screen::DrawPrimitives();
 	m_Menu.DrawTopLayer();
 }
@@ -201,6 +203,20 @@ void ScreenSelectMode::RefreshModeChoices()
 	}
 
 	m_ScrollingList.Load( asGraphicPaths );
+
+
+	if( SELECTION_SPECIFIC_BG_ANIMATIONS )
+	{
+		CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
+
+		for( int i=0; i<m_aPossibleModeChoices.GetSize(); i++ )
+		{
+			CString sChoiceName = m_aPossibleModeChoices[i].name;
+			m_BGAnimations[i].LoadFromAniDir( THEME->GetPathTo("BGAnimations",ssprintf("select mode %s %s", sGameName, sChoiceName)) );	
+		}
+	}
+
+
 }
 
 
@@ -218,10 +234,8 @@ void ScreenSelectMode::MenuBack( PlayerNumber pn )
 
 void ScreenSelectMode::AfterChange()
 {
-	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
-	const ModeChoice& choice = m_aPossibleModeChoices[ m_ScrollingList.GetSelection() ];
-	if( SELECTION_SPECIFIC_BG_ANIMATIONS )
-		m_Menu.m_Background.LoadFromAniDir( THEME->GetPathTo("BGAnimations",ssprintf("select mode %s %s", sGameName, choice.name)) );
+//	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
+//	const ModeChoice& choice = m_aPossibleModeChoices[ m_ScrollingList.GetSelection() ];
 }
 
 void ScreenSelectMode::MenuLeft( PlayerNumber pn )
diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h
index dee3d25538..db8a271e18 100644
--- a/stepmania/src/ScreenSelectMode.h
+++ b/stepmania/src/ScreenSelectMode.h
@@ -21,6 +21,8 @@ Andrew Livy
 
 /* Class Definition */
 
+const int MAX_MODE_CHOICES = 10;
+
 
 class ScreenSelectMode : public Screen
 {
@@ -56,6 +58,7 @@ protected:
 	ScrollingList m_ScrollingList;
 	void RefreshModeChoices();
 
+	BGAnimation	m_BGAnimations[MAX_MODE_CHOICES];
 	MenuElements m_Menu;
 
 	RageSoundSample m_soundSelect;