diff --git a/stepmania/src/ControllerStateDisplay.cpp b/stepmania/src/ControllerStateDisplay.cpp
new file mode 100644
index 0000000000..25dc71068f
--- /dev/null
+++ b/stepmania/src/ControllerStateDisplay.cpp
@@ -0,0 +1,129 @@
+#include "global.h"
+#include "ControllerStateDisplay.h"
+#include "EnumHelper.h"
+#include "RageUtil.h"
+#include "RageInputDevice.h"
+#include "ThemeManager.h"
+#include "InputMapper.h"
+#include "InputFilter.h"
+#include "RageLog.h"
+#include "LuaBinding.h"
+
+static const char *ControllerStateButtonNames[] = {
+	"Up",
+	"Down",
+	"Left",
+	"Right",
+};
+XToString( ControllerStateButton, NUM_ControllerStateButton );
+
+static const DeviceButton ControllerStateButtonToDeviceButton[] = {
+	JOY_UP,
+	JOY_DOWN,
+	JOY_LEFT,
+	JOY_RIGHT,
+};
+// TODO: Generalize for all game types
+static const GameButton ControllerStateButtonToGameButton[] = {
+	DANCE_BUTTON_UP,
+	DANCE_BUTTON_DOWN,
+	DANCE_BUTTON_LEFT,
+	DANCE_BUTTON_RIGHT,
+};
+
+REGISTER_ACTOR_CLASS( ControllerStateDisplay )
+
+ControllerStateDisplay::ControllerStateDisplay()
+{
+	m_bIsLoaded = false;
+	m_mp = MultiPlayer_INVALID;
+}
+
+void ControllerStateDisplay::LoadMultiPlayer( MultiPlayer mp )
+{
+	LoadInternal( mp, GAME_CONTROLLER_1 );
+}
+
+void ControllerStateDisplay::LoadGameController( GameController gc )
+{
+	LoadInternal( MultiPlayer_INVALID, gc );
+}
+
+void ControllerStateDisplay::LoadInternal( MultiPlayer mp, GameController gc )
+{
+	ASSERT( !m_bIsLoaded );
+	m_bIsLoaded = true;
+
+	m_sprFrame.Load( THEME->GetPathG("ControllerStateDisplay", "frame") );
+	this->AddChild( m_sprFrame );
+
+	m_mp = mp;
+	FOREACH_ENUM2( ControllerStateButton, b )
+	{
+		Button &button = m_Buttons[ b ];
+
+		RString sPath = THEME->GetPathG( "ControllerStateDisplay", ControllerStateButtonToString(b) );
+		button.spr.Load( sPath );
+		this->AddChild( m_Buttons[b].spr );
+		
+		button.gi = GameInput( gc, ControllerStateButtonToGameButton[b] );
+	}
+}
+
+void ControllerStateDisplay::Update( float fDelta )
+{
+	ActorFrame::Update( fDelta );
+
+	FOREACH_ENUM2( ControllerStateButton, b )
+	{
+		Button &button = m_Buttons[ b ];
+
+		bool bVisible = INPUTMAPPER->IsButtonDown( button.gi, m_mp );
+
+		button.spr->SetVisible( bVisible );
+	}
+}
+
+// lua start
+class LunaControllerStateDisplay: public Luna<ControllerStateDisplay>
+{
+public:
+	LunaControllerStateDisplay() { LUA->Register( Register ); }
+
+	static int LoadGameController( T* p, lua_State *L )	{ p->LoadGameController( (GameController)IArg(1) ); return 0; }
+	static int LoadMultiPlayer( T* p, lua_State *L )	{ p->LoadMultiPlayer( (MultiPlayer)IArg(1) ); return 0; }
+
+	static void Register(lua_State *L) 
+	{
+		ADD_METHOD( LoadGameController );
+		ADD_METHOD( LoadMultiPlayer );
+		Luna<T>::Register( L );
+	}
+};
+
+LUA_REGISTER_DERIVED_CLASS( ControllerStateDisplay, Actor )
+
+/*
+ * (c) 2001-2004 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/stepmania/src/ControllerStateDisplay.h b/stepmania/src/ControllerStateDisplay.h
new file mode 100644
index 0000000000..b6eb545b2e
--- /dev/null
+++ b/stepmania/src/ControllerStateDisplay.h
@@ -0,0 +1,85 @@
+/* ControllerStateDisplay - Show the button state of a controller. */
+
+#ifndef ControllerStateDisplay_H
+#define ControllerStateDisplay_H
+
+#include "ActorFrame.h"
+#include "ActorUtil.h"
+#include "PlayerNumber.h"
+#include "AutoActor.h"
+#include "RageInput.h"
+#include "GameInput.h"
+
+enum ControllerStateButton
+{
+	ControllerStateButton_Up,
+	ControllerStateButton_Down,
+	ControllerStateButton_Left,
+	ControllerStateButton_Right,
+	NUM_ControllerStateButton
+};
+
+
+class ControllerStateDisplay : public ActorFrame
+{
+public:
+	ControllerStateDisplay();
+	void LoadMultiPlayer( MultiPlayer mp );
+	void LoadGameController( GameController gc );
+	virtual void Update( float fDelta );
+	bool IsLoaded() const { return m_bIsLoaded; }
+
+	virtual Actor *Copy() const;
+
+	//
+	// Lua
+	//
+	virtual void PushSelf( lua_State *L );
+
+protected:
+	void LoadInternal( MultiPlayer mp, GameController gc );
+	MultiPlayer m_mp;
+
+	bool m_bIsLoaded;
+	AutoActor m_sprFrame;
+	struct Button
+	{
+		Button()
+		{
+			di.MakeInvalid();
+			gi.MakeInvalid();
+		}
+
+		AutoActor spr;
+		DeviceInput di;
+		GameInput gi;
+	};
+	Button m_Buttons[NUM_ControllerStateButton];
+};
+
+#endif
+
+/*
+ * (c) 2001-2004 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */