diff --git a/src/ifu/fetchbuffer.sv b/src/ifu/fetchbuffer.sv
new file mode 100644
index 000000000..4a828e2f2
--- /dev/null
+++ b/src/ifu/fetchbuffer.sv
@@ -0,0 +1,71 @@
+///////////////////////////////////////////
+// fetchbuffer.sv
+//
+// Written: chickson@hmc.edu ; vkrishna@hmc.edu
+// Created: 30 September 2024
+// Modified: 3 October 2024
+//
+// Purpose: Store multiple instructions in a cyclic FIFO
+// 
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+// 
+// Copyright (C) 2021-24 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file 
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You 
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work 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.
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+module fetchbuffer import cvw::*; #(parameter cvw_t P) (
+	input  logic        clk, reset,
+	input  logic        StallD, flush,
+	input  logic [31:0] writeData,
+	output logic [31:0] readData,
+	output logic        StallF
+);
+  localparam [31:0] nop = 32'h00000013;
+  logic      [31:0] readf0, readf1, readf2, readMuxed;
+  logic      [2:0]  readPtr, writePtr;
+  logic             empty, full;
+
+  assign empty  = |(readPtr & writePtr); // Bitwise and the read&write ptr, and or the bits of the result together
+  assign full   = |({writePtr[1:0], writePtr[2]} & readPtr); // Same as above but left rotate writePtr to "add 1"
+  assign StallF = full;
+
+  // will go in a generate block once this is parameterized
+  flopenr f0 (.clk, .reset(reset | flush), .en(writePtr[0]), .d(writeData), .q(readf0)); 
+  flopenr f1 (.clk, .reset(reset | flush), .en(writePtr[1]), .d(writeData), .q(readf1));
+  flopenr f2 (.clk, .reset(reset | flush), .en(writePtr[2]), .d(writeData), .q(readf2));
+
+  always_comb begin : readMuxes
+    // Mux read data from the three registers
+    case (readPtr)
+      3'b001:  readMuxed = readf0;
+      3'b010:  readMuxed = readf1;
+      3'b001:  readMuxed = readf2;
+      default: readMuxed = nop; // just in case?
+    endcase
+    // issue nop when appropriate
+    readData = empty ? nop : readMuxed;
+  end
+
+  always_ff @(posedge clk) begin : shiftRegister
+    if (reset) begin
+      writePtr <= 3'b001;
+      readPtr  <= 3'b001;
+    end else begin
+      writePtr <= ~full ? {writePtr[1:0], writePtr[2]} : writePtr;
+      readPtr <= ~(StallD | empty) ? {readPtr[1:0], readPtr[2]} : readPtr;
+    end
+  end
+endmodule
diff --git a/src/ifu/ifu.sv b/src/ifu/ifu.sv
index 695603758..17e01f270 100644
--- a/src/ifu/ifu.sv
+++ b/src/ifu/ifu.sv
@@ -301,7 +301,9 @@ module ifu import cvw::*;  #(parameter cvw_t P) (
   assign IFUStallF = IFUCacheBusStallF | SelSpillNextF;
   assign GatedStallD = StallD & ~SelSpillNextF;
   
-  flopenl #(32) AlignedInstrRawDFlop(clk, reset | FlushD, ~StallD, PostSpillInstrRawF, nop, InstrRawD);
+  // flopenl #(32) AlignedInstrRawDFlop(clk, reset | FlushD, ~StallD, PostSpillInstrRawF, nop, InstrRawD);
+  // TODO: Test this?!?!?!
+  fetchbuffer #(P) fetchbuff(.clk, .reset, .StallD, .flush(FlushD), .writeData(PostSpillInstrRawF), .readData(InstrRawD), .StallF); // Figure out what TODO with StallF
 
   ////////////////////////////////////////////////////////////////////////////////////////////////
   // PCNextF logic