diff --git a/stepmania/TODO.andy b/stepmania/TODO.andy
index 0e9751f7c9..e17f0ddf5d 100644
--- a/stepmania/TODO.andy
+++ b/stepmania/TODO.andy
@@ -3,9 +3,13 @@ X denotes task complete or no longer required to do.
 - denotes task to do, but also being worked upon by other dev.
 H denotes task on hold.
 
+TODO As of: 12:26 03/02/28
+* Mathematics Assignment
+* Integrating Assignment 3
+
 TODO As of: 16:57 03/02/08
-* Object Oriented Design 2 Assignment
-* Operating Systems 2 Assignment
+X Object Oriented Design 2 Assignment
+X Operating Systems 2 Assignment
 * Systems Programming 2 Assignment
 * Para-Style EndScreens
 * Para-Style Scoreboard
diff --git a/stepmania/Themes/default/Fonts/ScreenEz2SelectMusic difficulty.redir b/stepmania/Themes/default/Fonts/ScreenEz2SelectMusic difficulty.redir
index 412e9ed7df..6c015f9d4b 100644
--- a/stepmania/Themes/default/Fonts/ScreenEz2SelectMusic difficulty.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenEz2SelectMusic difficulty.redir	
@@ -1 +1 @@
-header1
+_shared1
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic difficulty frame.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic difficulty frame.redir
new file mode 100644
index 0000000000..e9da29cf3e
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic difficulty frame.redir	
@@ -0,0 +1 @@
+ScreenSelectMusicEz2 difficulty frame.png
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic infoframe.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic infoframe.redir
new file mode 100644
index 0000000000..c91ec4a051
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic infoframe.redir	
@@ -0,0 +1 @@
+ScreenSelectMusicEz2 infoframe.png
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic mirroricon.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic mirroricon.redir
new file mode 100644
index 0000000000..56d433615f
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic mirroricon.redir	
@@ -0,0 +1 @@
+ScreenSelectMusicEz2 mirroricon.png
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic options message.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic options message.redir
new file mode 100644
index 0000000000..4704c8e70f
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic options message.redir	
@@ -0,0 +1 @@
+ScreenSelectMusic options message 1x2.png
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic shuffleicon.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic shuffleicon.redir
new file mode 100644
index 0000000000..116be19d49
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic shuffleicon.redir	
@@ -0,0 +1 @@
+ScreenSelectMusicEz2 shuffleicon.png
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic speedicon.redir b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic speedicon.redir
new file mode 100644
index 0000000000..e63653cbe1
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEz2SelectMusic speedicon.redir	
@@ -0,0 +1 @@
+ScreenSelectMusicEz2 speedicon.png
\ No newline at end of file
diff --git a/stepmania/src/RageSoundReader_SDL_Sound.h b/stepmania/src/RageSoundReader_SDL_Sound.h
index 887df2c8c5..81c35b1faa 100644
--- a/stepmania/src/RageSoundReader_SDL_Sound.h
+++ b/stepmania/src/RageSoundReader_SDL_Sound.h
@@ -24,8 +24,8 @@ public:
 
 #endif
 /*
------------------------------------------------------------------------------
+------------------------------------------------------------------------------
  Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
 	Glenn Maynard
------------------------------------------------------------------------------
+------------------------------------------------------------------------------
 */
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index eaa532b085..e4dc8cb079 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -57,6 +57,8 @@ const ScreenMessage SM_NoSongs	= ScreenMessage(SM_User+3);
 
 ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
 {
+	m_bTransitioning = false;
+	m_fRemainingWaitTime = 0.0f;
 	i_ErrorDetected=0;
 	CodeDetector::RefreshCacheItems();
 
@@ -341,6 +343,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
 	}
 
 	m_bMadeChoice = true;
+	m_fRemainingWaitTime = RageTimer::GetTimeSinceStart();
 
 	TweenOffScreen();
 
@@ -353,8 +356,6 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
 	m_sprOptionsMessage.BeginTweening( 0.25f );	// fade out
 	m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
 	m_sprOptionsMessage.SetZoomY( 0 );
-
-	m_Menu.StartTransitioning( SM_GoToNextScreen );
 }
 
 
@@ -367,6 +368,12 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
 		this->PostScreenMessage( SM_NoSongs, 5.5f ); // timeout incase the user decides to do nothing :D
 	}
 
+	if(m_bMadeChoice && RageTimer::GetTimeSinceStart() > m_fRemainingWaitTime + 2 && !m_bTransitioning)
+	{
+		m_bTransitioning = true;
+		m_Menu.StartTransitioning( SM_GoToNextScreen );
+	}
+
 	Screen::Update( fDeltaTime );
 }
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index 0ac989adc9..136e1865b0 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -20,7 +20,7 @@
 #include "MenuElements.h"
 #include "DifficultyMeter.h"
 #include "DifficultyRating.h"
-
+#include "RageTimer.h"
 
 class ScreenEz2SelectMusic : public Screen
 {
@@ -50,6 +50,7 @@ protected:
 
 	void TweenOffScreen();
 
+
 	Sprite  m_ChoiceListFrame;
 	Sprite  m_ChoiceListHighlight;
 	Sprite  m_Guide;
@@ -65,6 +66,7 @@ protected:
 	RageSound			m_soundMusicChange;
 	RageSound			m_soundMusicCycle;
 
+	float m_fRemainingWaitTime;
 	MusicBannerWheel			m_MusicBannerWheel;
 	MenuElements		m_Menu;
 	DifficultyRating	m_DifficultyRating;
@@ -73,6 +75,7 @@ protected:
 	int					m_iSelection[NUM_PLAYERS];
 	bool m_bGoToOptions;
 	bool m_bMadeChoice;
+	bool m_bTransitioning;
 
 	int i_ErrorDetected;
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 035f9764e5..376c28ee74 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -44,6 +44,7 @@
 //
 #define PREV_SCREEN( play_mode )		THEME->GetMetric ("ScreenGameplay","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
 #define NEXT_SCREEN( play_mode )		THEME->GetMetric ("ScreenGameplay","NextScreen"+Capitalize(PlayModeToString(play_mode)))
+
 CachedThemeMetricF SECONDS_BETWEEN_COMMENTS	("ScreenGameplay","SecondsBetweenComments");
 CachedThemeMetricF G_TICK_EARLY_SECONDS		("ScreenGameplay","TickEarlySeconds");
 
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index 091e387d84..b80719cfa2 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -1,6 +1,6 @@
 #include "global.h"
 /****************************************
-ScreenSelectModeOld,cpp
+ScreenSelectMode.cpp
 Desc: See Header
 Copyright (C):
 Andrew Livy
diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h
index d0fa7f2651..900763c8eb 100644
--- a/stepmania/src/ScreenSelectMode.h
+++ b/stepmania/src/ScreenSelectMode.h
@@ -15,7 +15,9 @@ Andrew Livy
 #include "ScrollingList.h"
 #include "GameConstantsAndTypes.h"
 #include "ModeChoice.h"
-
+#include "BitmapText.h"
+// #include "TransitionFade.h"
+#include "RandomSample.h"
 
 /* Class Definition */
 
diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 8b2693afe5..53b960a104 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -31,6 +31,7 @@ void MakeInputHandlers(vector<InputHandler *> &Add)
 
 #if defined(WIN32)
 	Add.push_back(new InputHandler_Win32_Pump);
+//	Add.push_back(new InputHandler_Win32_Para);
 #endif
 }
 
diff --git a/stepmania/src/arch/arch_Win32.h b/stepmania/src/arch/arch_Win32.h
index 87b126df09..ac3568abd3 100644
--- a/stepmania/src/arch/arch_Win32.h
+++ b/stepmania/src/arch/arch_Win32.h
@@ -7,6 +7,7 @@
 #include "ArchHooks/ArchHooks_Win32.h"
 
 #include "InputHandler/InputHandler_Win32_Pump.h"
+// #include "InputHandler/InputHandler_Win32_Para.h"
 
 #include "Sound/RageSoundDriver_DSound.h"
 #include "Sound/RageSoundDriver_DSound_Software.h"