diff --git a/example/example.xcodeproj/project.pbxproj b/example/example.xcodeproj/project.pbxproj
index 8808cfa..2432f4e 100644
--- a/example/example.xcodeproj/project.pbxproj
+++ b/example/example.xcodeproj/project.pbxproj
@@ -397,7 +397,6 @@
 		39FA2B7F1C457606003FAB28 /* SettingsLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsLoader.h; sourceTree = "<group>"; };
 		39FBE8B01C6A636900155B9E /* Gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gui.h; sourceTree = "<group>"; };
 		39FBE8B11C6A636900155B9E /* Gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Gui.cpp; sourceTree = "<group>"; };
-		39FBE8B31C6A6BDF00155B9E /* GuiEventType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiEventType.h; sourceTree = "<group>"; };
 		39FDD9EA1AC007BF00262205 /* BaseCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseCmd.h; path = Commands/BaseCmd.h; sourceTree = "<group>"; };
 		BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
 		E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
@@ -718,7 +717,6 @@
 		396841681BC91F6F009F0BAE /* Application */ = {
 			isa = PBXGroup;
 			children = (
-				39FBE8B31C6A6BDF00155B9E /* GuiEventType.h */,
 				39FBE8B01C6A636900155B9E /* Gui.h */,
 				39FBE8B11C6A636900155B9E /* Gui.cpp */,
 				0117D70E1D65A8C1008FECEB /* GuiBaseWidget.h */,
diff --git a/src/Application/Gui.h b/src/Application/Gui.h
index 1ee97f1..98d476c 100644
--- a/src/Application/Gui.h
+++ b/src/Application/Gui.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ofEvents.h"
-#include "GuiEventType.h"
 #include "BaseSurface.h"
 
 #include "GuiBaseWidget.h"
@@ -12,7 +11,7 @@ namespace piMapper {
 
 struct GuiEvent{
 	ofMouseEventArgs args;
-	int type;
+	GuiBaseWidget * widget;
 };
 
 // TODO: compress the following structs into something like:
diff --git a/src/Application/GuiEventType.h b/src/Application/GuiEventType.h
deleted file mode 100644
index 2a8caf0..0000000
--- a/src/Application/GuiEventType.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-namespace ofx {
-namespace piMapper {
-
-struct GuiEventType {
-	enum {
-		SURFACE_HIT,
-		SURFACE_DRAGGED,
-		SURFACE_RELEASED,
-		JOINT_PRESSED,
-		JOINT_RELEASED,
-		JOINT_DRAGGED
-	};
-};
-
-} // namespace piMapper
-} // namespace ofx
\ No newline at end of file