diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..f0f287811
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,70 @@
+Language: Cpp
+BasedOnStyle: LLVM
+
+# Newlines
+LineEnding: LF
+InsertNewlineAtEOF: true
+MaxEmptyLinesToKeep: 3
+BreakBeforeBraces: Allman
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: AfterColon
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
+BreakBeforeConceptDeclarations: Always
+
+# General rules
+InsertBraces: false 			
+PointerAlignment: Left
+ColumnLimit: 0
+
+# Indentation: use 4 spaces for all indentation
+UseTab: ForContinuationAndIndentation
+TabWidth: 4
+IndentWidth: 4
+ContinuationIndentWidth: 4
+ConstructorInitializerIndentWidth: 4
+AccessModifierOffset: -4
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+LambdaBodyIndentation: OuterScope
+
+# namespaces
+NamespaceIndentation: All
+FixNamespaceComments: true
+CompactNamespaces: false
+
+# Alignment
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: Right
+PackConstructorInitializers: Never
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 1
+AlignEscapedNewlines: Right
+AllowAllArgumentsOnNextLine: true
+AllowBreakBeforeNoexceptSpecifier: Always
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakTemplateDeclarations: Yes
+BitFieldColonSpacing: Both
+
+# includes
+SortIncludes: CaseSensitive
+IncludeBlocks: Preserve
+
+# Empty lines
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+
+# Prevent indentation on next line after these macros:
+StatementMacros: [ESMeta, MetaExternal]
+
+
+
+
diff --git a/.gitattributes b/.gitattributes
index b7f1410b1..a73125838 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,3 +14,4 @@
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.glb filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
+*.exe -text
diff --git a/.gitignore b/.gitignore
index 855f654d1..f02196514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,75 @@
-###################
-# Rythe Generated #
-###################
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Mono auto generated files
+mono_crash.*
 
-# Rythe library output
-include/**
-lib/*
+# Visual Studio 2015/2017 cache/options directory
+.vs/
 
-# Rythe Precompiled shader files
-*.shil
+# Visual Studio code files
+.vscode/
 
-#########
-# Build #
-#########
-
-# CMake
-CMakeFiles/
-CMakeScripts/
-cmake_install.cmake
-CMakeCache.txt
-cmake-build-*/
-CMakeDoxyfile.in
-CMakeDoxygenDefaults.cmake
-
-# CMake Tests
-CTestTestfile.cmake
-DartConfiguration.tcl
-unit_tests_*.cmake
-Testing/
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Executables
+*.exe
+*.out
+*.app
 
 # Build results
 [Dd]ebug/
@@ -38,64 +81,56 @@ x86/
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
+bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
 
-# Executables
-*.exe
-*.out
-*.app
-
-#############
-# Platforms #
-#############
-
-# Windows
-
-# Linux
+# Rythe engine asset folder
+!**/assets/**
+!**/engine/resources/**
 
-# MacOS
-*.DS_Store
-*.sb-*
+# Rythe engine tools folder
+!**/tools/**
 
-#############
-# Compilers #
-#############
+# Word temporary files
+~$*.*
 
-################
-# IDEs/Editors #
-################
+# linux Makefiles
+**/Makefile
 
-# Visual Studio
-*.sln
-*.vcxproj
-*.vcxproj.user
-*.vcxproj.filters
-.vs/
+# Windows Preview files
+**/Thumbs.db
+*.xcf
 
-# Visual Studio Code
-.vscode/
+*.shil
+!**/applications/**/engine/**
 
-# CLion
-*.idea/
+# Mono VM
+vm/**
 
-# XCode
-*.xcodeproj/
-XCBuildData/
+# Rythe Libraries
+lib/*
 
-########
-# Misc #
-########
+# Rythe Precompiled shader files
+*.shil
 
-# Mono
-mono_crash.*
-vm/**
+# Rythe Includes
+include/**
 
-# Word temporary files
-~$*.*
+# Misc
+*/**/Thumbs.db
+applications/sandbox/imgui.ini
 
-# Dear Imgui
-imgui.ini
-build/*
+# Reference files (not for upload)
+**/**_ref/*
+docs/venv
+**/__pycache__/**
+**/imgui.ini
+*.sln
+*.vcxproj
+*.filters
+build/.cmake
+build/CMakeFiles
+build/CMakeCache.txt
diff --git a/.gitmodules b/.gitmodules
index a3b5dd01e..c0d692d6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,21 @@
-[submodule "rythe/engine/core"]
-	path = rythe/engine/core
+[submodule "modules/rythe/core"]
+	path = modules/rythe/core
 	url = https://github.com/Rythe-Interactive/Rythe-Core.git
-[submodule "rythe/engine/application"]
-	path = rythe/engine/application
+[submodule "modules/rythe/application"]
+	path = modules/rythe/application
 	url = https://github.com/Rythe-Interactive/Rythe-Application.git
-[submodule "rythe/engine/graphics"]
-	path = rythe/engine/graphics
+[submodule "modules/rythe/graphics"]
+	path = modules/rythe/graphics
 	url = https://github.com/Rythe-Interactive/Rythe-Graphics.git
-[submodule "rythe/engine/audio"]
-	path = rythe/engine/audio
+[submodule "modules/rythe/audio"]
+	path = modules/rythe/audio
 	url = https://github.com/Rythe-Interactive/Rythe-Audio.git
-[submodule "rythe/engine/physics"]
-	path = rythe/engine/physics
+[submodule "modules/rythe/physics"]
+	path = modules/rythe/physics
 	url = https://github.com/Rythe-Interactive/Rythe-Physics.git
+[submodule "libraries/rythe/rythe-standard-library"]
+	path = libraries/rythe/rythe-standard-library
+	url = https://github.com/Rythe-Interactive/Rythe-Standard-Library.git
+[submodule "libraries/third_party/catch2"]
+	path = libraries/third_party/catch2
+	url = https://github.com/Rythe-Interactive/Catch2.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 401c38a66..000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-# Root CMake build file for Rythe-Engine
-# Sets up the build environment for Rythe engine, editor, applications, and samples.
-# Refer to the readme or docs for information on its usage.
-
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-project(rythe LANGUAGES CXX)
-
-# Configuration
-option(RYTHE_FORCE_ENABLE_ALL_MODULES "Forcefully enable all modules (overrides module toggles)" OFF)
-option(RYTHE_BUILD_OPTION_ASAN "Enable the address sanitizer where possible" ON)
-option(RYTHE_BUILD_OPTION_WERROR "Treat warnings as errors in all of Rythe's libraries and applications" ON)
-option(RYTHE_BUILD_APPLICATIONS "Build applications such as samples and sandbox apps" ON)
-option(RYTHE_FETCH_SUBMODULES "Enable fetching required submodules. Recommended when configuring modules/dependencies. Turn off if you're just adjusting files within the project." ON)
-
-# Folder structure
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON)
-set(CMAKE_FOLDER "1 - utils")
-
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-
-# Convenience directory variables, usable in subdirs
-set(RYTHE_DIR_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set(RYTHE_DIR_RYTHE ${CMAKE_CURRENT_SOURCE_DIR}/rythe)
-set(RYTHE_DIR_ENGINE ${CMAKE_CURRENT_SOURCE_DIR}/rythe/engine)
-set(RYTHE_DIR_EDITOR ${CMAKE_CURRENT_SOURCE_DIR}/rythe/editor)
-
-set(RYTHE_DIR_OUTPUT_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-set(RYTHE_DIR_OUTPUT_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-# C++ files/lang
-set(RYTHE_LANGUAGE CXX)
-set(RYTHE_FILE_TYPES *.h *.hpp *.c *.cpp *.inl)
-
-# Include dirs
-set(RYTHE_INCLUDE_ALL "")
-set(RYTHE_INCLUDE_ENGINE "")
-set(RYTHE_INCLUDE_EDITOR "")
-set(RYTHE_INCLUDE_THIRD_PARTY "")
-
-# Libs
-set(RYTHE_LIBS_ALL "")
-set(RYTHE_LIBS_ENGINE "")
-set(RYTHE_LIBS_EDITOR "")
-set(RYTHE_LIBS_THIRD_PARTY "")
-
-# Definitions
-set(RYTHE_DEFINITIONS "")
-list(APPEND RYTHE_DEFINITIONS "RYTHE_ENGINE")
-
-# Compiler flags
-set(RYTHE_COMPILER_FLAGS "")
-set(RYTHE_LINKER_FLAGS "")
-
-if (NOT MSVC)
-	set(RYTHE_COMPILER_FLAGS -Wall -Wextra -Wpedantic
-							-Wno-c++98-compat -Wno-c++98-compat-pedantic 
-							-Wno-c++0x-compat 
-							-Wno-c++11-compat -Wno-c++11-compat-pedantic
-							-Wno-c++14-compat -Wno-c++14-compat-pedantic
-							${RYTHE_COMPILER_FLAGS})
-
-    if (${RYTHE_BUILD_OPTION_WERROR})
-        set(RYTHE_COMPILER_FLAGS -Werror ${RYTHE_COMPILER_FLAGS})
-    endif()
-
-	if (${RYTHE_BUILD_OPTION_ASAN})
-		set(RYTHE_COMPILER_FLAGS -fsanitize=address ${RYTHE_COMPILER_FLAGS})
-		set(RYTHE_LINKER_FLAGS -fsanitize=address ${RYTHE_LINKER_FLAGS})
-	endif()
-else()
-	set(RYTHE_COMPILER_FLAGS /MP /W4 ${RYTHE_COMPILER_FLAGS})
-
-    if (${RYTHE_BUILD_OPTION_WERROR})
-        set(RYTHE_COMPILER_FLAGS /WX ${RYTHE_COMPILER_FLAGS})
-    endif()
-
-	if (${RYTHE_BUILD_OPTION_ASAN})
-		set(RYTHE_COMPILER_FLAGS /fsanitize=address ${RYTHE_COMPILER_FLAGS})
-	endif()
-endif()
-
-# Force library type to static
-set(RYTHE_LIBRARY_TYPE STATIC)
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-mark_as_advanced(FORCE BUILD_SHARED_LIBS) # Hide
-
-# Third party libraries often like to enable docs/examples
-# we practically never want this from our dependencies
-set(BUILD_DOC OFF CACHE BOOL "" FORCE)
-set(BUILD_DOCS OFF CACHE BOOL "" FORCE)
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-set(BUILD_SANDBOX OFF CACHE BOOL "" FORCE)
-set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
-
-# Utility files
-include("${CMAKE_MODULE_PATH}/update_submodule.cmake")
-include("${CMAKE_MODULE_PATH}/copy_module_output.cmake")
-include("${CMAKE_MODULE_PATH}/configure_application.cmake")
-include("${CMAKE_MODULE_PATH}/configure_module.cmake")
-include("${CMAKE_MODULE_PATH}/add_third_party.cmake")
-include("${CMAKE_MODULE_PATH}/find_sources.cmake")
-
-# Get Git
-find_package(Git REQUIRED)
-
-execute_process(COMMAND ${GIT_EXECUTABLE} config --global core.longpaths true
-	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-	RESULT_VARIABLE GIT_SUBMOD_RESULT)
-
-if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-	message(FATAL_ERROR "git submodule update failed with ${GIT_SUBMOD_RESULT}")
-endif()
-
-# Add Rythe
-set(RYTHE_ENABLED_MODULE_NAMES "")
-set(RYTHE_ENABLED_APPLICATION_NAMES "")
-set(RYTHE_ENABLED_MODULE_PATHS "")
-add_subdirectory(${RYTHE_DIR_RYTHE})
-
-# The engine is ready - add applications
-if (${RYTHE_BUILD_APPLICATIONS})
-	add_subdirectory(${RYTHE_DIR_ROOT}/applications)
-
-	foreach(path ${RYTHE_ENABLED_MODULE_PATHS})
-		add_subdirectory(${RYTHE_DIR_ROOT}/${path}/applications)
-	endforeach()
-endif()
-
-# Add config project
-set(configure_command_args "")
-list(APPEND configure_command_args "\"${RYTHE_DIR_ROOT}\"")
-list(APPEND configure_command_args "-G \"${CMAKE_GENERATOR}\"")
-list(APPEND configure_command_args "-S \"${RYTHE_DIR_ROOT}\"")
-list(APPEND configure_command_args "-B \"${CMAKE_BINARY_DIR}\"")
-list(APPEND configure_command_args -T ClangCL)
-list(APPEND configure_command_args -D RYTHE_FETCH_SUBMODULES=OFF)
-
-list(APPEND configure_command_args -D RYTHE_BUILD_APPLICATIONS=${RYTHE_BUILD_APPLICATIONS})
-
-list(APPEND configure_command_args -D RYTHE_BUILD_OPTION_ASAN=${RYTHE_BUILD_OPTION_ASAN})
-
-list(APPEND configure_command_args -D RYTHE_BUILD_OPTION_WERROR=${RYTHE_BUILD_OPTION_WERROR})
-
-
-if (${RYTHE_FORCE_ENABLE_ALL_MODULES})
-	list(APPEND configure_command_args -D RYTHE_FORCE_ENABLE_ALL_MODULES=ON)
-else()
-	list(APPEND configure_command_args -D RYTHE_FORCE_ENABLE_ALL_MODULES=OFF)
-	foreach(module_name ${RYTHE_ENABLED_MODULE_NAMES})
-		string(TOUPPER module_name module)
-		list(APPEND configure_command_args -D RYTHE_MODULE_${module}=ON)
-	endforeach()	
-endif()
-
-add_custom_target(configure ${CMAKE_COMMAND} ${configure_command_args})
-
-foreach(module_name ${RYTHE_ENABLED_MODULE_NAMES})
-	add_dependencies(${module_name} configure)
-endforeach()
-
-foreach(application_name ${RYTHE_ENABLED_APPLICATION_NAMES})
-	add_dependencies(${application_name} configure)
-endforeach()
-
-# Set folder names
-file(GLOB files ${RYTHE_DIR_RYTHE}/${RYTHE_FILE_TYPES})
-foreach(file ${files})
-	set_target_properties(${file} PROPERTIES FOLDER ${file})
-endforeach()
diff --git a/Rythe-Engine.code-workspace b/Rythe-Engine.code-workspace
new file mode 100644
index 000000000..876a1499c
--- /dev/null
+++ b/Rythe-Engine.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}
\ No newline at end of file
diff --git a/VisualStudio22-All.bat b/VisualStudio22-All.bat
index 67ce0a412..f6597e9f8 100644
--- a/VisualStudio22-All.bat
+++ b/VisualStudio22-All.bat
@@ -1,2 +1 @@
-cmake -E make_directory build
-cmake . -G "Visual Studio 17 2022" -S . -B ./build/ -T ClangCL -D RYTHE_BUILD_APPLICATIONS=ON -D RYTHE_BUILD_OPTION_ASAN=OFF -D RYTHE_FORCE_ENABLE_ALL_MODULES=ON
\ No newline at end of file
+tools\premake5 vs2022
\ No newline at end of file
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
deleted file mode 100644
index 1cb1f47c4..000000000
--- a/applications/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Overarching CMake script for applications.
-# The Rythe root CMakeLists adds this folder as a submodule,
-# this script doesn't have to do much other than add every known application in.
-
-if(${RYTHE_BUILD_APPLICATIONS})
-    add_subdirectory(sandbox)
-    add_subdirectory(rsl_test)
-endif()
-
-set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
diff --git a/applications/core_test/.rythe_project b/applications/core_test/.rythe_project
new file mode 100644
index 000000000..87ce667ab
--- /dev/null
+++ b/applications/core_test/.rythe_project
@@ -0,0 +1,7 @@
+local project = {
+    dependencies = {
+        "rythe/core"
+    }
+}
+
+return project
diff --git a/applications/core_test/src/core_test/source.cpp b/applications/core_test/src/core_test/source.cpp
new file mode 100644
index 000000000..9d13e62db
--- /dev/null
+++ b/applications/core_test/src/core_test/source.cpp
@@ -0,0 +1,15 @@
+#define RYTHE_ENTRY
+
+#include <rsl/time>
+#include <rsl/math>
+#include <rsl/logging>
+#include <chrono>
+#include <iostream>
+
+#include <core/core.hpp>
+
+void RYTHE_CCONV reportModules(rythe::core::Program* program)
+{
+    rsl::log::debug("Initilizing Core-Application");
+    program->addEngineInstance();
+}
diff --git a/applications/editor/.rythe_project b/applications/editor/.rythe_project
new file mode 100644
index 000000000..33f2465c4
--- /dev/null
+++ b/applications/editor/.rythe_project
@@ -0,0 +1,7 @@
+local project = {
+    dependencies = {
+        "rythe/core"
+    }
+}
+
+return project
\ No newline at end of file
diff --git a/applications/editor/engine/tools/lgnspre.exe b/applications/editor/engine/tools/lgnspre.exe
new file mode 100644
index 000000000..420b5b87f
Binary files /dev/null and b/applications/editor/engine/tools/lgnspre.exe differ
diff --git a/applications/rsl_test/.rythe_project b/applications/rsl_test/.rythe_project
new file mode 100644
index 000000000..59bf9c459
--- /dev/null
+++ b/applications/rsl_test/.rythe_project
@@ -0,0 +1,7 @@
+local project = {
+    dependencies = {
+        "rythe/rythe-standard-library:test"
+    }
+}
+
+return project
\ No newline at end of file
diff --git a/applications/rsl_test/CMakeLists.txt b/applications/rsl_test/CMakeLists.txt
deleted file mode 100644
index 5e835aa26..000000000
--- a/applications/rsl_test/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-project(rsl_test LANGUAGES ${RYTHE_LANGUAGE})
-
-rythe_find_sources(sources "${PROJECT_SOURCE_DIR}")
-add_executable(rsl_test ${sources})
-set_target_properties(rsl_test PROPERTIES FOLDER "2 - applications")
-
-# Dependency on RSL
-target_include_directories(rsl_test PUBLIC "${RYTHE_DIR_ENGINE}/core/third_party/rythe-standard-library/src")
-target_link_libraries(rsl_test PUBLIC rythe-standard-library)
-
-rythe_configure_manual_application(rsl_test)
-	
-set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
diff --git a/applications/rsl_test/source.cpp b/applications/rsl_test/source.cpp
deleted file mode 100644
index 779e286d7..000000000
--- a/applications/rsl_test/source.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-#define RYTHE_VALIDATE
-
-#include <rsl/delegate>
-#include <rsl/buffered_string>
-#include <rsl/time>
-
-#include <rsl/math>
-
-#include <iostream>
-#include <chrono>
-
-static size_t counter;
-
-static void func() {
-    counter++;
-}
-
-struct Object {
-    std::vector<size_t> ints;
-
-    void memberFunc() {
-        for (size_t& i : ints) {
-            i++;
-            counter += i;
-        }
-    }
-
-    void constMemberFunc() const {
-
-        for (size_t i : ints) {
-            counter += i;
-        }
-    }
-};
-
-static std::vector<size_t> createVec(size_t idx) {
-    std::vector<size_t> vec;
-    for (size_t i = idx + 20; i > idx; i--) {
-        vec.push_back(i);
-    }
-    return vec;
-}
-
-void delegate_test(size_t i) {
-    rsl::multicast_delegate<void()> del;
-
-    {
-        del = &func;
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        del = []() {
-            counter++;
-        };
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        std::vector<size_t> ints = createVec(i);
-        del = [ints]() {
-            for (size_t i : ints) {
-                i++;
-                counter += i;
-            }
-        };
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        Object obj{ createVec(i) };
-        {
-            del.assign<Object, &Object::memberFunc>(obj);
-        }
-
-        del();
-    }
-
-    counter = 0;
-
-    {
-        const Object obj{ createVec(i) };
-        {
-            del.assign<Object, &Object::constMemberFunc>(obj);
-        }
-
-        del();
-    }
-
-    counter = 0;
-
-    for (size_t j = 0; j < 10000; j++) {
-        del();
-    }
-}
-
-void stl_test(size_t i) {
-    std::function<void()> del;
-
-    {
-        del = &func;
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        del = []() {
-            counter++;
-        };
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        std::vector<size_t> ints = createVec(i);
-        del = [ints]() {
-            for (size_t i : ints) {
-                i++;
-                counter += i;
-            }
-        };
-    }
-
-    del();
-
-    counter = 0;
-
-    {
-        Object obj{ createVec(i) };
-        {
-            auto mf = std::mem_fn(&Object::memberFunc);
-            del = std::bind(mf, &obj);
-        }
-
-        del();
-    }
-
-    counter = 0;
-
-    {
-        const Object obj{ createVec(i) };
-        {
-            auto mf = std::mem_fn(&Object::constMemberFunc);
-            del = std::bind(mf, const_cast<Object*>(&obj));
-        }
-
-        del();
-    }
-
-    counter = 0;
-
-    for (size_t j = 0; j < 10000; j++) {
-        del();
-    }
-}
-
-int main() {
-    constexpr size_t ITERATIONS = 10000;
-    using clock = std::chrono::high_resolution_clock;
-    {
-        auto start = clock::now();
-
-        for (size_t i = 0; i < ITERATIONS; i++) {
-            delegate_test(i);
-        }
-
-        auto elapsed = (clock::now() - start);
-        std::cout << counter << std::endl;
-        std::cout << (std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(elapsed).count() / ITERATIONS) << "\t" << elapsed.count() << std::endl;
-        counter = 0;
-    }
-
-    {
-        auto start = clock::now();
-
-        for (size_t i = 0; i < ITERATIONS; i++) {
-            stl_test(i);
-        }
-
-        auto elapsed = (clock::now() - start);
-        std::cout << counter << std::endl;
-        std::cout << (std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(elapsed).count() / ITERATIONS) << "\t" << elapsed.count() << std::endl;
-        counter = 0;
-    }
-
-    rsl::stopwatch<rsl::fast_time, std::chrono::system_clock> timer;
-    rsl::timer accurateTimer;
-
-    rsl::time_point startTime = timer.start_point();
-
-    std::cout << "timer started at: " << startTime.hours() << ':' << startTime.minutes() << ' ' << startTime.seconds() << "s\n";
-
-    rsl::time_point currentTime = timer.current_point();
-    rsl::time_span elapsedTime = currentTime - startTime;
-    rsl::time_span otherElapsed = timer.elapsed_time();
-    rsl::time_span accurateElapsed = accurateTimer.elapsed_time();
-
-    std::cout << "timer after log: " << currentTime.hours() << ':' << currentTime.minutes() << ' ' << currentTime.seconds() << "s\n";
-
-
-    std::cout << "elapsed time: " << elapsedTime.nanoseconds() << " nanoseconds, other elapsed: " << otherElapsed.nanoseconds() << " nanoseconds, accurate elapsed: " << accurateElapsed.nanoseconds() << " nanoseconds\n";
-
-
-    rsl::buffered_string<16> str = "Hello there!";
-    rsl::buffered_string<16> str2 = "This is more than 16 chars!";
-
-    constexpr auto typeName = rsl::type_name(str);
-
-    std::cout << typeName << '\n';
-
-    std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
-
-    str.resize(15);
-
-    std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
-
-    str.resize(6);
-
-    std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
-
-    return 0;
-}
diff --git a/applications/rsl_test/src/rsl_test/source.cpp b/applications/rsl_test/src/rsl_test/source.cpp
new file mode 100644
index 000000000..d2de3dd65
--- /dev/null
+++ b/applications/rsl_test/src/rsl_test/source.cpp
@@ -0,0 +1,281 @@
+#define RYTHE_VALIDATE
+
+#include <rsl/buffered_string>
+#include <rsl/delegate>
+#include <rsl/time>
+
+#include <rsl/math>
+
+#include <chrono>
+#include <iostream>
+
+static size_t counter;
+
+static void func()
+{
+	counter++;
+}
+
+static void func2(unsigned& i)
+{
+	static unsigned tmp = 0;
+	static volatile unsigned* ptr = &tmp;
+	*ptr = i;
+}
+
+struct Object
+{
+	std::vector<size_t> ints;
+
+	void memberFunc()
+	{
+		for (size_t& i : ints)
+		{
+			i++;
+			counter += i;
+		}
+	}
+
+	void constMemberFunc() const
+	{
+
+		for (size_t i : ints)
+		{
+			counter += i;
+		}
+	}
+};
+
+static std::vector<size_t> createVec(size_t idx)
+{
+	std::vector<size_t> vec;
+	for (size_t i = idx + 20; i > idx; i--)
+	{
+		vec.push_back(i);
+	}
+	return vec;
+}
+
+void delegate_test(size_t i)
+{
+
+	rsl::delegate<void(rsl::uint32&)> del2;
+
+	{
+		del2 = &func2;
+		rsl::uint32 t = 0;
+		del2(t);
+	}
+
+	rsl::multicast_delegate<void()> del;
+
+	{
+		del = &func;
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		del = []()
+		{
+			counter++;
+		};
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		std::vector<size_t> ints = createVec(i);
+		del = [ints]()
+		{
+			for (size_t i : ints)
+			{
+				i++;
+				counter += i;
+			}
+		};
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		Object obj{createVec(i)};
+		{
+			del.assign<Object, &Object::memberFunc>(obj);
+		}
+
+		del();
+	}
+
+	counter = 0;
+
+	{
+		const Object obj{createVec(i)};
+		{
+			del.assign<Object, &Object::constMemberFunc>(obj);
+		}
+
+		del();
+	}
+
+	counter = 0;
+
+	for (size_t j = 0; j < 10000; j++)
+	{
+		del();
+	}
+}
+
+void stl_test(size_t i)
+{
+
+	std::function<void(rsl::uint32&)> del2;
+
+	{
+		del2 = &func2;
+		rsl::uint32 t = 0;
+		del2(t);
+	}
+
+	std::function<void()> del;
+
+	{
+		del = &func;
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		del = []()
+		{
+			counter++;
+		};
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		std::vector<size_t> ints = createVec(i);
+		del = [ints]()
+		{
+			for (size_t i : ints)
+			{
+				i++;
+				counter += i;
+			}
+		};
+	}
+
+	del();
+
+	counter = 0;
+
+	{
+		Object obj{createVec(i)};
+		{
+			auto mf = std::mem_fn(&Object::memberFunc);
+			del = std::bind(mf, &obj);
+		}
+
+		del();
+	}
+
+	counter = 0;
+
+	{
+		const Object obj{createVec(i)};
+		{
+			auto mf = std::mem_fn(&Object::constMemberFunc);
+			del = std::bind(mf, const_cast<Object*>(&obj));
+		}
+
+		del();
+	}
+
+	counter = 0;
+
+	for (size_t j = 0; j < 10000; j++)
+	{
+		del();
+	}
+}
+
+int main()
+{
+	constexpr size_t ITERATIONS = 10000;
+	using clock = std::chrono::high_resolution_clock;
+	{
+		auto start = clock::now();
+
+		for (size_t i = 0; i < ITERATIONS; i++)
+		{
+			delegate_test(i);
+		}
+
+		auto elapsed = (clock::now() - start);
+		std::cout << counter << std::endl;
+		std::cout << (std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(elapsed).count() / ITERATIONS) << "\t" << elapsed.count() << std::endl;
+		counter = 0;
+	}
+
+	{
+		auto start = clock::now();
+
+		for (size_t i = 0; i < ITERATIONS; i++)
+		{
+			stl_test(i);
+		}
+
+		auto elapsed = (clock::now() - start);
+		std::cout << counter << std::endl;
+		std::cout << (std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(elapsed).count() / ITERATIONS) << "\t" << elapsed.count() << std::endl;
+		counter = 0;
+	}
+
+	rsl::stopwatch<rsl::fast_time, std::chrono::system_clock> timer;
+	rsl::timer accurateTimer;
+
+	rsl::time_point startTime = timer.start_point();
+
+	std::cout << "timer started at: " << startTime.hours() << ':' << startTime.minutes() << ' ' << startTime.seconds() << "s\n";
+
+	rsl::time_point currentTime = timer.current_point();
+	rsl::time_span elapsedTime = currentTime - startTime;
+	rsl::time_span otherElapsed = timer.elapsed_time();
+	rsl::time_span accurateElapsed = accurateTimer.elapsed_time();
+
+	std::cout << "timer after log: " << currentTime.hours() << ':' << currentTime.minutes() << ' ' << currentTime.seconds() << "s\n";
+
+
+	std::cout << "elapsed time: " << elapsedTime.nanoseconds() << " nanoseconds, other elapsed: " << otherElapsed.nanoseconds() << " nanoseconds, accurate elapsed: " << accurateElapsed.nanoseconds() << " nanoseconds\n";
+
+
+	rsl::buffered_string<16> str = "Hello there!";
+	rsl::buffered_string<16> str2 = "This is more than 16 chars!";
+
+	constexpr auto typeName = rsl::type_name(str);
+
+	std::cout << typeName << '\n';
+
+	std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
+
+	str.resize(15);
+
+	std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
+
+	str.resize(6);
+
+	std::cout << '\"' << str << "\"\n\"" << str2 << "\"\n";
+
+	return 0;
+}
diff --git a/applications/sandbox/.rythe_project b/applications/sandbox/.rythe_project
new file mode 100644
index 000000000..fdbf6994c
--- /dev/null
+++ b/applications/sandbox/.rythe_project
@@ -0,0 +1,9 @@
+local project = {
+    dependencies = {
+        "rythe/core",
+        "rythe/graphics",
+        "rythe/audio"
+    }
+}
+
+return project
\ No newline at end of file
diff --git a/applications/sandbox/CMakeLists.txt b/applications/sandbox/CMakeLists.txt
deleted file mode 100644
index b19c86c52..000000000
--- a/applications/sandbox/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Sandbox depends on applications and graphics in this case
-
-if (${RYTHE_MODULE_APPLICATION} AND ${RYTHE_MODULE_GRAPHICS})
-	project(sandbox LANGUAGES ${RYTHE_LANGUAGE})
-
-	rythe_find_sources(sources "${PROJECT_SOURCE_DIR}")
-	add_executable(sandbox ${sources})
-	set_target_properties(sandbox PROPERTIES FOLDER "2 - applications")
-
-	target_include_directories(sandbox PUBLIC "${RYTHE_DIR_ENGINE}/core/third_party/rythe-standard-library/src")
-	target_link_libraries(sandbox PUBLIC rythe-standard-library)
-
-	target_include_directories(sandbox PUBLIC "${RYTHE_DIR_ENGINE}/core/src")
-	target_link_libraries(sandbox PUBLIC core)
-
-	rythe_configure_manual_application(sandbox)
-	
-	set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
-endif()
diff --git a/applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif b/applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif
index 6b3c38dea..65574a853 100644
Binary files a/applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif and b/applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif differ
diff --git a/applications/sandbox/engine/resources/rythe/Icon.png b/applications/sandbox/engine/resources/rythe/Icon.png
new file mode 100644
index 000000000..ed8949f74
--- /dev/null
+++ b/applications/sandbox/engine/resources/rythe/Icon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9f58ab800e02c7d394173ea055bad791eac4691a0af9d1602e2fbedacc5e2e1
+size 80187
diff --git a/applications/sandbox/engine/resources/rythe/icon b/applications/sandbox/engine/resources/rythe/icon
deleted file mode 100644
index 2eff229cf..000000000
Binary files a/applications/sandbox/engine/resources/rythe/icon and /dev/null differ
diff --git a/applications/sandbox/engine/shaders/legiontonemap.shs b/applications/sandbox/engine/shaders/rythetonemap.shs
similarity index 100%
rename from applications/sandbox/engine/shaders/legiontonemap.shs
rename to applications/sandbox/engine/shaders/rythetonemap.shs
diff --git a/applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll b/applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll
index c8af8da40..171b77020 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll and b/applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_asyncio.pyd b/applications/sandbox/engine/tools/lgnspre/_asyncio.pyd
index abb9d2273..328cd9fed 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_asyncio.pyd and b/applications/sandbox/engine/tools/lgnspre/_asyncio.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_bz2.pyd b/applications/sandbox/engine/tools/lgnspre/_bz2.pyd
index 40b9cab80..274fcf2a6 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_bz2.pyd and b/applications/sandbox/engine/tools/lgnspre/_bz2.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_ctypes.pyd b/applications/sandbox/engine/tools/lgnspre/_ctypes.pyd
index 84355f029..81cda9000 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_ctypes.pyd and b/applications/sandbox/engine/tools/lgnspre/_ctypes.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_decimal.pyd b/applications/sandbox/engine/tools/lgnspre/_decimal.pyd
index 3d382be0c..924b26413 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_decimal.pyd and b/applications/sandbox/engine/tools/lgnspre/_decimal.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_elementtree.pyd b/applications/sandbox/engine/tools/lgnspre/_elementtree.pyd
index c62602bb0..a7c29cd4c 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_elementtree.pyd and b/applications/sandbox/engine/tools/lgnspre/_elementtree.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_hashlib.pyd b/applications/sandbox/engine/tools/lgnspre/_hashlib.pyd
index d2ddb643e..1835fea09 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_hashlib.pyd and b/applications/sandbox/engine/tools/lgnspre/_hashlib.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_lzma.pyd b/applications/sandbox/engine/tools/lgnspre/_lzma.pyd
index c1870b1b4..df8b559f6 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_lzma.pyd and b/applications/sandbox/engine/tools/lgnspre/_lzma.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd b/applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd
index fdb3449db..65c7c507b 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd and b/applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_overlapped.pyd b/applications/sandbox/engine/tools/lgnspre/_overlapped.pyd
index 364b1f2b8..4c472701a 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_overlapped.pyd and b/applications/sandbox/engine/tools/lgnspre/_overlapped.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_queue.pyd b/applications/sandbox/engine/tools/lgnspre/_queue.pyd
index 964bed761..e5cd65a24 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_queue.pyd and b/applications/sandbox/engine/tools/lgnspre/_queue.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_socket.pyd b/applications/sandbox/engine/tools/lgnspre/_socket.pyd
index bcf96c145..2d55bd3d3 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_socket.pyd and b/applications/sandbox/engine/tools/lgnspre/_socket.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_ssl.pyd b/applications/sandbox/engine/tools/lgnspre/_ssl.pyd
index 10d48f755..86745dc3d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_ssl.pyd and b/applications/sandbox/engine/tools/lgnspre/_ssl.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_testcapi.pyd b/applications/sandbox/engine/tools/lgnspre/_testcapi.pyd
index a71c142c3..0dcf89b19 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_testcapi.pyd and b/applications/sandbox/engine/tools/lgnspre/_testcapi.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/_tkinter.pyd b/applications/sandbox/engine/tools/lgnspre/_tkinter.pyd
index 1498d064b..785bbebf6 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/_tkinter.pyd and b/applications/sandbox/engine/tools/lgnspre/_tkinter.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll
index a7b61616b..98db7beb1 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll
index f297988c1..f05f999c4 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll
index e233aa1b0..3e06ddc3a 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll
index 0ae7612d4..e9912ead9 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll
index 054396466..70d34f22a 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll
index f4446ae4c..ac1bc6991 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll
index 63d0395e4..84678c868 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll
index fbc3e1bea..6628fbe15 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll
index 62c5055c1..e7d48fe19 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll
index b1a21364e..8fecf9563 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll
index 107e64dde..70614e766 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll
index 9ac7a5ccc..e9dd8abd4 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll
index ed221dd91..eaea3e7b3 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll
index 2dbba88d6..f37cb5b30 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll
index ff74f3392..c80b1c9dd 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll
index 726647cd2..8797b138f 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll
index 6cf2e9fe6..bc682f4eb 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll
index 21224edf7..190145883 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll
index 1134e5f29..74662b695 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll
index 6056c5a8c..3713ac45d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll
index 486145b01..520c75516 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll
index f8c18ec98..c88aa2895 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll
index 885d5dfe3..6b2cad498 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll
index c2926ab71..501b7b40c 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll
index 29a64af73..f5982f668 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll
index 7551f625a..a022afe66 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll
index 457529183..51515840d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll
index d665a2171..bae722cb8 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll
index 3eb3a5ecd..68b4de49d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll
index fa4f50c1b..a1976943e 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll
index d88deb8e5..01a799ae3 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll
index d2612b40a..9b4bafb96 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll
index 3245ea48b..952779ad4 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll
index 3c3c749fc..c1b95c7aa 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll
index b9234b3df..d6118d938 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll
index 52ab439de..e4be65143 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll
index ae59db1cc..40df4a905 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll
index 133565eb4..eeaed3e80 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll and b/applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/base_library.zip b/applications/sandbox/engine/tools/lgnspre/base_library.zip
index 1802e9f9e..962047aff 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/base_library.zip and b/applications/sandbox/engine/tools/lgnspre/base_library.zip differ
diff --git a/applications/sandbox/engine/tools/lgnspre/lgncleancache.exe b/applications/sandbox/engine/tools/lgnspre/lgncleancache.exe
new file mode 100644
index 000000000..6b6a2bb99
Binary files /dev/null and b/applications/sandbox/engine/tools/lgnspre/lgncleancache.exe differ
diff --git a/applications/sandbox/engine/tools/lgnspre/lgnspre.exe b/applications/sandbox/engine/tools/lgnspre/lgnspre.exe
new file mode 100644
index 000000000..b024fcb0a
Binary files /dev/null and b/applications/sandbox/engine/tools/lgnspre/lgnspre.exe differ
diff --git a/applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll b/applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll
index aaf01623f..66c1fde2d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll and b/applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/libffi-7.dll b/applications/sandbox/engine/tools/lgnspre/libffi-7.dll
index eeda33bec..60cc8c02d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/libffi-7.dll and b/applications/sandbox/engine/tools/lgnspre/libffi-7.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll b/applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll
index 76e02b830..4492553d6 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll and b/applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/pyexpat.pyd b/applications/sandbox/engine/tools/lgnspre/pyexpat.pyd
index e9474110b..d972c5189 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/pyexpat.pyd and b/applications/sandbox/engine/tools/lgnspre/pyexpat.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/python38.dll b/applications/sandbox/engine/tools/lgnspre/python38.dll
index e0bb366e6..266b83e06 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/python38.dll and b/applications/sandbox/engine/tools/lgnspre/python38.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/pywintypes38.dll b/applications/sandbox/engine/tools/lgnspre/pywintypes38.dll
index 74a19d66c..1c8f03f5d 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/pywintypes38.dll and b/applications/sandbox/engine/tools/lgnspre/pywintypes38.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/select.pyd b/applications/sandbox/engine/tools/lgnspre/select.pyd
index fab571072..7d52c2289 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/select.pyd and b/applications/sandbox/engine/tools/lgnspre/select.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/tcl86t.dll b/applications/sandbox/engine/tools/lgnspre/tcl86t.dll
index b622b6184..29e8386b4 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/tcl86t.dll and b/applications/sandbox/engine/tools/lgnspre/tcl86t.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/tk86t.dll b/applications/sandbox/engine/tools/lgnspre/tk86t.dll
index ce714c4dc..ecd050afd 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/tk86t.dll and b/applications/sandbox/engine/tools/lgnspre/tk86t.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/ucrtbase.dll b/applications/sandbox/engine/tools/lgnspre/ucrtbase.dll
index b32c41c3d..e945fcfd8 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/ucrtbase.dll and b/applications/sandbox/engine/tools/lgnspre/ucrtbase.dll differ
diff --git a/applications/sandbox/engine/tools/lgnspre/unicodedata.pyd b/applications/sandbox/engine/tools/lgnspre/unicodedata.pyd
index 3c09c5231..19d1059f1 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/unicodedata.pyd and b/applications/sandbox/engine/tools/lgnspre/unicodedata.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/win32api.pyd b/applications/sandbox/engine/tools/lgnspre/win32api.pyd
index 70ac70a2e..c9b83b7a5 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/win32api.pyd and b/applications/sandbox/engine/tools/lgnspre/win32api.pyd differ
diff --git a/applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd b/applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd
index 479df6eee..c3e33f6cd 100644
Binary files a/applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd and b/applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd differ
diff --git a/applications/sandbox/module/examplemodule.hpp b/applications/sandbox/module/examplemodule.hpp
deleted file mode 100644
index 4da7df983..000000000
--- a/applications/sandbox/module/examplemodule.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-#include <core/core.hpp>
-
-#include "../systems/mysystem.hpp"
-#include "../systems/examplesystem.hpp"
-#include "../systems/simplecameracontroller.hpp"
-#include "../systems/gui_test.hpp"
-
-class ExampleModule : public legion::Module
-{
-public:
-    virtual void setup() override
-    {
-        using namespace legion;
-        app::WindowSystem::requestWindow(
-            ecs::world_entity_id,
-            math::ivec2(1920, 1080),
-            "LEGION Engine",
-            "Legion Icon",
-            nullptr,
-            nullptr,
-            0
-        );
-
-        //reportSystem<MySystem>();
-        reportSystem<SimpleCameraController>();
-        reportSystem<ExampleSystem>();
-        reportSystem<GuiTestSystem>();
-    }
-};
diff --git a/applications/sandbox/source.cpp b/applications/sandbox/source.cpp
deleted file mode 100644
index 80b30bb78..000000000
--- a/applications/sandbox/source.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//#define LEGION_ENTRY
-//#define LEGION_LOG_DEBUG
-//
-//#if defined(NDEBUG)
-//    #define LEGION_KEEP_CONSOLE
-//#endif
-//
-//#include <core/core.hpp>
-//#include <application/application.hpp>
-//#include <graphics/graphics.hpp>
-//#include "module/examplemodule.hpp"
-//
-//#ifdef RYTHE_AUDIO
-//#include <audio/audio.hpp>
-//#endif
-//
-//void LEGION_CCONV reportModules(legion::Engine* engine)
-//{
-//    using namespace legion;
-//    engine->reportModule<app::ApplicationModule>();
-//    engine->reportModule<gfx::RenderingModule>();
-//    engine->reportModule<ExampleModule>();
-//
-//#ifdef RYTHE_AUDIO
-//    engine->reportModule<audio::AudioModule>();
-//#endif
-//}
-
-//#define LEGION_ENTRY
-
-#include <iostream>
-
-#include <core/core.hpp>
-
-struct StartFeature : public rythe::feature {
-    void invoke() {}
-};
-
-struct UpdateFeature : public rythe::feature {
-    void invoke() {}
-};
-
-struct RaycastFeature : public rythe::feature {
-    void invoke() {}
-};
-
-struct RaycastTerrainFeature : public rythe::feature {
-    void invoke() {}
-};
-
-
-struct RenderFeature : public rythe::feature {
-    void invoke() {}
-};
-
-class GameModule : public rythe::module<rythe::feature_set<StartFeature, UpdateFeature, RenderFeature>> {
-};
-
-class PhysicsModule : public rythe::module<rythe::feature_set<RaycastFeature, RaycastTerrainFeature>> {
-};
-
-class Game : public rythe::program<GameModule, PhysicsModule> {
-};
-
-template<typename T>
-void logType() {
-    std::cout << rsl::type_name<T>() << '\n';
-}
-
-template<typename... Types>
-void logTypeSequenceImpl(rsl::type_sequence<Types...>) {
-    (logType<Types>(), ...);
-}
-
-template<rsl::type_sequence_c Seq>
-void logTypeSequence() {
-    logTypeSequenceImpl(Seq{});
-}
-
-template<rythe::feature_set_c Seq>
-void logFeatureSet() {
-    logTypeSequenceImpl(typename Seq::type_sequence{});
-}
-
-template<typename ProgramT, rythe::feature_c feature>
-void checkFeature() {
-    static_assert(ProgramT::template has_feature<feature>(), "Missing feature!");
-}
-
-int main() {
-   using t = rsl::concat_sequence_t<rsl::type_sequence<StartFeature, UpdateFeature>, rsl::type_sequence<RaycastFeature, RaycastTerrainFeature, RenderFeature>>;
-   std::cout << "type sequence:\n";
-    logTypeSequence<t>();
-
-    std::cout << "\nfeature set:\n";
-    logFeatureSet<Game::features>();
-
-    checkFeature<Game, StartFeature>();
-    checkFeature<Game, UpdateFeature>();
-    checkFeature<Game, RaycastFeature>();
-    checkFeature<Game, RaycastTerrainFeature>();
-    if constexpr (!Game::has_feature<RenderFeature>()) {
-        std::cout << "Game does not have \"" << rsl::type_name<RenderFeature>() << "\"\n";
-    }
-    else {
-        std::cout << "Game has \"" << rsl::type_name<RenderFeature>() << "\"\n";
-    }
-
-    return 0;
-}
diff --git a/applications/sandbox/src/sandbox/module/examplemodule.hpp b/applications/sandbox/src/sandbox/module/examplemodule.hpp
new file mode 100644
index 000000000..0dd8d2a8c
--- /dev/null
+++ b/applications/sandbox/src/sandbox/module/examplemodule.hpp
@@ -0,0 +1,30 @@
+#pragma once
+#include <core/core.hpp>
+
+#include "../systems/examplesystem.hpp"
+#include "../systems/gui_test.hpp"
+#include "../systems/mysystem.hpp"
+#include "../systems/simplecameracontroller.hpp"
+
+class ExampleModule : public rythe::Module
+{
+public:
+	virtual void setup() override
+	{
+		using namespace rythe;
+		app::WindowSystem::requestWindow(
+			ecs::world_entity_id,
+			math::int2(1920, 1080),
+			"RYTHE Engine",
+			"RYTHE Icon",
+			nullptr,
+			nullptr,
+			0
+		);
+
+		// reportSystem<MySystem>();
+		reportSystem<SimpleCameraController>();
+		// reportSystem<ExampleSystem>();
+		reportSystem<GuiTestSystem>();
+	}
+};
diff --git a/applications/sandbox/src/sandbox/source.cpp b/applications/sandbox/src/sandbox/source.cpp
new file mode 100644
index 000000000..4e7c20db7
--- /dev/null
+++ b/applications/sandbox/src/sandbox/source.cpp
@@ -0,0 +1,27 @@
+#define RYTHE_ENTRY
+#define RYTHE_LOG_DEBUG
+
+#if defined(NDEBUG)
+	#define RYTHE_KEEP_CONSOLE
+#endif
+#include <application/application.hpp>
+#include <core/core.hpp>
+#include <graphics/graphics.hpp>
+
+#include "module/examplemodule.hpp"
+
+#ifdef RYTHE_AUDIO
+	#include <audio/audio.hpp>
+#endif
+
+void RYTHE_CCONV reportModules(rythe::Engine* engine)
+{
+	using namespace rythe;
+	engine->reportModule<app::ApplicationModule>();
+	engine->reportModule<gfx::RenderingModule>();
+	engine->reportModule<ExampleModule>();
+
+#ifdef RYTHE_AUDIO
+	engine->reportModule<audio::AudioModule>();
+#endif
+}
diff --git a/applications/sandbox/src/sandbox/systems/examplesystem.hpp b/applications/sandbox/src/sandbox/systems/examplesystem.hpp
new file mode 100644
index 000000000..291211f9f
--- /dev/null
+++ b/applications/sandbox/src/sandbox/systems/examplesystem.hpp
@@ -0,0 +1,519 @@
+#pragma once
+#include <application/application.hpp>
+#include <core/core.hpp>
+#include <graphics/graphics.hpp>
+
+struct example_comp
+{
+};
+
+struct tonemap_action : public ryt::app::input_action<tonemap_action>
+{
+};
+struct reload_shaders_action : public ryt::app::input_action<reload_shaders_action>
+{
+};
+struct switch_skybox_action : public ryt::app::input_action<switch_skybox_action>
+{
+};
+
+class ExampleSystem final : public rythe::System<ExampleSystem>
+{
+	rsl::size_type frames = 0;
+	rsl::time64 totalTime = 0;
+	rsl::stopwatch<rsl::time64> timer;
+	std::array<rsl::time64, 18000> times;
+
+public:
+	void setup()
+	{
+		using namespace rythe;
+		log::filter(log::severity_debug);
+		log::debug("ExampleSystem setup");
+
+		app::InputSystem::createBinding<tonemap_action>(app::inputmap::method::F2);
+		app::InputSystem::createBinding<reload_shaders_action>(app::inputmap::method::F3);
+		app::InputSystem::createBinding<switch_skybox_action>(app::inputmap::method::F4);
+		bindToEvent<tonemap_action, &ExampleSystem::onTonemapSwitch>();
+		bindToEvent<reload_shaders_action, &ExampleSystem::onShaderReload>();
+		bindToEvent<switch_skybox_action, &ExampleSystem::onSkyboxSwitch>();
+
+		app::window& win = ecs::world.get_component<app::window>();
+		app::context_guard guard(win);
+
+		auto model = gfx::ModelCache::create_model("Sphere", fs::view("assets://models/sphere.obj"));
+
+		auto material = gfx::MaterialCache::create_material("White", fs::view("assets://shaders/color.shs"));
+		material.set_param("color", math::colors::white);
+		/*{
+			auto ent = createEntity("Sun");
+			ent.add_component(gfx::light::directional(math::color(1, 1, 0.8f), 10.f));
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = position(0.f, 3.f, 6.f);
+			rot = rotation::lookat(math::float3::zero, math::float3(1.f, -1.f, 0.1f));
+		}*/
+
+		// #if defined(RYTHE_DEBUG)
+		//         for (int i = 0; i < 2000; i++)
+		// #else
+		//         for (int i = 0; i < 20000; i++)
+		// #endif
+		//         {
+		//             auto ent = createEntity();
+		//
+		//             auto [pos, rot, scal] = ent.add_component<transform>();
+		//             pos = math::sphericalRand(5.f);
+		//             scal = scale(0.1f, 0.1f, 0.1f);
+		//
+		//             ent.add_component<example_comp, velocity>();
+		//             ent.add_component(gfx::mesh_renderer(material, model));
+		//         }
+
+		material = gfx::MaterialCache::create_material("iron", fs::view("engine://shaders/default_lit.shs"));
+
+		material.set_param("alphaCutoff", 0.5f);
+		material.set_param("useAlbedoTex", true);
+		material.set_param("useRoughnessTex", true);
+		material.set_param("useNormal", true);
+		material.set_param("useAmbientOcclusion", true);
+		material.set_param("useHeight", true);
+		material.set_param("useMetallicTex", true);
+
+		material.set_param("useEmissiveTex", false);
+		material.set_param("useMetallicRoughness", false);
+
+		material.set_param("ambientOcclusionTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-ao.png")));
+		material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-height.png")));
+		material.set_param("heightScale", 1.f);
+		material.set_param("metallicTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-metallic.png")));
+		material.set_param("emissiveColor", math::colors::black);
+
+		material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-albedo-2048.png")));
+		material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-normal.png")));
+		material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-roughness.png")));
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 0.f, 0.f);
+			scal = math::float3(3.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("rock", fs::view("assets://shaders/pbr.shs"));
+
+		material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_Albedo.png")));
+		material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_NormalHeight.png")));
+		material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_MRDAo.png")));
+		material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_emissive.png")));
+		material.set_param(SV_HEIGHTSCALE, 1.f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 0.f, 4.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("copper", fs::view("assets://shaders/pbr.shs"));
+
+		material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-albedo-2048.png")));
+		material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-normalHeight-2048.png")));
+		material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-MRDAo-2048.png")));
+		material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-emissive-2048.png")));
+		material.set_param(SV_HEIGHTSCALE, 1.f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 0.f, 8.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("wood", fs::view("engine://shaders/default_lit.shs"));
+
+		material.set_param("alphaCutoff", 0.5f);
+		material.set_param("useAlbedoTex", true);
+		material.set_param("useRoughnessTex", true);
+		material.set_param("useNormal", true);
+		material.set_param("useHeight", true);
+
+		material.set_param("useAmbientOcclusion", false);
+		material.set_param("useMetallicTex", false);
+		material.set_param("useEmissiveTex", false);
+		material.set_param("useMetallicRoughness", false);
+
+		material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Displacement.png")));
+		material.set_param("heightScale", 1.f);
+		material.set_param("metallicValue", 0.f);
+		material.set_param("emissiveColor", math::colors::black);
+
+		material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/WoodColor.png")));
+		material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Normal.png")));
+		material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Roughness.png")));
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 4.f, 0.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("paint", fs::view("assets://shaders/pbr.shs"));
+
+		material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-albedo-2048.png")));
+		material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-normalHeight-2048.png")));
+		material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-MRDAo-2048.png")));
+		material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-emissive-2048.png")));
+		material.set_param(SV_HEIGHTSCALE, 1.f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 4.f, 4.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("tiles", fs::view("engine://shaders/default_lit.shs"));
+
+		material.set_param("alphaCutoff", 0.5f);
+		material.set_param("useAlbedoTex", true);
+		material.set_param("useRoughnessTex", true);
+		material.set_param("useNormal", true);
+
+		material.set_param("useMetallicTex", false);
+		material.set_param("useHeight", false);
+		material.set_param("useAmbientOcclusion", false);
+		material.set_param("useEmissiveTex", false);
+		material.set_param("useMetallicRoughness", false);
+
+		material.set_param("metallicValue", 0.f);
+		material.set_param("emissiveColor", math::colors::black);
+
+		material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileColor.png")));
+		material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileNormal.png")));
+		material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileRoughness.png")));
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 4.f, 8.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("slate", fs::view("assets://shaders/pbr.shs"));
+
+		material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-albedo-2048.png")));
+		material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-normalHeight-2048.png")));
+		material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-MRDAo-2048.png")));
+		material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-emissive-2048.png")));
+		material.set_param(SV_HEIGHTSCALE, 1.f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 8.f, 0.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("bricks", fs::view("engine://shaders/default_lit.shs"));
+
+		material.set_param("alphaCutoff", 0.5f);
+		material.set_param("useAlbedoTex", true);
+		material.set_param("useRoughnessTex", true);
+		material.set_param("useNormal", true);
+		material.set_param("useHeight", true);
+		material.set_param("useAmbientOcclusion", true);
+
+		material.set_param("useMetallicTex", false);
+		material.set_param("useEmissiveTex", false);
+		material.set_param("useMetallicRoughness", false);
+
+		material.set_param("metallicValue", 0.f);
+		material.set_param("emissiveColor", math::colors::black);
+
+		material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickColor.png")));
+		material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickRoughness.png")));
+		material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickNormal.png")));
+		material.set_param("ambientOcclusionTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickAO.png")));
+		material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickDisplacement.png")));
+		material.set_param("heightScale", 0.1f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 8.f, 4.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		material = gfx::MaterialCache::create_material("default", fs::view("assets://shaders/pbr.shs"));
+
+		material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("engine://resources/default/albedo.png")));
+		material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("engine://resources/default/normalHeight.png")));
+		material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("engine://resources/default/MRDAo.png")));
+		material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("engine://resources/default/emissive.png")));
+		material.set_param(SV_HEIGHTSCALE, 1.f);
+
+		{
+			auto ent = createEntity(material.get_name());
+			ent.add_component<example_comp>();
+			auto [pos, rot, scal] = ent.add_component<transform>();
+			pos = math::float3(0.f, 8.f, 8.f);
+			rot = math::angleAxis(math::half_pi<float>(), math::float3::up);
+			scal = math::float3(3.f);
+			ent.add_component(gfx::mesh_renderer(material, model));
+		}
+
+		// core::events::bindToEvent<events::exit, &ExampleSystem::onExit>();
+	}
+
+	void shutdown()
+	{
+		ryt::log::debug("ExampleSystem shutdown");
+	}
+
+	void onShaderReload(reload_shaders_action& event)
+	{
+		using namespace rythe;
+		if (event.pressed())
+		{
+			auto targetWin = ecs::world.get_component<app::window>();
+			if (!targetWin)
+				return;
+
+			app::window& win = targetWin.get();
+
+			if (!app::WindowSystem::windowStillExists(win.handle))
+				return;
+
+			app::context_guard guard(win);
+			if (guard.contextIsValid())
+			{
+				gfx::ShaderCache::clear_checked_paths();
+				gfx::ShaderCache::reload_shaders();
+			}
+		}
+	}
+
+	void onTonemapSwitch(tonemap_action& event)
+	{
+		using namespace rythe;
+		if (event.pressed())
+		{
+			static rsl::size_type type = static_cast<rsl::size_type>(gfx::tonemapping_type::rythe);
+			type = (type + 1) % (static_cast<rsl::size_type>(gfx::tonemapping_type::unreal3) + 1);
+
+			auto typeEnum = static_cast<gfx::tonemapping_type>(type);
+
+			std::string algorithmName;
+			switch (typeEnum)
+			{
+				case gfx::tonemapping_type::aces:
+					algorithmName = "aces";
+					break;
+				case gfx::tonemapping_type::reinhard:
+					algorithmName = "reinhard";
+					break;
+				case gfx::tonemapping_type::reinhard_jodie:
+					algorithmName = "reinhard_jodie";
+					break;
+				case gfx::tonemapping_type::rythe:
+					algorithmName = "rythe";
+					break;
+				case gfx::tonemapping_type::unreal3:
+					algorithmName = "unreal3";
+					break;
+				default:
+					algorithmName = "rythe";
+					break;
+			}
+			log::debug("Set tonemapping algorithm to {}", algorithmName);
+
+			gfx::Tonemapping::setAlgorithm(typeEnum);
+		}
+	}
+
+	void onSkyboxSwitch(switch_skybox_action& event)
+	{
+		using namespace rythe;
+		if (event.pressed())
+		{
+			static rsl::size_type idx = 0;
+			static gfx::texture_handle textures[4] = {};
+			static bool initialized = false;
+
+			if (!initialized)
+			{
+				auto targetWin = ecs::world.get_component<app::window>();
+				if (!targetWin)
+					return;
+
+				app::window& win = targetWin.get();
+
+				if (!app::WindowSystem::windowStillExists(win.handle))
+					return;
+
+				app::context_guard guard(win);
+				if (guard.contextIsValid())
+				{
+					textures[0] = gfx::TextureCache::create_texture("morning islands", fs::view("assets://textures/HDRI/morning_islands.jpg"));
+					textures[1] = gfx::TextureCache::create_texture("earth", fs::view("assets://textures/HDRI/earth.png"));
+					textures[2] = gfx::TextureCache::create_texture("park", fs::view("assets://textures/HDRI/park.jpg"));
+					textures[3] = gfx::TextureCache::create_texture("atmosphere", fs::view("assets://textures/HDRI/planetatmo.png"));
+					initialized = true;
+				}
+				else
+					return;
+			}
+
+			idx = (idx + 1) % 4;
+			auto skyboxRenderer = ecs::world.get_component<gfx::skybox_renderer>();
+			skyboxRenderer->material.set_param(SV_SKYBOX, textures[idx]);
+
+			log::debug("Set skybox to {}", textures[idx].get_texture().name);
+		}
+	}
+
+	void onExit([[maybe_unused]] ryt::events::exit& event)
+	{
+		using namespace rythe;
+
+		rsl::time64 avg0 = totalTime / frames;
+		rsl::time64 avg1 = timer.elapsed_time() / frames;
+
+		std::set<rsl::time64, std::greater<rsl::time64>> orderedTimes;
+
+		for (auto& time : times)
+			orderedTimes.insert(time);
+
+		rsl::time64 onePcLow = 0;
+		rsl::time64 pointOnePcLow = 0;
+
+		rsl::size_type i = 0;
+		for (auto& time : orderedTimes)
+		{
+			i++;
+			onePcLow += time;
+
+			if (i <= math::max<rsl::size_type>(math::uround(frames / 1000.0), 1))
+			{
+				pointOnePcLow += time;
+			}
+
+			if (i >= math::max<rsl::size_type>(math::uround(frames / 100.0), 1))
+			{
+				break;
+			}
+		}
+
+		pointOnePcLow /= math::max<rsl::size_type>(math::uround(frames / 1000.0), 1);
+		onePcLow /= math::max<rsl::size_type>(math::uround(frames / 100.0), 1);
+
+		log::info("1%Low {:.3f} 0.1%Low {:.3f} Avg {:.3f} Measured Avg {:.3f}", onePcLow, pointOnePcLow, avg0, avg1);
+		log::info("1%Low {:.3f} 0.1%Low {:.3f} Avg {:.3f} Measured Avg {:.3f}", 1.0 / onePcLow, 1.0 / pointOnePcLow, 1.0 / avg0, 1.0 / avg1);
+	}
+
+	void update(rsl::span deltaTime)
+	{
+		using namespace rythe;
+		static bool firstFrame = true;
+		if (firstFrame)
+		{
+			timer.start();
+			firstFrame = false;
+		}
+
+		{
+			ecs::filter<rotation, example_comp> filter;
+			for (auto& ent : filter)
+			{
+				ent.get_component<rotation>().get() *= math::angleAxis(math::tau<float>() * 0.1f * deltaTime, math::float3::up);
+			}
+		}
+
+		ecs::filter<position, velocity, example_comp> filter;
+
+		float dt = deltaTime;
+		if (dt > 0.07f)
+			return;
+
+		if (filter.size())
+		{
+			auto poolSize = (schd::Scheduler::jobPoolSize() + 1);
+			rsl::size_type jobSize = math::iround(math::ceil(filter.size() / static_cast<float>(poolSize)));
+
+			queueJobs(poolSize, [&](rsl::id_type jobId)
+			{
+				auto start = jobId * jobSize;
+				auto end = start + jobSize;
+				if (end > filter.size())
+					end = filter.size();
+
+				for (rsl::size_type i = start; i < end; i++)
+				{
+					auto& pos = filter[i].get_component<position>().get();
+					auto& vel = filter[i].get_component<velocity>().get();
+
+					if (vel == math::float3::zero)
+						vel = math::normalize(pos);
+
+					math::float3 perp;
+
+					perp = math::normalize(math::cross(vel, math::float3::up));
+
+					/*             math::float3 rotated = (math::axisAngleMatrix(vel, math::perlin(pos) * math::pi<float>()) * math::float4(perp.x, perp.y, perp.z, 0)).xyz();
+								 rotated.y -= 0.5f;
+								 rotated = math::normalize(rotated);
+
+								 vel = math::normalize(vel + rotated * dt);
+
+								 if (math::abs(vel.y) >= 0.9f)
+								 {
+									 auto rand = math::circularRand(1.f);
+									 vel.y = 0.9f;
+									 vel = math::normalize(vel + math::float3(rand.x, 0.f, rand.y));
+								 }*/
+
+					pos += vel * 0.3f * dt;
+				}
+			}).wait();
+		}
+
+		rsl::time64 delta = schd::Clock::lastTickDuration();
+
+		if (frames < times.size())
+		{
+			times[frames] = delta;
+			frames++;
+			totalTime += delta;
+		}
+		else
+		{
+
+			// raiseEvent<events::exit>();
+		}
+	}
+};
diff --git a/applications/sandbox/src/sandbox/systems/gui_test.cpp b/applications/sandbox/src/sandbox/systems/gui_test.cpp
new file mode 100644
index 000000000..f3eb4d7ac
--- /dev/null
+++ b/applications/sandbox/src/sandbox/systems/gui_test.cpp
@@ -0,0 +1,4 @@
+#include "gui_test.hpp"
+
+bool rythe::GuiTestSystem::captured = false;
+bool rythe::GuiTestSystem::isEditingText = false;
diff --git a/applications/sandbox/src/sandbox/systems/gui_test.hpp b/applications/sandbox/src/sandbox/systems/gui_test.hpp
new file mode 100644
index 000000000..362d26e98
--- /dev/null
+++ b/applications/sandbox/src/sandbox/systems/gui_test.hpp
@@ -0,0 +1,843 @@
+#pragma once
+
+#include <graphics/util/gui.hpp>
+#include <imgui/imgui_internal.h>
+
+#include <core/core.hpp>
+#include <graphics/graphics.hpp>
+#include <graphics/pipeline/gui/stages/imguirenderstage.hpp>
+#include <graphics/systems/renderer.hpp>
+
+RYTHE_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+
+namespace ImGuizmo
+{
+	inline void EditTransform(const float* cameraView, const float* cameraProjection, float* matrix, bool editTransformDecomposition)
+	{
+		static OPERATION mCurrentGizmoOperation(TRANSLATE);
+		static MODE mCurrentGizmoMode(LOCAL);
+		static bool useSnap = false;
+		static float snap[] = {1.f, 1.f, 1.f};
+		static float bounds[] = {-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f};
+		static float boundsSnap[] = {0.1f, 0.1f, 0.1f};
+		static bool boundSizing = false;
+		static bool boundSizingSnap = false;
+
+		ImGuiIO& io = ImGui::GetIO();
+		if (editTransformDecomposition)
+		{
+			if (!io.WantCaptureKeyboard)
+			{
+				if (ImGui::IsKeyPressed(90))
+					mCurrentGizmoOperation = TRANSLATE;
+				if (ImGui::IsKeyPressed(69))
+					mCurrentGizmoOperation = ROTATE;
+				if (ImGui::IsKeyPressed(82)) // r Key
+					mCurrentGizmoOperation = SCALE;
+			}
+
+			if (ImGui::RadioButton("Translate", mCurrentGizmoOperation == TRANSLATE))
+				mCurrentGizmoOperation = TRANSLATE;
+			ImGui::SameLine();
+			if (ImGui::RadioButton("Rotate", mCurrentGizmoOperation == ROTATE))
+				mCurrentGizmoOperation = ROTATE;
+			ImGui::SameLine();
+			if (ImGui::RadioButton("Scale", mCurrentGizmoOperation == SCALE))
+				mCurrentGizmoOperation = SCALE;
+			float matrixTranslation[3], matrixRotation[3], matrixScale[3];
+			DecomposeMatrixToComponents(matrix, matrixTranslation, matrixRotation, matrixScale);
+			ImGui::InputFloat3("Tr", matrixTranslation);
+			ImGui::InputFloat3("Rt", matrixRotation);
+			ImGui::InputFloat3("Sc", matrixScale);
+			RecomposeMatrixFromComponents(matrixTranslation, matrixRotation, matrixScale, matrix);
+
+			if (mCurrentGizmoOperation != SCALE)
+			{
+				if (ImGui::RadioButton("Local", mCurrentGizmoMode == LOCAL))
+					mCurrentGizmoMode = LOCAL;
+				ImGui::SameLine();
+				if (ImGui::RadioButton("World", mCurrentGizmoMode == WORLD))
+					mCurrentGizmoMode = WORLD;
+			}
+
+			if (!io.WantCaptureKeyboard)
+				if (ImGui::IsKeyPressed(83))
+					useSnap = !useSnap;
+
+			ImGui::Checkbox("", &useSnap);
+			ImGui::SameLine();
+
+			switch (mCurrentGizmoOperation)
+			{
+				case TRANSLATE:
+					ImGui::InputFloat3("Snap", &snap[0]);
+					break;
+				case ROTATE:
+					ImGui::InputFloat("Angle Snap", &snap[0]);
+					break;
+				case SCALE:
+					ImGui::InputFloat("Scale Snap", &snap[0]);
+					break;
+			}
+			ImGui::Checkbox("Bound Sizing", &boundSizing);
+			if (boundSizing)
+			{
+				ImGui::PushID(3);
+				ImGui::Checkbox("", &boundSizingSnap);
+				ImGui::SameLine();
+				ImGui::InputFloat3("Snap", boundsSnap);
+				ImGui::PopID();
+			}
+		}
+		SetRect(0, 0, io.DisplaySize.x, io.DisplaySize.y);
+		Manipulate(cameraView, cameraProjection, mCurrentGizmoOperation, mCurrentGizmoMode, matrix, NULL, useSnap ? snap : NULL, boundSizing ? bounds : NULL, boundSizingSnap ? boundsSnap : NULL);
+	}
+} // namespace ImGuizmo
+
+namespace rythe
+{
+	using namespace rendering;
+	using namespace filesystem::literals;
+
+	class GuiTestSystem : public System<GuiTestSystem>
+	{
+		static bool captured;
+
+	public:
+		static bool isEditingText;
+
+		static void CaptureKeyboard(bool cap = true)
+		{
+			captured = cap;
+		}
+
+		static void ReleaseKeyboard()
+		{
+			captured = false;
+		}
+
+		ecs::filter<camera, transform> cameraQuery;
+		ecs::entity selected;
+
+		math::float4x4 view = math::float4x4(1.0f);
+		math::float4x4 projection = math::float4x4(1.0f);
+		math::float4x4 model = math::float4x4(1.0f);
+
+		void setup()
+		{
+			static_cast<DefaultPipeline*>(Renderer::getMainPipeline())->attachStage<ImGuiStage>();
+
+			// gui code goes here
+			ImGuiStage::addGuiRender<GuiTestSystem, &GuiTestSystem::onGUI>(this);
+
+			app::window& window = ecs::world.get_component<app::window>();
+
+			model_handle cubeModel;
+			material_handle decalMaterial;
+
+			{
+				application::context_guard guard(window);
+
+				cubeModel = ModelCache::create_model("cube", "assets://models/Cube.obj"_view);
+				decalMaterial = MaterialCache::create_material("decal", "assets://shaders/decal.shs"_view);
+				decalMaterial.set_param(SV_ALBEDO, TextureCache::create_texture("engine://resources/default/albedo.png"_view));
+				decalMaterial.set_param(SV_NORMALHEIGHT, TextureCache::create_texture("engine://resources/default/normalHeight.png"_view));
+				decalMaterial.set_param(SV_MRDAO, TextureCache::create_texture("engine://resources/default/MRDAo.png"_view));
+				decalMaterial.set_param(SV_EMISSIVE, TextureCache::create_texture("engine://resources/default/emissive.png"_view));
+				decalMaterial.set_param(SV_HEIGHTSCALE, 0.f);
+			}
+
+			auto decalEntity = createEntity("Decal");
+			selected = decalEntity;
+
+			position pos(5.f, 0.f, 5.f);
+			scale scal(3.f, 2.f, 3.f);
+			rotation rot = angleAxis(math::quarter_pi<float>(), math::float3::up);
+			model = compose(scal, rot, pos);
+
+			decalEntity.add_component<transform>(pos, rot, scal);
+			decalEntity.add_component(mesh_renderer(decalMaterial, cubeModel));
+		}
+
+		// BuildTree creates a rudimentary Entity View, as entities do currently not have the ability to be named
+		// This is going to display IDs, which isn't great but still gives a little insight
+		// In how the Scene is currently structured, it will also try to show the names of the components of the
+		// entities, which makes identifying them easier
+		//
+		bool BuildTree(ecs::entity handle)
+		{
+			static bool isEditingName = false;
+			static char buffer[512];
+
+			if (ImGui::TreeNode(reinterpret_cast<void*>(handle->id), "%s", handle->name.c_str()))
+			{
+				if (ImGui::IsItemClicked())
+				{
+					selected = handle;
+				}
+
+				if (handle->name.empty())
+				{
+					if (handle == ecs::world)
+						handle->name = "World";
+					else if (selected.has_component<camera>())
+						handle->name = "camera";
+					else
+						handle->name = "Entity " + std::to_string(handle->id);
+
+					if (selected == handle && isEditingName)
+						strcpy(buffer, handle->name.data());
+				}
+
+				if (!handle.has_component<camera>())
+				{
+					if (selected == handle && isEditingName)
+					{
+						if (ImGui::InputText(" ###", buffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
+						{
+							handle->name = buffer;
+							isEditingName = false;
+						}
+						if (ImGui::IsItemClicked())
+						{
+							selected = handle;
+						}
+					}
+					else
+					{
+						ImGui::Text("");
+					}
+
+					ImGui::SameLine();
+					if (ImGui::Button("Change Name"))
+					{
+						if (selected == handle && isEditingName)
+						{
+							handle->name = buffer;
+							isEditingName = false;
+						}
+						else
+						{
+							if (isEditingName)
+							{
+								selected->name = buffer;
+							}
+							selected = handle;
+							isEditingName = true;
+							strcpy(buffer, handle->name.data());
+						}
+					}
+				}
+				else
+					ImGui::Text("");
+
+				if (handle != ecs::world && !handle.has_component<camera>() /* && !handle.has_component<scene>()*/)
+				{
+					ImGui::SameLine();
+					if (ImGui::Button("Destroy"))
+					{
+						handle.destroy();
+						ImGui::TreePop();
+						return false;
+					}
+				}
+
+				if (selected != handle)
+				{
+					ImGui::SameLine();
+					if (ImGui::Button("Select"))
+					{
+						if (isEditingName)
+						{
+							selected->name = buffer;
+						}
+						isEditingName = false;
+						selected = handle;
+					}
+				}
+
+				ImGui::Separator();
+
+				if (ImGui::TreeNode("Children"))
+				{
+					if (ImGui::IsItemClicked())
+					{
+						selected = handle;
+					}
+
+					ImGui::SameLine();
+					if (ImGui::Button("Add child"))
+					{
+						(void)createEntity(handle);
+					}
+
+					std::vector<ecs::entity> toErase;
+					for (auto child : handle)
+					{
+						if (!BuildTree(child))
+							toErase.push_back(child);
+					}
+
+					if (toErase.size())
+					{
+						for (auto child : toErase)
+							handle.remove_child(child);
+					}
+
+					ImGui::TreePop();
+				}
+				else if (ImGui::IsItemClicked())
+				{
+					selected = handle;
+				}
+
+
+				if (ImGui::TreeNode("Components"))
+				{
+					if (ImGui::IsItemClicked())
+					{
+						selected = handle;
+					}
+					for (rsl::id_type id : handle.component_composition())
+					{
+						ImGui::Text("%s", ecs::Registry::getFamilyName(id).c_str());
+						if (ImGui::IsItemClicked())
+						{
+							selected = handle;
+						}
+					}
+
+					ImGui::TreePop();
+				}
+				else
+				{
+					if (ImGui::IsItemClicked())
+					{
+						selected = handle;
+					}
+				}
+				ImGui::TreePop();
+			}
+			return true;
+		}
+
+		void DisplayFileHandling()
+		{
+			if (ImGui::BeginMainMenuBar())
+			{
+				// if (ImGui::BeginMenu("File"))
+				//{
+				//     if (ImGui::BeginMenu("Save Scene"))
+				//     {
+				//         if (!SceneManager::currentScene)
+				//         {
+				//             SceneManager::currentScene = SceneManager::create_scene();
+				//         }
+				//         auto sceneEntity = SceneManager::currentScene.entity;
+				//         std::string sceneName = sceneEntity.get_name();
+
+				//        std::string text = "Save scene as:";
+				//        text += sceneName;
+				//        if (ImGui::Button(text.c_str()))
+				//        {
+				//            SceneManager::create_scene(sceneName, sceneEntity);
+				//        }
+				//        ImGui::EndMenu();
+				//    }
+
+				//    if (ImGui::BeginMenu("Load Scene"))
+				//    {
+				//        for (auto& [id, name] : SceneManager::sceneNames)
+				//        {
+				//            if (id && ImGui::MenuItem(name.c_str()))
+				//            {
+				//                SceneManager::load_scene(name);
+				//            }
+				//        }
+				//        ImGui::EndMenu();
+				//    }
+				//    ImGui::EndMenu();
+				//}
+				ImGui::EndMainMenuBar();
+			}
+		}
+
+		template <typename Vec>
+		bool DisplayVec(rsl::cstring name, Vec& value)
+		{
+			if constexpr (std::is_same_v<typename Vec::scalar, float>)
+			{
+				return ImGui::InputScalarN(name, ImGuiDataType_Float, value.data, Vec::size);
+			}
+			else if constexpr (std::is_same_v<typename Vec::scalar, int>)
+			{
+				return ImGui::InputScalarN(name, ImGuiDataType_S32, value.data, Vec::size);
+			}
+			else if constexpr (std::is_same_v<typename Vec::scalar, bool>)
+			{
+				ImGuiWindow* window = ImGui::GetCurrentWindow();
+				if (window->SkipItems)
+					return false;
+
+				ImGuiContext& g = *ImGui::GetCurrentContext();
+				bool value_changed = false;
+				ImGui::BeginGroup();
+				ImGui::PushID(name);
+				ImGui::PushMultiItemsWidths(Vec::size, ImGui::CalcItemWidth());
+
+				for (int i = 0; i < Vec::size; i++)
+				{
+					ImGui::PushID(i);
+					if (i > 0)
+						ImGui::SameLine(0, g.Style.ItemInnerSpacing.x);
+
+					std::string label = std::string("##") + name + std::to_string(i);
+
+					value_changed |= ImGui::Checkbox(label.c_str(), &value[i]);
+
+					ImGui::PopID();
+					ImGui::PopItemWidth();
+				}
+				ImGui::PopID();
+
+				const char* label_end = ImGui::FindRenderedTextEnd(name);
+				if (name != label_end)
+				{
+					ImGui::SameLine(0.0f, g.Style.ItemInnerSpacing.x);
+					ImGui::TextEx(name, label_end);
+				}
+
+				ImGui::EndGroup();
+				return value_changed;
+			}
+		}
+
+		template <typename T>
+		bool DisplayValue(rsl::cstring name, T& value)
+		{
+			if constexpr (std::is_same_v<T, float>)
+			{
+				return ImGui::InputFloat(name, &value);
+			}
+			else if constexpr (std::is_same_v<T, bool>)
+			{
+				return ImGui::Checkbox(name, &value);
+			}
+			else if constexpr (std::is_same_v<T, int>)
+			{
+				return ImGui::InputInt(name, &value);
+			}
+			else
+			{
+				return DisplayVec<T>(name, value);
+			}
+		}
+
+		bool DisplayParamEditor(material_handle material, const std::string& name, const GLenum& type)
+		{
+			if (rsl::starts_with(name, "ryt_"))
+				return false;
+
+			ImGui::Text("%s:", name.c_str());
+			ImGui::SameLine();
+
+			std::string label = "##" + name;
+
+			switch (type)
+			{
+				case GL_SAMPLER_2D:
+				{
+					auto value = material.get_param<texture_handle>(name);
+					auto& tex = value.get_texture();
+					static char buffer[512];
+					strcpy(buffer, tex.path.data());
+
+					if (ImGui::InputText(label.c_str(), buffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
+					{
+						if (tex.path != buffer)
+						{
+							std::string newTex = buffer;
+							value = TextureCache::create_texture(fs::view(newTex));
+							material.set_param<texture_handle>(name, value);
+							return true;
+						}
+					}
+				}
+				break;
+				case GL_FLOAT:
+				{
+					float value = material.get_param<float>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_VEC2:
+				{
+					math::float2 value = material.get_param<math::float2>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_VEC3:
+				{
+					math::float3 value = material.get_param<math::float3>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_VEC4:
+				{
+					math::float4 value = material.get_param<math::float4>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_UNSIGNED_INT:
+				{
+					int value = material.get_param<rsl::uint>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_INT:
+				{
+					int value = material.get_param<int>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_INT_VEC2:
+				{
+					math::int2 value = material.get_param<math::ivec2>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_INT_VEC3:
+				{
+					math::int3 value = material.get_param<math::ivec3>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_INT_VEC4:
+				{
+					math::int4 value = material.get_param<math::ivec4>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_BOOL:
+				{
+					bool value = material.get_param<bool>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_BOOL_VEC2:
+				{
+					math::bvec2 value = material.get_param<math::bvec2>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_BOOL_VEC3:
+				{
+					math::bvec3 value = material.get_param<math::bvec3>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_BOOL_VEC4:
+				{
+					math::bvec4 value = material.get_param<math::bvec4>(name);
+					if (DisplayValue(label.c_str(), value))
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_MAT2:
+				{
+					math::float2x2 value = material.get_param<math::float2x2>(name);
+					bool changed = false;
+					std::string label0 = label + '0';
+					changed |= DisplayValue(label0.c_str(), value[0]);
+					std::string label1 = label + '1';
+					changed |= DisplayValue(label1.c_str(), value[1]);
+					if (changed)
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_MAT3:
+				{
+					math::float3x3 value = material.get_param<math::float3x3>(name);
+					bool changed = false;
+					std::string label0 = label + '0';
+					changed |= DisplayValue(label0.c_str(), value[0]);
+					std::string label1 = label + '1';
+					changed |= DisplayValue(label1.c_str(), value[1]);
+					std::string label2 = label + '2';
+					changed |= DisplayValue(label2.c_str(), value[2]);
+					if (changed)
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				case GL_FLOAT_MAT4:
+				{
+					math::float4x4 value = material.get_param<math::float4x4>(name);
+					bool changed = false;
+					std::string label0 = label + '0';
+					changed |= DisplayValue(label0.c_str(), value[0]);
+					std::string label1 = label + '1';
+					changed |= DisplayValue(label1.c_str(), value[1]);
+					std::string label2 = label + '2';
+					changed |= DisplayValue(label2.c_str(), value[2]);
+					std::string label3 = label + '3';
+					changed |= DisplayValue(label3.c_str(), value[3]);
+					if (changed)
+					{
+						material.set_param(name, value);
+						return true;
+					}
+				}
+				break;
+				default:
+					ImGui::Text("Unknown parameter type");
+			}
+			return false;
+		}
+
+		void onGUI([[maybe_unused]] app::window& context, camera& cam, const camera::camera_input& camInput, [[maybe_unused]] rsl::span deltaTime)
+		{
+			// if (!SceneManager::currentScene)
+			//   SceneManager::currentScene = SceneManager::create_scene();
+
+			ImGuiIO& io = ImGui::GetIO();
+
+			if (captured)
+			{
+				io.WantCaptureKeyboard = true;
+				isEditingText = false;
+			}
+			else
+				isEditingText = io.WantCaptureKeyboard;
+
+			setProjectionAndView(io.DisplaySize.x / io.DisplaySize.y, cam, camInput);
+
+			using namespace imgui;
+			ImGuizmo::SetOrthographic(false);
+
+			DisplayFileHandling();
+
+			std::string windowName = "Entities";
+
+			if (selected)
+			{
+				windowName += "  (selected:";
+
+				if (selected->name.empty())
+				{
+					if (selected == ecs::world)
+						selected->name = "World";
+					else if (selected.has_component<camera>())
+						selected->name = "camera";
+					else
+						selected->name = "Entity " + std::to_string(selected->id);
+				}
+
+				windowName += selected->name;
+
+				windowName += ")";
+			}
+
+			windowName += "###";
+
+			if (base::Begin(windowName.c_str()))
+			{
+				BuildTree(ecs::world);
+			}
+			base::End();
+
+			static bool showGizmo = true;
+
+			ImGuizmo::BeginFrame();
+
+			base::Begin("Edit Entity");
+			if (selected)
+			{
+				if (selected.has_component<camera>())
+				{
+					ImGui::Text("Changing camera transform not allowed.");
+				}
+				else if (selected.has_component<position>() && selected.has_component<rotation>() && selected.has_component<scale>())
+				{
+					if (base::RadioButton("Show Gizmo", showGizmo))
+						showGizmo = !showGizmo;
+
+					if (showGizmo)
+					{
+						position& pos = selected.get_component<position>();
+						rotation& rot = selected.get_component<rotation>();
+						scale& scal = selected.get_component<scale>();
+						model = compose(scal, rot, pos);
+						ImGuizmo::EditTransform(view.data, projection.data, model.data, true);
+						decompose(model, scal, rot, pos);
+					}
+				}
+				else if (ImGui::Button("Add Transform"))
+				{
+					selected.add_component<transform>();
+				}
+
+				if (selected.has_component<mesh_renderable>())
+				{
+					static ecs::entity lastSelected;
+					static char modelBuffer[512];
+					static char shaderBuffer[512];
+					static char variantBuffer[512];
+
+					mesh_renderer& renderer = selected.get_component<mesh_renderer>();
+					mesh_filter& mesh = selected.get_component<mesh_filter>();
+
+					std::string modelPath;
+
+					if (mesh.shared_mesh.id() != invalid_id)
+					{
+						modelPath = mesh.shared_mesh.path();
+					}
+
+					ImGui::Text("Model:");
+					if (lastSelected != selected)
+						strcpy(modelBuffer, modelPath.data());
+					ImGui::SameLine();
+					if (ImGui::InputText("##model", modelBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
+					{
+						if (modelPath != modelBuffer)
+						{
+							modelPath = modelBuffer;
+							mesh.shared_mesh = assets::get<core::mesh>(ModelCache::create_model(modelPath, filesystem::view(modelPath)).id);
+						}
+					}
+
+					ImGui::Text("Material:");
+					auto shader = renderer.material.get_shader();
+					std::string shaderPath = shader.get_path();
+					if (lastSelected != selected)
+						strcpy(shaderBuffer, shaderPath.data());
+
+					ImGui::SameLine();
+					if (ImGui::InputText("##shader", shaderBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
+					{
+						if (shaderPath != shaderBuffer)
+						{
+							shaderPath = shaderBuffer;
+							std::string materialName = std::to_string(selected->id) + shaderPath;
+							shader = ShaderCache::create_shader(fs::view(shaderPath));
+							renderer.material = MaterialCache::create_material(materialName, shader);
+						}
+					}
+
+					ImGui::Text("Variant:");
+					auto& variant = shader.get_variant(renderer.material.current_variant());
+					std::string variantName = variant.name;
+					if (lastSelected != selected)
+						strcpy(variantBuffer, variantName.data());
+
+					ImGui::SameLine();
+					if (ImGui::InputText("##variant", variantBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
+					{
+						if (variantName != variantBuffer)
+						{
+							variantName = variantBuffer;
+							if (renderer.material.has_variant(variantName))
+							{
+								renderer.material.set_variant(variantName);
+							}
+						}
+					}
+
+					auto currentVariant = renderer.material.current_variant();
+					if (currentVariant == 0)
+						currentVariant = rsl::nameHash("default");
+
+
+					for (auto& [variantId, variantInfo] : shader.get_uniform_info())
+					{
+						if (variantId != currentVariant)
+							continue;
+
+						for (auto& [name, location, type] : variantInfo)
+						{
+							DisplayParamEditor(renderer.material, name, type);
+						}
+					}
+
+					if (lastSelected != selected)
+						lastSelected = selected;
+				}
+				else if (ImGui::Button("Add Renderable"))
+				{
+					selected.add_component<mesh_renderable>();
+				}
+			}
+			else
+			{
+				ImGui::Text("Select an entity to edit its transform.");
+			}
+			base::End();
+		}
+
+		void setProjectionAndView(float aspect, const camera& cam, const camera::camera_input& camInput)
+		{
+			view = camInput.view;
+			projection = cam.get_projection(aspect);
+		}
+	};
+
+} // namespace rythe
+
+RYTHE_CLANG_SUPPRESS_WARNING_POP
diff --git a/applications/sandbox/src/sandbox/systems/mysystem.hpp b/applications/sandbox/src/sandbox/systems/mysystem.hpp
new file mode 100644
index 000000000..e2c29759c
--- /dev/null
+++ b/applications/sandbox/src/sandbox/systems/mysystem.hpp
@@ -0,0 +1,166 @@
+#pragma once
+
+///
+/// This system is not used in the project and just here for an example!!!
+///
+
+#include <core/core.hpp>
+
+class MySystem final : public ryt::System<MySystem>
+{
+public:
+	auto to_string(ryt::channel_format format)
+	{
+		switch (format)
+		{
+			case ryt::channel_format::eight_bit:
+				return "8bit";
+			case ryt::channel_format::sixteen_bit:
+				return "16bit";
+			case ryt::channel_format::float_hdr:
+				return "hdr";
+			default:
+				return "unknown";
+		}
+	}
+
+	auto to_string(ryt::image_components components)
+	{
+		switch (components)
+		{
+			case ryt::image_components::grey:
+				return "grey";
+			case ryt::image_components::grey_alpha:
+				return "grey alpha";
+			case ryt::image_components::rgb:
+				return "rgb";
+			case ryt::image_components::rgba:
+				return "rgba";
+			default:
+				return "unknown";
+		}
+	}
+
+	ryt::async::async_operation<ryt::common::result<ryt::assets::asset<ryt::mesh>>> asyncOp;
+
+	void setup()
+	{
+		using namespace rythe;
+		auto result = assets::load<image>(fs::view("engine://resources/default/albedo"));
+		if (!result)
+			log::error("{}", result.error());
+
+		if (result.has_warnings())
+			for (auto& warn : result.warnings())
+				log::warn(warn);
+
+		[[maybe_unused]] auto val = result.except([]([[maybe_unused]] exception& error)
+		{ return assets::invalid_asset<image>; });
+
+		if (result)
+		{
+			auto img = result.value();
+			// log::debug("\nname: {}\nid: {}\nresolution: {}\nformat: {}\ncomponents: {}",
+			//     img.name(), img.id(), img->resolution(), to_string(img->format()), to_string(img->components()));
+		}
+
+		auto objR = assets::load<mesh>(fs::view("assets://models/submeshtest.obj"));
+		if (!objR)
+			log::error("{}", objR.error());
+
+		if (objR.has_warnings())
+			for (auto& warn : objR.warnings())
+				log::warn(warn);
+
+		if (objR)
+		{
+			auto msh = objR.value();
+			// log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}",
+			//     msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
+		}
+
+		auto glbR = assets::load<mesh>(fs::view("assets://models/submeshtest.glb"));
+		if (!glbR)
+			log::error("{}", glbR.error());
+
+		if (glbR.has_warnings())
+			for (auto& warn : glbR.warnings())
+				log::warn(warn);
+
+		if (glbR)
+		{
+			auto msh = glbR.value();
+			// log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}",
+			//     msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
+		}
+	}
+
+	void update([[maybe_unused]] rsl::span deltaTime)
+	{
+		using namespace rythe;
+
+		static bool tested = false;
+
+		if (tested)
+			return;
+
+		tested = true;
+
+		rsl::stopwatch<> clock;
+		asyncOp = assets::loadAsync<mesh>(fs::view("assets://models/wizardgnome.glb"));
+
+		while (!asyncOp.is_done())
+			log::info("waiting... {:.2f}%", asyncOp.progress() * 100.f);
+
+		log::debug("waited {}s", clock.elapsed_time().seconds());
+
+		auto& gltfR = asyncOp.get_result();
+
+		if (!gltfR)
+			log::error("{}", gltfR.error());
+
+		if (gltfR.has_warnings())
+			for (auto& warn : gltfR.warnings())
+				log::warn(warn);
+
+		if (gltfR)
+		{
+			auto msh = gltfR.value();
+			log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}", msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
+		}
+
+		queueJobs(1, []()
+		{
+			ryt::log::error("Sleep start");
+			std::this_thread::sleep_for(std::chrono::minutes(1));
+			ryt::log::error("Sleep end");
+		});
+
+		ryt::async::rw_spinlock lock;
+		lock.lock();
+
+		auto procA = queueJobs(2000, [&lock](rsl::id_type jobId)
+		{
+			ryt::async::readonly_guard guard(lock);
+			ryt::log::info("\tjob A id [{}]", jobId);
+		});
+
+		auto procB = queueJobs(2000, [&lock](rsl::id_type jobId)
+		{
+			ryt::async::readonly_guard guard(lock);
+			ryt::log::debug("\tjob B id [{}]", jobId);
+		});
+
+
+		auto procC = queueJobs(2000, [&lock](rsl::id_type jobId)
+		{
+			ryt::async::readonly_guard guard(lock);
+			ryt::log::warn("\tjob C id [{}]", jobId);
+		});
+
+		lock.unlock();
+		procC.wait();
+		procB.wait();
+		procA.wait();
+	}
+};
diff --git a/applications/sandbox/src/sandbox/systems/simplecameracontroller.hpp b/applications/sandbox/src/sandbox/systems/simplecameracontroller.hpp
new file mode 100644
index 000000000..ade8b3151
--- /dev/null
+++ b/applications/sandbox/src/sandbox/systems/simplecameracontroller.hpp
@@ -0,0 +1,294 @@
+#pragma once
+#include "gui_test.hpp"
+#include <application/application.hpp>
+#include <core/core.hpp>
+#include <graphics/graphics.hpp>
+// #include "../data/crosshair.hpp"
+
+#ifdef RYTHE_AUDIO
+	#include <audio/audio.hpp>
+#endif
+
+using namespace rythe;
+
+struct player_move : public app::input_axis<player_move>
+{
+};
+struct player_strive : public app::input_axis<player_strive>
+{
+};
+struct player_fly : public app::input_axis<player_fly>
+{
+};
+struct player_look_x : public app::input_axis<player_look_x>
+{
+};
+struct player_look_y : public app::input_axis<player_look_y>
+{
+};
+struct player_speedup : public app::input_axis<player_speedup>
+{
+};
+
+struct exit_action : public app::input_action<exit_action>
+{
+};
+struct restart_action : public app::input_action<restart_action>
+{
+};
+
+struct fullscreen_action : public app::input_action<fullscreen_action>
+{
+};
+struct escape_cursor_action : public app::input_action<escape_cursor_action>
+{
+};
+struct vsync_action : public app::input_action<vsync_action>
+{
+};
+
+class SimpleCameraController final : public System<SimpleCameraController>
+{
+public:
+	ecs::entity camera;
+
+	bool escaped = true;
+	float movementspeed = 5.f;
+
+	void setup()
+	{
+		// Crosshair::setScale(math::float2(1.f));
+		// gfx::PostProcessingStage::addEffect<Crosshair>(-100);
+#pragma region Input binding
+		app::InputSystem::createBinding<player_move>(app::inputmap::method::W, 1.f);
+		app::InputSystem::createBinding<player_move>(app::inputmap::method::S, -1.f);
+		app::InputSystem::createBinding<player_strive>(app::inputmap::method::D, 1.f);
+		app::InputSystem::createBinding<player_strive>(app::inputmap::method::A, -1.f);
+		app::InputSystem::createBinding<player_fly>(app::inputmap::method::SPACE, 1.f);
+		app::InputSystem::createBinding<player_fly>(app::inputmap::method::LEFT_SHIFT, -1.f);
+		app::InputSystem::createBinding<player_look_x>(app::inputmap::method::MOUSE_X, 0.f);
+		app::InputSystem::createBinding<player_look_y>(app::inputmap::method::MOUSE_Y, 0.f);
+		app::InputSystem::createBinding<player_speedup>(app::inputmap::method::LEFT_CONTROL, 3.f);
+		app::InputSystem::createBinding<player_speedup>(app::inputmap::method::LEFT_ALT, -3.f);
+
+		app::InputSystem::createBinding<exit_action>(app::inputmap::method::ESCAPE);
+		app::InputSystem::createBinding<restart_action>(app::inputmap::method::F10);
+		app::InputSystem::createBinding<fullscreen_action>(app::inputmap::method::F11);
+		app::InputSystem::createBinding<escape_cursor_action>(app::inputmap::method::MOUSE_RIGHT);
+		app::InputSystem::createBinding<vsync_action>(app::inputmap::method::F1);
+
+		bindToEvent<player_move, &SimpleCameraController::onPlayerMove>();
+		bindToEvent<player_strive, &SimpleCameraController::onPlayerStrive>();
+		bindToEvent<player_fly, &SimpleCameraController::onPlayerFly>();
+		bindToEvent<player_look_x, &SimpleCameraController::onPlayerLookX>();
+		bindToEvent<player_look_y, &SimpleCameraController::onPlayerLookY>();
+		bindToEvent<exit_action, &SimpleCameraController::onExit>();
+		bindToEvent<restart_action, &SimpleCameraController::onRestart>();
+		bindToEvent<player_speedup, &SimpleCameraController::onSpeedUp>();
+		bindToEvent<fullscreen_action, &SimpleCameraController::onFullscreen>();
+		bindToEvent<escape_cursor_action, &SimpleCameraController::onEscapeCursor>();
+		bindToEvent<vsync_action, &SimpleCameraController::onVSYNCSwap>();
+
+#pragma endregion
+
+		app::window& window = ecs::world.get_component<app::window>();
+		window.enableCursor(true);
+		window.show();
+
+		{
+			app::context_guard guard(window);
+			/*Crosshair::setTexture(gfx::TextureCache::create_texture("assets://textures/crosshair.png"_view, {
+		gfx::texture_type::two_dimensional, channel_format::eight_bit, gfx::texture_format::rgba,
+		gfx::texture_components::rgba, true, true, gfx::texture_mipmap::linear, gfx::texture_mipmap::linear,
+		gfx::texture_wrap::edge_clamp, gfx::texture_wrap::edge_clamp, gfx::texture_wrap::edge_clamp }));*/
+			setupCameraEntity();
+		}
+
+		createProcess<&SimpleCameraController::onGetCamera>("Update", 0.5f);
+	}
+
+	void onGetCamera(rsl::span)
+	{
+		static ecs::filter<gfx::camera> query{};
+
+		if (query.size())
+		{
+			camera = query[0];
+		}
+	}
+
+	void setupCameraEntity()
+	{
+		auto skyboxMat = rendering::MaterialCache::create_material("skybox", "assets://shaders/skybox.shs"_view);
+		skyboxMat.set_param(SV_SKYBOX, TextureCache::create_texture("morning islands", fs::view("assets://textures/HDRI/morning_islands.jpg")));
+		ecs::world.add_component(gfx::skybox_renderer{skyboxMat});
+
+		auto groundplane = createEntity("Ground Plane");
+		auto groundmat = rendering::MaterialCache::create_material("floor", "assets://shaders/groundplane.shs"_view);
+		groundmat.set_param("floorTile", rendering::TextureCache::create_texture("floorTile", "engine://resources/default/tile.png"_view));
+		groundplane.add_component(gfx::mesh_renderer{groundmat, rendering::ModelCache::create_model("floor", "assets://models/plane.obj"_view)});
+		groundplane.add_component<transform>();
+
+		camera = createEntity("Camera");
+		camera.add_component<transform>(position(0.f, 3.f, -30.f), rotation::lookat(math::float3::zero, math::float3::forward), scale());
+
+#ifdef RYTHE_AUDIO
+		camera.add_component<audio::audio_listener>();
+#endif
+
+		rendering::camera cam;
+		cam.set_projection(60.f, 0.001f, 1000.f);
+		camera.add_component<gfx::camera>(cam);
+	}
+
+#pragma region input stuff
+	void onRestart(restart_action& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (action.released())
+			this_engine::restart();
+	}
+
+	void onExit(exit_action& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (action.released())
+			raiseEvent<events::exit>();
+	}
+
+	void onSpeedUp(player_speedup& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		movementspeed = 5.f + action.value;
+	}
+
+	void onFullscreen(fullscreen_action& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (action.released())
+		{
+			app::WindowSystem::requestFullscreenToggle(ecs::world_entity_id, math::int2(100, 100), math::int2(1360, 768));
+		}
+	}
+
+	void onEscapeCursor(escape_cursor_action& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (action.released() && !escaped)
+		{
+			app::window& window = ecs::world.get_component<app::window>();
+			escaped = true;
+			window.enableCursor(true);
+		}
+		else if (action.pressed() && escaped)
+		{
+			app::window& window = ecs::world.get_component<app::window>();
+			escaped = false;
+			window.enableCursor(false);
+		}
+		GuiTestSystem::CaptureKeyboard(!escaped);
+	}
+
+	void onVSYNCSwap(vsync_action& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (action.released())
+		{
+			app::window& window = ecs::world.get_component<app::window>();
+			window.setSwapInterval(window.swapInterval() ? 0 : 1);
+			log::debug("set swap interval to {}", window.swapInterval());
+		}
+	}
+
+	void onPlayerMove(player_move& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (escaped)
+			return;
+
+		position& pos = camera.get_component<position>();
+		rotation& rot = camera.get_component<rotation>();
+		math::float3 move = math::toMat3(rot) * math::float3(0.f, 0.f, 1.f);
+		pos += math::normalize(move * math::float3(1, 0, 1)) * action.value * action.input_delta * movementspeed;
+	}
+
+	void onPlayerStrive(player_strive& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (escaped)
+			return;
+
+		position& pos = camera.get_component<position>();
+		rotation& rot = camera.get_component<rotation>();
+		math::float3 move = math::toMat3(rot) * math::float3(1.f, 0.f, 0.f);
+		pos += math::normalize(move * math::float3(1, 0, 1)) * action.value * action.input_delta * movementspeed;
+	}
+
+	void onPlayerFly(player_fly& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (escaped)
+			return;
+
+		position& pos = camera.get_component<position>();
+		pos += (math::float3(0.f, action.value * action.input_delta * movementspeed, 0.f));
+	}
+
+	void onPlayerLookX(player_look_x& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (escaped)
+			return;
+
+		rotation& rot = camera.get_component<rotation>();
+		rot = math::angleAxis(action.value * action.input_delta * 500.f, math::float3::up) * rot;
+	}
+
+	void onPlayerLookY(player_look_y& action)
+	{
+		if (GuiTestSystem::isEditingText)
+			return;
+
+		if (escaped)
+			return;
+
+		rotation& rot = camera.get_component<rotation>();
+		math::float3x3 rotMat = math::toMat3(rot);
+		math::float3 right = rotMat * math::float3::right;
+		math::float3 fwd = math::normalize(math::cross(right, math::float3::up));
+		math::float3 up = rotMat * math::float3::up;
+		float angle = math::orientedAngle(fwd, up, right);
+
+		angle += action.value * action.input_delta * 500.f;
+
+		if (angle > -0.001f)
+			angle = -0.001f;
+		if (angle < -(math::pi<float>() - 0.001f))
+			angle = -(math::pi<float>() - 0.001f);
+
+		up = math::float3x3(math::axisAngleMatrix(right, angle)) * fwd;
+		fwd = math::cross(right, up);
+		rot = (rotation)math::conjugate(math::toQuat(math::lookAt(math::float3::zero, fwd, up)));
+	}
+#pragma endregion
+};
diff --git a/applications/sandbox/systems/examplesystem.hpp b/applications/sandbox/systems/examplesystem.hpp
deleted file mode 100644
index a7d1e6ebd..000000000
--- a/applications/sandbox/systems/examplesystem.hpp
+++ /dev/null
@@ -1,515 +0,0 @@
-#pragma once
-#include <core/core.hpp>
-#include <application/application.hpp>
-#include <graphics/graphics.hpp>
-
-struct example_comp
-{
-
-};
-
-struct tonemap_action : public lgn::app::input_action<tonemap_action> {};
-struct reload_shaders_action : public lgn::app::input_action<reload_shaders_action> {};
-struct switch_skybox_action : public lgn::app::input_action<switch_skybox_action> {};
-
-class ExampleSystem final : public legion::System<ExampleSystem>
-{
-    lgn::size_type frames = 0;
-    lgn::time64 totalTime = 0;
-    lgn::time::stopwatch<lgn::time64> timer;
-    std::array<lgn::time64, 18000> times;
-
-public:
-    void setup()
-    {
-        using namespace legion;
-        log::filter(log::severity_debug);
-        log::debug("ExampleSystem setup");
-
-        app::InputSystem::createBinding<tonemap_action>(app::inputmap::method::F2);
-        app::InputSystem::createBinding<reload_shaders_action>(app::inputmap::method::F3);
-        app::InputSystem::createBinding<switch_skybox_action>(app::inputmap::method::F4);
-        bindToEvent<tonemap_action, &ExampleSystem::onTonemapSwitch>();
-        bindToEvent<reload_shaders_action, &ExampleSystem::onShaderReload>();
-        bindToEvent<switch_skybox_action, &ExampleSystem::onSkyboxSwitch>();
-
-        app::window& win = ecs::world.get_component<app::window>();
-        app::context_guard guard(win);
-
-        auto model = gfx::ModelCache::create_model("Sphere", fs::view("assets://models/sphere.obj"));
-
-        auto material = gfx::MaterialCache::create_material("White", fs::view("assets://shaders/color.shs"));
-        material.set_param("color", math::colors::white);
-        /*{
-            auto ent = createEntity("Sun");
-            ent.add_component(gfx::light::directional(math::color(1, 1, 0.8f), 10.f));
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = position(0.f, 3.f, 6.f);
-            rot = rotation::lookat(math::vec3::zero, math::vec3(1.f, -1.f, 0.1f));
-        }*/
-
-        //#if defined(LEGION_DEBUG)
-        //        for (int i = 0; i < 2000; i++)
-        //#else
-        //        for (int i = 0; i < 20000; i++)
-        //#endif
-        //        {
-        //            auto ent = createEntity();
-        //
-        //            auto [pos, rot, scal] = ent.add_component<transform>();
-        //            pos = math::sphericalRand(5.f);
-        //            scal = scale(0.1f, 0.1f, 0.1f);
-        //
-        //            ent.add_component<example_comp, velocity>();
-        //            ent.add_component(gfx::mesh_renderer(material, model));
-        //        }
-
-        material = gfx::MaterialCache::create_material("iron", fs::view("engine://shaders/default_lit.shs"));
-
-        material.set_param("alphaCutoff", 0.5f);
-        material.set_param("useAlbedoTex", true);
-        material.set_param("useRoughnessTex", true);
-        material.set_param("useNormal", true);
-        material.set_param("useAmbientOcclusion", true);
-        material.set_param("useHeight", true);
-        material.set_param("useMetallicTex", true);
-
-        material.set_param("useEmissiveTex", false);
-        material.set_param("useMetallicRoughness", false);
-
-        material.set_param("ambientOcclusionTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-ao.png")));
-        material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-height.png")));
-        material.set_param("heightScale", 1.f);
-        material.set_param("metallicTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-metallic.png")));
-        material.set_param("emissiveColor", math::colors::black);
-
-        material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-albedo-2048.png")));
-        material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-normal.png")));
-        material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/iron/rustediron-roughness.png")));
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 0.f, 0.f);
-            scal = math::vec3(3.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("rock", fs::view("assets://shaders/pbr.shs"));
-
-        material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_Albedo.png")));
-        material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_NormalHeight.png")));
-        material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_MRDAo.png")));
-        material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/detailedRock/Rock020_1K_emissive.png")));
-        material.set_param(SV_HEIGHTSCALE, 1.f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 0.f, 4.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("copper", fs::view("assets://shaders/pbr.shs"));
-
-        material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-albedo-2048.png")));
-        material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-normalHeight-2048.png")));
-        material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-MRDAo-2048.png")));
-        material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/copper/copper-emissive-2048.png")));
-        material.set_param(SV_HEIGHTSCALE, 1.f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 0.f, 8.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("wood", fs::view("engine://shaders/default_lit.shs"));
-
-        material.set_param("alphaCutoff", 0.5f);
-        material.set_param("useAlbedoTex", true);
-        material.set_param("useRoughnessTex", true);
-        material.set_param("useNormal", true);
-        material.set_param("useHeight", true);
-
-        material.set_param("useAmbientOcclusion", false);
-        material.set_param("useMetallicTex", false);
-        material.set_param("useEmissiveTex", false);
-        material.set_param("useMetallicRoughness", false);
-
-        material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Displacement.png")));
-        material.set_param("heightScale", 1.f);
-        material.set_param("metallicValue", 0.f);
-        material.set_param("emissiveColor", math::colors::black);
-
-        material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/WoodColor.png")));
-        material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Normal.png")));
-        material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/wood/Wood035_1K_Roughness.png")));
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 4.f, 0.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("paint", fs::view("assets://shaders/pbr.shs"));
-
-        material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-albedo-2048.png")));
-        material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-normalHeight-2048.png")));
-        material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-MRDAo-2048.png")));
-        material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/paint/paint-peeling-emissive-2048.png")));
-        material.set_param(SV_HEIGHTSCALE, 1.f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 4.f, 4.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("tiles", fs::view("engine://shaders/default_lit.shs"));
-
-        material.set_param("alphaCutoff", 0.5f);
-        material.set_param("useAlbedoTex", true);
-        material.set_param("useRoughnessTex", true);
-        material.set_param("useNormal", true);
-
-        material.set_param("useMetallicTex", false);
-        material.set_param("useHeight", false);
-        material.set_param("useAmbientOcclusion", false);
-        material.set_param("useEmissiveTex", false);
-        material.set_param("useMetallicRoughness", false);
-
-        material.set_param("metallicValue", 0.f);
-        material.set_param("emissiveColor", math::colors::black);
-
-        material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileColor.png")));
-        material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileNormal.png")));
-        material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/tile/tileRoughness.png")));
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 4.f, 8.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("slate", fs::view("assets://shaders/pbr.shs"));
-
-        material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-albedo-2048.png")));
-        material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-normalHeight-2048.png")));
-        material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-MRDAo-2048.png")));
-        material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("assets://textures/slate/slate-emissive-2048.png")));
-        material.set_param(SV_HEIGHTSCALE, 1.f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 8.f, 0.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("bricks", fs::view("engine://shaders/default_lit.shs"));
-
-        material.set_param("alphaCutoff", 0.5f);
-        material.set_param("useAlbedoTex", true);
-        material.set_param("useRoughnessTex", true);
-        material.set_param("useNormal", true);
-        material.set_param("useHeight", true);
-        material.set_param("useAmbientOcclusion", true);
-
-        material.set_param("useMetallicTex", false);
-        material.set_param("useEmissiveTex", false);
-        material.set_param("useMetallicRoughness", false);
-
-        material.set_param("metallicValue", 0.f);
-        material.set_param("emissiveColor", math::colors::black);
-
-        material.set_param("albedoTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickColor.png")));
-        material.set_param("roughnessTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickRoughness.png")));
-        material.set_param("normalTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickNormal.png")));
-        material.set_param("ambientOcclusionTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickAO.png")));
-        material.set_param("heightTex", rendering::TextureCache::create_texture(fs::view("assets://textures/brick/brickDisplacement.png")));
-        material.set_param("heightScale", 0.1f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 8.f, 4.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        material = gfx::MaterialCache::create_material("default", fs::view("assets://shaders/pbr.shs"));
-
-        material.set_param(SV_ALBEDO, rendering::TextureCache::create_texture(fs::view("engine://resources/default/albedo")));
-        material.set_param(SV_NORMALHEIGHT, rendering::TextureCache::create_texture(fs::view("engine://resources/default/normalHeight")));
-        material.set_param(SV_MRDAO, rendering::TextureCache::create_texture(fs::view("engine://resources/default/MRDAo")));
-        material.set_param(SV_EMISSIVE, rendering::TextureCache::create_texture(fs::view("engine://resources/default/emissive")));
-        material.set_param(SV_HEIGHTSCALE, 1.f);
-
-        {
-            auto ent = createEntity(material.get_name());
-            ent.add_component<example_comp>();
-            auto [pos, rot, scal] = ent.add_component<transform>();
-            pos = math::vec3(0.f, 8.f, 8.f);
-            rot = math::angleAxis(math::half_pi<float>(), math::vec3::up);
-            scal = math::vec3(3.f);
-            ent.add_component(gfx::mesh_renderer(material, model));
-        }
-
-        bindToEvent<events::exit, &ExampleSystem::onExit>();
-    }
-
-    void shutdown()
-    {
-        lgn::log::debug("ExampleSystem shutdown");
-    }
-
-    void onShaderReload(reload_shaders_action& event)
-    {
-        using namespace legion;
-        if (event.pressed())
-        {
-            auto targetWin = ecs::world.get_component<app::window>();
-            if (!targetWin)
-                return;
-
-            app::window& win = targetWin.get();
-
-            if (!app::WindowSystem::windowStillExists(win.handle))
-                return;
-
-            app::context_guard guard(win);
-            if (guard.contextIsValid())
-            {
-                gfx::ShaderCache::clear_checked_paths();
-                gfx::ShaderCache::reload_shaders();
-            }
-        }
-    }
-
-    void onTonemapSwitch(tonemap_action& event)
-    {
-        using namespace legion;
-        if (event.pressed())
-        {
-            static size_type type = static_cast<size_type>(gfx::tonemapping_type::legion);
-            type = (type + 1) % (static_cast<size_type>(gfx::tonemapping_type::unreal3) + 1);
-
-            auto typeEnum = static_cast<gfx::tonemapping_type>(type);
-
-            std::string algorithmName;
-            switch (typeEnum)
-            {
-            case gfx::tonemapping_type::aces:
-                algorithmName = "aces";
-                break;
-            case gfx::tonemapping_type::reinhard:
-                algorithmName = "reinhard";
-                break;
-            case gfx::tonemapping_type::reinhard_jodie:
-                algorithmName = "reinhard_jodie";
-                break;
-            case gfx::tonemapping_type::legion:
-                algorithmName = "legion";
-                break;
-            case gfx::tonemapping_type::unreal3:
-                algorithmName = "unreal3";
-                break;
-            default:
-                algorithmName = "legion";
-                break;
-            }
-            log::debug("Set tonemapping algorithm to {}", algorithmName);
-
-            gfx::Tonemapping::setAlgorithm(typeEnum);
-        }
-    }
-
-    void onSkyboxSwitch(switch_skybox_action& event)
-    {
-        using namespace legion;
-        if (event.pressed())
-        {
-            static size_type idx = 0;
-            static gfx::texture_handle textures[4] = {};
-            static bool initialized = false;
-
-            if (!initialized)
-            {
-                auto targetWin = ecs::world.get_component<app::window>();
-                if (!targetWin)
-                    return;
-
-                app::window& win = targetWin.get();
-
-                if (!app::WindowSystem::windowStillExists(win.handle))
-                    return;
-
-                app::context_guard guard(win);
-                if (guard.contextIsValid())
-                {
-                    textures[0] = gfx::TextureCache::create_texture("morning islands", fs::view("assets://textures/HDRI/morning_islands.jpg"));
-                    textures[1] = gfx::TextureCache::create_texture("earth", fs::view("assets://textures/HDRI/earth.png"));
-                    textures[2] = gfx::TextureCache::create_texture("park", fs::view("assets://textures/HDRI/park.jpg"));
-                    textures[3] = gfx::TextureCache::create_texture("atmosphere", fs::view("assets://textures/HDRI/planetatmo.png"));
-                    initialized = true;
-                }
-                else
-                    return;
-            }
-
-            idx = (idx + 1) % 4;
-            auto skyboxRenderer = ecs::world.get_component<gfx::skybox_renderer>();
-            skyboxRenderer->material.set_param(SV_SKYBOX, textures[idx]);
-
-            log::debug("Set skybox to {}", textures[idx].get_texture().name);
-        }
-    }
-
-    void onExit(L_MAYBEUNUSED lgn::events::exit& event)
-    {
-        using namespace legion;
-
-        time64 avg0 = totalTime / frames;
-        time64 avg1 = timer.elapsed_time() / frames;
-
-        std::set<time64, std::greater<time64>> orderedTimes;
-
-        for (auto& time : times)
-            orderedTimes.insert(time);
-
-        time64 onePcLow = 0;
-        time64 pointOnePcLow = 0;
-
-        size_type i = 0;
-        for (auto& time : orderedTimes)
-        {
-            i++;
-            onePcLow += time;
-
-            if (i <= math::max<size_type>(math::uround(frames / 1000.0), 1))
-            {
-                pointOnePcLow += time;
-            }
-
-            if (i >= math::max<size_type>(math::uround(frames / 100.0), 1))
-            {
-                break;
-            }
-        }
-
-        pointOnePcLow /= math::max<size_type>(math::uround(frames / 1000.0), 1);
-        onePcLow /= math::max<size_type>(math::uround(frames / 100.0), 1);
-
-        log::info("1%Low {:.3f} 0.1%Low {:.3f} Avg {:.3f} Measured Avg {:.3f}", onePcLow, pointOnePcLow, avg0, avg1);
-        log::info("1%Low {:.3f} 0.1%Low {:.3f} Avg {:.3f} Measured Avg {:.3f}", 1.0 / onePcLow, 1.0 / pointOnePcLow, 1.0 / avg0, 1.0 / avg1);
-    }
-
-    void update(legion::time::span deltaTime)
-    {
-        using namespace legion;
-        static bool firstFrame = true;
-        if (firstFrame)
-        {
-            timer.start();
-            firstFrame = false;
-        }
-
-        {
-            ecs::filter<rotation, example_comp> filter;
-            for (auto& ent : filter)
-            {
-                ent.get_component<rotation>().get() *= math::angleAxis(math::two_pi<float>() * 0.1f * deltaTime, math::vec3::up);
-            }
-        }
-
-        ecs::filter<position, velocity, example_comp> filter;
-
-        float dt = deltaTime;
-        if (dt > 0.07f)
-            return;
-
-        if (filter.size())
-        {
-            auto poolSize = (schd::Scheduler::jobPoolSize() + 1);
-            size_type jobSize = math::iround(math::ceil(filter.size() / static_cast<float>(poolSize)));
-
-            queueJobs(poolSize, [&](id_type jobId)
-                {
-                    auto start = jobId * jobSize;
-                    auto end = start + jobSize;
-                    if (end > filter.size())
-                        end = filter.size();
-
-                    for (size_type i = start; i < end; i++)
-                    {
-                        auto& pos = filter[i].get_component<position>().get();
-                        auto& vel = filter[i].get_component<velocity>().get();
-
-                        if (vel == math::vec3::zero)
-                            vel = math::normalize(pos);
-
-                        math::vec3 perp;
-
-                        perp = math::normalize(math::cross(vel, math::vec3::up));
-
-                        math::vec3 rotated = (math::axisAngleMatrix(vel, math::perlin(pos) * math::pi<float>()) * math::vec4(perp.x, perp.y, perp.z, 0)).xyz();
-                        rotated.y -= 0.5f;
-                        rotated = math::normalize(rotated);
-
-                        vel = math::normalize(vel + rotated * dt);
-
-                        if (math::abs(vel.y) >= 0.9f)
-                        {
-                            auto rand = math::circularRand(1.f);
-                            vel.y = 0.9f;
-                            vel = math::normalize(vel + math::vec3(rand.x, 0.f, rand.y));
-                        }
-
-                        pos += vel * 0.3f * dt;
-                    }
-                }
-            ).wait();
-        }
-
-        time64 delta = schd::Clock::lastTickDuration();
-
-        if (frames < times.size())
-        {
-            times[frames] = delta;
-            frames++;
-            totalTime += delta;
-        }
-        else
-        {
-
-            //raiseEvent<events::exit>();
-        }
-    }
-};
diff --git a/applications/sandbox/systems/gui_test.cpp b/applications/sandbox/systems/gui_test.cpp
deleted file mode 100644
index 743f4ea60..000000000
--- a/applications/sandbox/systems/gui_test.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//#include "gui_test.hpp"
-//
-//bool legion::GuiTestSystem::captured = false;
-//bool legion::GuiTestSystem::isEditingText = false;
diff --git a/applications/sandbox/systems/gui_test.hpp b/applications/sandbox/systems/gui_test.hpp
deleted file mode 100644
index 97b526330..000000000
--- a/applications/sandbox/systems/gui_test.hpp
+++ /dev/null
@@ -1,842 +0,0 @@
-#pragma once
-
-#include <graphics/util/gui.hpp>
-#include <imgui/imgui_internal.h>
-
-#include <core/core.hpp>
-#include <graphics/graphics.hpp>
-#include <graphics/pipeline/gui/stages/imguirenderstage.hpp>
-#include <graphics/systems/renderer.hpp>
-
-LEGION_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-
-namespace ImGuizmo
-{
-        inline void EditTransform(const float* cameraView, const float* cameraProjection, float* matrix, bool editTransformDecomposition)
-        {
-            static OPERATION mCurrentGizmoOperation(TRANSLATE);
-            static MODE mCurrentGizmoMode(LOCAL);
-            static bool useSnap = false;
-            static float snap[] = { 1.f, 1.f, 1.f };
-            static float bounds[] = { -0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f };
-            static float boundsSnap[] = { 0.1f, 0.1f, 0.1f };
-            static bool boundSizing = false;
-            static bool boundSizingSnap = false;
-
-            ImGuiIO& io = ImGui::GetIO();
-            if (editTransformDecomposition)
-            {
-                if (!io.WantCaptureKeyboard)
-                {
-                    if (ImGui::IsKeyPressed(90))
-                        mCurrentGizmoOperation = TRANSLATE;
-                    if (ImGui::IsKeyPressed(69))
-                        mCurrentGizmoOperation = ROTATE;
-                    if (ImGui::IsKeyPressed(82)) // r Key
-                        mCurrentGizmoOperation = SCALE;
-                }
-
-                if (ImGui::RadioButton("Translate", mCurrentGizmoOperation == TRANSLATE))
-                    mCurrentGizmoOperation = TRANSLATE;
-                ImGui::SameLine();
-                if (ImGui::RadioButton("Rotate", mCurrentGizmoOperation == ROTATE))
-                    mCurrentGizmoOperation = ROTATE;
-                ImGui::SameLine();
-                if (ImGui::RadioButton("Scale", mCurrentGizmoOperation == SCALE))
-                    mCurrentGizmoOperation = SCALE;
-                float matrixTranslation[3], matrixRotation[3], matrixScale[3];
-                DecomposeMatrixToComponents(matrix, matrixTranslation, matrixRotation, matrixScale);
-                ImGui::InputFloat3("Tr", matrixTranslation);
-                ImGui::InputFloat3("Rt", matrixRotation);
-                ImGui::InputFloat3("Sc", matrixScale);
-                RecomposeMatrixFromComponents(matrixTranslation, matrixRotation, matrixScale, matrix);
-
-                if (mCurrentGizmoOperation != SCALE)
-                {
-                    if (ImGui::RadioButton("Local", mCurrentGizmoMode == LOCAL))
-                        mCurrentGizmoMode = LOCAL;
-                    ImGui::SameLine();
-                    if (ImGui::RadioButton("World", mCurrentGizmoMode == WORLD))
-                        mCurrentGizmoMode = WORLD;
-                }
-
-                if (!io.WantCaptureKeyboard)
-                    if (ImGui::IsKeyPressed(83))
-                        useSnap = !useSnap;
-
-                ImGui::Checkbox("", &useSnap);
-                ImGui::SameLine();
-
-                switch (mCurrentGizmoOperation)
-                {
-                case TRANSLATE:
-                    ImGui::InputFloat3("Snap", &snap[0]);
-                    break;
-                case ROTATE:
-                    ImGui::InputFloat("Angle Snap", &snap[0]);
-                    break;
-                case SCALE:
-                    ImGui::InputFloat("Scale Snap", &snap[0]);
-                    break;
-                }
-                ImGui::Checkbox("Bound Sizing", &boundSizing);
-                if (boundSizing)
-                {
-                    ImGui::PushID(3);
-                    ImGui::Checkbox("", &boundSizingSnap);
-                    ImGui::SameLine();
-                    ImGui::InputFloat3("Snap", boundsSnap);
-                    ImGui::PopID();
-                }
-            }
-            SetRect(0, 0, io.DisplaySize.x, io.DisplaySize.y);
-            Manipulate(cameraView, cameraProjection, mCurrentGizmoOperation, mCurrentGizmoMode, matrix, NULL, useSnap ? snap : NULL, boundSizing ? bounds : NULL, boundSizingSnap ? boundsSnap : NULL);
-        }
-}
-
-namespace legion
-{
-    using namespace rendering;
-    using namespace filesystem::literals;
-
-    class GuiTestSystem : public System<GuiTestSystem>
-    {
-        static bool captured;
-    public:
-        static bool isEditingText;
-
-        static void CaptureKeyboard(bool cap = true)
-        {
-            captured = cap;
-        }
-
-        static void ReleaseKeyboard()
-        {
-            captured = false;
-        }
-
-        ecs::filter<camera, transform> cameraQuery;
-        ecs::entity selected;
-
-        math::mat4 view = math::mat4(1.0f);
-        math::mat4 projection = math::mat4(1.0f);
-        math::mat4 model = math::mat4(1.0f);
-
-        void setup()
-        {
-            static_cast<DefaultPipeline*>(Renderer::getMainPipeline())->attachStage<ImGuiStage>();
-
-            //gui code goes here
-            ImGuiStage::addGuiRender<GuiTestSystem, &GuiTestSystem::onGUI>(this);
-
-            app::window& window = ecs::world.get_component<app::window>();
-
-            model_handle cubeModel;
-            material_handle decalMaterial;
-
-            {
-                application::context_guard guard(window);
-
-                cubeModel = ModelCache::create_model("cube", "assets://models/Cube.obj"_view);
-                decalMaterial = MaterialCache::create_material("decal", "assets://shaders/decal.shs"_view);
-                decalMaterial.set_param(SV_ALBEDO, TextureCache::create_texture("engine://resources/default/albedo"_view));
-                decalMaterial.set_param(SV_NORMALHEIGHT, TextureCache::create_texture("engine://resources/default/normalHeight"_view));
-                decalMaterial.set_param(SV_MRDAO, TextureCache::create_texture("engine://resources/default/MRDAo"_view));
-                decalMaterial.set_param(SV_EMISSIVE, TextureCache::create_texture("engine://resources/default/emissive"_view));
-                decalMaterial.set_param(SV_HEIGHTSCALE, 0.f);
-            }
-
-            auto decalEntity = createEntity("Decal");
-            selected = decalEntity;
-
-            position pos(5.f, 0.f, 5.f);
-            scale scal(3.f, 2.f, 3.f);
-            rotation rot = angleAxis(math::quarter_pi<float>(), math::vec3::up);
-            model = compose(scal, rot, pos);
-
-            decalEntity.add_component<transform>(pos, rot, scal);
-            decalEntity.add_component(mesh_renderer(decalMaterial, cubeModel));
-
-        }
-
-        // BuildTree creates a rudimentary Entity View, as entities do currently not have the ability to be named
-        // This is going to display IDs, which isn't great but still gives a little insight
-        // In how the Scene is currently structured, it will also try to show the names of the components of the
-        // entities, which makes identifying them easier
-        //
-        bool BuildTree(ecs::entity handle)
-        {
-            static bool isEditingName = false;
-            static char buffer[512];
-
-            if (ImGui::TreeNode(reinterpret_cast<void*>(handle->id), "%s", handle->name.c_str()))
-            {
-                if (ImGui::IsItemClicked())
-                {
-                    selected = handle;
-                }
-
-                if (handle->name.empty())
-                {
-                    if (handle == ecs::world)
-                        handle->name = "World";
-                    else if (selected.has_component<camera>())
-                        handle->name = "camera";
-                    else
-                        handle->name = "Entity " + std::to_string(handle->id);
-
-                    if (selected == handle && isEditingName)
-                        strcpy(buffer, handle->name.data());
-                }
-
-                if (!handle.has_component<camera>())
-                {
-                    if (selected == handle && isEditingName)
-                    {
-                        if (ImGui::InputText(" ###", buffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
-                        {
-                            handle->name = buffer;
-                            isEditingName = false;
-                        }
-                        if (ImGui::IsItemClicked())
-                        {
-                            selected = handle;
-                        }
-                    }
-                    else
-                    {
-                        ImGui::Text("");
-                    }
-
-                    ImGui::SameLine();
-                    if (ImGui::Button("Change Name"))
-                    {
-                        if (selected == handle && isEditingName)
-                        {
-                            handle->name = buffer;
-                            isEditingName = false;
-                        }
-                        else
-                        {
-                            if (isEditingName)
-                            {
-                                selected->name = buffer;
-                            }
-                            selected = handle;
-                            isEditingName = true;
-                            strcpy(buffer, handle->name.data());
-                        }
-                    }
-                }
-                else
-                    ImGui::Text("");
-
-                if (handle != ecs::world && !handle.has_component<camera>()/* && !handle.has_component<scene>()*/)
-                {
-                    ImGui::SameLine();
-                    if (ImGui::Button("Destroy"))
-                    {
-                        handle.destroy();
-                        ImGui::TreePop();
-                        return false;
-                    }
-                }
-
-                if (selected != handle)
-                {
-                    ImGui::SameLine();
-                    if (ImGui::Button("Select"))
-                    {
-                        if (isEditingName)
-                        {
-                            selected->name = buffer;
-                        }
-                        isEditingName = false;
-                        selected = handle;
-                    }
-                }
-
-                ImGui::Separator();
-
-                if (ImGui::TreeNode("Children"))
-                {
-                    if (ImGui::IsItemClicked())
-                    {
-                        selected = handle;
-                    }
-
-                    ImGui::SameLine();
-                    if (ImGui::Button("Add child"))
-                    {
-                        (void)createEntity(handle);
-                    }
-
-                    std::vector<ecs::entity> toErase;
-                    for (auto child : handle)
-                    {
-                        if (!BuildTree(child))
-                            toErase.push_back(child);
-                    }
-
-                    if (toErase.size())
-                    {
-                        for (auto child : toErase)
-                            handle.remove_child(child);
-                    }
-
-                    ImGui::TreePop();
-                }
-                else if (ImGui::IsItemClicked())
-                {
-                    selected = handle;
-                }
-
-
-                if (ImGui::TreeNode("Components")) {
-                    if (ImGui::IsItemClicked())
-                    {
-                        selected = handle;
-                    }
-                    for (id_type id : handle.component_composition())
-                    {
-                        ImGui::Text("%s", ecs::Registry::getFamilyName(id).c_str());
-                        if (ImGui::IsItemClicked())
-                        {
-                            selected = handle;
-                        }
-                    }
-
-                    ImGui::TreePop();
-                }
-                else
-                {
-                    if (ImGui::IsItemClicked())
-                    {
-                        selected = handle;
-                    }
-                }
-                ImGui::TreePop();
-            }
-            return true;
-        }
-
-        void DisplayFileHandling()
-        {
-            if (ImGui::BeginMainMenuBar())
-            {
-                //if (ImGui::BeginMenu("File"))
-                //{
-                //    if (ImGui::BeginMenu("Save Scene"))
-                //    {
-                //        if (!SceneManager::currentScene)
-                //        {
-                //            SceneManager::currentScene = SceneManager::create_scene();
-                //        }
-                //        auto sceneEntity = SceneManager::currentScene.entity;
-                //        std::string sceneName = sceneEntity.get_name();
-
-                //        std::string text = "Save scene as:";
-                //        text += sceneName;
-                //        if (ImGui::Button(text.c_str()))
-                //        {
-                //            SceneManager::create_scene(sceneName, sceneEntity);
-                //        }
-                //        ImGui::EndMenu();
-                //    }
-
-                //    if (ImGui::BeginMenu("Load Scene"))
-                //    {
-                //        for (auto& [id, name] : SceneManager::sceneNames)
-                //        {
-                //            if (id && ImGui::MenuItem(name.c_str()))
-                //            {
-                //                SceneManager::load_scene(name);
-                //            }
-                //        }
-                //        ImGui::EndMenu();
-                //    }
-                //    ImGui::EndMenu();
-                //}
-                ImGui::EndMainMenuBar();
-            }
-        }
-
-        template<typename Vec>
-        bool DisplayVec(cstring name, Vec& value)
-        {
-            if constexpr (std::is_same_v<typename Vec::value_type, float>)
-            {
-                return ImGui::InputScalarN(name, ImGuiDataType_Float, math::value_ptr(value), Vec::length());
-            }
-            else if constexpr (std::is_same_v<typename Vec::value_type, int>)
-            {
-                return ImGui::InputScalarN(name, ImGuiDataType_S32, math::value_ptr(value), Vec::length());
-            }
-            else if constexpr (std::is_same_v<typename Vec::value_type, bool>)
-            {
-                ImGuiWindow* window = ImGui::GetCurrentWindow();
-                if (window->SkipItems)
-                    return false;
-
-                ImGuiContext& g = *ImGui::GetCurrentContext();
-                bool value_changed = false;
-                ImGui::BeginGroup();
-                ImGui::PushID(name);
-                ImGui::PushMultiItemsWidths(Vec::length(), ImGui::CalcItemWidth());
-
-                for (int i = 0; i < Vec::length(); i++)
-                {
-                    ImGui::PushID(i);
-                    if (i > 0)
-                        ImGui::SameLine(0, g.Style.ItemInnerSpacing.x);
-
-                    std::string label = std::string("##") + name + std::to_string(i);
-
-                    value_changed |= ImGui::Checkbox(label.c_str(), &value[i]);
-
-                    ImGui::PopID();
-                    ImGui::PopItemWidth();
-                }
-                ImGui::PopID();
-
-                const char* label_end = ImGui::FindRenderedTextEnd(name);
-                if (name != label_end)
-                {
-                    ImGui::SameLine(0.0f, g.Style.ItemInnerSpacing.x);
-                    ImGui::TextEx(name, label_end);
-                }
-
-                ImGui::EndGroup();
-                return value_changed;
-            }
-        }
-
-        template<typename T>
-        bool DisplayValue(cstring name, T& value)
-        {
-            if constexpr (std::is_same_v<T, float>)
-            {
-                return ImGui::InputFloat(name, &value);
-            }
-            else if constexpr (std::is_same_v<T, bool>)
-            {
-                return ImGui::Checkbox(name, &value);
-            }
-            else if constexpr (std::is_same_v<T, int>)
-            {
-                return ImGui::InputInt(name, &value);
-            }
-            else
-            {
-                return DisplayVec<T>(name, value);
-            }
-        }
-
-        bool DisplayParamEditor(material_handle material, const std::string& name, const GLenum& type)
-        {
-            if (common::starts_with(name, "lgn_"))
-                return false;
-
-            ImGui::Text("%s:", name.c_str());
-            ImGui::SameLine();
-
-            std::string label = "##" + name;
-
-            switch (type)
-            {
-            case GL_SAMPLER_2D:
-            {
-                auto value = material.get_param<texture_handle>(name);
-                auto& tex = value.get_texture();
-                static char buffer[512];
-                strcpy(buffer, tex.path.data());
-
-                if (ImGui::InputText(label.c_str(), buffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
-                {
-                    if (tex.path != buffer)
-                    {
-                        std::string newTex = buffer;
-                        value = TextureCache::create_texture(fs::view(newTex));
-                        material.set_param<texture_handle>(name, value);
-                        return true;
-                    }
-                }
-            }
-            break;
-            case GL_FLOAT:
-            {
-                float value = material.get_param<float>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_VEC2:
-            {
-                math::vec2 value = material.get_param<math::vec2>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_VEC3:
-            {
-                math::vec3 value = material.get_param<math::vec3>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_VEC4:
-            {
-                math::vec4 value = material.get_param<math::vec4>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_UNSIGNED_INT:
-            {
-                int value = material.get_param<uint>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_INT:
-            {
-                int value = material.get_param<int>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_INT_VEC2:
-            {
-                math::ivec2 value = material.get_param<math::ivec2>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_INT_VEC3:
-            {
-                math::ivec3 value = material.get_param<math::ivec3>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_INT_VEC4:
-            {
-                math::ivec4 value = material.get_param<math::ivec4>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_BOOL:
-            {
-                bool value = material.get_param<bool>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_BOOL_VEC2:
-            {
-                math::bvec2 value = material.get_param<math::bvec2>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_BOOL_VEC3:
-            {
-                math::bvec3 value = material.get_param<math::bvec3>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_BOOL_VEC4:
-            {
-                math::bvec4 value = material.get_param<math::bvec4>(name);
-                if (DisplayValue(label.c_str(), value))
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_MAT2:
-            {
-                math::mat2 value = material.get_param<math::mat2>(name);
-                bool changed = false;
-                std::string label0 = label + '0';
-                changed |= DisplayValue(label0.c_str(), value[0]);
-                std::string label1 = label + '1';
-                changed |= DisplayValue(label1.c_str(), value[1]);
-                if (changed)
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_MAT3:
-            {
-                math::mat3 value = material.get_param<math::mat3>(name);
-                bool changed = false;
-                std::string label0 = label + '0';
-                changed |= DisplayValue(label0.c_str(), value[0]);
-                std::string label1 = label + '1';
-                changed |= DisplayValue(label1.c_str(), value[1]);
-                std::string label2 = label + '2';
-                changed |= DisplayValue(label2.c_str(), value[2]);
-                if (changed)
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            case GL_FLOAT_MAT4:
-            {
-                math::mat4 value = material.get_param<math::mat4>(name);
-                bool changed = false;
-                std::string label0 = label + '0';
-                changed |= DisplayValue(label0.c_str(), value[0]);
-                std::string label1 = label + '1';
-                changed |= DisplayValue(label1.c_str(), value[1]);
-                std::string label2 = label + '2';
-                changed |= DisplayValue(label2.c_str(), value[2]);
-                std::string label3 = label + '3';
-                changed |= DisplayValue(label3.c_str(), value[3]);
-                if (changed)
-                {
-                    material.set_param(name, value);
-                    return true;
-                }
-            }
-            break;
-            default:
-                ImGui::Text("Unknown parameter type");
-            }
-            return false;
-        }
-
-        void onGUI(L_MAYBEUNUSED app::window& context, camera& cam, const camera::camera_input& camInput, L_MAYBEUNUSED time::span deltaTime)
-        {
-            //if (!SceneManager::currentScene)
-              //  SceneManager::currentScene = SceneManager::create_scene();
-
-            ImGuiIO& io = ImGui::GetIO();
-
-            if (captured)
-            {
-                io.WantCaptureKeyboard = true;
-                isEditingText = false;
-            }
-            else
-                isEditingText = io.WantCaptureKeyboard;
-
-            setProjectionAndView(io.DisplaySize.x / io.DisplaySize.y, cam, camInput);
-
-            using namespace imgui;
-            ImGuizmo::SetOrthographic(false);
-
-            DisplayFileHandling();
-
-            std::string windowName = "Entities";
-
-            if (selected)
-            {
-                windowName += "  (selected:";
-
-                if (selected->name.empty())
-                {
-                    if (selected == ecs::world)
-                        selected->name = "World";
-                    else if (selected.has_component<camera>())
-                        selected->name = "camera";
-                    else
-                        selected->name = "Entity " + std::to_string(selected->id);
-                }
-
-                windowName += selected->name;
-
-                windowName += ")";
-            }
-
-            windowName += "###";
-
-            if (base::Begin(windowName.c_str()))
-            {
-                BuildTree(ecs::world);
-            }
-            base::End();
-
-            static bool showGizmo = true;
-
-            ImGuizmo::BeginFrame();
-
-            base::Begin("Edit Entity");
-            if (selected)
-            {
-                if (selected.has_component<camera>())
-                {
-                    ImGui::Text("Changing camera transform not allowed.");
-                }
-                else if (selected.has_component<position>() && selected.has_component<rotation>() && selected.has_component<scale>())
-                {
-                    if (base::RadioButton("Show Gizmo", showGizmo))
-                        showGizmo = !showGizmo;
-
-                    if (showGizmo)
-                    {
-                        position& pos = selected.get_component<position>();
-                        rotation& rot = selected.get_component<rotation>();
-                        scale& scal = selected.get_component<scale>();
-                        model = compose(scal, rot, pos);
-                        ImGuizmo::EditTransform(value_ptr(view), value_ptr(projection), value_ptr(model), true);
-                        decompose(model, scal, rot, pos);
-                    }
-                }
-                else if (ImGui::Button("Add Transform"))
-                {
-                    selected.add_component<transform>();
-                }
-
-                if (selected.has_component<mesh_renderable>())
-                {
-                    static ecs::entity lastSelected;
-                    static char modelBuffer[512];
-                    static char shaderBuffer[512];
-                    static char variantBuffer[512];
-
-                    mesh_renderer& renderer = selected.get_component<mesh_renderer>();
-                    mesh_filter& mesh = selected.get_component<mesh_filter>();
-
-                    std::string modelPath;
-
-                    if (mesh.shared_mesh.id() != invalid_id)
-                    {
-                        modelPath = mesh.shared_mesh.path();
-                    }
-
-                    ImGui::Text("Model:");
-                    if (lastSelected != selected)
-                        strcpy(modelBuffer, modelPath.data());
-                    ImGui::SameLine();
-                    if (ImGui::InputText("##model", modelBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
-                    {
-                        if (modelPath != modelBuffer)
-                        {
-                            modelPath = modelBuffer;
-                            mesh.shared_mesh = assets::get<core::mesh>(ModelCache::create_model(modelPath, filesystem::view(modelPath)).id);
-                        }
-                    }
-
-                    ImGui::Text("Material:");
-                    auto shader = renderer.material.get_shader();
-                    std::string shaderPath = shader.get_path();
-                    if (lastSelected != selected)
-                        strcpy(shaderBuffer, shaderPath.data());
-
-                    ImGui::SameLine();
-                    if (ImGui::InputText("##shader", shaderBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
-                    {
-                        if (shaderPath != shaderBuffer)
-                        {
-                            shaderPath = shaderBuffer;
-                            std::string materialName = std::to_string(selected->id) + shaderPath;
-                            shader = ShaderCache::create_shader(fs::view(shaderPath));
-                            renderer.material = MaterialCache::create_material(materialName, shader);
-                        }
-                    }
-
-                    ImGui::Text("Variant:");
-                    auto& variant = shader.get_variant(renderer.material.current_variant());
-                    std::string variantName = variant.name;
-                    if (lastSelected != selected)
-                        strcpy(variantBuffer, variantName.data());
-
-                    ImGui::SameLine();
-                    if (ImGui::InputText("##variant", variantBuffer, 512, ImGuiInputTextFlags_EnterReturnsTrue))
-                    {
-                        if (variantName != variantBuffer)
-                        {
-                            variantName = variantBuffer;
-                            if (renderer.material.has_variant(variantName))
-                            {
-                                renderer.material.set_variant(variantName);
-                            }
-                        }
-                    }
-
-                    auto currentVariant = renderer.material.current_variant();
-                    if (currentVariant == 0)
-                        currentVariant = nameHash("default");
-
-
-                    for (auto& [variantId, variantInfo] : shader.get_uniform_info())
-                    {
-                        if (variantId != currentVariant)
-                            continue;
-
-                        for (auto& [name, location, type] : variantInfo)
-                        {
-                            DisplayParamEditor(renderer.material, name, type);
-                        }
-                    }
-
-                    if (lastSelected != selected)
-                        lastSelected = selected;
-                }
-                else if (ImGui::Button("Add Renderable"))
-                {
-                    selected.add_component<mesh_renderable>();
-                }
-            }
-            else
-            {
-                ImGui::Text("Select an entity to edit its transform.");
-            }
-            base::End();
-        }
-
-        void setProjectionAndView(float aspect, const camera& cam, const camera::camera_input& camInput)
-        {
-            view = camInput.view;
-            projection = cam.get_projection(aspect);
-        }
-    };
-
-}
-
-LEGION_CLANG_SUPPRESS_WARNING_POP
diff --git a/applications/sandbox/systems/mysystem.hpp b/applications/sandbox/systems/mysystem.hpp
deleted file mode 100644
index 5e81b8483..000000000
--- a/applications/sandbox/systems/mysystem.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma once
-
-///
-/// This system is not used in the project and just here for an example!!!
-///
-
-#include <core/core.hpp>
-
-class MySystem final : public lgn::System<MySystem>
-{
-public:
-    auto to_string(lgn::channel_format format)
-    {
-        switch (format)
-        {
-        case lgn::channel_format::eight_bit:
-            return "8bit";
-        case lgn::channel_format::sixteen_bit:
-            return "16bit";
-        case lgn::channel_format::float_hdr:
-            return "hdr";
-        default:
-            return "unknown";
-        }
-    }
-
-    auto to_string(lgn::image_components components)
-    {
-        switch (components)
-        {
-        case lgn::image_components::grey:
-            return "grey";
-        case lgn::image_components::grey_alpha:
-            return "grey alpha";
-        case lgn::image_components::rgb:
-            return "rgb";
-        case lgn::image_components::rgba:
-            return "rgba";
-        default:
-            return "unknown";
-        }
-    }
-
-    lgn::async::async_operation<lgn::common::result<lgn::assets::asset<lgn::mesh>>> asyncOp;
-
-    void setup()
-    {
-        using namespace legion;
-        auto result = assets::load<image>(fs::view("engine://resources/default/albedo"));
-        if (!result)
-            log::error("{}", result.error());
-
-        if (result.has_warnings())
-            for (auto& warn : result.warnings())
-                log::warn(warn);
-
-        L_MAYBEUNUSED auto val = result.except([](L_MAYBEUNUSED exception& error) { return assets::invalid_asset<image>; });
-
-        if (result)
-        {
-            auto img = result.value();
-            log::debug("\nname: {}\nid: {}\nresolution: {}\nformat: {}\ncomponents: {}",
-                img.name(), img.id(), img->resolution(), to_string(img->format()), to_string(img->components()));
-        }
-
-        auto objR = assets::load<mesh>(fs::view("assets://models/submeshtest.obj"));
-        if (!objR)
-            log::error("{}", objR.error());
-
-        if (objR.has_warnings())
-            for (auto& warn : objR.warnings())
-                log::warn(warn);
-
-        if (objR)
-        {
-            auto msh = objR.value();
-            log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}",
-                msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
-        }
-
-        auto glbR = assets::load<mesh>(fs::view("assets://models/submeshtest.glb"));
-        if (!glbR)
-            log::error("{}", glbR.error());
-
-        if (glbR.has_warnings())
-            for (auto& warn : glbR.warnings())
-                log::warn(warn);
-
-        if (glbR)
-        {
-            auto msh = glbR.value();
-            log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}",
-                msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
-        }
-
-    }
-
-    void update(L_MAYBEUNUSED lgn::time::span deltaTime)
-    {
-        using namespace legion;
-
-        static bool tested = false;
-
-        if (tested)
-            return;
-
-        tested = true;
-
-        time::timer clock;
-        asyncOp = assets::loadAsync<mesh>(fs::view("assets://models/wizardgnome.glb"));
-
-        while (!asyncOp.is_done())
-            log::info("waiting... {:.2f}%", asyncOp.progress() * 100.f);
-
-        log::debug("waited {}s", clock.elapsed_time().seconds());
-
-        auto& gltfR = asyncOp.get_result();
-
-        if (!gltfR)
-            log::error("{}", gltfR.error());
-
-        if (gltfR.has_warnings())
-            for (auto& warn : gltfR.warnings())
-                log::warn(warn);
-
-        if (gltfR)
-        {
-            auto msh = gltfR.value();
-            log::debug("\nname: {}\nid: {}\nvertex count: {}\ntriangle count: {}\nmaterial count: {}",
-                msh.name(), msh.id(), msh->vertices.size(), msh->indices.size() / 3, msh->materials.size());
-        }
-
-        queueJobs(1, []()
-            {
-                lgn::log::error("Sleep start");
-                std::this_thread::sleep_for(std::chrono::minutes(1));
-                lgn::log::error("Sleep end");
-            });
-
-        lgn::async::rw_spinlock lock;
-        lock.lock();
-
-        auto procA = queueJobs(2000, [&lock](lgn::id_type jobId)
-            {
-                lgn::async::readonly_guard guard(lock);
-                lgn::log::info("\tjob A id [{}]", jobId);
-            });
-
-        auto procB = queueJobs(2000, [&lock](lgn::id_type jobId)
-            {
-                lgn::async::readonly_guard guard(lock);
-                lgn::log::debug("\tjob B id [{}]", jobId);
-            });
-
-
-        auto procC = queueJobs(2000, [&lock](lgn::id_type jobId)
-            {
-                lgn::async::readonly_guard guard(lock);
-                lgn::log::warn("\tjob C id [{}]", jobId);
-            });
-
-        lock.unlock();
-        procC.wait();
-        procB.wait();
-        procA.wait();
-
-    }
-};
-
-
-
-
-
diff --git a/applications/sandbox/systems/simplecameracontroller.hpp b/applications/sandbox/systems/simplecameracontroller.hpp
deleted file mode 100644
index 1f3c3e8b1..000000000
--- a/applications/sandbox/systems/simplecameracontroller.hpp
+++ /dev/null
@@ -1,273 +0,0 @@
-#pragma once
-#include <core/core.hpp>
-#include <application/application.hpp>
-#include <graphics/graphics.hpp>
-#include "gui_test.hpp"
-//#include "../data/crosshair.hpp"
-
-#ifdef RYTHE_AUDIO
-#include <audio/audio.hpp>
-#endif
-
-using namespace legion;
-
-struct player_move : public app::input_axis<player_move> {};
-struct player_strive : public app::input_axis<player_strive> {};
-struct player_fly : public app::input_axis<player_fly> {};
-struct player_look_x : public app::input_axis<player_look_x> {};
-struct player_look_y : public app::input_axis<player_look_y> {};
-struct player_speedup : public app::input_axis<player_speedup> {};
-
-struct exit_action : public app::input_action<exit_action> {};
-struct restart_action : public app::input_action<restart_action> {};
-
-struct fullscreen_action : public app::input_action<fullscreen_action> {};
-struct escape_cursor_action : public app::input_action<escape_cursor_action> {};
-struct vsync_action : public app::input_action<vsync_action> {};
-
-class SimpleCameraController final : public System<SimpleCameraController>
-{
-public:
-    ecs::entity camera;
-
-    bool escaped = true;
-    float movementspeed = 5.f;
-
-    void setup()
-    {
-        //Crosshair::setScale(math::vec2(1.f));
-        //gfx::PostProcessingStage::addEffect<Crosshair>(-100);
-#pragma region Input binding
-        app::InputSystem::createBinding<player_move>(app::inputmap::method::W, 1.f);
-        app::InputSystem::createBinding<player_move>(app::inputmap::method::S, -1.f);
-        app::InputSystem::createBinding<player_strive>(app::inputmap::method::D, 1.f);
-        app::InputSystem::createBinding<player_strive>(app::inputmap::method::A, -1.f);
-        app::InputSystem::createBinding<player_fly>(app::inputmap::method::SPACE, 1.f);
-        app::InputSystem::createBinding<player_fly>(app::inputmap::method::LEFT_SHIFT, -1.f);
-        app::InputSystem::createBinding<player_look_x>(app::inputmap::method::MOUSE_X, 0.f);
-        app::InputSystem::createBinding<player_look_y>(app::inputmap::method::MOUSE_Y, 0.f);
-        app::InputSystem::createBinding<player_speedup>(app::inputmap::method::LEFT_CONTROL, 3.f);
-        app::InputSystem::createBinding<player_speedup>(app::inputmap::method::LEFT_ALT, -3.f);
-
-        app::InputSystem::createBinding<exit_action>(app::inputmap::method::ESCAPE);
-        app::InputSystem::createBinding<restart_action>(app::inputmap::method::F10);
-        app::InputSystem::createBinding<fullscreen_action>(app::inputmap::method::F11);
-        app::InputSystem::createBinding<escape_cursor_action>(app::inputmap::method::MOUSE_RIGHT);
-        app::InputSystem::createBinding<vsync_action>(app::inputmap::method::F1);
-
-        bindToEvent<player_move, &SimpleCameraController::onPlayerMove>();
-        bindToEvent<player_strive, &SimpleCameraController::onPlayerStrive>();
-        bindToEvent<player_fly, &SimpleCameraController::onPlayerFly>();
-        bindToEvent<player_look_x, &SimpleCameraController::onPlayerLookX>();
-        bindToEvent<player_look_y, &SimpleCameraController::onPlayerLookY>();
-        bindToEvent<exit_action, &SimpleCameraController::onExit>();
-        bindToEvent<restart_action, &SimpleCameraController::onRestart>();
-        bindToEvent<player_speedup, &SimpleCameraController::onSpeedUp>();
-        bindToEvent<fullscreen_action, &SimpleCameraController::onFullscreen>();
-        bindToEvent<escape_cursor_action, &SimpleCameraController::onEscapeCursor>();
-        bindToEvent<vsync_action, &SimpleCameraController::onVSYNCSwap>();
-
-#pragma endregion
-
-        app::window& window = ecs::world.get_component<app::window>();
-        window.enableCursor(true);
-        window.show();
-
-        {
-            app::context_guard guard(window);
-            /*Crosshair::setTexture(gfx::TextureCache::create_texture("assets://textures/crosshair.png"_view, {
-        gfx::texture_type::two_dimensional, channel_format::eight_bit, gfx::texture_format::rgba,
-        gfx::texture_components::rgba, true, true, gfx::texture_mipmap::linear, gfx::texture_mipmap::linear,
-        gfx::texture_wrap::edge_clamp, gfx::texture_wrap::edge_clamp, gfx::texture_wrap::edge_clamp }));*/
-            setupCameraEntity();
-        }
-
-        createProcess<&SimpleCameraController::onGetCamera>("Update", 0.5f);
-    }
-
-    void onGetCamera(time::span)
-    {
-        static ecs::filter<gfx::camera> query{};
-
-        if (query.size())
-        {
-            camera = query[0];
-        }
-    }
-
-    void setupCameraEntity()
-    {
-        auto skyboxMat = rendering::MaterialCache::create_material("skybox", "assets://shaders/skybox.shs"_view);
-        skyboxMat.set_param(SV_SKYBOX, TextureCache::create_texture("morning islands", fs::view("assets://textures/HDRI/morning_islands.jpg")));
-        ecs::world.add_component(gfx::skybox_renderer{ skyboxMat });
-
-        auto groundplane = createEntity("Ground Plane");
-        auto groundmat = rendering::MaterialCache::create_material("floor", "assets://shaders/groundplane.shs"_view);
-        groundmat.set_param("floorTile", rendering::TextureCache::create_texture("floorTile", "engine://resources/default/tile.png"_view));
-        groundplane.add_component(gfx::mesh_renderer{ groundmat, rendering::ModelCache::create_model("floor", "assets://models/plane.obj"_view) });
-        groundplane.add_component<transform>();
-
-        camera = createEntity("Camera");
-        camera.add_component<transform>(position(0.f, 3.f, -30.f), rotation::lookat(math::vec3::zero, math::vec3::forward), scale());
-
-#ifdef RYTHE_AUDIO
-        camera.add_component<audio::audio_listener>();
-#endif
-
-        rendering::camera cam;
-        cam.set_projection(60.f, 0.001f, 1000.f);
-        camera.add_component<gfx::camera>(cam);
-    }
-
-#pragma region input stuff
-    void onRestart(restart_action& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (action.released())
-            this_engine::restart();
-    }
-
-    void onExit(exit_action& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (action.released())
-            raiseEvent<events::exit>();
-    }
-
-    void onSpeedUp(player_speedup& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        movementspeed = 5.f + action.value;
-    }
-
-    void onFullscreen(fullscreen_action& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (action.released())
-        {
-            app::WindowSystem::requestFullscreenToggle(ecs::world_entity_id, math::ivec2(100, 100), math::ivec2(1360, 768));
-        }
-    }
-
-    void onEscapeCursor(escape_cursor_action& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (action.released() && !escaped)
-        {
-            app::window& window = ecs::world.get_component<app::window>();
-            escaped = true;
-            window.enableCursor(true);
-        }
-        else if (action.pressed() && escaped)
-        {
-            app::window& window = ecs::world.get_component<app::window>();
-            escaped = false;
-            window.enableCursor(false);
-        }
-        GuiTestSystem::CaptureKeyboard(!escaped);
-    }
-
-    void onVSYNCSwap(vsync_action& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (action.released())
-        {
-            app::window& window = ecs::world.get_component<app::window>();
-            window.setSwapInterval(window.swapInterval() ? 0 : 1);
-            log::debug("set swap interval to {}", window.swapInterval());
-        }
-    }
-
-    void onPlayerMove(player_move& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (escaped)
-            return;
-
-        position& pos = camera.get_component<position>();
-        rotation& rot = camera.get_component<rotation>();
-        math::vec3 move = math::toMat3(rot) * math::vec3(0.f, 0.f, 1.f);
-        pos += math::normalize(move * math::vec3(1, 0, 1)) * action.value * action.input_delta * movementspeed;
-    }
-
-    void onPlayerStrive(player_strive& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (escaped)
-            return;
-
-        position& pos = camera.get_component<position>();
-        rotation& rot = camera.get_component<rotation>();
-        math::vec3 move = math::toMat3(rot) * math::vec3(1.f, 0.f, 0.f);
-        pos += math::normalize(move * math::vec3(1, 0, 1)) * action.value * action.input_delta * movementspeed;
-    }
-
-    void onPlayerFly(player_fly& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (escaped)
-            return;
-
-        position& pos = camera.get_component<position>();
-        pos += (math::vec3(0.f, action.value * action.input_delta * movementspeed, 0.f));
-    }
-
-    void onPlayerLookX(player_look_x& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (escaped)
-            return;
-
-        rotation& rot = camera.get_component<rotation>();
-        rot = math::angleAxis(action.value * action.input_delta * 500.f, math::vec3::up) * rot;
-    }
-
-    void onPlayerLookY(player_look_y& action)
-    {
-        if (GuiTestSystem::isEditingText)
-            return;
-
-        if (escaped)
-            return;
-
-        rotation& rot = camera.get_component<rotation>();
-        math::mat3 rotMat = math::toMat3(rot);
-        math::vec3 right = rotMat * math::vec3::right;
-        math::vec3 fwd = math::normalize(math::cross(right, math::vec3::up));
-        math::vec3 up = rotMat * math::vec3::up;
-        float angle = math::orientedAngle(fwd, up, right);
-
-        angle += action.value * action.input_delta * 500.f;
-
-        if (angle > -0.001f)
-            angle = -0.001f;
-        if (angle < -(math::pi<float>() - 0.001f))
-            angle = -(math::pi<float>() - 0.001f);
-
-        up = math::mat3(math::axisAngleMatrix(right, angle)) * fwd;
-        fwd = math::cross(right, up);
-        rot = (rotation)math::conjugate(math::toQuat(math::lookAt(math::vec3::zero, fwd, up)));
-    }
-#pragma endregion
-
-};
diff --git a/build/vs2022/rythe/program.hpp b/build/vs2022/rythe/program.hpp
new file mode 100644
index 000000000..f2b52d6d3
--- /dev/null
+++ b/build/vs2022/rythe/program.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+class Program
+{
+
+};
diff --git a/cmake/add_test.cmake b/cmake/add_test.cmake
deleted file mode 100644
index de61f04a5..000000000
--- a/cmake/add_test.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-macro(rythe_add_catch2)
-    set(oneValueArgs PATH)
-    cmake_parse_arguments(RYTHE_ADD_CATCH2 ""${oneValueArgs}"" ${ARGN} )
-
-    if(NOT TARGET Catch2)
-        if (${RYTHE_FETCH_SUBMODULES})
-            message(STATUS "Downloading ${RYTHE_ADD_CATCH2_PATH}")
-            
-            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --rebase -- ${RYTHE_ADD_CATCH2_PATH}
-                            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
-            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-                message(FATAL_ERROR "git submodule update failed with ${GIT_SUBMOD_RESULT}")
-            endif()
-        endif()
-
-        set(RYTHE_CATCH_DIR ${RYTHE_ADD_CATCH2_PATH} PARENT_SCOPE)
-        add_subdirectory(${RYTHE_ADD_CATCH2_PATH})
-
-        if(TARGET Catch2)
-            set_target_properties(Catch2 PROPERTIES FOLDER "5 - tests/third_party/catch2")
-
-            get_target_property(target_sources Catch2 SOURCES)
-            foreach(src ${target_sources})
-                get_filename_component(dir ${src} DIRECTORY)
-                source_group("${dir}" FILES "${src}")
-            endforeach()
-        endif()
-    endif()
-endmacro()
-
-function(rythe_configure_test target)
-    if(NOT TARGET Catch2)
-        message(FATAL_ERROR "Catch2 was not found!")
-    else()
-        # Language
-        target_compile_features(${target} PUBLIC cxx_std_20)
-        
-        # Dependency on Rythe
-        target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_ENGINE})
-        target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_ENGINE})
-
-        target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_THIRD_PARTY})
-        target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_THIRD_PARTY})
-
-        target_include_directories(${target} PUBLIC ${RYTHE_CATCH_DIR}/src)
-        target_link_libraries(${target} PUBLIC Catch2)
-
-        # Compiler
-        target_compile_definitions(${target} PUBLIC ${RYTHE_DEFINITIONS})
-        target_compile_options(${target} PUBLIC ${RYTHE_COMPILER_FLAGS})
-        
-        # Linker
-        if (NOT ${RYTHE_LINKER_FLAGS} STREQUAL "")
-            target_link_options(${target} PUBLIC ${RYTHE_LINKER_FLAGS})
-        endif()
-        set_target_properties(${target} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-
-        get_target_property(target_sources ${target} SOURCES)
-        foreach(src ${target_sources})
-            get_filename_component(dir ${src} DIRECTORY)
-            file(RELATIVE_PATH rel_path ${PROJECT_SOURCE_DIR} ${dir})
-            source_group("${rel_path}" FILES "${src}")
-        endforeach()
-
-        list(APPEND RYTHE_ENABLED_APPLICATION_NAMES ${target})
-        set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
-
-        message(STATUS "Test: \"${target}\" [Enabled]")
-    endif()
-endmacro()
diff --git a/cmake/add_third_party.cmake b/cmake/add_third_party.cmake
deleted file mode 100644
index fe7ffe12d..000000000
--- a/cmake/add_third_party.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-# Simple macro that checks if the third party library has previously been added before adding it
-macro(rythe_add_third_party)
-	set(options CURRENT_HEADER_ONLY LIBRARY_HEADER_ONLY)
-	set(oneValueArgs CURRENT LIBRARY PATH INCLUDE FOLDER)
-	set(multiValueArgs FOLDER_TARGETS)
-
-	cmake_parse_arguments(RYTHE_ADD_THIRD_PARTY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-	if (${RYTHE_FETCH_SUBMODULES})
-		message(STATUS "Downloading ${RYTHE_ADD_THIRD_PARTY_PATH}")
-		
-		execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --rebase -- ${RYTHE_ADD_THIRD_PARTY_PATH}
-						WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-						RESULT_VARIABLE GIT_SUBMOD_RESULT)
-		if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-			message(FATAL_ERROR "git submodule update failed with ${GIT_SUBMOD_RESULT}")
-		endif()
-	endif()
-
-    if (NOT TARGET ${RYTHE_ADD_THIRD_PARTY_LIBRARY})
-		set(RYTHE_INCLUDE_THIRD_PARTY ${RYTHE_INCLUDE_THIRD_PARTY} ${RYTHE_ADD_THIRD_PARTY_INCLUDE})
-		set(RYTHE_INCLUDE_THIRD_PARTY ${RYTHE_INCLUDE_THIRD_PARTY} PARENT_SCOPE)
-		
-		# Bit of an exception: Core adds its dependencies to all other modules
-		if (${RYTHE_ADD_THIRD_PARTY_CURRENT} STREQUAL "core")
-			set(RYTHE_INCLUDE_ALL ${RYTHE_INCLUDE_ALL} PARENT_SCOPE)
-			set(RYTHE_INCLUDE_ALL ${RYTHE_INCLUDE_ALL} ${RYTHE_ADD_THIRD_PARTY_INCLUDE})
-
-			set(RYTHE_INCLUDE_ENGINE ${RYTHE_INCLUDE_ENGINE} PARENT_SCOPE)
-			set(RYTHE_INCLUDE_ENGINE ${RYTHE_INCLUDE_ENGINE} ${RYTHE_ADD_THIRD_PARTY_INCLUDE})
-		endif()
-
-		if (NOT ${RYTHE_ADD_THIRD_PARTY_LIBRARY_HEADER_ONLY})
-        	add_subdirectory(${RYTHE_ADD_THIRD_PARTY_PATH})
-
-			foreach(target ${RYTHE_ADD_THIRD_PARTY_FOLDER_TARGETS})
-				if (TARGET ${target})
-					string(REGEX REPLACE "^third_party" "4 - third party" filter ${RYTHE_ADD_THIRD_PARTY_FOLDER})
-					set_target_properties(${target} PROPERTIES FOLDER ${filter})
-
-					get_target_property(target_sources ${target} SOURCES)
-					foreach(src ${target_sources})
-						get_filename_component(dir ${src} DIRECTORY)
-						source_group("${dir}" FILES "${src}")
-					endforeach()
-				endif()
-			endforeach()
-			
-			set(RYTHE_LIBS_THIRD_PARTY ${RYTHE_LIBS_THIRD_PARTY} ${RYTHE_ADD_THIRD_PARTY_LIBRARY})
-			set(RYTHE_LIBS_THIRD_PARTY ${RYTHE_LIBS_THIRD_PARTY} PARENT_SCOPE)
-		endif()
-    endif()
-
-	if (NOT ${RYTHE_ADD_THIRD_PARTY_CURRENT_HEADER_ONLY})
-		target_include_directories(${RYTHE_ADD_THIRD_PARTY_CURRENT} PUBLIC ${RYTHE_ADD_THIRD_PARTY_INCLUDE})
-	endif()
-endmacro()
diff --git a/cmake/configure_application.cmake b/cmake/configure_application.cmake
deleted file mode 100644
index bccb37c93..000000000
--- a/cmake/configure_application.cmake
+++ /dev/null
@@ -1,97 +0,0 @@
-# Utility file that introduces rythe_configure_engine_application() and rythe_configure_editor_application()
-# These functions simplify setting up compiler settings and dependencies.
-
-function(rythe_configure_engine_application target)
-	# Language
-	target_compile_features(${target} PUBLIC cxx_std_20)
-	
-	# Dependency on Rythe
-	target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_ENGINE})
-	target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_ENGINE})
-
-	target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_THIRD_PARTY})
-	target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_THIRD_PARTY})
-	
-	# Compiler
-	target_compile_definitions(${target} PUBLIC ${RYTHE_DEFINITIONS})
-	target_compile_options(${target} PUBLIC ${RYTHE_COMPILER_FLAGS})
-	
-	# Linker
-	if (NOT ${RYTHE_LINKER_FLAGS} STREQUAL "")
-		target_link_options(${target} PUBLIC ${RYTHE_LINKER_FLAGS})
-	endif()
-	set_target_properties(${target} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-
-	get_target_property(target_sources ${target} SOURCES)
-	foreach(src ${target_sources})
-		get_filename_component(dir ${src} DIRECTORY)
-        file(RELATIVE_PATH rel_path ${PROJECT_SOURCE_DIR} ${dir})
-		source_group("${rel_path}" FILES "${src}")
-	endforeach()
-
-	list(APPEND RYTHE_ENABLED_APPLICATION_NAMES ${target})
-	set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
-
-	message(STATUS "Application: \"${target}\" [Enabled] [Mode=Engine]")
-endfunction()
-	
-function(rythe_configure_manual_application target)
-	# Language
-	target_compile_features(${target} PUBLIC cxx_std_20)
-	
-	# Compiler
-	target_compile_definitions(${target} PUBLIC ${RYTHE_DEFINITIONS})
-	target_compile_options(${target} PUBLIC ${RYTHE_COMPILER_FLAGS})
-	
-	# Linker
-	if (NOT ${RYTHE_LINKER_FLAGS} STREQUAL "")
-		target_link_options(${target} PUBLIC ${RYTHE_LINKER_FLAGS})
-	endif()
-	set_target_properties(${target} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-
-	get_target_property(target_sources ${target} SOURCES)
-	foreach(src ${target_sources})
-		get_filename_component(dir ${src} DIRECTORY)
-        file(RELATIVE_PATH rel_path ${PROJECT_SOURCE_DIR} ${dir})
-		source_group("${rel_path}" FILES "${src}")
-	endforeach()
-
-	list(APPEND RYTHE_ENABLED_APPLICATION_NAMES ${target})
-	set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
-
-	message(STATUS "Application: \"${target}\" [Enabled] [Mode=Manual]")
-endfunction()
-
-function(rythe_configure_editor_application target)
-	# Language
-	target_compile_features(${target} PUBLIC cxx_std_20)
-	
-	# Dependency on Rythe
-	target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_ALL})
-	target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_ALL})
-		
-	target_include_directories(${target} PUBLIC ${RYTHE_INCLUDE_THIRD_PARTY})
-	target_link_libraries(${target} PUBLIC ${RYTHE_LIBS_THIRD_PARTY})
-	
-	# Compiler
-	target_compile_definitions(${target} PUBLIC ${RYTHE_DEFINITIONS})
-	target_compile_options(${target} PUBLIC ${RYTHE_COMPILER_FLAGS})
-	
-	# Linker
-	if (NOT ${RYTHE_LINKER_FLAGS} STREQUAL "")
-		target_link_options(${target} PUBLIC ${RYTHE_LINKER_FLAGS})
-	endif()
-	set_target_properties(${target} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-	
-	get_target_property(target_sources ${target} SOURCES)
-	foreach(src ${target_sources})
-		get_filename_component(dir ${src} DIRECTORY)
-        file(RELATIVE_PATH rel_path ${PROJECT_SOURCE_DIR} ${dir})
-		source_group("${rel_path}" FILES "${src}")
-	endforeach()
-
-	list(APPEND RYTHE_ENABLED_APPLICATION_NAMES ${target})
-	set(RYTHE_ENABLED_APPLICATION_NAMES ${RYTHE_ENABLED_APPLICATION_NAMES} PARENT_SCOPE)
-	
-	message(STATUS "Application: \"${target}\" [Enabled] [Mode=Editor]")
-endfunction()
diff --git a/cmake/configure_module.cmake b/cmake/configure_module.cmake
deleted file mode 100644
index 101748689..000000000
--- a/cmake/configure_module.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# Utility file that introduces a rythe_configure_module macro.
-# Unlike configure_application.cmake, this is intentionally introduced as a macro so that
-# the functions called internally can use the true parent scope appropriately.
-
-macro(rythe_configure_module module)
-    set(MODULE_INFO_HAS_HEADERS OFF PARENT_SCOPE)
-    set(MODULE_INFO_HAS_SOURCES OFF PARENT_SCOPE)
-
-    get_target_property(MODULE_SOURCES ${module} SOURCES)
-    set(MODULE_INFO_SOURCES ${MODULE_SOURCES} PARENT_SCOPE)
-
-    if(MODULE_SOURCES)
-        foreach(src ${MODULE_SOURCES})
-            get_filename_component(SRC_EXT ${src} EXT)
-
-            if (SRC_EXT STREQUAL ".hpp" OR 
-                SRC_EXT STREQUAL ".h" OR 
-                SRC_EXT STREQUAL ".inl")
-                set(MODULE_INFO_HAS_HEADERS ON PARENT_SCOPE)
-            endif()
-
-            if (SRC_EXT STREQUAL ".cpp" OR 
-                SRC_EXT STREQUAL ".c")
-                set(MODULE_INFO_HAS_SOURCES ON PARENT_SCOPE)
-            endif()
-
-            get_filename_component(dir ${src} DIRECTORY)
-            file(RELATIVE_PATH rel_path ${RYTHE_DIR_ENGINE}/${module}/src/${module} ${dir})
-            source_group("${rel_path}" FILES "${src}")
-        endforeach()
-    else()
-        message(WARNING "Module: \"${module}\" is empty.")
-    endif()
-endmacro()
diff --git a/cmake/copy_module_output.cmake b/cmake/copy_module_output.cmake
deleted file mode 100644
index eafc60b41..000000000
--- a/cmake/copy_module_output.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-# Utility file that defines the copy_module_output() function.
-# copy_module_output adds commands to targets that copy library and header files,
-# to the designated rythe include/ and lib/ folders.
-# Note: this utility function is **only** designed for use with rythe projects,
-# it uses ${RYTHE_DIR_ROOT} to get full filepaths and ${RYTHE_DIR_OUTPUT_INCLUDES} to copy results to.
-
-# Add post-build commands to copy library and header files to output directories.
-function(rythe_copy_module_output targetName targetDir)
-	# Prepare directories for library output
-	add_custom_command(TARGET ${targetName} 
-		POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E
-		make_directory ${RYTHE_DIR_OUTPUT_LIBS}/Debug
-	)
-
-	add_custom_command(TARGET ${targetName} 
-		POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E
-		make_directory ${RYTHE_DIR_OUTPUT_LIBS}/Release
-	)
-
-	if (${MODULE_INFO_HAS_SOURCES})
-		# Copy debug library
-		# Note: || (exit 0) makes sure these commands succeed even if no library file was generated.
-		add_custom_command(TARGET ${targetName} 
-			POST_BUILD
-			COMMAND $<$<CONFIG:Debug>:${CMAKE_COMMAND}> -E 
-			copy 
-				$<TARGET_FILE:${targetName}>
-				"${RYTHE_DIR_OUTPUT_LIBS}/Debug/" || (exit 0)
-		)
-
-		# Copy release library
-		add_custom_command(TARGET ${targetName} 
-			POST_BUILD
-			COMMAND $<$<CONFIG:Release>:${CMAKE_COMMAND}> -E 
-			copy
-				$<TARGET_FILE:${targetName}>
-				"${RYTHE_DIR_OUTPUT_LIBS}/Release/" || (exit 0)
-		)
-	endif()
-	
-	# Function for recursively going through directories.
-	# This is necessary because cmake copy takes a directory,
-	# and we want to make sure to copy the files to the correct directory.
-	function(read_directory curdir)
-		set(SOURCE_PATH ${RYTHE_DIR_ROOT}/${targetDir}/src/${targetName}/${curdir})
-		set(DEST_PATH ${RYTHE_DIR_OUTPUT_INCLUDES}/${targetDir}/${curdir})
-
-		# Clear data
-		set(files "")
-
-		# Get all files and folders in the current directory
-		file(GLOB children 
-			LIST_DIRECTORIES true
-			RELATIVE ${SOURCE_PATH} 
-			${SOURCE_PATH}/*)
-
-		foreach(child ${children})
-			# Files can be checked for copying
-			if (NOT (IS_DIRECTORY ${SOURCE_PATH}/${child}))
-				get_filename_component(CHILD_EXT ${child} EXT)
-
-				# Only copy headers/inl files
-				if (CHILD_EXT STREQUAL ".hpp" OR 
-					CHILD_EXT STREQUAL ".h" OR 
-					CHILD_EXT STREQUAL ".inl")
-
-					# configure_file creates a CMake (configure time) dependency
-					# where if the source file changes, the destination file gets updated (in this case copied to)
-					configure_file(${SOURCE_PATH}/${child} ${DEST_PATH}/${child} COPYONLY)
-				endif()
-			# Folders can be recursively looked through for more headers
-			else()
-				# Skip irrelevant folders
-				if (${child} STREQUAL "Debug" OR 
-					${child} STREQUAL "Release" OR
-					${child} STREQUAL "CMakeFiles" OR 
-					${child} STREQUAL "CMakeScripts" OR 
-					${child} STREQUAL "${targetName}.dir")
-					continue()
-				endif()
-
-				# Recursively add directories
-				read_directory(${curdir}/${child})
-			endif()
-		endforeach()
-	endfunction()
-
-	# Run the macro on the root folder
-	read_directory("")
-endfunction()
diff --git a/cmake/find_sources.cmake b/cmake/find_sources.cmake
deleted file mode 100644
index e6dda126d..000000000
--- a/cmake/find_sources.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# Utility macro to find files in directory and store into the given parameter
-
-macro(rythe_find_sources sources directory)
-	file(GLOB_RECURSE sources ${RYTHE_FILE_TYPES})
-	list(FILTER sources INCLUDE REGEX ${directory})
-	if(NOT sources)
-		file(WRITE ${directory}/delete_me.cpp)
-		file(GLOB_RECURSE sources ${RYTHE_FILE_TYPES})
-		list(FILTER sources INCLUDE REGEX ${directory})
-	endif()
-endmacro()
diff --git a/cmake/parse_submodules.cmake b/cmake/parse_submodules.cmake
deleted file mode 100644
index 20ef8b25e..000000000
--- a/cmake/parse_submodules.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-# Utility file to be included directly into a CMake file.
-# Uses `git submodule` to get a list of submodule names, paths, and commit hashes.
-#
-# `git submodule` outputs every submodule in the repo (non-recursively), separated by line e.g.:
-# d8aab41087704f9e7e69f473bdd439fd446bb102 rythe/engine/modules/rendering (remotes/origin/HEAD)
-# We can simply split the output by line, and then by spaces, after which we can read out the path,
-# and get the text after the last / to get the submodule's name.
-#
-# output ${SUBMODULE_NAMES}     list of submodule names (last part of the path, so "path/to/submodule" is just "submodule")
-# output ${SUBMODULE_PATHS}     list of submodule paths (from root, "path/to/submodule")
-# output ${SUBMODULE_DIRS}      list of submodule directories (from root, "path/to/")
-# output ${SUBMODULE_HASHES}    list of submodule commit hashes
-# output ${SUBMODULE_COUNT}     number of submodules in the lists
-
-# Clear output
-set(SUBMODULE_NAMES "")
-set(SUBMODULE_PATHS "")
-set(SUBMODULE_HASHES "")
-set(SUBMODULE_DIRS "")
-set(SUBMODULE_COUNT 0)
-
-# Get submodules
-execute_process(COMMAND ${GIT_EXECUTABLE} submodule
-    WORKING_DIRECTORY ${RYTHE_DIR_ROOT}
-    RESULT_VARIABLE GIT_SUBMOD_RESULT
-    OUTPUT_VARIABLE GIT_SUBMOD_OUTPUT)
-if (NOT GIT_SUBMOD_RESULT EQUAL "0")
-    message(FATAL_ERROR "git submodule failed with ${GIT_SUBMOD_RESULT}")
-endif()
-
-if (NOT GIT_SUBMOD_OUTPUT STREQUAL "")
-    # Split into lines
-    string(REPLACE "\n" ";" SUBMODULES_LINES ${GIT_SUBMOD_OUTPUT})
-
-    foreach(LINE ${SUBMODULES_LINES})
-        # Remove starting/trailing whitespace
-        string(STRIP "${LINE}" LINE)
-
-        # Split by space to get the hash and path
-        string(REPLACE " " ";" LINE_ENTRIES ${LINE})
-        list(GET LINE_ENTRIES 0 SUBMODULE_HASH)
-        list(GET LINE_ENTRIES 1 SUBMODULE_PATH)
-
-        # Get the submodule name by splitting the path by / and getting the last element
-        string(REPLACE "/" ";" SUBMODULE_PATH_PARTS "${SUBMODULE_PATH}")
-        list(GET SUBMODULE_PATH_PARTS -1 SUBMODULE_NAME)
-
-        # Skip notfound
-        if (${SUBMODULE_NAME} STREQUAL "notfound")
-            continue()
-        endif()
-
-        # Get the submodule dir by removing the submodule name from the path
-        string(LENGTH ${SUBMODULE_PATH} PATH_LEN)
-        string(LENGTH ${SUBMODULE_NAME} NAME_LEN)
-        math(EXPR DIR_END "${PATH_LEN} - ${NAME_LEN}")
-        string(SUBSTRING ${SUBMODULE_PATH} 0 ${DIR_END} SUBMODULE_DIR)
-
-        list(APPEND SUBMODULE_NAMES ${SUBMODULE_NAME})
-        list(APPEND SUBMODULE_PATHS ${SUBMODULE_PATH})
-        list(APPEND SUBMODULE_DIRS ${SUBMODULE_DIR})
-        list(APPEND SUBMODULE_HASHES ${SUBMODULE_HASH})
-    endforeach()
-
-    # Convenient SUBMODULE_COUNT variable, can be used for iteration 
-    list(LENGTH SUBMODULE_NAMES SUBMODULE_COUNT)
-    
-endif()
diff --git a/cmake/update_submodule.cmake b/cmake/update_submodule.cmake
deleted file mode 100644
index e5eb98e63..000000000
--- a/cmake/update_submodule.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Utility function for updating a git submodule.
-# Simply calls `git submodule update --init --recursive --rebase -- ${modulePath}`,
-# but only if the submodule hasn't already been updated (checks for common repo files).
-function(rythe_update_submodule modulePath)
-	if (${RYTHE_FETCH_SUBMODULES})
-		if( NOT (EXISTS ${RYTHE_DIR_ROOT}/${modulePath}/README.md) AND
-			NOT (EXISTS ${RYTHE_DIR_ROOT}/${modulePath}/.gitignore) AND 
-			NOT (EXISTS ${RYTHE_DIR_ROOT}/${modulePath}/CMakeLists.txt))
-			message(STATUS "Downloading ${modulePath}")
-			execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --rebase -- ${modulePath}
-							WORKING_DIRECTORY ${RYTHE_DIR_ROOT}
-							RESULT_VARIABLE GIT_SUBMOD_RESULT)
-			if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-				message(FATAL_ERROR "git submodule update failed with ${GIT_SUBMOD_RESULT}")
-			endif()
-		endif()
-	endif()
-endfunction()
diff --git a/premake/rythe/_preload.lua b/premake/rythe/_preload.lua
new file mode 100644
index 000000000..a785abbea
--- /dev/null
+++ b/premake/rythe/_preload.lua
@@ -0,0 +1,3 @@
+return function(cfg)
+	return true
+end
\ No newline at end of file
diff --git a/premake/rythe/context.lua b/premake/rythe/context.lua
new file mode 100644
index 000000000..eeafecb71
--- /dev/null
+++ b/premake/rythe/context.lua
@@ -0,0 +1,67 @@
+local context = {}
+
+local utils = dofile("utils.lua")
+
+local function hasFilter(list, item)
+	if list then
+		if string.contains(list, "-" .. item) then
+            return false
+        end
+
+		return string.contains(list, item)
+	end
+
+	return true
+end
+
+-- Gets the command that was used to call premake with
+function context.getCommand()
+	local cmd = "tools\\premake5 " .. _ACTION
+	for k,v in pairs(_OPTIONS) do
+		cmd = cmd .. "--" .. k .. "=" .. tostring(v) .. " "
+	end
+
+	return utils.trim(cmd)
+end
+
+function context.hasConfiguration(configuration)
+	return hasFilter(_OPTIONS["configurations"], configuration)
+end
+
+-- Module names: e.g. core, graphics, audio
+function context.hasModule(module)
+	return hasFilter(_OPTIONS["modules"], module)
+end
+
+-- Project types are e.g. test, module, application, editor, libary, header-only, util
+function context.hasProjectType(projectType)
+    return hasFilter(_OPTIONS["types"], projectType)
+end
+
+-- Project groups are e.g. rythe, deps, my_plugin, my_game, etc
+function context.hasProjectGroup(projectGroup)
+    return hasFilter(_OPTIONS["groups"], projectGroup)
+end
+
+-- Links as shared library
+function context.linkShared()
+    return _OPTIONS["shared"] and not _OPTIONS["static"]
+end
+
+-- If no link target is defined, then static is chosen
+function context.linkStatic()
+    return _OPTIONS["static"] or not context.linkShared()
+end
+
+function context.linkTarget()
+	return (context.linkStatic() and "StaticLib") or "SharedLib"
+end
+
+-- Tag to place at the end of a solution name
+function context.solutionTag()
+    local tag = _OPTIONS["tag"]
+	if tag then return "-" .. tag end
+	return ""
+end
+
+return context
\ No newline at end of file
diff --git a/premake/rythe/filesystem.lua b/premake/rythe/filesystem.lua
new file mode 100644
index 000000000..e4f8c05e2
--- /dev/null
+++ b/premake/rythe/filesystem.lua
@@ -0,0 +1,38 @@
+local fs = {}
+
+function fs.exists(file)
+    local ok, err, code = os.rename(file, file)
+    if not ok then
+        if code == 13 or code == 32 or code == 5 then
+            -- Permission denied, but it exists
+            return true, nil, nil
+        end
+        return false, err, code
+   end
+   return true, nil, nil
+end
+
+function fs.readLines(file)
+    if not fs.exists(file) then return {} end
+
+    local lines = {}
+    for line in io.lines(file) do
+        lines[#lines + 1] = line
+    end
+
+    return lines
+end
+
+function fs.parentPath(path)
+    return string.match(path, "^(.+)[/\\]")
+end
+
+function fs.fileName(path)
+    return string.match(path, "([^/\\]+)$")
+end
+
+function fs.rootName(path)
+    return string.match(path, "^([^/\\]+)")
+end
+
+return fs
\ No newline at end of file
diff --git a/premake/rythe/projects.lua b/premake/rythe/projects.lua
new file mode 100644
index 000000000..4161a081c
--- /dev/null
+++ b/premake/rythe/projects.lua
@@ -0,0 +1,608 @@
+local fs = dofile("filesystem.lua")
+local ctx = dofile("context.lua")
+local utils = dofile("utils.lua")
+
+local rythe = premake.rythe
+local loadedProjects = rythe.loadedProjects
+local buildSettings = rythe.buildSettings
+
+local projects = {}
+
+local function folderToProjectType(projectFolder)
+    if projectFolder == "applications" then
+        return "application"
+    elseif projectFolder == "modules" then
+        return "module"
+    elseif projectFolder == "libraries" then
+        return "library"
+    elseif projectFolder == "utils" then
+        return "util"
+    end
+
+    return projectFolder
+end
+
+local function find(projectPath)
+    local projectName = fs.fileName(projectPath)
+    local projectType = fs.rootName(projectPath)
+    local group = fs.parentPath(projectPath)
+
+    local projectTypeLength = string.len(projectType) + 2
+    if string.len(group) > projectTypeLength then
+        group = string.sub(group, projectTypeLength)
+    else
+        group = ""
+    end
+
+    local projectFile = projectPath .. "/.rythe_project"
+
+    local thirdPartyFile = projectPath .. "/.rythe_third_party"
+    if not fs.exists(thirdPartyFile) then
+        thirdPartyFile = nil
+    end
+
+    return projectFile, thirdPartyFile, group, projectName, folderToProjectType(projectType)
+end
+
+local function getProjectId(group, projectName)
+    return group == "" and projectName or group .. "/" .. projectName
+end
+
+local function getDepAssemblyAndScope(dependency)
+    local scope = string.match(dependency, "([^%s]+[%s]+)")
+    local assemblyId = dependency
+    
+    if scope ~= "" and scope ~= nil then
+        assemblyId = string.sub(dependency, string.len(scope) + 1)
+        
+        scope = string.gsub(scope, "%s+", "")
+        if scope ~= "public" and scope ~= "private" then
+            return nil, nil
+        end
+
+    else
+        scope = "private"
+    end
+
+    return assemblyId, scope
+end
+
+local function isThirdPartyProject(projectId)
+    return string.find(projectId, "^(third_party)") ~= nil
+end
+
+local function findAssembly(assemblyId)
+    local projectId = string.match(assemblyId, "^([^:]+)")
+    local projectType = string.sub(assemblyId, string.len(projectId) + 2)
+    local project = loadedProjects[projectId]
+
+    if projectType == "" then        
+        if project == nil then
+            return nil, projectId, nil
+        else
+            return project, projectId, project.types[1]
+        end
+    end
+
+    return project, projectId, projectType
+end
+
+local function kindName(projectType, config)
+    if projectType == "module" then
+        return ctx.linkTarget()
+    elseif projectType == "test" then
+        return "ConsoleApp"
+    elseif projectType == "editor" then
+        return "SharedLib"
+    elseif projectType == "application" then
+        if config == rythe.Configuration.RELEASE then
+            return "WindowedApp"
+        else
+            return "ConsoleApp"
+        end
+    elseif projectType == "library" then
+        return "StaticLib"
+    elseif projectType == "header-only" then
+        return "SharedItems"
+    elseif projectType == "util" then
+        return "Utility"
+    end
+    assert(false, "Unknown project type: \"" .. projectType .. "\"")
+end
+
+local function projectTypeGroupPrefix(projectType)
+    if projectType == "util" then
+        return "1 - utils/"
+    elseif projectType == "application" then
+        return "2 - applications/"
+    elseif projectType == "module" then
+        return "3 - modules/"
+    elseif projectType == "editor" then
+        return "4 - editor/"
+    elseif projectType == "library" or projectType == "header-only" then
+        return "5 - libraries/"
+    elseif projectType == "test" then
+        return "6 - tests/"
+    end
+
+    assert(false, "Unknown project type: \"" .. projectType .. "\"")
+end
+
+local function projectNameSuffix(projectType)
+    if projectType == "module" then
+        return "-module"
+    elseif projectType == "test" then
+        return "-test"
+    elseif projectType == "application" then
+        return "-application"
+    elseif projectType == "editor" then
+        return "-editor"
+    end
+
+    return ""
+end
+
+local function projectTypeFilesDir(projectType, namespace)
+    if projectType == "test" then
+        return "/tests/"
+    elseif projectType == "editor" then
+        return "/editor/"
+    end
+
+    if namespace == "" or namespace == nil then
+        return "/src/"
+    end
+
+    return "/src/" .. namespace .. "/"
+end
+
+local function isProjectTypeMainType(projectType)
+    if projectType == "test" then
+        return false
+    elseif projectType == "editor" then
+        return false
+    end
+
+    return true
+end
+
+local function printTable(name, table, indent)
+    print(indent .. name .. ":")
+    indent = indent .. "\t"
+    for key, value in pairs(table) do
+        if type(value) == "table" then
+            printTable(key, value, indent)
+        elseif type(value) == "function" then
+            print(indent .. key .. ": " .. "function")
+        else
+            print(indent .. key .. ": " .. value)
+        end
+    end
+    indent = indent:sub(-1)
+end
+
+local function loadProject(projectId, project, projectPath, name, projectType)
+    if project.alias == nil then
+        project.alias = name
+    end
+
+    if project.namespace == nil then
+        project.namespace = name
+    end
+
+    if project.types == nil then
+        project.types = { projectType }
+    else
+        project.types[1] = projectType
+    end
+
+    if project.fast_up_to_date_check == nil then
+        project.fast_up_to_date_check = true
+    end
+
+    if not utils.tableIsEmpty(project.additional_types) then
+        project.types = utils.concatTables(project.types, project.additional_types)
+    end
+
+    if utils.tableIsEmpty(project.defines) then
+        project.defines = { "PROJECT_NAME=" .. project.alias, "PROJECT_FULL_NAME=" .. project.name, "PROJECT_NAMESPACE=" .. project.namespace }
+    else
+        project.defines[#project.defines +1 ] = "PROJECT_NAME=" .. project.alias
+        project.defines[#project.defines +1 ] = "PROJECT_FULL_NAME=" .. project.name
+        project.defines[#project.defines +1 ] = "PROJECT_NAMESPACE=" .. project.namespace
+    end
+
+    project.location = projectPath
+
+    if project.files == nil then -- files can be an empty table if no files need to be loaded
+        project.files = { "./**" }
+    end
+
+    loadedProjects[projectId] = project
+
+    return project
+end
+
+function projects.load(projectPath)
+    
+    local projectFile, thirdPartyFile, group, name, projectType = find(projectPath)
+    local projectId = getProjectId(group, name)
+            
+    if loadedProjects[projectId] ~= nil then
+        return loadedProjects[projectId]
+    end
+
+    if projectFile == nil then
+        print("Could not find project \"" .. group .. "/" .. name .. "\"")
+        return nil
+    end
+
+    if thirdPartyFile ~= nil then
+        local thirdParties = dofile(thirdPartyFile)
+
+        for i, thirdParty in ipairs(thirdParties) do
+            thirdParty.src = thirdPartyFile
+
+            if thirdParty.init ~= nil then
+                thirdParty = thirdParty:init(ctx)
+            end
+            
+            if thirdParty == nil then
+                print("Could not initialize a third party dependency of project \"" .. group .. "/" .. name .. "\"")
+                return nil
+            end
+
+            local thirdPartyType = "library"
+
+            if not utils.tableIsEmpty(thirdParty.types) then
+                thirdPartyType = thirdParty.types[1]
+            end
+
+            local thirdPartyId = getProjectId(thirdParty.group, thirdParty.name)
+
+            if not isThirdPartyProject(thirdPartyId) then
+                thirdParty.group = "third_party/" .. thirdParty.group
+                thirdPartyId = getProjectId(thirdParty.group, thirdParty.name)
+            end
+
+            if thirdParty.location == nil then
+                thirdParty.location = projectPath .. "/third_party/" .. thirdParty.name
+            end
+
+            thirdParty = loadProject(thirdPartyId, thirdParty, thirdParty.location, thirdParty.name, thirdPartyType)
+        end
+    end
+
+    local project = dofile(projectFile)
+
+    project.group = group
+    project.name = name
+    project.src = projectFile
+    if project.init ~= nil then
+        project = project:init(ctx)
+    end
+
+    if project == nil then
+        print("Could not initialize project \"" .. group .. "/" .. name .. "\"")
+        return nil
+    end
+
+    if not utils.tableIsEmpty(project.types) then
+        projectType = project.types[1]
+    end
+
+    return loadProject(projectId, project, projectPath, name, projectType)
+end
+
+local function appendConfigSuffix(linkTargets, config)
+    local suffix = rythe.targetSuffix(config)
+    local copy = {}
+    for i, target in ipairs(linkTargets) do
+        copy[i] = target .. suffix
+    end
+
+    return copy
+end
+
+local function setupRelease(projectType, linkTargets)
+    filter("configurations:Release")
+        defines { "NDEBUG" }
+        optimize("Full")
+        kind(kindName(projectType, rythe.Configuration.RELEASE))
+        links(appendConfigSuffix(linkTargets, rythe.Configuration.RELEASE))
+end
+
+local function setupDevelopment(projectType, linkTargets)
+    filter("configurations:Development")
+        defines { "DEBUG" }
+        optimize("Debug")
+        inlining("Explicit")
+        symbols("On")
+        kind(kindName(projectType, rythe.Configuration.DEVELOPMENT))
+        links(appendConfigSuffix(linkTargets, rythe.Configuration.DEVELOPMENT))
+end
+
+local function setupDebug(projectType, linkTargets)
+    filter("configurations:Debug")
+        defines { "DEBUG" }
+        symbols("On")
+        kind(kindName(projectType, rythe.Configuration.DEBUG))
+        links(appendConfigSuffix(linkTargets, rythe.Configuration.DEBUG))
+end
+
+local function getDepsRecursive(project, projectType)
+    local deps = project.dependencies
+    
+    if deps == nil then
+        deps = {}
+    end
+
+    if projectType == "test" then
+        deps[#deps + 1] = "third_party/catch2"
+    end
+
+    local copy = utils.copyTable(deps)
+
+    local set = {}
+
+    for i, dep in ipairs(deps) do
+        set[dep] = true
+    end
+
+    for i, dep in ipairs(deps) do
+        local assemblyId, scope = getDepAssemblyAndScope(dep)
+        local depProject, depId, depType = findAssembly(assemblyId)
+
+        if depProject == nil and isThirdPartyProject(depId) then
+            local thirdPartyProject = {
+                group = fs.parentPath(depId),
+                name = fs.fileName(depId)
+            }
+
+            local path = project.location .. "/third_party/" .. thirdPartyProject.name
+
+            if not fs.exists(path .. "/") then
+                path = _WORKING_DIR .. "/libraries/third_party/" .. thirdPartyProject.name
+            end
+
+            if fs.exists(path .. "/") then
+                thirdPartyProject.files = {}
+                    
+                thirdPartyProject.additional_include_dirs = {
+                    path .. "/src",
+                    path .. "/include"
+                }
+
+                thirdPartyProject.additional_external_include_dirs = {
+                    path .. "/src",
+                    path .. "/include"
+                }
+
+                local srcDir = path .. "/src/" .. thirdPartyProject.name .. "/"
+                if fs.exists(srcDir) then
+                    thirdPartyProject.files[#thirdPartyProject.files + 1] = srcDir .. "**"
+                end
+                
+                local includeDir = path .. "/include/" .. thirdPartyProject.name .. "/"
+                if fs.exists(includeDir) then
+                    thirdPartyProject.files[#thirdPartyProject.files + 1] = includeDir .. "**"
+                end
+
+                if utils.tableIsEmpty(thirdPartyProject.files) then
+                    thirdPartyProject.files = {
+                        path .. "/src/**",
+                        path .. "/include/**"
+                    }
+                end
+
+                thirdPartyProject.src = project.src
+
+                if depType == nil then
+                    depType = "library"
+                end
+
+                depProject = loadProject(depId, thirdPartyProject, path, thirdPartyProject.name, depType)
+            end
+        end
+
+        if depProject ~= nil then
+            local newDeps = getDepsRecursive(depProject, depType)
+            for i, newDep in ipairs(newDeps) do
+                local newDepAssemblyId, newDepScope = getDepAssemblyAndScope(newDep)
+
+                if newDepScope == "public" and set[newDep] == nil then
+                    set[newDep] = true
+                    copy[#copy + 1] = newDep
+                end
+            end
+        end
+    end
+
+    if not isProjectTypeMainType(projectType) then
+        if utils.tableIsEmpty(copy) then
+            copy = { getProjectId(project.group, project.name) }
+        else
+            copy = utils.concatTables({ getProjectId(project.group, project.name) }, copy)
+        end
+    end
+
+    return copy
+end
+
+function projects.resolveDeps(proj)
+    for i, projectType in ipairs(proj.types) do
+        getDepsRecursive(proj, projectType)
+    end
+end
+
+function projects.submit(proj)
+    local configSetup = { 
+        [rythe.Configuration.RELEASE] = setupRelease,
+        [rythe.Configuration.DEVELOPMENT] = setupDevelopment,
+        [rythe.Configuration.DEBUG] = setupDebug        
+    }
+
+    for i, projectType in ipairs(proj.types) do
+        local fullGroupPath = projectTypeGroupPrefix(projectType) .. proj.group
+        local binDir = "build/" .. _ACTION .. "/bin/"
+        print("Building " .. proj.name .. ": " .. projectType)
+
+        group(fullGroupPath)
+        project(proj.alias .. projectNameSuffix(projectType))
+            filename(proj.alias .. projectNameSuffix(projectType))
+            location("build/" .. _ACTION .. "/" .. proj.group)
+
+            fastuptodate(proj.fast_up_to_date_check)
+
+            if proj.pre_build ~= nil then                
+                prebuildcommands(proj.pre_build)
+            end
+
+            if proj.post_build ~= nil then                
+                postbuildcommands(proj.post_build)
+            end
+
+            if proj.pre_link ~= nil then                
+                prelinkcommands(proj.pre_link)
+            end
+
+            local allDeps = getDepsRecursive(proj, projectType)
+            local allDefines = proj.defines
+
+            if allDefines == nil then
+                allDefines = {}
+            end
+            
+            local libDirs = {}
+            local linkTargets = {}
+            local externalIncludeDirs = {}
+            
+            if not utils.tableIsEmpty(allDeps) then
+                local depNames = {}
+                for i, dep in ipairs(allDeps) do
+                    local assemblyId, scope = getDepAssemblyAndScope(dep)
+                    local depProject, depId, depType = findAssembly(assemblyId)
+
+                    if depProject ~= nil then
+                        externalIncludeDirs[#externalIncludeDirs + 1] = depProject.location .. projectTypeFilesDir(depType, "")
+                        
+                        if isThirdPartyProject(depId) then
+                            externalIncludeDirs[#externalIncludeDirs + 1] = depProject.location .. "/include/"
+                            externalIncludeDirs[#externalIncludeDirs + 1] = depProject.location .. "/"
+                        end
+
+                        depNames[#depNames + 1] = depProject.alias .. projectNameSuffix(depType)
+                        
+                        allDefines[#allDefines + 1] = depProject.group == "" and string.upper(depProject.alias) .. "=1" or string.upper(string.gsub(depProject.group, "[/\\]", "_")) .. "_" .. string.upper(depProject.alias) .. "=1"
+
+                        libDirs[#libDirs + 1] = binDir .. depProject.group .. "/" .. depProject.name
+                        
+                        if depType ~= "header-only" then
+                            linkTargets[#linkTargets + 1] = depProject.alias .. projectNameSuffix(depType)
+                        end
+                    else
+                        print("\tDependency \"" .. depId .. "\" was not found")
+                    end
+                end
+                
+                dependson(depNames)
+            end
+            
+            architecture(buildSettings.platform)
+            
+            local targetDir = binDir .. proj.group .. "/" .. proj.name
+            targetdir(targetDir)
+            objdir(binDir .. "obj")
+            
+            if projectType ~= "util" then
+                if not utils.tableIsEmpty(externalIncludeDirs) then
+                    externalincludedirs(externalIncludeDirs)
+                end
+
+                if not utils.tableIsEmpty(libDirs) then
+                    libdirs(libDirs)
+                end
+
+                if not utils.tableIsEmpty(proj.additional_include_dirs) then
+                    includedirs(proj.additional_include_dirs)
+                end
+
+                if not utils.tableIsEmpty(proj.additional_external_include_dirs) then
+                    externalincludedirs(proj.additional_external_include_dirs)
+                end
+
+                defines(allDefines)
+                
+                toolset(buildSettings.toolset)
+                language("C++")
+                cppdialect(buildSettings.cppVersion)
+            end
+
+            local filePatterns = {}
+            for i, pattern in ipairs(proj.files) do
+                if string.find(pattern, "^(%.[/\\])") == nil then
+                    filePatterns[#filePatterns + 1] = pattern
+                else
+                    filePatterns[#filePatterns + 1] = proj.location .. projectTypeFilesDir(projectType, proj.namespace) .. string.sub(pattern, 3)
+                end
+            end
+
+            if projectType == "test" then
+                filePatterns[#filePatterns + 1] = _WORKING_DIR .. "/utils/test utils/**"
+
+                vpaths({ ["test utils"] = _WORKING_DIR .. "/utils/test utils/**" })
+            end
+
+            filePatterns[#filePatterns + 1] = proj.src
+
+            vpaths({ ["*"] = { proj.location .. projectTypeFilesDir(projectType, proj.namespace), fs.parentPath(proj.src) }})
+            files(filePatterns)
+
+            if not utils.tableIsEmpty(proj.exclude_files) then
+                local excludePatterns = {}
+                for i, pattern in ipairs(proj.exclude_files) do
+                    if string.find(pattern, "^(%.[/\\])") == nil then
+                        excludePatterns[#excludePatterns + 1] = pattern
+                    else
+                        excludePatterns[#excludePatterns + 1] = proj.location .. projectTypeFilesDir(projectType, proj.namespace) .. string.sub(pattern, 3)
+                    end
+                end
+
+                removefiles(excludePatterns)
+            end
+
+            if projectType == "util" then
+                kind("Utility")
+            else
+                for i, config in pairs(rythe.Configuration) do
+                    configSetup[config](projectType, linkTargets)
+                end
+            end
+        filter("")
+    end
+
+    group("")
+end
+
+function projects.scan(path)
+    local srcDirs = {}
+
+    for i, file in ipairs(os.matchfiles(path .. "**/.rythe_project")) do        
+        srcDirs[#srcDirs + 1] = fs.parentPath(file)
+    end
+
+    for i, dir in ipairs(srcDirs) do
+        local project = projects.load(dir)
+    end
+
+    local sourceProjects = utils.copyTable(loadedProjects)
+    for projectId, project in pairs(sourceProjects) do
+        projects.resolveDeps(project)
+    end
+
+    for projectId, project in pairs(loadedProjects) do
+        projects.submit(project)
+    end
+end
+
+return projects
\ No newline at end of file
diff --git a/premake/rythe/rythe.lua b/premake/rythe/rythe.lua
new file mode 100644
index 000000000..80797d422
--- /dev/null
+++ b/premake/rythe/rythe.lua
@@ -0,0 +1,50 @@
+include("_preload.lua")
+
+premake.rythe = {
+    Configuration = {
+        RELEASE = 1,
+        DEVELOPMENT = 2,
+        DEBUG = 3
+    },
+    loadedProjects = {},
+    buildSettings = {
+        platform = "x86_64",
+        toolset = "clang",
+        cppVersion = "C++20"
+    }
+}
+
+local rythe = premake.rythe
+
+local projects = dofile("projects.lua")
+
+function rythe.configName(config)
+    local configNames = { 
+        [rythe.Configuration.RELEASE] = "Release",
+        [rythe.Configuration.DEVELOPMENT] = "Development",
+        [rythe.Configuration.DEBUG] = "Debug"        
+    }
+
+    return configNames[config]
+end
+
+function rythe.targetSuffix(config)
+    local configSuffix = { 
+        [rythe.Configuration.RELEASE] = "",
+        [rythe.Configuration.DEVELOPMENT] = "-dev",
+        [rythe.Configuration.DEBUG] = "-debug"        
+    }
+
+    return configSuffix[config]
+end
+
+function rythe.configure()
+    filter { "configurations:Debug" }
+        targetsuffix(rythe.targetSuffix(rythe.Configuration.DEBUG))
+    filter { "configurations:Development" }
+        targetsuffix(rythe.targetSuffix(rythe.Configuration.DEVELOPMENT))
+
+    projects.scan("./")
+end
+
+return rythe
diff --git a/premake/rythe/utils.lua b/premake/rythe/utils.lua
new file mode 100644
index 000000000..51a8e9725
--- /dev/null
+++ b/premake/rythe/utils.lua
@@ -0,0 +1,30 @@
+local utils = {}
+
+function utils.trim(s)
+	return (s:gsub("^%s*(.-)%s*$", "%1"))
+end
+
+function utils.concatTables(lhs, rhs)
+	for i=1, #rhs do
+		lhs[#lhs + 1] = rhs[i]
+	end
+	return lhs
+end
+
+function utils.tableIsEmpty(t)
+	return t == nil or next(t) == nil
+end
+
+function utils.stringEndsWith(str, suffix)
+	return str:sub(-#suffix) == suffix
+end
+
+function utils.copyTable(t)
+	local copy = {}
+	for key, value in pairs(t) do
+		copy[key] = value
+	end
+	return copy
+end
+
+return utils
\ No newline at end of file
diff --git a/premake5.lua b/premake5.lua
new file mode 100644
index 000000000..729098452
--- /dev/null
+++ b/premake5.lua
@@ -0,0 +1,10 @@
+-- root workspace, all sub-project should be included
+workspace "rythe"
+    location("build/" .. _ACTION)
+    configurations { "Debug", "Development", "Release" }
+
+os.chdir(_MAIN_SCRIPT_DIR)
+
+local r = require("premake/rythe")
+
+r.configure()
\ No newline at end of file
diff --git a/run-clang-format.ps1 b/run-clang-format.ps1
new file mode 100644
index 000000000..8c0bd0d5f
--- /dev/null
+++ b/run-clang-format.ps1
@@ -0,0 +1,8 @@
+Get-ChildItem -Path . -Directory -Recurse |
+    foreach {
+        cd $_.FullName
+	Write-host "Formatting: $_"
+        &D:\Perforce\rythe-interactive\Rythe-Engine\tools\clang-format -style=file -i *.cpp
+        &D:\Perforce\rythe-interactive\Rythe-Engine\tools\clang-format -style=file -i *.hpp
+        &D:\Perforce\rythe-interactive\Rythe-Engine\tools\clang-format -style=file -i *.inl
+    }
\ No newline at end of file
diff --git a/rythe/CMakeLists.txt b/rythe/CMakeLists.txt
deleted file mode 100644
index 908ec54e3..000000000
--- a/rythe/CMakeLists.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-# Rythe engine/editor cmake file
-# Gathers modules from git submodules
-    # Rythe engine modules are detected and become toggleable
-    # Enabled modules are added to the build system
-    # Matching editor modules are added if their engine module is enabled
-
-# Clear previously created output directory for header and lib files
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${RYTHE_DIR_OUTPUT_INCLUDES}/)
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${RYTHE_DIR_OUTPUT_LIBS}/)
-
-# Parse submodules
-include("${CMAKE_MODULE_PATH}/parse_submodules.cmake")
-
-macro(rythe_add_module NAME PATH DIR)
-	# Core isn't optional so no need for an option variable
-	if (NOT ${NAME} STREQUAL "core")
-		# Convert the name to uppercase to follow CMake all caps naming
-		string(TOUPPER ${NAME} VARIABLE_NAME)
-		option(RYTHE_MODULE_${VARIABLE_NAME} "Adds module ${NAME} from the build if enabled" OFF)
-	endif()
-
-	# Add if either A) this is core, B) the module is enabled, or C) all modules are forcefully enabled
-	if ((${NAME} STREQUAL "core") OR
-		(${RYTHE_MODULE_${VARIABLE_NAME}}) OR 
-		(${RYTHE_FORCE_ENABLE_ALL_MODULES}))
-
-		set(RYTHE_MODULE_${VARIABLE_NAME} ON CACHE INTERNAL "Enable ${NAME} module" FORCE)
-		
-		message(STATUS "Module: \"${NAME}\" [Enabled]")
-		# MODULE_INFO variables are updated by the module
-		# see cmake/configure_module.cmake
-		set(MODULE_INFO_HAS_HEADERS OFF)
-		set(MODULE_INFO_HAS_SOURCES OFF)
-		set(MODULE_INFO_SOURCES "")
-
-		rythe_update_submodule(${PATH})
-		add_subdirectory(${RYTHE_DIR_ROOT}/${PATH})
-		string(REGEX REPLACE "^rythe\/engine" "3 - rythe" filter ${DIR})
-		set_target_properties(${NAME} PROPERTIES FOLDER ${filter})
-
-		# No need to add as an include path if no headers are present
-		if (${MODULE_INFO_HAS_HEADERS})
-			list(APPEND RYTHE_INCLUDE_ALL "${RYTHE_DIR_ROOT}/${PATH}/src")
-			list(APPEND RYTHE_INCLUDE_ENGINE "${RYTHE_DIR_ROOT}/${PATH}/src")
-		endif()
-
-		# We have to check explicitly because otherwise
-		# targets will attempt to link with ${NAME}, which won't
-		# exist if the target has no cpp or c files
-		if (${MODULE_INFO_HAS_SOURCES})
-			list(APPEND RYTHE_LIBS_ALL ${NAME})
-			list(APPEND RYTHE_LIBS_ENGINE ${NAME})
-		endif()
-		
-		list(APPEND RYTHE_DEFINITIONS "RYTHE_${VARIABLE_NAME}")
-
-		list(APPEND RYTHE_ENABLED_MODULE_NAMES ${NAME})
-		list(APPEND RYTHE_ENABLED_MODULE_PATHS ${PATH})
-
-		# Try to find a matching editor
-		list(FIND SUBMODULE_PATHS "rythe/editor/modules/${NAME}" EDITOR_INDEX)
-		if (NOT ${SUBMODULE_EDITOR_INDEX} EQUAL -1)
-			# Get submodule info
-			list(GET SUBMODULE_NAMES  ${EDITOR_INDEX} EDITOR_NAME)
-			list(GET SUBMODULE_PATHS  ${EDITOR_INDEX} EDITOR_PATH)
-			list(GET SUBMODULE_DIRS   ${EDITOR_INDEX} EDITOR_DIR)
-			list(GET SUBMODULE_HASHES ${EDITOR_INDEX} EDITOR_HASH)
-
-			message(STATUS "Editor: \"${EDITOR_NAME}\" found!")
-			rythe_update_submodule("${EDITOR_PATH}")
-			add_subdirectory("${EDITOR_PATH}")
-			set_target_properties("${EDITOR_NAME}" PROPERTIES FOLDER ${EDITOR_DIR})
-
-			list(APPEND RYTHE_LIBS_ALL "${EDITOR_NAME}")
-			list(APPEND RYTHE_LIBS_EDITOR "${EDITOR_NAME}")
-			list(APPEND RYTHE_INCLUDE_ALL "${RYTHE_DIR_ROOT}/${EDITOR_PATH}/src")
-			list(APPEND RYTHE_INCLUDE_EDITOR "${RYTHE_DIR_ROOT}/${EDITOR_PATH}/src")
-			list(APPEND RYTHE_DEFINITIONS "RYTHE_${VARIABLE_NAME}_EDITOR")
-		endif()
-	else()
-		message(STATUS "Module: \"${NAME}\" [Disabled]")
-	endif()
-endmacro()
-
-if (NOT ${SUBMODULE_COUNT} EQUAL 0)
-	rythe_add_module("core" "rythe/engine/core" "rythe/engine")
-
-	math(EXPR ITER_END "${SUBMODULE_COUNT} - 1")
-    foreach(INDEX RANGE 0 ${ITER_END})
-        # Get submodule info
-        list(GET SUBMODULE_NAMES ${INDEX} SUBMODULE_NAME)
-        list(GET SUBMODULE_PATHS ${INDEX} SUBMODULE_PATH)
-        list(GET SUBMODULE_DIRS ${INDEX} SUBMODULE_DIR)
-        list(GET SUBMODULE_HASHES ${INDEX} SUBMODULE_HASH)
-
-		# Only add modules if they are in the rythe/engine folder
-		# Editor modules are added separately based on the engine modules
-		string(SUBSTRING ${SUBMODULE_PATH} 0 12 PATH_PREFIX)
-		if (NOT ${PATH_PREFIX} STREQUAL "rythe/engine")
-			continue()
-		endif()
-
-		# Core was added in manually before the for loop
-		if (${SUBMODULE_NAME} STREQUAL "core")
-			continue()
-		endif()
-
-		# Add module
-		rythe_add_module(${SUBMODULE_NAME} ${SUBMODULE_PATH} ${SUBMODULE_DIR})
-    endforeach()
-endif()
-
-# Use RYTHE_LIBS to set a few shared features
-# such as include dirs, definitions, and compiler/linker flags.
-foreach(library ${RYTHE_LIBS_ENGINE})
-    set_target_properties(${library} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-
-	target_include_directories(${library} PUBLIC ${RYTHE_INCLUDE_ENGINE})
-	target_compile_definitions(${library} PUBLIC ${RYTHE_DEFINITIONS})
-	target_compile_options(${library} PUBLIC ${RYTHE_COMPILER_FLAGS})
-    target_compile_features(${library} PUBLIC cxx_std_20)
-	target_link_options(${library} PUBLIC ${RYTHE_LINKER_FLAGS})
-endforeach()
-
-foreach(library ${RYTHE_LIBS_EDITOR})
-    set_target_properties(${library} PROPERTIES LINKER_LANGUAGE ${RYTHE_LANGUAGE})
-
-    target_include_directories(${library} PUBLIC ${RYTHE_INCLUDE_ALL})
-	target_compile_definitions(${library} PUBLIC ${RYTHE_DEFINITIONS})
-    target_compile_options(${library} PUBLIC ${RYTHE_COMPILER_FLAGS})
-    target_compile_features(${library} PUBLIC cxx_std_20)
-    target_link_options(${library} PUBLIC ${RYTHE_LINKER_FLAGS})
-endforeach()
-
-# Re-set all the modified RYTHE variables but with PARENT_SCOPE enabled
-# so that it properly updates in the root scope.
-set(RYTHE_LIBS_ALL ${RYTHE_LIBS_ALL} PARENT_SCOPE)
-set(RYTHE_LIBS_ENGINE ${RYTHE_LIBS_ENGINE} PARENT_SCOPE)
-set(RYTHE_LIBS_THIRD_PARTY ${RYTHE_LIBS_THIRD_PARTY} PARENT_SCOPE)
-
-set(RYTHE_INCLUDE_ALL ${RYTHE_INCLUDE_ALL} PARENT_SCOPE)
-set(RYTHE_INCLUDE_ENGINE ${RYTHE_INCLUDE_ENGINE} PARENT_SCOPE)
-set(RYTHE_INCLUDE_THIRD_PARTY ${RYTHE_INCLUDE_THIRD_PARTY} PARENT_SCOPE)
-
-set(RYTHE_DEFINITIONS ${RYTHE_DEFINITIONS} PARENT_SCOPE)
-
-set(RYTHE_ENABLED_MODULE_NAMES ${RYTHE_ENABLED_MODULE_NAMES} PARENT_SCOPE)
-set(RYTHE_ENABLED_MODULE_PATHS ${RYTHE_ENABLED_MODULE_PATHS} PARENT_SCOPE)
diff --git a/rythe/editor/todo.txt b/rythe/editor/todo.txt
deleted file mode 100644
index a83ff1767..000000000
--- a/rythe/editor/todo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Setup editor repo & module editors
\ No newline at end of file
diff --git a/tools/clang-format.exe b/tools/clang-format.exe
new file mode 100644
index 000000000..67244de03
Binary files /dev/null and b/tools/clang-format.exe differ
diff --git a/tools/llvm_license.txt b/tools/llvm_license.txt
new file mode 100644
index 000000000..fa6ac5400
--- /dev/null
+++ b/tools/llvm_license.txt
@@ -0,0 +1,279 @@
+==============================================================================
+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
+==============================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+    1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+---- LLVM Exceptions to the Apache 2.0 License ----
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
+
+==============================================================================
+Software from third parties included in the LLVM Project:
+==============================================================================
+The LLVM Project contains third party software which is under different license
+terms. All such code will be identified clearly using at least one of two
+mechanisms:
+1) It will be in a separate directory tree with its own `LICENSE.txt` or
+   `LICENSE` file at the top containing the specific license and restrictions
+   which apply to that software, or
+2) It will contain specific license and restriction terms at the top of every
+   file.
+
+==============================================================================
+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
diff --git a/tools/premake5.exe b/tools/premake5.exe
new file mode 100644
index 000000000..b72e6e98b
Binary files /dev/null and b/tools/premake5.exe differ
diff --git a/tools/premake5_license.txt b/tools/premake5_license.txt
new file mode 100644
index 000000000..63962d7da
--- /dev/null
+++ b/tools/premake5_license.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2003-2022 Jason Perkins and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+
+  3. Neither the name of Premake nor the names of its contributors may be
+     used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tools/sfk197.exe b/tools/sfk197.exe
new file mode 100644
index 000000000..af160b19c
Binary files /dev/null and b/tools/sfk197.exe differ
diff --git a/utils/refresh/.rythe_project b/utils/refresh/.rythe_project
new file mode 100644
index 000000000..0a38928da
--- /dev/null
+++ b/utils/refresh/.rythe_project
@@ -0,0 +1,21 @@
+local project = {
+    pre_build = {},
+    fast_up_to_date_check = false
+}
+
+function project.init(proj, ctx)
+    proj.pre_build = {
+        "cd " .. _WORKING_DIR,
+        ctx.getCommand()
+    }
+
+    local targetPattern = "build/" .. _ACTION .. "/bin/**/" .. proj.name
+    for i, dir in ipairs(os.matchdirs(targetPattern)) do
+        print(dir)
+        os.rmdir(dir)
+    end
+    
+    return proj
+end
+
+return project
\ No newline at end of file
diff --git a/utils/test utils/main.cpp b/utils/test utils/main.cpp
new file mode 100644
index 000000000..3e15d339a
--- /dev/null
+++ b/utils/test utils/main.cpp	
@@ -0,0 +1 @@
+#include <catch2/catch_session.hpp>
diff --git a/xcopyexclude b/xcopyexclude
new file mode 100644
index 000000000..5e0eb3e54
--- /dev/null
+++ b/xcopyexclude
@@ -0,0 +1,9 @@
+.cpp
+.vcxproj
+.lua
+.c
+xcopyexclude
+delete_this
+.obj
+.tlog
+.recipe
\ No newline at end of file