diff --git a/applications/core_test/src/core_test/source.cpp b/applications/core_test/src/core_test/source.cpp
index bf072e349..6f70879a1 100644
--- a/applications/core_test/src/core_test/source.cpp
+++ b/applications/core_test/src/core_test/source.cpp
@@ -1,45 +1,20 @@
 #define RYTHE_ENTRY
 
-#include <chrono>
-#include <iostream>
-#include <rsl/logging>
-#include <rsl/math>
-#include <rsl/time>
-
 #include <core/core.hpp>
 
-enum struct test_error : rsl::errc
-{
-    no_error = 0,
-    hi,
-    no,
-    fuck,
-    you
-};
+using namespace rythe::core;
 
-void assert_handler(
-	std::string_view expression, std::string_view file, rsl::size_type line, std::string_view message, bool soft
-)
+struct test_struct
 {
-	rsl::log::undecoratedln(
-		soft ? rsl::log::severity::warn : rsl::log::severity::fatal,
-		"Assertion failed:\t{}\nExpected:\t\t{}\nSource:\t\t\t{}, line {}", message, expression, file, line
-	);
-
-	__debugbreak();
-}
+	int i = 14;
+};
 
-rsl::result<void> RYTHE_CCONV init_program(rythe::core::Program& program)
+rsl::result<void> RYTHE_CCONV init_program(Program& program)
 {
-	rsl::asserts::assert_handler = &assert_handler;
-
-	rsl::result<void> result;
-
-	rsl::log::debug("Initilizing Core-Application");
-	program.addEngineInstance();
+	auto& engine = program.addEngineInstance();
+	engine.get_context().emplace<test_struct>().i = 15;
 
-    rsl::append_error(result, test_error::no, "NOPE");
-    rsl::append_warning(result, test_error::hi, "HEEEEYYYYY");
+    rsl::log::debug("{}", engine.get_context().get<test_struct>().i);
 
-    return result;
+    return rsl::error; // Temporarily to stop the engine from running.
 }
diff --git a/libraries/rythe/rythe-standard-library b/libraries/rythe/rythe-standard-library
index ad9bb35be..d4fb0ead7 160000
--- a/libraries/rythe/rythe-standard-library
+++ b/libraries/rythe/rythe-standard-library
@@ -1 +1 @@
-Subproject commit ad9bb35bede0f6065031bf6b38c96fb4c770df16
+Subproject commit d4fb0ead7292463a345ccdf45d028b97247bb411
diff --git a/modules/rythe/core b/modules/rythe/core
index b3ec839e8..64574ff33 160000
--- a/modules/rythe/core
+++ b/modules/rythe/core
@@ -1 +1 @@
-Subproject commit b3ec839e89828224a178f4aca5dcbb75dd5b4ff1
+Subproject commit 64574ff33c4e27d16e6d3006a5b344ddc9ec85ac