diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index b265a96624..9498449424 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -62,7 +62,7 @@ NoteData.cpp NoteData.h NoteDataUtil.cpp NoteDataUtil.h NoteDataWithScoring.cpp
 NoteFieldPositioning.cpp NoteFieldPositioning.h NoteTypes.cpp NoteTypes.h NotesLoader.cpp NotesLoader.h \
 NotesLoaderBMS.cpp NotesLoaderBMS.h NotesLoaderDWI.cpp NotesLoaderDWI.h NotesLoaderKSF.cpp NotesLoaderKSF.h \
 NotesLoaderSM.cpp NotesLoaderSM.h NotesWriterDWI.cpp NotesWriterDWI.h NotesWriterSM.cpp NotesWriterSM.h \
-PlayerAI.cpp PlayerAI.h PlayerNumber.cpp PlayerNumber.h PlayerOptions.cpp PlayerOptions.h RandomSample.cpp RandomSample.h \
+PlayerAI.cpp PlayerAI.h PlayerNumber.cpp PlayerNumber.h PlayerOptions.cpp PlayerOptions.h Profile.cpp Profile.h RandomSample.cpp RandomSample.h \
 ScoreKeeper.h ScoreKeeperMAX2.cpp ScoreKeeperMAX2.h ScoreKeeperRave.cpp ScoreKeeperRave.h \
 Song.cpp song.h SongCacheIndex.cpp SongCacheIndex.h SongOptions.cpp SongOptions.h StageStats.cpp StageStats.h Steps.cpp Steps.h \
 Style.h StyleDef.cpp StyleDef.h StyleInput.h TimingData.cpp TimingData.h TitleSubstitution.cpp TitleSubstitution.h
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
new file mode 100644
index 0000000000..fec4a0c871
--- /dev/null
+++ b/stepmania/src/Profile.cpp
@@ -0,0 +1,42 @@
+#include "global.h"
+/*
+-----------------------------------------------------------------------------
+ Class: ProfileManager
+
+ Desc: See header.
+
+ Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
+	Chris Danford
+-----------------------------------------------------------------------------
+*/
+
+#include "ProfileManager.h"
+#include "RageUtil.h"
+
+CString Profile::GetDisplayName()
+{
+	if( !m_sName.empty() )
+		return m_sName;
+	else if( !m_sLastUsedHighScoreName.empty() )
+		return m_sLastUsedHighScoreName;
+	else
+		return "NO NAME";
+}
+
+CString Profile::GetDisplayCaloriesBurned()
+{
+	if( m_fWeightPounds == 0 )	// weight not entered
+		return "N/A";
+	else 
+		return ssprintf("%iCal",m_fCaloriesBurned);
+}
+
+int Profile::GetTotalNumSongsPlayed()
+{
+	int iTotal = 0;
+	for( int i=0; i<NUM_PLAY_MODES; i++ )
+		iTotal += m_iNumSongsPlayedByPlayMode[i];
+	return iTotal;
+}
+
+
diff --git a/stepmania/src/Profile.h b/stepmania/src/Profile.h
new file mode 100644
index 0000000000..51391c012c
--- /dev/null
+++ b/stepmania/src/Profile.h
@@ -0,0 +1,68 @@
+#ifndef Profile_H
+#define Profile_H
+/*
+-----------------------------------------------------------------------------
+ Class: Profile
+
+ Desc: Player data that persists between sessions.  Can be stored on a local
+	disk or on a memory card.
+
+ Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
+	Chris Danford
+-----------------------------------------------------------------------------
+*/
+
+#include "GameConstantsAndTypes.h"
+#include "Style.h"
+
+struct Profile
+{
+	Profile() { Init(); }
+	void Init()
+	{
+		m_sName = "";
+		m_sLastUsedHighScoreName = "";
+		m_bUsingProfileDefaultModifiers = false;
+		m_sDefaultModifiers = "";
+		m_iTotalPlays = 0;
+		m_iTotalPlaySeconds = 0;
+		m_iTotalGameplaySeconds = 0;
+		m_iCurrentCombo = 0;
+		m_fWeightPounds = 0;
+		m_fCaloriesBurned = 0;
+
+		int i;
+		for( i=0; i<NUM_PLAY_MODES; i++ )
+			m_iNumSongsPlayedByPlayMode[i] = 0;
+		for( i=0; i<NUM_STYLES; i++ )
+			m_iNumSongsPlayedByStyle[i] = 0;
+		for( i=0; i<NUM_DIFFICULTIES; i++ )
+			m_iNumSongsPlayedByDifficulty[i] = 0;
+		for( i=0; i<MAX_METER+1; i++ )
+			m_iNumSongsPlayedByMeter[i] = 0;
+	}
+
+	CString GetDisplayName();
+	CString GetDisplayCaloriesBurned();
+	int GetTotalNumSongsPlayed();
+
+	bool LoadFromIni( CString sIniPath );
+	bool SaveToIni( CString sIniPath );
+	CString m_sName;
+	CString m_sLastUsedHighScoreName;
+	bool m_bUsingProfileDefaultModifiers;
+	CString m_sDefaultModifiers;
+	int m_iTotalPlays;
+	int m_iTotalPlaySeconds;
+	int m_iTotalGameplaySeconds;
+	int m_iCurrentCombo;
+	float m_fWeightPounds;
+	int m_fCaloriesBurned;
+	int m_iNumSongsPlayedByPlayMode[NUM_PLAY_MODES];
+	int m_iNumSongsPlayedByStyle[NUM_STYLES];
+	int m_iNumSongsPlayedByDifficulty[NUM_DIFFICULTIES];
+	int m_iNumSongsPlayedByMeter[MAX_METER+1];
+};
+
+
+#endif
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index d07b2a9602..3aea0bb72a 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -65,33 +65,6 @@ static const char *MEM_CARD_DIR[NUM_PLAYERS] =
 };
 
 
-CString Profile::GetDisplayName()
-{
-	if( !m_sName.empty() )
-		return m_sName;
-	else if( !m_sLastUsedHighScoreName.empty() )
-		return m_sLastUsedHighScoreName;
-	else
-		return "NO NAME";
-}
-
-CString Profile::GetDisplayCaloriesBurned()
-{
-	if( m_fWeightPounds == 0 )	// weight not entered
-		return "N/A";
-	else 
-		return ssprintf("%iCal",m_fCaloriesBurned);
-}
-
-int Profile::GetTotalNumSongsPlayed()
-{
-	int iTotal = 0;
-	for( int i=0; i<NUM_PLAY_MODES; i++ )
-		iTotal += m_iNumSongsPlayedByPlayMode[i];
-	return iTotal;
-}
-
-
 ProfileManager::ProfileManager()
 {
 	for( int p=0; p<NUM_PLAYERS; p++ )
diff --git a/stepmania/src/ProfileManager.h b/stepmania/src/ProfileManager.h
index e8a851021f..3fedebc598 100644
--- a/stepmania/src/ProfileManager.h
+++ b/stepmania/src/ProfileManager.h
@@ -12,59 +12,10 @@
 -----------------------------------------------------------------------------
 */
 
-
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"
 #include "Style.h"
-
-struct Profile
-{
-	Profile() { Init(); }
-	void Init()
-	{
-		m_sName = "";
-		m_sLastUsedHighScoreName = "";
-		m_bUsingProfileDefaultModifiers = false;
-		m_sDefaultModifiers = "";
-		m_iTotalPlays = 0;
-		m_iTotalPlaySeconds = 0;
-		m_iTotalGameplaySeconds = 0;
-		m_iCurrentCombo = 0;
-		m_fWeightPounds = 0;
-		m_fCaloriesBurned = 0;
-
-		int i;
-		for( i=0; i<NUM_PLAY_MODES; i++ )
-			m_iNumSongsPlayedByPlayMode[i] = 0;
-		for( i=0; i<NUM_STYLES; i++ )
-			m_iNumSongsPlayedByStyle[i] = 0;
-		for( i=0; i<NUM_DIFFICULTIES; i++ )
-			m_iNumSongsPlayedByDifficulty[i] = 0;
-		for( i=0; i<MAX_METER+1; i++ )
-			m_iNumSongsPlayedByMeter[i] = 0;
-	}
-
-	CString GetDisplayName();
-	CString GetDisplayCaloriesBurned();
-	int GetTotalNumSongsPlayed();
-
-	bool LoadFromIni( CString sIniPath );
-	bool SaveToIni( CString sIniPath );
-	CString m_sName;
-	CString m_sLastUsedHighScoreName;
-	bool m_bUsingProfileDefaultModifiers;
-	CString m_sDefaultModifiers;
-	int m_iTotalPlays;
-	int m_iTotalPlaySeconds;
-	int m_iTotalGameplaySeconds;
-	int m_iCurrentCombo;
-	float m_fWeightPounds;
-	int m_fCaloriesBurned;
-	int m_iNumSongsPlayedByPlayMode[NUM_PLAY_MODES];
-	int m_iNumSongsPlayedByStyle[NUM_STYLES];
-	int m_iNumSongsPlayedByDifficulty[NUM_DIFFICULTIES];
-	int m_iNumSongsPlayedByMeter[MAX_METER+1];
-};
+#include "Profile.h"
 
 class ProfileManager
 {
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 8cd2792558..c031ae658c 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -65,7 +65,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                    	cl                                                    /Zl                                                    /nologo                                                    /c                                                    verstub.cpp                                                    /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                     	cl                                                     /Zl                                                     /nologo                                                     /c                                                     verstub.cpp                                                     /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -103,8 +103,8 @@ IntDir=.\../Debug_Xbox
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                                                 	cl                                                                                                                                                                                                                                                                  /Zl                                                                                                                                                                                                                                                                  /nologo                                                                                                                                                                                                                                                                  /c \
-                                                                                                                                                                                                                                                                                            verstub.cpp                                                                                                                                                                                                                                                                                                          /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                                                  	cl                                                                                                                                                                                                                                                                   /Zl                                                                                                                                                                                                                                                                   /nologo                                                                                                                                                                                                                                                                   /c \
+                                                                                                                                                                                                                                                                                              verstub.cpp                                                                                                                                                                                                                                                                                                           /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -144,7 +144,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                     	cl              /Zl              /nologo              /c              verstub.cpp              /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                      	cl               /Zl               /nologo               /c               verstub.cpp               /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -184,8 +184,8 @@ IntDir=.\../Release_Xbox
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                                                  	cl                                                                                                                                                                                                                                                                   /Zl                                                                                                                                                                                                                                                                   /nologo                                                                                                                                                                                                                                                                   /c \
-                                                                                                                                                                                                                                                                                              verstub.cpp                                                                                                                                                                                                                                                                                                           /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                                                   	cl                                                                                                                                                                                                                                                                    /Zl                                                                                                                                                                                                                                                                    /nologo                                                                                                                                                                                                                                                                    /c \
+                                                                                                                                                                                                                                                                                                verstub.cpp                                                                                                                                                                                                                                                                                                            /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -1633,6 +1633,25 @@ SOURCE=.\PlayerOptions.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\Profile.cpp
+
+!IF  "$(CFG)" == "StepMania - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Profile.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\RandomSample.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 5a264a3669..79f6c2374a 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -713,6 +713,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="PlayerOptions.h">
 			</File>
+			<File
+				RelativePath="Profile.cpp">
+			</File>
+			<File
+				RelativePath="Profile.h">
+			</File>
 			<File
 				RelativePath=".\RandomSample.cpp">
 			</File>