diff --git a/src/terminal/circ_buf.zig b/src/terminal/circ_buf.zig
new file mode 100644
index 000000000..971b332dd
--- /dev/null
+++ b/src/terminal/circ_buf.zig
@@ -0,0 +1,219 @@
+const std = @import("std");
+const assert = std.debug.assert;
+const Allocator = std.mem.Allocator;
+
+/// Returns a circular buffer containing type T.
+pub fn CircBuf(comptime T: type) type {
+    return struct {
+        const Self = @This();
+
+        // Implementation note: there's a lot of unsafe addition of usize
+        // here in this implementation that can technically overflow. If someone
+        // wants to fix this and make it overflow safe (use subtractions for
+        // checks prior to additions) then I welcome it. In reality, we'd
+        // have to be a really, really large terminal screen to even worry
+        // about this so I'm punting it.
+
+        storage: []T,
+        head: usize,
+        tail: usize,
+
+        // We could remove this and just use math with head/tail to figure
+        // it out, but our usage of circular buffers stores so much data that
+        // this minor overhead is not worth optimizing out.
+        full: bool,
+
+        /// Initialize a new circular buffer that can store size elements.
+        pub fn init(alloc: Allocator, size: usize) !Self {
+            var buf = try alloc.alloc(T, size);
+            std.mem.set(T, buf, std.mem.zeroes(T));
+
+            return Self{
+                .storage = buf,
+                .head = 0,
+                .tail = 0,
+                .full = false,
+            };
+        }
+
+        pub fn deinit(self: *Self, alloc: Allocator) void {
+            alloc.free(self.storage);
+            self.* = undefined;
+        }
+
+        /// Returns if the buffer is currently empty. To check if its
+        /// full, just check the "full" attribute.
+        pub fn empty(self: Self) bool {
+            return !self.full and self.head == self.tail;
+        }
+
+        /// Returns the total capacity allocated for this buffer.
+        pub fn capacity(self: Self) usize {
+            return self.storage.len;
+        }
+
+        /// Returns the length in elements that are used.
+        pub fn len(self: Self) usize {
+            if (self.full) return self.storage.len;
+            if (self.head >= self.tail) return self.head - self.tail;
+            return self.storage.len - (self.tail - self.head);
+        }
+
+        /// Delete the oldest n values from the buffer. If there are less
+        /// than n values in the buffer, it'll delete everything.
+        pub fn deleteOldest(self: *Self, n: usize) void {
+            // If we're not full, we can just advance the tail. We know
+            // it'll be less than the length because otherwise we'd be full.
+            self.tail += @minimum(self.len(), n);
+            if (self.tail >= self.storage.len) self.tail -= self.storage.len;
+            self.full = false;
+        }
+
+        /// Returns a pointer to the value at offset with the given length,
+        /// and considers this full amount of data "written" if it is beyond
+        /// the end of our buffer. This never "rotates" the buffer because
+        /// the offset can only be within the size of the buffer.
+        pub fn getPtrSlice(self: *Self, offset: usize, slice_len: usize) [2][]T {
+            assert(slice_len > 0);
+
+            // End offset is the last offset (exclusive) for our slice.
+            // We use exclusive because it makes the math easier and it
+            // matches Zigs slicing parameterization.
+            const end_offset = offset + slice_len;
+
+            // If our slice can't fit it in our length, then we need to advance.
+            if (end_offset > self.len()) self.advance(end_offset - self.len());
+
+            // Our start and end indexes into the storage buffer
+            const start_idx = self.storageOffset(offset);
+            const end_idx = self.storageOffset(end_offset - 1);
+            // std.log.warn("A={} B={}", .{ start_idx, end_idx });
+
+            // Optimistically, our data fits in one slice
+            if (end_idx >= start_idx) {
+                return .{
+                    self.storage[start_idx .. end_idx + 1],
+                    self.storage[0..0], // So there is an empty slice
+                };
+            }
+
+            return .{
+                self.storage[start_idx..],
+                self.storage[0 .. end_idx + 1],
+            };
+        }
+
+        /// Advances the head/tail so that we can store amount.
+        fn advance(self: *Self, amount: usize) void {
+            assert(amount <= self.storage.len - self.len());
+
+            // Optimistically add our amount
+            self.head += amount;
+
+            // If we exceeded the length of the buffer, wrap around.
+            if (self.head >= self.storage.len) {
+                self.head = self.head - self.storage.len;
+                self.tail = self.head;
+            }
+
+            // We're full if the head reached the tail. The head can never
+            // pass the tail because advance asserts amount is only in
+            // available space left
+            self.full = self.head == self.tail;
+        }
+
+        /// For a given offset from zero, this returns the offset in the
+        /// storage buffer where this data can be found.
+        fn storageOffset(self: Self, offset: usize) usize {
+            assert(offset < self.storage.len);
+
+            // This should be subtraction ideally to avoid overflows but
+            // it would take a really, really, huge buffer to overflow.
+            const fits_offset = self.tail + offset;
+            if (fits_offset < self.storage.len) return fits_offset;
+            return fits_offset - self.storage.len;
+        }
+    };
+}
+
+test {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    const Buf = CircBuf(u8);
+    var buf = try Buf.init(alloc, 12);
+    defer buf.deinit(alloc);
+
+    try testing.expect(buf.empty());
+    try testing.expectEqual(@as(usize, 0), buf.len());
+}
+
+test "getPtrSlice fits" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    const Buf = CircBuf(u8);
+    var buf = try Buf.init(alloc, 12);
+    defer buf.deinit(alloc);
+
+    const slices = buf.getPtrSlice(0, 11);
+    try testing.expectEqual(@as(usize, 11), slices[0].len);
+    try testing.expectEqual(@as(usize, 0), slices[1].len);
+    try testing.expectEqual(@as(usize, 11), buf.len());
+}
+
+test "getPtrSlice wraps" {
+    const testing = std.testing;
+    const alloc = testing.allocator;
+
+    const Buf = CircBuf(u8);
+    var buf = try Buf.init(alloc, 4);
+    defer buf.deinit(alloc);
+
+    // Fill the buffer
+    _ = buf.getPtrSlice(0, buf.capacity());
+    try testing.expect(buf.full);
+    try testing.expectEqual(@as(usize, 4), buf.len());
+
+    // Delete
+    buf.deleteOldest(2);
+    try testing.expect(!buf.full);
+    try testing.expectEqual(@as(usize, 2), buf.len());
+
+    // Get a slice that doesn't grow
+    {
+        const slices = buf.getPtrSlice(0, 2);
+        try testing.expectEqual(@as(usize, 2), slices[0].len);
+        try testing.expectEqual(@as(usize, 0), slices[1].len);
+        try testing.expectEqual(@as(usize, 2), buf.len());
+        slices[0][0] = 1;
+        slices[0][1] = 2;
+    }
+
+    // Get a slice that does grow, and forces wrap
+    {
+        const slices = buf.getPtrSlice(2, 2);
+        try testing.expectEqual(@as(usize, 2), slices[0].len);
+        try testing.expectEqual(@as(usize, 0), slices[1].len);
+        try testing.expectEqual(@as(usize, 4), buf.len());
+
+        // should be empty
+        try testing.expectEqual(@as(u8, 0), slices[0][0]);
+        try testing.expectEqual(@as(u8, 0), slices[0][1]);
+        slices[0][0] = 3;
+        slices[0][1] = 4;
+    }
+
+    // Get a slice across boundaries
+    {
+        const slices = buf.getPtrSlice(0, 4);
+        try testing.expectEqual(@as(usize, 2), slices[0].len);
+        try testing.expectEqual(@as(usize, 2), slices[1].len);
+        try testing.expectEqual(@as(usize, 4), buf.len());
+
+        try testing.expectEqual(@as(u8, 1), slices[0][0]);
+        try testing.expectEqual(@as(u8, 2), slices[0][1]);
+        try testing.expectEqual(@as(u8, 3), slices[1][0]);
+        try testing.expectEqual(@as(u8, 4), slices[1][1]);
+    }
+}
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index a1a1d0d34..c46b6dbc3 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -40,7 +40,7 @@ test {
     _ = Terminal;
     _ = Screen;
 
-    _ = @import("osc.zig");
-    _ = @import("parse_table.zig");
-    _ = @import("Tabstops.zig");
+test {
+    @import("std").testing.refAllDecls(@This());
+    _ = @import("circ_buf.zig");
 }