diff --git a/addons/goggles/ACE_Settings.hpp b/addons/goggles/ACE_Settings.hpp
index 6b3faa1823..a78c2866e0 100644
--- a/addons/goggles/ACE_Settings.hpp
+++ b/addons/goggles/ACE_Settings.hpp
@@ -1,4 +1,11 @@
+
 class ACE_Settings {
+    /*class GVAR(enable) { // @todo
+        value = 0;
+        typeName = "BOOL";
+        isClientSettable = 1;
+        displayName = CSTRING(enable);
+    };*/
     class GVAR(showInThirdPerson) {
         value = 0;
         typeName = "BOOL";
diff --git a/addons/goggles/CfgEventHandlers.hpp b/addons/goggles/CfgEventHandlers.hpp
index 8c7edda20f..67f17fda18 100644
--- a/addons/goggles/CfgEventHandlers.hpp
+++ b/addons/goggles/CfgEventHandlers.hpp
@@ -1,10 +1,36 @@
+
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
+
 class Extended_PostInit_EventHandlers {
-  class ADDON {
-    init = QUOTE(call COMPILE_FILE(XEH_postInit));
-  };
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};
+
+class Extended_Killed_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            killed = QUOTE(_this call FUNC(handleKilled));
+        };
+    };
+};
+
+class Extended_Fired_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            fired = QUOTE(if (local (_this select 0)) then {_this call FUNC(handleFired)});
+        };
+    };
+};
+
+class Extended_Explosion_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            explosion = QUOTE(if (local (_this select 0)) then {_this call FUNC(handleExplosion)});
+        };
+    };
 };
diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf
index 088ccc477a..51ffd14b49 100644
--- a/addons/goggles/XEH_postInit.sqf
+++ b/addons/goggles/XEH_postInit.sqf
@@ -1,24 +1,8 @@
-/*
- * Author: Garth 'L-H' de Wet
- * Sets up the glasses mod for usage. Initialises variables and event handlers.
- * Shouldn't be called by a user/modder ever. Done by the engine.
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- *
- * Example:
- * None
- *
- * Public: No
- */
 #include "script_component.hpp"
+
 if (!hasInterface) exitWith {};
 
-["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses),
-{
+["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), {
     if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith {
         call FUNC(clearGlasses);
         true
@@ -26,7 +10,12 @@ if (!hasInterface) exitWith {};
     false
 },
 {false},
-[20, [true, true, false]], false] call cba_fnc_addKeybind;
+[20, [true, true, false]], false] call CBA_fnc_addKeybind;
+
+
+
+
+
 
 if isNil(QGVAR(UsePP)) then {
     GVAR(UsePP) = true;
diff --git a/addons/goggles/XEH_preInit.sqf b/addons/goggles/XEH_preInit.sqf
index 4eb7df91d1..c6fa4e12b2 100644
--- a/addons/goggles/XEH_preInit.sqf
+++ b/addons/goggles/XEH_preInit.sqf
@@ -1,22 +1,12 @@
-/*
- * Author: Garth 'L-H' de Wet
- * Initialises Goggles.
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- *
- * Example:
- * None
- *
- * Public: No
- */
 #include "script_component.hpp"
 
 ADDON = false;
 
+PREP(handleExplosion);
+PREP(handleFired);
+PREP(handleKilled);
+
+
 PREP(applyDirtEffect);
 PREP(applyDust);
 PREP(applyGlassesEffect);