diff --git a/firmware/rtl/raster/ram_shim.v b/firmware/rtl/raster/ram_shim.v
new file mode 100644
index 0000000..5496d22
--- /dev/null
+++ b/firmware/rtl/raster/ram_shim.v
@@ -0,0 +1,60 @@
+/* Ram shim. This is an interface designed for a LiteX RAM
+ * DMA module. It can also be connected to a simulator.
+ *
+ * THIS MODULE ASSUMES that RAM_WORD < DAT_WID < RAM_WORD*2.
+ */
+module ram_shim #(
+	parameter BASE_ADDR = 32'h1000000,
+	parameter MAX_BYTE_WID = 13,
+	parameter DAT_WID = 24,
+	parameter RAM_WORD = 16,
+	parameter RAM_WID = 32
+) (
+	input clk,
+	input signed [DAT_WID-1:0] data,
+	input commit,
+	output reg finished,
+
+	output reg [RAM_WORD-1:0] word,
+	output [RAM_WID-1:0] addr,
+	output reg write,
+	input valid
+);
+
+localparam WAIT_ON_COMMIT = 0;
+localparam HIGH_WORD_LOAD = 1;
+localparam WAIT_ON_HIGH_WORD = 2;
+localparam WAIT_ON_COMMIT_DEASSERT = 3;
+reg [2:0] state = WAIT_ON_COMMIT;
+
+reg [MAX_BYTE_WID-1:0] offset = 0;
+assign addr = BASE_ADDR + offset;
+
+always @ (posedge clk) begin
+	case (state)
+	WAIT_ON_COMMIT: if (commit) begin
+		word <= data[RAM_WORD-1:0];
+		write <= 1;
+		state <= HIGH_WORD;
+	end
+	HIGH_WORD_LOAD: if (valid) begin
+		offset <= offset + (RAM_WORD/2);
+		write <= 0;
+		word <= {(RAM_WORD*2 - DAT_WID){word[DAT_WID-1]},
+		         word[DAT_WID-1:RAM_WORD]};
+		state <= WAIT_ON_HIGH_WORD;
+	end
+	WAIT_ON_HIGH_WORD: if (!write) begin
+		write <= 1;
+	end else if (valid) begin
+		offset <= offset + (RAM_WORD / 2);
+		state <= WAIT_ON_COMMIT_DEASSERT;
+		finished <= 1;
+	end
+	WAIT_ON_COMMIT_DEASSERT: if (!commit) begin
+		finished <= 0;
+	end
+	endcase
+end
+
+endmodule
diff --git a/firmware/rtl/raster/raster.v b/firmware/rtl/raster/raster.v
index dd96930..7bfc630 100644
--- a/firmware/rtl/raster/raster.v
+++ b/firmware/rtl/raster/raster.v
@@ -261,7 +261,7 @@ always @ (posedge clk) begin
 
 	SEND_VALUE: if (mem_finished) begin
 		if (!arm) state <= WAIT_ON_ARM;
-		state <= SCAN_ADC_VALUES;
+		else state <= SCAN_ADC_VALUES;
 	end
 	ADVANCE_DAC_WRITE: begin
 		if (!x_arm || !y_arm) begin