diff --git a/stepmania/TODO.tim b/stepmania/TODO.tim
new file mode 100644
index 0000000000..1706933168
--- /dev/null
+++ b/stepmania/TODO.tim
@@ -0,0 +1,17 @@
+---------------------------------------------------------------------
+			TODO for Tim Hentenaar
+
+			* = todo
+			^ = done
+---------------------------------------------------------------------
+
+As of: 2/18/2003
+* Add RageSoundDriver for Linux to the drivers list
+* Make a makefile for Linux if there isn't one
+* Do some testing...
+
+^ checked in RageSound Driver for Linux (ALSA)
+^ modified arch.cpp & arch.h to include Linux Sound Driver
+
+
+
diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index c581f95d83..6268748645 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -13,10 +13,13 @@
 #include "arch_default.h"
 
 /* Override them with arch-specific drivers, as available. */
-#if defined(WIN32)
+#if defined(LINUX)
+#include "RageSoundDriver_Linux.h"
+#elif defined(WIN32)
 #include "arch_Win32.h"
 #endif
 
+
 LoadingWindow *MakeLoadingWindow() { return new ARCH_LOADING_WINDOW; }
 ErrorDialog *MakeErrorDialog() { return new ARCH_ERROR_DIALOG; }
 ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; }
@@ -47,6 +50,8 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
 			if(!DriversToTry[i].CompareNoCase("DirectSound")) ret = new RageSound_DSound;
 			else if(!DriversToTry[i].CompareNoCase("DirectSound-sw")) ret = new RageSound_DSound_Software;
 			else if(!DriversToTry[i].CompareNoCase("WaveOut")) ret = new RageSound_WaveOut;
+			else if(!DriversToTry[i].CompareNoCase("Linux")) ret = new RageSound_Linux;
+			
 #else
 #warning No sound drivers defined!
 			if(1) ret = new RageSound_Null;
diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h
index c63823e979..0cb358d1f1 100644
--- a/stepmania/src/arch/arch.h
+++ b/stepmania/src/arch/arch.h
@@ -16,7 +16,9 @@ void MakeInputHandlers(vector<InputHandler *> &Add);
 RageSoundDriver *MakeRageSoundDriver(CString drivers);
 
 /* Define the default list of sound drivers for each arch. */
-#if defined(WIN32)
+#if defined(LINUX)
+#define DEFAULT_SOUND_DRIVER_LIST "Linux"
+#elif defined(WIN32)
 #define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut"
 #else
 #define DEFAULT_SOUND_DRIVER_LIST "Null"