diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index c071d1d7ad..b6d0c444c5 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -65,179 +65,6 @@ void Notes::WriteSMNotesTag( FILE* fp )
 	fprintf( fp, "%s;\n", m_sSMNoteData );
 }
 
-struct DWICharLookup {
-	char c;
-	bool bCol[6];	
-};
-
-char NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4, bool bCol5, bool bCol6 )
-{
-	const DWICharLookup lookup[] = {
-		{ '0', 0, 0, 0, 0, 0, 0 },
-		{ '1', 0, 1, 1, 0, 0, 0 },
-		{ '2', 0, 0, 1, 0, 0, 0 },
-		{ '3', 0, 0, 1, 0, 1, 0 },
-		{ '4', 0, 1, 0, 0, 0, 0 },
-		{ '6', 0, 0, 0, 0, 1, 0 },
-		{ '7', 0, 1, 0, 1, 0, 0 },
-		{ '8', 0, 0, 0, 1, 0, 0 },
-		{ '9', 0, 0, 0, 1, 1, 0 },
-		{ 'A', 0, 0, 1, 1, 0, 0 },
-		{ 'B', 0, 1, 0, 0, 1, 0 },
-		{ 'C', 0, 1, 0, 0, 0, 0 },
-		{ 'D', 0, 0, 0, 0, 1, 0 },
-		{ 'E', 1, 1, 0, 0, 0, 0 },
-		{ 'F', 0, 1, 1, 0, 0, 0 },
-		{ 'G', 0, 1, 0, 1, 0, 0 },
-		{ 'H', 0, 1, 0, 0, 0, 1 },
-		{ 'I', 1, 0, 0, 0, 1, 0 },
-		{ 'J', 0, 0, 1, 0, 1, 0 },
-		{ 'K', 0, 0, 0, 1, 1, 0 },
-		{ 'L', 0, 0, 0, 0, 1, 1 },
-		{ 'M', 0, 1, 0, 0, 1, 0 },
-	};
-	const int iNumLookups = sizeof(lookup) / sizeof(DWICharLookup);
-
-	for( int i=0; i<iNumLookups; i++ )
-	{
-		const DWICharLookup& l = lookup[i];
-		if( l.bCol[0]==bCol1 && l.bCol[1]==bCol2 && l.bCol[2]==bCol3 && l.bCol[3]==bCol4 && l.bCol[4]==bCol5 && l.bCol[5]==bCol6 )
-			return l.c;
-	}
-	ASSERT(0);
-	return '0';
-}
-
-char NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4 )
-{
-	return NotesToDWIChar( 0, bCol1, bCol2, bCol3, bCol4, 0 );
-}
-
-CString NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4, char cNoteCol5, char cNoteCol6 )
-{
-	char cShow = NotesToDWIChar( cNoteCol1!='0', cNoteCol2!='0', cNoteCol3!='0', cNoteCol4!='0', cNoteCol5!='0', cNoteCol6!='0' );
-	char cHold = NotesToDWIChar( cNoteCol1=='2', cNoteCol2=='2', cNoteCol3=='2', cNoteCol4=='2', cNoteCol5=='2', cNoteCol6=='2' );
-	
-	if( cHold != '0' )
-		return ssprintf( "%c!%c", cShow, cHold );
-	else
-		return cShow;
-}
-
-CString NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4 )
-{
-	return NotesToDWIString( '0', cNoteCol1, cNoteCol2, cNoteCol3, cNoteCol4, '0' );
-}
-
-void Notes::WriteDWINotesTag( FILE* fp )
-{
-	LOG->Trace( "Notes::WriteDWINotesTag" );
-
-	switch( m_NotesType )
-	{
-	case NOTES_TYPE_DANCE_SINGLE:	fprintf( fp, "#SINGLE:" );	break;
-	case NOTES_TYPE_DANCE_COUPLE_1:	fprintf( fp, "#COUPLE:" );	break;
-	case NOTES_TYPE_DANCE_DOUBLE:	fprintf( fp, "#DOUBLE:" );	break;
-	case NOTES_TYPE_DANCE_SOLO:		fprintf( fp, "#SOLO:" );	break;
-	default:	return;	// not a type supported by DWI
-	}
-
-	switch( m_DifficultyClass )
-	{
-	case CLASS_EASY:	fprintf( fp, "BASIC:" );	break;
-	case CLASS_MEDIUM:	fprintf( fp, "ANOTHER:" );	break;
-	case CLASS_HARD:	fprintf( fp, "MANIAC:" );	break;
-	default:	ASSERT(0);	return;
-	}
-
-	fprintf( fp, "%d:\n", m_iMeter );
-
-	NoteData notedata;
-	this->GetNoteData( &notedata );
-	notedata.ConvertHoldNotesTo2sAnd3s();
-
-	const int iNumPads = (m_NotesType==NOTES_TYPE_DANCE_COUPLE_1 || m_NotesType==NOTES_TYPE_DANCE_DOUBLE) ? 2 : 1;
-	const int iLastMeasure = int( notedata.GetLastBeat()/BEATS_PER_MEASURE );
-
-	for( int pad=0; pad<iNumPads; pad++ )
-	{
-		if( pad == 1 )	// 2nd pad
-			fprintf( fp, ":\n" );
-
-		for( int m=0; m<=iLastMeasure; m++ )	// foreach measure
-		{
-			NoteType nt = notedata.GetSmallestNoteTypeForMeasure( m );
-
-			double fCurrentIncrementer;
-			switch( nt )
-			{
-			case NOTE_TYPE_4TH:
-			case NOTE_TYPE_8TH:	
-				fCurrentIncrementer = 1.0/8 * BEATS_PER_MEASURE;
-				break;
-			case NOTE_TYPE_12TH:
-				fprintf( fp, "[" );
-				fCurrentIncrementer = 1.0/24 * BEATS_PER_MEASURE;
-				break;
-			case NOTE_TYPE_16TH:
-				fprintf( fp, "(" );
-				fCurrentIncrementer = 1.0/16 * BEATS_PER_MEASURE;
-				break;
-			default:
-				ASSERT(0);
-				// fall though
-			case NOTE_TYPE_INVALID:
-				fprintf( fp, "<" );
-				fCurrentIncrementer = 1.0/192 * BEATS_PER_MEASURE;
-				break;
-			}
-
-			double fFirstBeatInMeasure = m * BEATS_PER_MEASURE;
-			double fLastBeatInMeasure = (m+1) * BEATS_PER_MEASURE;
-
-			for( double b=fFirstBeatInMeasure; b<fLastBeatInMeasure; b+=fCurrentIncrementer )
-			{
-				int row = BeatToNoteRow( (float)b );
-
-				switch( m_NotesType )
-				{
-				case NOTES_TYPE_DANCE_SINGLE:
-				case NOTES_TYPE_DANCE_COUPLE_1:
-				case NOTES_TYPE_DANCE_DOUBLE:
-					fprintf( fp, NotesToDWIString( notedata.m_TapNotes[pad*4+0][row], notedata.m_TapNotes[pad*4+1][row], notedata.m_TapNotes[pad*4+2][row], notedata.m_TapNotes[pad*4+3][row] ) );
-					break;
-				case NOTES_TYPE_DANCE_SOLO:
-					fprintf( fp, NotesToDWIString( notedata.m_TapNotes[0][row], notedata.m_TapNotes[1][row], notedata.m_TapNotes[2][row], notedata.m_TapNotes[3][row], notedata.m_TapNotes[4][row], notedata.m_TapNotes[5][row] ) );
-					break;
-				default:	return;	// not a type supported by DWI
-				}
-			}
-
-			switch( nt )
-			{
-			case NOTE_TYPE_4TH:
-			case NOTE_TYPE_8TH:	
-				break;
-			case NOTE_TYPE_12TH:
-				fprintf( fp, "]" );
-				break;
-			case NOTE_TYPE_16TH:
-				fprintf( fp, ")" );
-				break;
-			default:
-				ASSERT(0);
-				// fall though
-			case NOTE_TYPE_INVALID:
-				fprintf( fp, ">" );
-				break;
-			}
-			fprintf( fp, "\n" );
-		}
-	}
-
-	fprintf( fp, ";\n" );
-}
-
 void Notes::SetNoteData( NoteData* pNewNoteData )
 {
 	ASSERT( pNewNoteData->m_iNumTracks == GameManager::NotesTypeToNumTracks(m_NotesType) );
diff --git a/stepmania/src/Notes.h b/stepmania/src/Notes.h
index a67d38a095..719e86b534 100644
--- a/stepmania/src/Notes.h
+++ b/stepmania/src/Notes.h
@@ -26,7 +26,6 @@ public:
 	// Loading
 	bool LoadFromNotesFile( const CString &sPath );
 	void WriteSMNotesTag( FILE* fp );
-	void WriteDWINotesTag( FILE* fp );
 
 public:
 	NotesType		m_NotesType;
diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
new file mode 100644
index 0000000000..520792184f
--- /dev/null
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -0,0 +1,221 @@
+#include "stdafx.h"
+#include "NotesWriterDWI.h"
+#include "NoteTypes.h"
+#include "NoteData.h"
+#include "RageUtil.h"
+#include "RageLog.h"
+
+char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4, bool bCol5, bool bCol6 )
+{
+	struct DWICharLookup {
+		char c;
+		bool bCol[6];	
+	} const lookup[] = {
+		{ '0', 0, 0, 0, 0, 0, 0 },
+		{ '1', 0, 1, 1, 0, 0, 0 },
+		{ '2', 0, 0, 1, 0, 0, 0 },
+		{ '3', 0, 0, 1, 0, 1, 0 },
+		{ '4', 0, 1, 0, 0, 0, 0 },
+		{ '6', 0, 0, 0, 0, 1, 0 },
+		{ '7', 0, 1, 0, 1, 0, 0 },
+		{ '8', 0, 0, 0, 1, 0, 0 },
+		{ '9', 0, 0, 0, 1, 1, 0 },
+		{ 'A', 0, 0, 1, 1, 0, 0 },
+		{ 'B', 0, 1, 0, 0, 1, 0 },
+		{ 'C', 0, 1, 0, 0, 0, 0 },
+		{ 'D', 0, 0, 0, 0, 1, 0 },
+		{ 'E', 1, 1, 0, 0, 0, 0 },
+		{ 'F', 0, 1, 1, 0, 0, 0 },
+		{ 'G', 0, 1, 0, 1, 0, 0 },
+		{ 'H', 0, 1, 0, 0, 0, 1 },
+		{ 'I', 1, 0, 0, 0, 1, 0 },
+		{ 'J', 0, 0, 1, 0, 1, 0 },
+		{ 'K', 0, 0, 0, 1, 1, 0 },
+		{ 'L', 0, 0, 0, 0, 1, 1 },
+		{ 'M', 0, 1, 0, 0, 1, 0 },
+	};
+	const int iNumLookups = sizeof(lookup) / sizeof(*lookup);
+
+	for( int i=0; i<iNumLookups; i++ )
+	{
+		const DWICharLookup& l = lookup[i];
+		if( l.bCol[0]==bCol1 && l.bCol[1]==bCol2 && l.bCol[2]==bCol3 && l.bCol[3]==bCol4 && l.bCol[4]==bCol5 && l.bCol[5]==bCol6 )
+			return l.c;
+	}
+	ASSERT(0);
+	return '0';
+}
+
+char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4 )
+{
+	return NotesToDWIChar( 0, bCol1, bCol2, bCol3, bCol4, 0 );
+}
+
+CString NotesWriterDWI::NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4, char cNoteCol5, char cNoteCol6 )
+{
+	char cShow = NotesToDWIChar( cNoteCol1!='0', cNoteCol2!='0', cNoteCol3!='0', cNoteCol4!='0', cNoteCol5!='0', cNoteCol6!='0' );
+	char cHold = NotesToDWIChar( cNoteCol1=='2', cNoteCol2=='2', cNoteCol3=='2', cNoteCol4=='2', cNoteCol5=='2', cNoteCol6=='2' );
+	
+	if( cHold != '0' )
+		return ssprintf( "%c!%c", cShow, cHold );
+	else
+		return cShow;
+}
+
+CString NotesWriterDWI::NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4 )
+{
+	return NotesToDWIString( '0', cNoteCol1, cNoteCol2, cNoteCol3, cNoteCol4, '0' );
+}
+
+void NotesWriterDWI::WriteDWINotesTag( FILE* fp, const Notes &out )
+{
+	LOG->Trace( "Notes::WriteDWINotesTag" );
+
+	switch( out.m_NotesType )
+	{
+	case NOTES_TYPE_DANCE_SINGLE:	fprintf( fp, "#SINGLE:" );	break;
+	case NOTES_TYPE_DANCE_COUPLE_1:	fprintf( fp, "#COUPLE:" );	break;
+	case NOTES_TYPE_DANCE_DOUBLE:	fprintf( fp, "#DOUBLE:" );	break;
+	case NOTES_TYPE_DANCE_SOLO:		fprintf( fp, "#SOLO:" );	break;
+	default:	return;	// not a type supported by DWI
+	}
+
+	switch( out.m_DifficultyClass )
+	{
+	case CLASS_EASY:	fprintf( fp, "BASIC:" );	break;
+	case CLASS_MEDIUM:	fprintf( fp, "ANOTHER:" );	break;
+	case CLASS_HARD:	fprintf( fp, "MANIAC:" );	break;
+	default:	ASSERT(0);	return;
+	}
+
+	fprintf( fp, "%d:\n", out.m_iMeter );
+
+	NoteData notedata;
+	out.GetNoteData( &notedata );
+	notedata.ConvertHoldNotesTo2sAnd3s();
+
+	const int iNumPads = (out.m_NotesType==NOTES_TYPE_DANCE_COUPLE_1 || out.m_NotesType==NOTES_TYPE_DANCE_DOUBLE) ? 2 : 1;
+	const int iLastMeasure = int( notedata.GetLastBeat()/BEATS_PER_MEASURE );
+
+	for( int pad=0; pad<iNumPads; pad++ )
+	{
+		if( pad == 1 )	// 2nd pad
+			fprintf( fp, ":\n" );
+
+		for( int m=0; m<=iLastMeasure; m++ )	// foreach measure
+		{
+			NoteType nt = notedata.GetSmallestNoteTypeForMeasure( m );
+
+			double fCurrentIncrementer;
+			switch( nt )
+			{
+			case NOTE_TYPE_4TH:
+			case NOTE_TYPE_8TH:	
+				fCurrentIncrementer = 1.0/8 * BEATS_PER_MEASURE;
+				break;
+			case NOTE_TYPE_12TH:
+				fprintf( fp, "[" );
+				fCurrentIncrementer = 1.0/24 * BEATS_PER_MEASURE;
+				break;
+			case NOTE_TYPE_16TH:
+				fprintf( fp, "(" );
+				fCurrentIncrementer = 1.0/16 * BEATS_PER_MEASURE;
+				break;
+			default:
+				ASSERT(0);
+				// fall though
+			case NOTE_TYPE_INVALID:
+				fprintf( fp, "<" );
+				fCurrentIncrementer = 1.0/192 * BEATS_PER_MEASURE;
+				break;
+			}
+
+			double fFirstBeatInMeasure = m * BEATS_PER_MEASURE;
+			double fLastBeatInMeasure = (m+1) * BEATS_PER_MEASURE;
+
+			for( double b=fFirstBeatInMeasure; b<fLastBeatInMeasure; b+=fCurrentIncrementer )
+			{
+				int row = BeatToNoteRow( (float)b );
+
+				switch( out.m_NotesType )
+				{
+				case NOTES_TYPE_DANCE_SINGLE:
+				case NOTES_TYPE_DANCE_COUPLE_1:
+				case NOTES_TYPE_DANCE_DOUBLE:
+					fprintf( fp, NotesToDWIString( notedata.m_TapNotes[pad*4+0][row], notedata.m_TapNotes[pad*4+1][row], notedata.m_TapNotes[pad*4+2][row], notedata.m_TapNotes[pad*4+3][row] ) );
+					break;
+				case NOTES_TYPE_DANCE_SOLO:
+					fprintf( fp, NotesToDWIString( notedata.m_TapNotes[0][row], notedata.m_TapNotes[1][row], notedata.m_TapNotes[2][row], notedata.m_TapNotes[3][row], notedata.m_TapNotes[4][row], notedata.m_TapNotes[5][row] ) );
+					break;
+				default:	return;	// not a type supported by DWI
+				}
+			}
+
+			switch( nt )
+			{
+			case NOTE_TYPE_4TH:
+			case NOTE_TYPE_8TH:	
+				break;
+			case NOTE_TYPE_12TH:
+				fprintf( fp, "]" );
+				break;
+			case NOTE_TYPE_16TH:
+				fprintf( fp, ")" );
+				break;
+			default:
+				ASSERT(0);
+				// fall though
+			case NOTE_TYPE_INVALID:
+				fprintf( fp, ">" );
+				break;
+			}
+			fprintf( fp, "\n" );
+		}
+	}
+
+	fprintf( fp, ";\n" );
+}
+
+
+bool NotesWriterDWI::Write( CString sPath, const Song &out )
+{
+	FILE* fp = fopen( sPath, "w" );	
+	if( fp == NULL )
+		throw RageException( "Error opening song file '%s' for writing.", sPath );
+
+	fprintf( fp, "#TITLE:%s;\n", out.GetFullTitle() );
+	fprintf( fp, "#ARTIST:%s;\n", out.m_sArtist );
+	ASSERT( out.m_BPMSegments[0].m_fStartBeat == 0 );
+	fprintf( fp, "#BPM:%.2f;\n", out.m_BPMSegments[0].m_fBPM );
+	fprintf( fp, "#GAP:%d;\n", -roundf( out.m_fBeat0OffsetInSeconds*1000 ) );
+
+	fprintf( fp, "#FREEZE:" );
+	for( int i=0; i<out.m_StopSegments.GetSize(); i++ )
+	{
+		const StopSegment &fs = out.m_StopSegments[i];
+		fprintf( fp, "%.2f=%.2f", BeatToNoteRow( fs.m_fStartBeat ) / ROWS_PER_BEAT * 4.0f, roundf(fs.m_fStopSeconds*1000) );
+		if( i != out.m_StopSegments.GetSize()-1 )
+			fprintf( fp, "," );
+	}
+	fprintf( fp, ";\n" );
+
+	fprintf( fp, "#CHANGEBPM:" );
+	for( i=1; i<out.m_BPMSegments.GetSize(); i++ )
+	{
+		const BPMSegment &bs = out.m_BPMSegments[i];
+		fprintf( fp, "%.2f=%.2f", BeatToNoteRow( bs.m_fStartBeat ) / ROWS_PER_BEAT * 4.0f, bs.m_fBPM );
+		if( i != out.m_BPMSegments.GetSize()-1 )
+			fprintf( fp, "," );
+	}
+	fprintf( fp, ";\n" );
+	
+	//
+	// Save all Notes for this file
+	//
+	for( i=0; i<out.m_apNotes.GetSize(); i++ ) 
+		WriteDWINotesTag( fp, *out.m_apNotes[i] );
+
+	fclose( fp );
+
+	return true;
+}
diff --git a/stepmania/src/NotesWriterDWI.h b/stepmania/src/NotesWriterDWI.h
new file mode 100644
index 0000000000..cbb0bfa8fb
--- /dev/null
+++ b/stepmania/src/NotesWriterDWI.h
@@ -0,0 +1,19 @@
+#ifndef NOTES_WRITER_DWI_H
+#define NOTES_WRITER_DWI_H
+
+#include "Song.h"
+#include "Notes.h"
+
+class NotesWriterDWI {
+	char NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4, bool bCol5, bool bCol6 );
+	char NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4 );
+	CString NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4, char cNoteCol5, char cNoteCol6 );
+	CString NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4 );
+
+	void WriteDWINotesTag( FILE* fp, const Notes &out );
+
+public:
+	bool Write( CString sPath, const Song &out );
+};
+
+#endif
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 6d41d0edc6..b5b0abd04e 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -30,6 +30,7 @@
 #include "NotesLoaderDWI.h"
 #include "NotesLoaderBMS.h"
 #include "NotesLoaderKSF.h"
+#include "NotesWriterDWI.h"
 
 const int FILE_CACHE_VERSION = 65;	// increment this when Song or Notes changes to invalidate cache
 
@@ -719,44 +720,8 @@ void Song::SaveToSongFileAndDWI()
 	CString sPath = GetSongFilePath();
 	sPath.Replace( ".sm", ".dwi" );
 
-
-	FILE* fp = fopen( sPath, "w" );	
-	if( fp == NULL )
-		throw RageException( "Error opening song file '%s' for writing.", sPath );
-
-	fprintf( fp, "#TITLE:%s;\n", GetFullTitle() );
-	fprintf( fp, "#ARTIST:%s;\n", m_sArtist );
-	ASSERT( m_BPMSegments[0].m_fStartBeat == 0 );
-	fprintf( fp, "#BPM:%.2f;\n", m_BPMSegments[0].m_fBPM );
-	fprintf( fp, "#GAP:%d;\n", -roundf( m_fBeat0OffsetInSeconds*1000 ) );
-
-	fprintf( fp, "#FREEZE:" );
-	for( int i=0; i<m_StopSegments.GetSize(); i++ )
-	{
-		StopSegment &fs = m_StopSegments[i];
-		fprintf( fp, "%.2f=%.2f", BeatToNoteRow( fs.m_fStartBeat ) / ROWS_PER_BEAT * 4.0f, roundf(fs.m_fStopSeconds*1000) );
-		if( i != m_StopSegments.GetSize()-1 )
-			fprintf( fp, "," );
-	}
-	fprintf( fp, ";\n" );
-
-	fprintf( fp, "#CHANGEBPM:" );
-	for( i=1; i<m_BPMSegments.GetSize(); i++ )
-	{
-		BPMSegment &bs = m_BPMSegments[i];
-		fprintf( fp, "%.2f=%.2f", BeatToNoteRow( bs.m_fStartBeat ) / ROWS_PER_BEAT * 4.0f, bs.m_fBPM );
-		if( i != m_BPMSegments.GetSize()-1 )
-			fprintf( fp, "," );
-	}
-	fprintf( fp, ";\n" );
-	
-	//
-	// Save all Notes for this file
-	//
-	for( i=0; i<m_apNotes.GetSize(); i++ ) 
-		m_apNotes[i]->WriteDWINotesTag( fp );
-
-	fclose( fp );
+	NotesWriterDWI wr;
+	wr.Write(sPath, *this);
 }
 
 struct AutoGenMapping