diff --git a/game/game.odin b/game/game.odin
index bcdabe9..fd3e969 100644
--- a/game/game.odin
+++ b/game/game.odin
@@ -61,6 +61,7 @@ init :: proc() {
 	fmt.println("hello from .dll!")
 
 	g = new(Game_Memory)
+	memory_set(g)
 }
 
 @(export)
diff --git a/src/event/event.odin b/src/event/event.odin
index bda2c35..4384446 100644
--- a/src/event/event.odin
+++ b/src/event/event.odin
@@ -5,10 +5,11 @@ import "core:fmt"
 import "sindri:input"
 
 // -----------------------------------------
+// Types
 
 // event category, bitfield (?)
 
-Event :: union {
+Event_Data :: union {
 	Window_Close_Event,
 	Window_Resize_Event,
 	Joystick_Connect_Event,
@@ -22,6 +23,11 @@ Event :: union {
 	Mouse_Scroll_Event,
 }
 
+Event :: struct {
+	data:    Event_Data,
+	handled: bool,
+}
+
 Window_Close_Event :: struct {
 	handled: bool,
 }
@@ -85,6 +91,13 @@ Mouse_Scroll_Event :: struct {
 }
 
 // -----------------------------------------
+// Variables
+
+// I want to have a list of Listeners per Event type, but this is state
+listeners: map[typeid][dynamic]Listener
+
+// -----------------------------------------
+// Public functions
 
 // Dispatcher(Event) -> forwards to the right function
 on_event :: proc(event: Event) {
@@ -116,3 +129,9 @@ on_event :: proc(event: Event) {
 			fmt.println("Joy dis:", e.id)
 	}
 }
+
+/*
+   Notes:
+
+   Have the events queued up into a frame buffer that gets drained at a specific time.
+ */