diff --git a/editor/src/main.cpp b/editor/src/main.cpp
index d310e27..c969c25 100644
--- a/editor/src/main.cpp
+++ b/editor/src/main.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <nova/core/debug.h>
-#include <nova/platform/system.h>
-#include <nova/render/renderer.h>
+#include <nova/platform/window_driver.h>
+#include <nova/render/render_driver.h>
 
 #include <cstdlib>
 
@@ -15,11 +15,17 @@ using namespace Nova;
 int main() {
 	Debug::get_logger()->set_level(spdlog::level::trace);
 
-	System::init();
-	Renderer::init(RenderAPI::VULKAN);
-	Renderer::get_driver()->create_device(RenderDevice::AUTO);
+	auto wd = WindowDriver::create();
+	auto rd = RenderDriver::create(RenderAPI::VULKAN, wd);
 
-	Renderer::shutdown();
-	System::shutdown();
+	rd->select_device(RenderDevice::AUTO);
+	wd->create_window("Nova", 1280, 720);
+
+	while (wd->get_window_count() > 0) {
+		wd->poll_events();
+	}
+
+	delete rd;
+	delete wd;
 	return EXIT_SUCCESS;
 }