Index: gui/button.cpp
===================================================================
--- gui/button.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/button.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -87,5 +87,5 @@
 }
 
-void Button::handleEvent(UIEvent& e) {
+void Button::handleEvent(GameEvent& e) {
    switch(e.type) {
       case UI_EVENT_MOUSEMOTION:
Index: gui/button.hpp
===================================================================
--- gui/button.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/button.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -21,5 +21,5 @@
    void init() override;
    void render(int x, int y) override;
-   void handleEvent(UIEvent& e) override;
+   void handleEvent(GameEvent& e) override;
 
 private:
Index: gui/game-screen.cpp
===================================================================
--- gui/game-screen.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/game-screen.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -49,5 +49,5 @@
 }
 
-void GameScreen::handleEvent(UIEvent& e) {
+void GameScreen::handleEvent(GameEvent& e) {
    Screen::handleEvent(e);
 }
Index: gui/game-screen.hpp
===================================================================
--- gui/game-screen.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/game-screen.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -13,5 +13,5 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) override;
 
-      void handleEvent(UIEvent& e) override;
+      void handleEvent(GameEvent& e) override;
 };
 
Index: gui/main-screen.cpp
===================================================================
--- gui/main-screen.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/main-screen.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -21,5 +21,5 @@
 }
 
-void MainScreen::handleEvent(UIEvent& e) {
+void MainScreen::handleEvent(GameEvent& e) {
    Screen::handleEvent(e);
 }
Index: gui/main-screen.hpp
===================================================================
--- gui/main-screen.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/main-screen.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -13,5 +13,5 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) override;
 
-      void handleEvent(UIEvent& e) override;
+      void handleEvent(GameEvent& e) override;
 };
 
Index: gui/panel.cpp
===================================================================
--- gui/panel.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/panel.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -72,5 +72,5 @@
 }
 
-void Panel::handleEvent(UIEvent& e) {
+void Panel::handleEvent(GameEvent& e) {
    for (UIElement*& uiElement : this->uiElements) {
       uiElement->handleEvent(e);
Index: gui/panel.hpp
===================================================================
--- gui/panel.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/panel.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -19,5 +19,5 @@
 
    void render(int x, int y) override;
-   void handleEvent(UIEvent& e) override;
+   void handleEvent(GameEvent& e) override;
 
 private:
Index: gui/screen.cpp
===================================================================
--- gui/screen.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/screen.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -29,5 +29,5 @@
 }
 
-void Screen::handleEvent(UIEvent& e) {
+void Screen::handleEvent(GameEvent& e) {
    for (UIElement*& uiElement : this->uiElements) {
       uiElement->handleEvent(e);
Index: gui/screen.hpp
===================================================================
--- gui/screen.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/screen.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -17,9 +17,4 @@
 class VulkanGame;
 
-template<class Type>
-struct ValueReference {
-   
-};
-
 // TODO: Add a function to create an SDL_Color from a uint32_t
 
@@ -34,5 +29,5 @@
    
    virtual void renderUI();
-   virtual void handleEvent(UIEvent& e);
+   virtual void handleEvent(GameEvent& e);
    void addUIElement(UIElement* element);
 
Index: gui/ui-element.cpp
===================================================================
--- gui/ui-element.cpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/ui-element.cpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -21,4 +21,4 @@
 }
 
-void UIElement::handleEvent(UIEvent& e) {
+void UIElement::handleEvent(GameEvent& e) {
 }
Index: gui/ui-element.hpp
===================================================================
--- gui/ui-element.hpp	(revision aa7707debaf679f9726a89d6342e9788e9f385ed)
+++ gui/ui-element.hpp	(revision 9c0a614cccc4e71b75dbd749218b1adb7fa608b8)
@@ -18,5 +18,5 @@
    virtual void init();
    virtual void render(int x, int y) = 0;
-   virtual void handleEvent(UIEvent& e);
+   virtual void handleEvent(GameEvent& e);
 
 protected: