diff --git a/stepmania/src/CombinedLifeMeterTug.cpp b/stepmania/src/CombinedLifeMeterTug.cpp
index 025b34333d..2bc8e96836 100644
--- a/stepmania/src/CombinedLifeMeterTug.cpp
+++ b/stepmania/src/CombinedLifeMeterTug.cpp
@@ -47,13 +47,13 @@ void CombinedLifeMeterTug::ChangeLife( PlayerNumber pn, TapNoteScore score )
 	float fPercentToMove = 0;
 	switch( score )
 	{
-	case TNS_W1:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_W1);		break;
-	case TNS_W2:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_W2);		break;
-	case TNS_W3:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_W3);		break;
-	case TNS_W4:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_W4);		break;
-	case TNS_W5:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_W5);		break;
-	case TNS_Miss:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_Miss);	break;
-	case TNS_HitMine:	fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_HitMine); break;
+	case TNS_W1:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W1];		break;
+	case TNS_W2:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W2];		break;
+	case TNS_W3:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W3];		break;
+	case TNS_W4:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W4];		break;
+	case TNS_W5:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W5];		break;
+	case TNS_Miss:		fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_Miss];	break;
+	case TNS_HitMine:	fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_HitMine]; break;
 	default:	ASSERT(0);	break;
 	}
 
@@ -65,8 +65,8 @@ void CombinedLifeMeterTug::ChangeLife( PlayerNumber pn, HoldNoteScore score, Tap
 	float fPercentToMove = 0;
 	switch( score )
 	{
-	case HNS_Held:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_Held);	break;
-	case HNS_LetGo:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange.Get(SE_LetGo);	break;
+	case HNS_Held:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_Held];	break;
+	case HNS_LetGo:			fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_LetGo];	break;
 	default:	ASSERT(0);	break;
 	}
 
diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 2ccacd99ca..a2f86156cc 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -139,7 +139,7 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
 		return false;
 	if( m_GoalType != GOAL_INVALID && PROFILEMAN->GetProfile(pn)->m_GoalType != m_GoalType )
 		return false;
-	if( !m_sProfileID.empty() && PREFSMAN->GetDefaultLocalProfileID(pn).Get() != m_sProfileID )
+	if( !m_sProfileID.empty() && PREFSMAN->m_sDefaultLocalProfileID[pn].Get() != m_sProfileID )
 		return false;
 
 	return true;
@@ -834,7 +834,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
 			PROFILEMAN->GetProfile(*pn)->m_GoalType = m_GoalType;
 	if( !m_sProfileID.empty() )
 		FOREACH_CONST( PlayerNumber, vpns, pn )
-			PREFSMAN->GetDefaultLocalProfileID(*pn).Set( m_sProfileID );
+			PREFSMAN->m_sDefaultLocalProfileID[*pn].Set( m_sProfileID );
 
 	/* If we're going to stop music, do so before preparing new screens, so we don't
 	 * stop music between preparing screens and loading screens. */
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index d0c944709e..a9de342a15 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -125,13 +125,13 @@ void LifeMeterBar::ChangeLife( TapNoteScore score )
 	switch( score )
 	{
 	default:	ASSERT(0);
-	case TNS_W1:			fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_W1);			break;
-	case TNS_W2:			fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_W2);			break;
-	case TNS_W3:			fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_W3);			break;
-	case TNS_W4:			fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_W4);			break;
-	case TNS_W5:			fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_W5);			break;
-	case TNS_Miss:		fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_Miss);		break;
-	case TNS_HitMine:	fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_HitMine);	break;
+	case TNS_W1:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W1];			break;
+	case TNS_W2:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W2];			break;
+	case TNS_W3:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W3];			break;
+	case TNS_W4:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W4];			break;
+	case TNS_W5:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W5];			break;
+	case TNS_Miss:		fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_Miss];		break;
+	case TNS_HitMine:	fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_HitMine];	break;
 	}
 	if( IsHot()  &&  score < TNS_W4 )
 		fDeltaLife = -0.10f;		// make it take a while to get back to "hot"
@@ -164,8 +164,8 @@ void LifeMeterBar::ChangeLife( HoldNoteScore score, TapNoteScore tscore )
 	case SongOptions::DRAIN_NORMAL:
 		switch( score )
 		{
-		case HNS_Held:	fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_Held);	break;
-		case HNS_LetGo:	fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_LetGo);	break;
+		case HNS_Held:	fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_Held];	break;
+		case HNS_LetGo:	fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_LetGo];	break;
 		default:
 			ASSERT(0);
 		}
@@ -176,7 +176,7 @@ void LifeMeterBar::ChangeLife( HoldNoteScore score, TapNoteScore tscore )
 		switch( score )
 		{
 		case HNS_Held:	fDeltaLife = +0.000f;	break;
-		case HNS_LetGo:	fDeltaLife = PREFSMAN->m_fLifePercentChange.Get(SE_LetGo);	break;
+		case HNS_LetGo:	fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_LetGo];	break;
 		default:
 			ASSERT(0);
 		}
diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp
index 20844a8615..1532918252 100644
--- a/stepmania/src/LifeMeterTime.cpp
+++ b/stepmania/src/LifeMeterTime.cpp
@@ -92,13 +92,13 @@ void LifeMeterTime::ChangeLife( TapNoteScore tns )
 	switch( tns )
 	{
 	default:	ASSERT(0);
-	case TNS_W1:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W1);		break;
-	case TNS_W2:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W2);		break;
-	case TNS_W3:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W3);		break;
-	case TNS_W4:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W4);		break;
-	case TNS_W5:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W5);		break;
-	case TNS_Miss:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_Miss);	break;
-	case TNS_HitMine:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_HitMine);	break;
+	case TNS_W1:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W1];		break;
+	case TNS_W2:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W2];		break;
+	case TNS_W3:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W3];		break;
+	case TNS_W4:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W4];		break;
+	case TNS_W5:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W5];		break;
+	case TNS_Miss:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_Miss];	break;
+	case TNS_HitMine:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_HitMine];	break;
 	}
 
 	m_fLifeTotalLostSeconds -= fMeterChange;
@@ -116,8 +116,8 @@ void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns )
 	switch( hns )
 	{
 	default:	ASSERT(0);
-	case HNS_Held:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_Held);	break;
-	case HNS_LetGo:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_LetGo);	break;
+	case HNS_Held:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_Held];	break;
+	case HNS_LetGo:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_LetGo];	break;
 	}
 
 	m_fLifeTotalLostSeconds -= fMeterChange;
diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp
index 13d27a8af4..da963ded89 100644
--- a/stepmania/src/MemoryCardManager.cpp
+++ b/stepmania/src/MemoryCardManager.cpp
@@ -386,21 +386,21 @@ void MemoryCardManager::Update( float fDelta )
 		FOREACH( UsbStorageDevice, vUnassignedDevices, d )
 		{
 			// search for card dir match
-			if( !PREFSMAN->GetMemoryCardOsMountPoint(p).Get().empty() &&
-				d->sOsMountDir.CompareNoCase(PREFSMAN->GetMemoryCardOsMountPoint(p).Get()) )
+			if( !PREFSMAN->m_sMemoryCardOsMountPoint[p].Get().empty() &&
+				d->sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p].Get()) )
 				continue;      // not a match
 			
 			// search for USB bus match
-			if( PREFSMAN->GetMemoryCardUsbBus(p) != -1 &&
-				PREFSMAN->GetMemoryCardUsbBus(p) != d->iBus )
+			if( PREFSMAN->m_iMemoryCardUsbBus[p] != -1 &&
+				PREFSMAN->m_iMemoryCardUsbBus[p] != d->iBus )
 				continue;       // not a match
 			
-			if( PREFSMAN->GetMemoryCardUsbPort(p) != -1 &&
-				PREFSMAN->GetMemoryCardUsbPort(p) != d->iPort )
+			if( PREFSMAN->m_iMemoryCardUsbPort[p] != -1 &&
+				PREFSMAN->m_iMemoryCardUsbPort[p] != d->iPort )
 				continue;       // not a match
 			
-			if( PREFSMAN->GetMemoryCardUsbLevel(p) != -1 &&
-				PREFSMAN->GetMemoryCardUsbLevel(p) != d->iLevel )
+			if( PREFSMAN->m_iMemoryCardUsbLevel[p] != -1 &&
+				PREFSMAN->m_iMemoryCardUsbLevel[p] != d->iLevel )
 				continue;       // not a match
 			
 			LOG->Trace( "Player %i: matched %s", p+1, d->sDevice.c_str() );
diff --git a/stepmania/src/NetworkSyncServer.cpp b/stepmania/src/NetworkSyncServer.cpp
index 55bd708f17..4b9bcb6324 100644
--- a/stepmania/src/NetworkSyncServer.cpp
+++ b/stepmania/src/NetworkSyncServer.cpp
@@ -977,19 +977,19 @@ void StepManiaLanServer::CheckLowerJudge(const unsigned int clientNum)
 		if (Client[clientNum]->IsPlaying(x))
 		{
 			if ((Client[clientNum]->Player[x].currstep == 2)&&
-				(PREFSMAN->m_fTimingWindowSeconds.Get(SE_W5) < Client[clientNum]->Player[x].offset))
+				(PREFSMAN->m_fTimingWindowSeconds[SE_W5] < Client[clientNum]->Player[x].offset))
 				Client[clientNum]->lowerJudge = true;
 			if ((Client[clientNum]->Player[x].currstep == 3)&&
-				(PREFSMAN->m_fTimingWindowSeconds.Get(SE_W4) < Client[clientNum]->Player[x].offset))
+				(PREFSMAN->m_fTimingWindowSeconds[SE_W4] < Client[clientNum]->Player[x].offset))
 				Client[clientNum]->lowerJudge = true;
 			if ((Client[clientNum]->Player[x].currstep == 4)&&
-				(PREFSMAN->m_fTimingWindowSeconds.Get(SE_W3) < Client[clientNum]->Player[x].offset))
+				(PREFSMAN->m_fTimingWindowSeconds[SE_W3] < Client[clientNum]->Player[x].offset))
 				Client[clientNum]->lowerJudge = true;
 			if ((Client[clientNum]->Player[x].currstep == 5)&&
-				(PREFSMAN->m_fTimingWindowSeconds.Get(SE_W2) < Client[clientNum]->Player[x].offset))
+				(PREFSMAN->m_fTimingWindowSeconds[SE_W2] < Client[clientNum]->Player[x].offset))
 				Client[clientNum]->lowerJudge = true;
 			if ((Client[clientNum]->Player[x].currstep == 6)&&
-				(PREFSMAN->m_fTimingWindowSeconds.Get(SE_W1) < Client[clientNum]->Player[x].offset))
+				(PREFSMAN->m_fTimingWindowSeconds[SE_W1] < Client[clientNum]->Player[x].offset))
 				Client[clientNum]->lowerJudge = true;
 		}
 }
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 283c33dd1f..7661251c61 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -49,7 +49,7 @@ static const float StepSearchDistance = 1.0f;
 
 float AdjustedWindowSeconds( TimingWindow tw, bool bIsPlayingBeginner )
 {
-	float fSecs = PREFSMAN->m_fTimingWindowSeconds.Get( tw );
+	float fSecs = PREFSMAN->m_fTimingWindowSeconds[tw];
 	fSecs *= PREFSMAN->m_fTimingWindowScale;
 	fSecs += PREFSMAN->m_fTimingWindowAdd;
 	if( tw==TW_W5 && bIsPlayingBeginner && PREFSMAN->m_bMercifulBeginner )
diff --git a/stepmania/src/Preference.h b/stepmania/src/Preference.h
index 12bfb23c8d..60a188dc77 100644
--- a/stepmania/src/Preference.h
+++ b/stepmania/src/Preference.h
@@ -98,7 +98,11 @@ public:
 		for( unsigned i=0; i<m_v.size(); i++ )
 			SAFE_DELETE( m_v[i] );
 	}
-	const Preference<T>& Get( size_t i ) const
+	const Preference<T>& operator[]( size_t i ) const
+	{
+		return *m_v[i];
+	}
+	Preference<T>& operator[]( size_t i )
 	{
 		return *m_v[i];
 	}
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index dd244cd016..17abc5fead 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -209,6 +209,36 @@ void TimeMeterSecondsChangeInit( size_t /*ScoreEvent*/ i, CString &sNameOut, flo
 	}
 }
 
+void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut )
+{
+	sNameOut = "DefaultLocalProfileID" + PlayerNumberToString( (PlayerNumber)i );
+	defaultValueOut = "";
+}
+
+void MemoryCardOsMountPointInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut )
+{
+	sNameOut = "MemoryCardOsMountPoint" + PlayerNumberToString( (PlayerNumber)i );
+	defaultValueOut = "";
+}
+
+void MemoryCardUsbBusInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
+{
+	sNameOut = "MemoryCardUsbBus" + PlayerNumberToString( (PlayerNumber)i );
+	defaultValueOut = -1;
+}
+
+void MemoryCardUsbPortInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
+{
+	sNameOut = "MemoryCardUsbPort" + PlayerNumberToString( (PlayerNumber)i );
+	defaultValueOut = -1;
+}
+
+void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
+{
+	sNameOut = "MemoryCardUsbLevel" + PlayerNumberToString( (PlayerNumber)i );
+	defaultValueOut = -1;
+}
+
 
 PrefsManager::PrefsManager() :
 	m_bWindowed				( "Windowed",				TRUE_IF_DEBUG),
@@ -318,18 +348,13 @@ PrefsManager::PrefsManager() :
 	m_bDisableScreenSaver			( "DisableScreenSaver",			true ),
 	m_sLanguage						( "Language",					"" ),	// ThemeManager will deal with this invalid language
 	m_sMemoryCardProfileSubdir		( "MemoryCardProfileSubdir",	PRODUCT_NAME ),
-	m_iProductID					( "ProductID",					1 ),	
-	m_sDefaultLocalProfileIDP1		( "DefaultLocalProfileIDP1",	"" ),
-	m_sDefaultLocalProfileIDP2		( "DefaultLocalProfileIDP2",	"" ),
+	m_iProductID					( "ProductID",					1 ),
+	m_sDefaultLocalProfileID		( DefaultLocalProfileIDInit, NUM_PLAYERS ),
 	m_bMemoryCards					( "MemoryCards",				false ),
-	m_sMemoryCardOsMountPointP1		( "MemoryCardOsMountPointP1",	"" ),
-	m_sMemoryCardOsMountPointP2		( "MemoryCardOsMountPointP2",	"" ),
-	m_iMemoryCardUsbBusP1			( "MemoryCardUsbBusP1",			-1 ),
-	m_iMemoryCardUsbBusP2			( "MemoryCardUsbBusP2",			-1 ),
-	m_iMemoryCardUsbPortP1			( "MemoryCardUsbPortP1",		-1 ),
-	m_iMemoryCardUsbPortP2			( "MemoryCardUsbPortP2",		-1 ),
-	m_iMemoryCardUsbLevelP1			( "MemoryCardUsbLevelP1",		-1 ),
-	m_iMemoryCardUsbLevelP2			( "MemoryCardUsbLevelP2",		-1 ),
+	m_sMemoryCardOsMountPoint		( MemoryCardOsMountPointInit, NUM_PLAYERS ),
+	m_iMemoryCardUsbBus				( MemoryCardUsbBusInit,		NUM_PLAYERS ),
+	m_iMemoryCardUsbPort			( MemoryCardUsbPortInit,	NUM_PLAYERS ),
+	m_iMemoryCardUsbLevel			( MemoryCardUsbLevelInit,	NUM_PLAYERS ),
 	m_iCenterImageTranslateX		( "CenterImageTranslateX",		0 ),
 	m_iCenterImageTranslateY		( "CenterImageTranslateY",		0 ),
 	m_fCenterImageAddWidth			( "CenterImageAddWidth",		0 ),
@@ -465,7 +490,7 @@ void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini )
 	// validate
 	m_iSongsPerPlay.Set( clamp(m_iSongsPerPlay.Get(),0,MAX_SONGS_PER_PLAY) );
 	FOREACH_PlayerNumber( pn )
-		GetMemoryCardOsMountPoint(pn).Set( FixSlashes(GetMemoryCardOsMountPoint(pn)) );
+		m_sMemoryCardOsMountPoint[pn].Set( FixSlashes(m_sMemoryCardOsMountPoint[pn]) );
 	m_BackgroundMode.Set( (BackgroundMode)clamp((int)m_BackgroundMode.Get(),0,(int)NUM_BackgroundMode-1) );
 }
 
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index d5d01d61c4..56c972dc7a 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -21,7 +21,6 @@ public:
 
 	void Init();
 
-	// GameOptions (ARE saved between sessions)
 	Preference<bool>	m_bWindowed;
 	Preference<int>		m_iDisplayWidth;
 	Preference<int>		m_iDisplayHeight;
@@ -147,22 +146,12 @@ public:
 	Preference<CString>	m_sLanguage;
 	Preference<CString>	m_sMemoryCardProfileSubdir;	// the directory on a memory card to look in for a profile
 	Preference<int>		m_iProductID;		// Saved in HighScore to track what software version a score came from.
-	Preference<CString>	m_sDefaultLocalProfileIDP1, m_sDefaultLocalProfileIDP2;
-	Preference<CString>& GetDefaultLocalProfileID( PlayerNumber pn )
-	{ switch(pn) { case PLAYER_1: return m_sDefaultLocalProfileIDP1; case PLAYER_2: return m_sDefaultLocalProfileIDP2;	default: ASSERT(0); } }
+	Preference1D<CString>	m_sDefaultLocalProfileID;
 	Preference<bool>	m_bMemoryCards;
-	Preference<CString>	m_sMemoryCardOsMountPointP1, m_sMemoryCardOsMountPointP2;	// if set, always use the device that mounts to this point
-	Preference<CString>& GetMemoryCardOsMountPoint( PlayerNumber pn )
-	{ switch(pn) { case PLAYER_1: return m_sMemoryCardOsMountPointP1; case PLAYER_2: return m_sMemoryCardOsMountPointP2;	default: ASSERT(0); } }
-	Preference<int>		m_iMemoryCardUsbBusP1, m_iMemoryCardUsbBusP2;	// look for this bus when assigning cards.  -1 = match any
-	Preference<int>& GetMemoryCardUsbBus( PlayerNumber pn )
-	{ switch(pn) { case PLAYER_1: return m_iMemoryCardUsbBusP1; case PLAYER_2: return m_iMemoryCardUsbBusP2;	default: ASSERT(0); } }
-	Preference<int>		m_iMemoryCardUsbPortP1, m_iMemoryCardUsbPortP2;	// look for this port when assigning cards.  -1 = match any
-	Preference<int>& GetMemoryCardUsbPort( PlayerNumber pn )
-	{ switch(pn) { case PLAYER_1: return m_iMemoryCardUsbPortP1; case PLAYER_2: return m_iMemoryCardUsbPortP2;	default: ASSERT(0); } }
-	Preference<int>		m_iMemoryCardUsbLevelP1, m_iMemoryCardUsbLevelP2;	// look for this level when assigning cards.  -1 = match any
-	Preference<int>& GetMemoryCardUsbLevel( PlayerNumber pn )
-	{ switch(pn) { case PLAYER_1: return m_iMemoryCardUsbLevelP1; case PLAYER_2: return m_iMemoryCardUsbLevelP2;	default: ASSERT(0); } }
+	Preference1D<CString>	m_sMemoryCardOsMountPoint;	// if set, always use the device that mounts to this point
+	Preference1D<int>	m_iMemoryCardUsbBus;	// look for this bus when assigning cards.  -1 = match any
+	Preference1D<int>	m_iMemoryCardUsbPort;	// look for this port when assigning cards.  -1 = match any
+	Preference1D<int>	m_iMemoryCardUsbLevel;	// look for this level when assigning cards.  -1 = match any
 	Preference<int>		m_iCenterImageTranslateX;
 	Preference<int>		m_iCenterImageTranslateY;
 	Preference<int>		m_fCenterImageAddWidth;
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 39a56882c7..168943541b 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -162,7 +162,7 @@ ProfileLoadResult ProfileManager::LoadProfile( PlayerNumber pn, CString sProfile
 
 bool ProfileManager::LoadLocalProfileFromMachine( PlayerNumber pn )
 {
-	CString sProfileID = PREFSMAN->GetDefaultLocalProfileID(pn);
+	CString sProfileID = PREFSMAN->m_sDefaultLocalProfileID[pn];
 	if( sProfileID.empty() )
 	{
 		m_sProfileDir[pn] = "";
diff --git a/stepmania/src/ScoreDisplayLifeTime.cpp b/stepmania/src/ScoreDisplayLifeTime.cpp
index e9e6bb7e55..337dd509d0 100644
--- a/stepmania/src/ScoreDisplayLifeTime.cpp
+++ b/stepmania/src/ScoreDisplayLifeTime.cpp
@@ -95,13 +95,13 @@ void ScoreDisplayLifeTime::OnJudgment( TapNoteScore tns )
 	float fMeterChange = 0;
 	switch( tns )
 	{
-	case TNS_W1:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W1);		break;
-	case TNS_W2:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W2);		break;
-	case TNS_W3:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W3);		break;
-	case TNS_W4:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W4);		break;
-	case TNS_W5:			fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_W5);		break;
-	case TNS_Miss:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_Miss);	break;
-	case TNS_HitMine:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_HitMine);	break;
+	case TNS_W1:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W1];		break;
+	case TNS_W2:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W2];		break;
+	case TNS_W3:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W3];		break;
+	case TNS_W4:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W4];		break;
+	case TNS_W5:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_W5];		break;
+	case TNS_Miss:		fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_Miss];	break;
+	case TNS_HitMine:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_HitMine];	break;
 	default:	ASSERT(0);
 	}
 
@@ -116,8 +116,8 @@ void ScoreDisplayLifeTime::OnJudgment( HoldNoteScore hns, TapNoteScore tns )
 	float fMeterChange = 0;
 	switch( hns )
 	{
-	case HNS_Held:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_Held);	break;
-	case HNS_LetGo:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange.Get(SE_LetGo);	break;
+	case HNS_Held:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_Held];	break;
+	case HNS_LetGo:	fMeterChange = PREFSMAN->m_fTimeMeterSecondsChange[SE_LetGo];	break;
 	default:	ASSERT(0);
 	}
 
diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp
index 107411de4c..470635236c 100644
--- a/stepmania/src/ScoreKeeperNormal.cpp
+++ b/stepmania/src/ScoreKeeperNormal.cpp
@@ -520,14 +520,14 @@ int ScoreKeeperNormal::TapNoteScoreToDancePoints( TapNoteScore tns, bool bBeginn
 	switch( tns )
 	{
 	default: FAIL_M( ssprintf("%i", tns) );
-	case TNS_None:		iWeight = 0;												break;
-	case TNS_HitMine:	iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_HitMine);	break;
-	case TNS_Miss:		iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_Miss);		break;
-	case TNS_W5:			iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_W5);		break;
-	case TNS_W4:			iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_W4);		break;
-	case TNS_W3:			iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_W3);		break;
-	case TNS_W2:			iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_W2);		break;
-	case TNS_W1:			iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_W1);		break;
+	case TNS_None:		iWeight = 0;											break;
+	case TNS_HitMine:	iWeight = PREFSMAN->m_iPercentScoreWeight[SE_HitMine];	break;
+	case TNS_Miss:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_Miss];		break;
+	case TNS_W5:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_W5];		break;
+	case TNS_W4:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_W4];		break;
+	case TNS_W3:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_W3];		break;
+	case TNS_W2:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_W2];		break;
+	case TNS_W1:		iWeight = PREFSMAN->m_iPercentScoreWeight[SE_W1];		break;
 	}
 	if( bBeginner && PREFSMAN->m_bMercifulBeginner )
 		iWeight = max( 0, iWeight );
@@ -540,9 +540,9 @@ int ScoreKeeperNormal::HoldNoteScoreToDancePoints( HoldNoteScore hns, bool bBegi
 	switch( hns )
 	{
 	default: FAIL_M( ssprintf("%i", hns) );
-	case HNS_None:	iWeight = 0;												break;
-	case HNS_LetGo:	iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_LetGo);	break;
-	case HNS_Held:	iWeight = PREFSMAN->m_iPercentScoreWeight.Get(SE_Held);		break;
+	case HNS_None:	iWeight = 0;											break;
+	case HNS_LetGo:	iWeight = PREFSMAN->m_iPercentScoreWeight[SE_LetGo];	break;
+	case HNS_Held:	iWeight = PREFSMAN->m_iPercentScoreWeight[SE_Held];		break;
 	}
 	if( bBeginner && PREFSMAN->m_bMercifulBeginner )
 		iWeight = max( 0, iWeight );
@@ -560,15 +560,15 @@ int ScoreKeeperNormal::TapNoteScoreToGradePoints( TapNoteScore tns, bool bBeginn
 	switch( tns )
 	{
 	default: FAIL_M( ssprintf("%i", tns) );
-	case TNS_None:		iWeight = 0;										break;
-	case TNS_AvoidMine:	iWeight = 0;										break;
-	case TNS_HitMine:	iWeight = PREFSMAN->m_iGradeWeight.Get(SE_HitMine);	break;
-	case TNS_Miss:		iWeight = PREFSMAN->m_iGradeWeight.Get(SE_Miss);	break;
-	case TNS_W5:			iWeight = PREFSMAN->m_iGradeWeight.Get(SE_W5);		break;
-	case TNS_W4:			iWeight = PREFSMAN->m_iGradeWeight.Get(SE_W4);		break;
-	case TNS_W3:			iWeight = PREFSMAN->m_iGradeWeight.Get(SE_W3);		break;
-	case TNS_W2:			iWeight = PREFSMAN->m_iGradeWeight.Get(SE_W2);		break;
-	case TNS_W1:			iWeight = PREFSMAN->m_iGradeWeight.Get(SE_W1);		break;
+	case TNS_None:		iWeight = 0;									break;
+	case TNS_AvoidMine:	iWeight = 0;									break;
+	case TNS_HitMine:	iWeight = PREFSMAN->m_iGradeWeight[SE_HitMine];	break;
+	case TNS_Miss:		iWeight = PREFSMAN->m_iGradeWeight[SE_Miss];	break;
+	case TNS_W5:		iWeight = PREFSMAN->m_iGradeWeight[SE_W5];		break;
+	case TNS_W4:		iWeight = PREFSMAN->m_iGradeWeight[SE_W4];		break;
+	case TNS_W3:		iWeight = PREFSMAN->m_iGradeWeight[SE_W3];		break;
+	case TNS_W2:		iWeight = PREFSMAN->m_iGradeWeight[SE_W2];		break;
+	case TNS_W1:		iWeight = PREFSMAN->m_iGradeWeight[SE_W1];		break;
 	}
 	if( bBeginner && PREFSMAN->m_bMercifulBeginner )
 		iWeight = max( 0, iWeight );
@@ -581,9 +581,9 @@ int ScoreKeeperNormal::HoldNoteScoreToGradePoints( HoldNoteScore hns, bool bBegi
 	switch( hns )
 	{
 	default: FAIL_M( ssprintf("%i", hns) );
-	case HNS_None:	iWeight = 0;										break;
-	case HNS_LetGo:	iWeight = PREFSMAN->m_iGradeWeight.Get(SE_LetGo);	break;
-	case HNS_Held:	iWeight = PREFSMAN->m_iGradeWeight.Get(SE_Held);	break;
+	case HNS_None:	iWeight = 0;									break;
+	case HNS_LetGo:	iWeight = PREFSMAN->m_iGradeWeight[SE_LetGo];	break;
+	case HNS_Held:	iWeight = PREFSMAN->m_iGradeWeight[SE_Held];	break;
 	}
 	if( bBeginner && PREFSMAN->m_bMercifulBeginner )
 		iWeight = max( 0, iWeight );
diff --git a/stepmania/src/ScoreKeeperRave.cpp b/stepmania/src/ScoreKeeperRave.cpp
index 67db69e5b6..1e44ba7168 100644
--- a/stepmania/src/ScoreKeeperRave.cpp
+++ b/stepmania/src/ScoreKeeperRave.cpp
@@ -28,7 +28,7 @@ void ScoreKeeperRave::HandleTapScore( TapNoteScore score )
 	float fPercentToMove = 0;
 	switch( score )
 	{
-	case TNS_HitMine:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_HitMine);	break;
+	case TNS_HitMine:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_HitMine];	break;
 	}
 
 	AddSuperMeterDelta( fPercentToMove );
@@ -42,12 +42,12 @@ void ScoreKeeperRave::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
 	switch( scoreOfLastTap )
 	{
 	default:	ASSERT(0);
-	case TNS_W1:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_W1);	break;
-	case TNS_W2:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_W2);	break;
-	case TNS_W3:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_W3);	break;
-	case TNS_W4:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_W4);	break;
-	case TNS_W5:		fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_W5);	break;
-	case TNS_Miss:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_Miss);	break;
+	case TNS_W1:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_W1];	break;
+	case TNS_W2:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_W2];	break;
+	case TNS_W3:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_W3];	break;
+	case TNS_W4:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_W4];	break;
+	case TNS_W5:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_W5];	break;
+	case TNS_Miss:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_Miss];	break;
 	}
 	AddSuperMeterDelta( fPercentToMove );
 }
@@ -57,7 +57,7 @@ void ScoreKeeperRave::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tap
 	float fPercentToMove = 0;
 	switch( tapScore )
 	{
-	case TNS_HitMine:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange.Get(SE_HitMine);	break;
+	case TNS_HitMine:	fPercentToMove = PREFSMAN->m_fSuperMeterPercentChange[SE_HitMine];	break;
 	}
 	AddSuperMeterDelta( fPercentToMove );
 }
diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp
index a3ea362d31..8310cf1347 100644
--- a/stepmania/src/ScreenOptionsManageProfiles.cpp
+++ b/stepmania/src/ScreenOptionsManageProfiles.cpp
@@ -276,26 +276,18 @@ void ScreenOptionsManageProfiles::HandleScreenMessage( const ScreenMessage SM )
 			default:
 				ASSERT(0);
 			case ProfileAction_SetDefaultP1:
-				{
-					PREFSMAN->m_sDefaultLocalProfileIDP1.Set( GetLocalProfileIDWithFocus() );
-					if( PREFSMAN->m_sDefaultLocalProfileIDP1.Get() == PREFSMAN->m_sDefaultLocalProfileIDP2.Get() )
-					{
-						int iIndex = GetLocalProfileIndexWithFocus();
-						iIndex++;
-						wrap( iIndex, m_vsLocalProfileID.size() );
-						PREFSMAN->m_sDefaultLocalProfileIDP2.Set( m_vsLocalProfileID[iIndex] );
-					}
-				}
-				break;
 			case ProfileAction_SetDefaultP2:
 				{
-					PREFSMAN->m_sDefaultLocalProfileIDP2.Set( GetLocalProfileIDWithFocus() );
-					if( PREFSMAN->m_sDefaultLocalProfileIDP1.Get() == PREFSMAN->m_sDefaultLocalProfileIDP2.Get() )
+					PlayerNumber pn = (PlayerNumber)(ScreenMiniMenu::s_iLastRowCode - ProfileAction_SetDefaultP1);
+					PlayerNumber pnOpposite = OPPOSITE_PLAYER[ pn ];
+
+					PREFSMAN->m_sDefaultLocalProfileID[pn].Set( GetLocalProfileIDWithFocus() );
+					if( PREFSMAN->m_sDefaultLocalProfileID[pn].Get() == PREFSMAN->m_sDefaultLocalProfileID[pnOpposite].Get() )
 					{
 						int iIndex = GetLocalProfileIndexWithFocus();
 						iIndex++;
 						wrap( iIndex, m_vsLocalProfileID.size() );
-						PREFSMAN->m_sDefaultLocalProfileIDP1.Set( m_vsLocalProfileID[iIndex] );
+						PREFSMAN->m_sDefaultLocalProfileID[pnOpposite].Set( m_vsLocalProfileID[iIndex] );
 					}
 				}
 				break;
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index 250160e37e..f19fdb9e01 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -66,7 +66,7 @@ void ScreenSMOnlineLogin::ImportOptions( int iRow, const vector<PlayerNumber> &v
 
 			FOREACH_PlayerNumber( pn )
 			{
-				CStringArray::iterator iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->GetDefaultLocalProfileID(pn).Get() );
+				CStringArray::iterator iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[pn].Get() );
 				if( iter != vsProfiles.end() )
 					m_pRows[0]->SetOneSelection((PlayerNumber) pn, iter - vsProfiles.begin());
 			}
@@ -85,7 +85,7 @@ void ScreenSMOnlineLogin::ExportOptions( int iRow, const vector<PlayerNumber> &v
 			PROFILEMAN->GetLocalProfileIDs( vsProfiles );
 
 			FOREACH_EnabledPlayer( pn )
-				PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[0]->GetOneSelection(pn)] );
+				PREFSMAN->m_sDefaultLocalProfileID[pn].Set( vsProfiles[m_pRows[0]->GetOneSelection(pn)] );
 		}
 		break;
 	}