diff --git a/Code/Misc/EventHandler/EventButton.h b/Code/Misc/EventHandler/EventButton.h
index 6a0a2cfb..e8fbc690 100644
--- a/Code/Misc/EventHandler/EventButton.h
+++ b/Code/Misc/EventHandler/EventButton.h
@@ -58,7 +58,7 @@ namespace Oyster
 		{
 			this->privData.ID = privData.currID;
 			this->privData.currID += 1;
-			this->privData.owner = NULL;
+			//this->privData.owner = NULL;
 			this->privData.EventFunc = NULL;
 		}
 
diff --git a/Code/Misc/EventHandler/EventButtonCollection.cpp b/Code/Misc/EventHandler/EventButtonCollection.cpp
index a6e4ed40..7908816e 100644
--- a/Code/Misc/EventHandler/EventButtonCollection.cpp
+++ b/Code/Misc/EventHandler/EventButtonCollection.cpp
@@ -22,20 +22,6 @@ void EventButtonCollection::Update(InputClass* inputObject)
 	}
 }
 
-template <class Owner>
-void EventButtonCollection::AddButton(Owner a)
-{
-	//buttons.push_back(button);
-}
-
-template <class Owner>
-EventButton<Owner>& EventButtonCollection::CreateButton()
-{
-	EventButton temp;
-	buttons.push_back((IEventButton)&temp);
-	return temp;
-}
-
 EventCollectionState EventButtonCollection::GetState() const
 {
 	return collectionState;
diff --git a/Code/Misc/EventHandler/EventButtonCollection.h b/Code/Misc/EventHandler/EventButtonCollection.h
index 2a3faf35..130d59fa 100644
--- a/Code/Misc/EventHandler/EventButtonCollection.h
+++ b/Code/Misc/EventHandler/EventButtonCollection.h
@@ -29,11 +29,22 @@ namespace Oyster
 
 			void Update(InputClass* inputObject);
 
-			template <class Owner>
-			void AddButton(Owner a);
+			template <typename Owner>
+			void AddButton(EventButton<Owner>& button)
+			{
+				EventButton<Owner>* b = new EventButton<Owner>();
+				buttons.size(); 
+				buttons.push_back((IEventButton*)b);
+				//buttons.push_back((IEventButton*)&button);
+			}
 
-			template <class Owner>
-			EventButton<Owner>& CreateButton();
+			template <typename Owner>
+			EventButton<Owner>& CreateButton()
+			{
+				EventButton<Owner> temp;
+				buttons.push_back(&temp);
+				return temp;
+			}
 
 			EventCollectionState GetState() const;
 			void SetState(const EventCollectionState state);
diff --git a/Code/Misc/EventHandler/IEventButton.h b/Code/Misc/EventHandler/IEventButton.h
index 236ab73c..92c58c10 100644
--- a/Code/Misc/EventHandler/IEventButton.h
+++ b/Code/Misc/EventHandler/IEventButton.h
@@ -8,9 +8,7 @@ namespace Oyster
 	{
 		class IEventButton
 		{
-			
 		public:
-			
 			enum ButtonState
 			{
 				Button_Clicked,
diff --git a/Code/Misc/Misc.vcxproj b/Code/Misc/Misc.vcxproj
index 51b905d2..f3e58e56 100644
--- a/Code/Misc/Misc.vcxproj
+++ b/Code/Misc/Misc.vcxproj
@@ -166,10 +166,10 @@
     <ClInclude Include="DynamicArray.h" />
     <ClInclude Include="EventHandler\EventButton.h" />
     <ClInclude Include="EventHandler\EventButtonCollection.h" />
+    <ClInclude Include="EventHandler\EventHandler.h" />
     <ClInclude Include="EventHandler\IEventButton.h" />
     <ClInclude Include="GID.h" />
     <ClInclude Include="IQueue.h" />
-    <ClInclude Include="EventHandler\EventHandler.h" />
     <ClInclude Include="OysterCallback.h" />
     <ClInclude Include="Packing\Packing.h" />
     <ClInclude Include="PostBox\IPostBox.h" />
diff --git a/Code/Misc/Misc.vcxproj.filters b/Code/Misc/Misc.vcxproj.filters
index f8309aed..edcf0e99 100644
--- a/Code/Misc/Misc.vcxproj.filters
+++ b/Code/Misc/Misc.vcxproj.filters
@@ -51,10 +51,10 @@
     <ClCompile Include="Packing\Packing.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="EventHandler\EventHandler.cpp">
+    <ClCompile Include="EventHandler\EventButtonCollection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="EventHandler\EventButtonCollection.cpp">
+    <ClCompile Include="EventHandler\EventHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -122,15 +122,15 @@
     <ClInclude Include="Packing\Packing.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EventHandler\EventHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="EventHandler\EventButton.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="EventHandler\EventButtonCollection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="EventHandler\EventHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="EventHandler\IEventButton.h">
       <Filter>Header Files</Filter>
     </ClInclude>