diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 79b39c1987..8bdc64e519 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -9,6 +9,14 @@
 #include "arch/Dialog/Dialog.h"
 #include "Foreach.h"
 #include "XmlFile.h"
+#include "LuaBinding.h"
+#include "LuaManager.h"
+
+
+// lua start
+//LUA_REGISTER_CLASS( Actor, null )
+// lua end
+
 
 float Actor::g_fCurrentBGMTime = 0, Actor::g_fCurrentBGMBeat;
 
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index d48df687eb..b036bf47ca 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -13,6 +13,16 @@ struct XNode;
 #define DRAW_ORDER_TRANSITIONS			100
 #define DRAW_ORDER_AFTER_EVERYTHING		200
 
+/*
+#define LUA_Actor_METHODS( T ) \
+	static int GetX( T* p, lua_State *L ) { lua_pushnumber(L, p->GetX()); return 1; } \
+	static int SetX( T* p, lua_State *L ) { p->SetX(luaL_checknumber(L, 1)); return 0; } \
+
+#define LUA_Actor_METHODS_MAP( T ) \
+	LUA_METHOD_MAP( T, GetX ) \
+	LUA_METHOD_MAP( T, SetX ) \
+*/
+
 class Actor
 {
 public:
diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index ea7b4e70cb..f9ada70518 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -14,7 +14,7 @@
 #include "Course.h"
 #include "XmlFile.h"
 #include "FontCharAliases.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 
 #include "arch/Dialog/Dialog.h"
 
diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 5bc1e91b3b..107d4bce55 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -4,7 +4,7 @@
 #include "BGAnimationLayer.h"
 #include "RageUtil.h"
 #include "ActorUtil.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "Foreach.h"
 
 
diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index a06a4b3eef..8e227fb2a5 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -10,7 +10,7 @@
 #include "RageDisplay.h"
 #include "ActorUtil.h"
 #include "arch/ArchHooks/ArchHooks.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 
 
 const float PARTICLE_SPEED = 300;
diff --git a/stepmania/src/Command.cpp b/stepmania/src/Command.cpp
index 048cc30d87..f34db8e84b 100644
--- a/stepmania/src/Command.cpp
+++ b/stepmania/src/Command.cpp
@@ -3,7 +3,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 
 
 void IncorrectNumberArgsWarning( const Command &command, int iMaxIndexAccessed )
diff --git a/stepmania/src/LuaFunctions.h b/stepmania/src/LuaFunctions.h
index 09cf6bb01a..d08e59d15d 100644
--- a/stepmania/src/LuaFunctions.h
+++ b/stepmania/src/LuaFunctions.h
@@ -1,7 +1,7 @@
 #ifndef LUA_FUNCTIONS_H
 #define LUA_FUNCTIONS_H
 
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "RageUtil.h" /* for ssprintf */
 
 extern "C"
diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp
index e44eeac106..81f9b0d0ad 100644
--- a/stepmania/src/LuaManager.cpp
+++ b/stepmania/src/LuaManager.cpp
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "LuaFunctions.h"
 #include "RageUtil.h"
 #include "RageLog.h"
diff --git a/stepmania/src/ScreenBranch.cpp b/stepmania/src/ScreenBranch.cpp
index 0ca7ececa9..f1fc7bbe0d 100644
--- a/stepmania/src/ScreenBranch.cpp
+++ b/stepmania/src/ScreenBranch.cpp
@@ -3,7 +3,7 @@
 #include "RageLog.h"
 #include "ScreenManager.h"
 #include "ThemeManager.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "GameCommand.h"
 #include "RageUtil.h"
 
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index bf1e312e3f..d5f58dfd49 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -21,7 +21,7 @@
 #include "RageSoundManager.h"
 #include "ProfileManager.h"
 #include "StepsUtil.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 
 #define LINE_NAMES				THEME->GetMetric (m_sName,"LineNames")
 #define OPTION_MENU_FLAGS		THEME->GetMetric (m_sName,"OptionMenuFlags")
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index b28ddfe886..aa3a6b80b4 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -12,6 +12,13 @@
 #include "ActorUtil.h"
 #include "arch/Dialog/Dialog.h"
 #include "Foreach.h"
+#include "LuaBinding.h"
+#include "LuaManager.h"
+
+// lua start
+//LUA_REGISTER_CLASS( Sprite, Actor )
+// lua end
+
 
 Sprite::Sprite()
 {
diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h
index a350dabf41..1cc405f51b 100644
--- a/stepmania/src/Sprite.h
+++ b/stepmania/src/Sprite.h
@@ -8,6 +8,14 @@
 
 class RageTexture;
 
+/*
+#define LUA_Sprite_METHODS( T ) \
+	LUA_Actor_METHODS( T ) \
+
+#define LUA_Sprite_METHODS_MAP( T ) \
+	LUA_Actor_METHODS_MAP( T ) \
+*/
+
 class Sprite: public Actor
 {
 public:
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 9880a3e592..316fc37fe2 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -44,7 +44,7 @@
 #include "ProfileManager.h"
 #include "MemoryCardManager.h"
 #include "ScreenManager.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "GameManager.h"
 #include "FontManager.h"
 #include "InputFilter.h"
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 2d55222459..e05d24ceb8 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -17,7 +17,7 @@
 #include "StepMania.h"
 #include "Foreach.h"
 #include "ThemeMetric.h"
-#include "LuaHelpers.h"
+#include "LuaManager.h"
 #include "ScreenDimensions.h"
 
 
@@ -715,7 +715,7 @@ float ThemeManager::GetMetricF( const CString &sClassName, const CString &sValue
 	return LUA->RunExpressionF( sValue );
 }
 
-// #include "LuaHelpers.h"
+// #include "LuaManager.h"
 bool ThemeManager::GetMetricB( const CString &sClassName, const CString &sValueName )
 {
 	CString sValue = GetMetricRaw( sClassName,sValueName );