diff --git a/src/game.zig b/src/game.zig
index bd2c153..26ac7d4 100644
--- a/src/game.zig
+++ b/src/game.zig
@@ -1,31 +1,14 @@
 const std = @import("std");
 const sdl = @import("sdl.zig");
+const Graphics = @import("graphics.zig");
 
-renderer: ?*sdl.SDL_Renderer,
-window: ?*sdl.SDL_Window,
+graphics: Graphics,
 running: bool,
 
 const Self = @This();
 pub fn init() GameError!Self {
-    if (!sdl.SDL_Init(sdl.SDL_INIT_VIDEO | sdl.SDL_INIT_EVENTS)) return GameError.SdlError;
-
-    var renderer: ?*sdl.SDL_Renderer = null;
-    var window: ?*sdl.SDL_Window = null;
-
-    if (!sdl.SDL_CreateWindowAndRenderer(
-        "Spacefarer",
-        1600,
-        900,
-        sdl.SDL_WINDOW_VULKAN,
-        &window,
-        &renderer,
-    )) return GameError.SdlError;
-
-    if (!sdl.SDL_SetRenderVSync(renderer, sdl.SDL_RENDERER_VSYNC_ADAPTIVE)) return GameError.SdlError;
-
     return Self{
-        .renderer = renderer,
-        .window = window,
+        .graphics = try Graphics.create(),
         .running = false,
     };
 }
@@ -47,9 +30,8 @@ fn update(self: *Self) GameError!void {
 }
 
 fn draw(self: *Self) GameError!void {
-    if (!sdl.SDL_SetRenderDrawColor(self.renderer, 0, 0, 0, 255)) return GameError.SdlError;
-    if (!sdl.SDL_RenderClear(self.renderer)) return GameError.SdlError;
-    if (!sdl.SDL_RenderPresent(self.renderer)) return GameError.SdlError;
+    try self.graphics.begin_draw();
+    try self.graphics.end_draw();
 }
 
 fn process_events(self: *Self) GameError!void {
@@ -78,8 +60,7 @@ fn process_event(self: *Self, event: sdl.SDL_Event) void {
 }
 
 pub fn deinit(self: *Self) void {
-    sdl.SDL_DestroyRenderer(self.renderer);
-    sdl.SDL_DestroyWindow(self.window);
+    self.graphics.destroy();
     sdl.SDL_Quit();
 }
 
diff --git a/src/graphics.zig b/src/graphics.zig
index 5c17d7d..cfd167f 100644
--- a/src/graphics.zig
+++ b/src/graphics.zig
@@ -1 +1,73 @@
+const std = @import("std");
 const sdl = @import("sdl.zig");
+const GameError = @import("game.zig").GameError;
+
+window: *sdl.SDL_Window,
+renderer: *sdl.SDL_Renderer,
+device: *sdl.SDL_GPUDevice,
+/// Only available while drawing
+command_buffer: ?*sdl.SDL_GPUCommandBuffer,
+
+const Self = @This();
+pub fn create() GameError!Self {
+    // Init
+    if (!sdl.SDL_Init(sdl.SDL_INIT_VIDEO | sdl.SDL_INIT_EVENTS)) return GameError.SdlError;
+
+    // Window and Renderer
+    var renderer: ?*sdl.SDL_Renderer = null;
+    var window: ?*sdl.SDL_Window = null;
+
+    if (!sdl.SDL_CreateWindowAndRenderer(
+        "Spacefarer",
+        1600,
+        900,
+        sdl.SDL_WINDOW_VULKAN,
+        &window,
+        &renderer,
+    )) return GameError.SdlError;
+    errdefer sdl.SDL_DestroyRenderer(renderer);
+    errdefer sdl.SDL_DestroyWindow(window);
+
+    if (!sdl.SDL_SetRenderVSync(renderer, sdl.SDL_RENDERER_VSYNC_ADAPTIVE)) return GameError.SdlError;
+
+    // Device
+    const device = sdl.SDL_CreateGPUDevice(
+        sdl.SDL_GPU_SHADERFORMAT_SPIRV,
+        @import("builtin").mode == .Debug,
+        null,
+    ) orelse return GameError.SdlError;
+    errdefer sdl.SDL_DestroyGPUDevice(device);
+
+    // Claim
+    if (!sdl.SDL_ClaimWindowForGPUDevice(device, window)) return GameError.SdlError;
+    errdefer sdl.SDL_ReleaseWindowFromGPUDevice(device, window);
+
+    return .{
+        .window = window.?,
+        .renderer = renderer.?,
+        .device = device,
+        .command_buffer = null,
+    };
+}
+
+pub fn destroy(self: *Self) void {
+    sdl.SDL_ReleaseWindowFromGPUDevice(self.device, self.window);
+    sdl.SDL_DestroyRenderer(self.renderer);
+    sdl.SDL_DestroyWindow(self.window);
+
+    if (self.command_buffer != null) {
+        _ = sdl.SDL_CancelGPUCommandBuffer(self.command_buffer);
+        self.command_buffer = null;
+    }
+    sdl.SDL_DestroyGPUDevice(self.device);
+}
+
+pub fn begin_draw(self: *Self) GameError!void {
+    self.command_buffer = sdl.SDL_AcquireGPUCommandBuffer(self.device) orelse return GameError.SdlError;
+}
+
+pub fn end_draw(self: *Self) GameError!void {
+    defer self.command_buffer = null;
+    // Errors out? Perhaps its due to command buffer being empty at the moment
+    if (sdl.SDL_SubmitGPUCommandBuffer(self.command_buffer)) return GameError.SdlError;
+}
diff --git a/src/main.zig b/src/main.zig
index aeebed5..09be2b3 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,8 +1,21 @@
 const std = @import("std");
+const sdl = @import("sdl.zig");
 const Game = @import("game.zig");
 
-pub fn main() !void {
+pub fn run_game() !void {
     var game = try Game.init();
     defer game.deinit();
     try game.run();
 }
+
+pub fn main() !void {
+    run_game() catch |err| {
+        switch (err) {
+            error.SdlError => {
+                std.debug.print("SDL Error:\n---\n{s}\n---\n", .{sdl.SDL_GetError()});
+            },
+            else => unreachable,
+        }
+        return err;
+    };
+}
diff --git a/src/sdl.zig b/src/sdl.zig
index 38679f2..09e95f1 100644
--- a/src/sdl.zig
+++ b/src/sdl.zig
@@ -1,4 +1,3 @@
 pub usingnamespace @cImport({
     @cInclude("SDL3/SDL.h");
 });
-