--- a/LightClone/Source/World.h	Fri Sep 16 18:21:36 2011 -0700
+++ b/LightClone/Source/World.h	Mon Sep 19 11:27:34 2011 -0700
@@ -14,10 +14,7 @@
 #include "Code.h"
 #include "Loader.h"
 #include "CameraController.h"
-//#include "DragController.h"
 #include "InputManager.h"
-//#include "ButtonPane.h"
-//#include "Dialog.h"
 #include "GuiInterface.h"
 #include "GuiImage.h"
 #include "GuiButton.h"
@@ -88,39 +85,69 @@
 	GuiInterface kInterface;
 
 	/*
-	 * kToolbar
+	 * pBackground
 	 */
-	//ButtonPane kToolbar;
+	GuiImage* pBackground;
+
+	/*
+	 * pButtonPlay
+	 */
+	GuiButton* pButtonPlay;
 
 	/*
-	 * kMain
+	 * pButtonStop
 	 */
-	//ButtonPane kMain;
+	GuiButton* pButtonStop;
 
 	/*
-	 * kFunction
+	 * pButtonReset
+	 */
+	GuiButton* pButtonReset;
+
+	/*
+	 * pButtonExit
 	 */
-	//ButtonPane kFunction;
+	GuiButton* pButtonExit;
+
+	/*
+	 * pToolbar
+	 */
+	GuiImage* pToolbar;
 
 	/*
-	 * kArrowBounds
+	 * pToolbarSlot
+	 */
+	GuiImage* pToolbarSlot[8];
+
+	/*
+	 * pFunctionMain
 	 */
-	//Rectangle2 kArrowBounds[2];
+	GuiImage* pFunctionMain;
+
+	/*
+	 * pFunctionMainSlot
+	 */
+	GuiImage* pFunctionMainSlot[16];
 
 	/*
-	 * kDialog1Bounds
+	 * pFunctionA
 	 */
-	//Rectangle2 kDialog1Bounds[1];
+	GuiImage* pFunctionA;
 
 	/*
-	 * kDialog2Bounds
+	 * pFunctionASlot
 	 */
-	//Rectangle2 kDialog2Bounds[2];
+	GuiImage* pFunctionASlot[16];
 
 	/*
-	 * kDialog
+	 * pFunctionB
 	 */
-	//Dialog kDialog;
+	GuiImage* pFunctionB;
+
+	/*
+	 * pFunctionBSlot
+	 */
+	GuiImage* pFunctionBSlot[16];
 
 	/*
 	 * pLevelDialog