diff --git a/src/rendering/vulkan/Context.zig b/src/rendering/vulkan/Context.zig
new file mode 100644
index 0000000..9708ed9
--- /dev/null
+++ b/src/rendering/vulkan/Context.zig
@@ -0,0 +1,20 @@
+const vk = @import("vulkan");
+const CommandBuffer = @import("Command.zig").CommandBuffer;
+const QueueId = @import("queues.zig").QueueId;
+
+cur_cmd_buf: [QueueId.count]CommandBuffer,
+prev_cmd_buf: [QueueId.count]CommandBuffer,
+last_submit_queue: QueueId,
+most_recent_begin: QueueId,
+
+const Self = @This();
+
+pub const context: Self = Self{};
+
+pub fn init() Self {
+    context.* = .{};
+}
+
+pub fn deinit() void {
+    context.* = .{};
+}
diff --git a/src/rendering/vulkan/Renderer.zig b/src/rendering/vulkan/Renderer.zig
index 35da960..a2d396a 100644
--- a/src/rendering/vulkan/Renderer.zig
+++ b/src/rendering/vulkan/Renderer.zig
@@ -7,7 +7,7 @@ const Device = @import("device.zig").Device;
 const Memory = @import("memory.zig").Memory;
 const Framebuffer = @import("framebuffer.zig").Framebuffer;
 const Swapchain = @import("Swapchain.zig");
-const Context = @import("context.zig").Context;
+const Context = @import("Context.zig");
 const MainPass = @import("main_pass.zig").MainPass;
 const Command = @import("Command.zig");