diff --git a/Aeon/Aeon.cpp b/Aeon/Aeon.cpp
index 8361964..157d92f 100644
--- a/Aeon/Aeon.cpp
+++ b/Aeon/Aeon.cpp
@@ -15,7 +15,7 @@ App::App( const AppProperties& props, const DisplayProperties& dispProps )
 	: mDisplay()
 	, mInput()
 {
-	RegisterAsSink( "ENGINE_DISPLAY_CORE", 0 );
+	PushThisAsSink( "ENGINE_DISPLAY_CORE" );
 
 	mDisplay.Create( dispProps );
 }
diff --git a/Aeon/Core/Display.cpp b/Aeon/Core/Display.cpp
index 707cd68..6e7cd3c 100644
--- a/Aeon/Core/Display.cpp
+++ b/Aeon/Core/Display.cpp
@@ -12,7 +12,7 @@ Display::Display()
 	, mContext( NULL )
 	, mClearColour{ 1.0f, 1.0f, 1.0f, 1.0f }
 {
-	RegisterAsSink( "ENGINE_DISPLAY_CORE", 0 );
+	PushThisAsSink( "ENGINE_DISPLAY_CORE" );
 }
 
 Display::~Display()
diff --git a/Aeon/Core/Events.cpp b/Aeon/Core/Events.cpp
index 4a79c25..0498f40 100644
--- a/Aeon/Core/Events.cpp
+++ b/Aeon/Core/Events.cpp
@@ -122,7 +122,7 @@ int EventManager::RegisterSinkPush( EventListener* sink, std::string system )
 	{
 		std::vector<std::tuple<EventListener*, int>> v;
 		mSinks.insert( { system, v } );
-		return;
+		return -1;
 	}
 
 	auto& sinkVector = mSinks[system];
@@ -141,7 +141,7 @@ int EventManager::RegisterSinkPushStick( EventListener* sink, std::string system
 	{
 		std::vector<std::tuple<EventListener*, int>> v;
 		mStickySinks.insert( { system, v } );
-		return;
+		return -1;
 	}
 
 	auto& sinkVector = mStickySinks[system];
@@ -158,8 +158,7 @@ int EventManager::RegisterSinkUnshift( EventListener* sink, std::string system )
 
 	if ( !mSinks.count( system ) )
 	{
-		RegisterSinkPush( sink, system );
-		return;
+		return RegisterSinkPush( sink, system );
 	}
 
 	auto& sinkVector = mSinks[system];
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67ada5d..aea3be0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 
 set(THREADS_PREFER_PTHREAD_FLAD ON)
 find_package(Threads REQUIRED)
diff --git a/CMakeSettings.json b/CMakeSettings.json
index f18056c..4bf8087 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -1,26 +1,26 @@
-{
-  "configurations": [
-    {
-      "name": "x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
-      "ctestCommandArgs": ""
-    },
-    {
-      "name": "x64-Release",
-      "generator": "Ninja",
-      "configurationType": "RelWithDebInfo",
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ]
-    }
-  ]
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "-DSDL2_PATH=\"C:/Users/benja/Programming/lib/SDL2-2.0.16/\"",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "-DSDL2_DIR=\"C:/Users/benja/Programming/lib/SDL2-2.0.16/\"",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ]
+    }
+  ]
 }
\ No newline at end of file