diff --git a/warriors/big-nothing.red b/warriors/bait.red
similarity index 77%
rename from warriors/big-nothing.red
rename to warriors/bait.red
index 6a1a0dd..3b863dc 100644
--- a/warriors/big-nothing.red
+++ b/warriors/bait.red
@@ -1,5 +1,5 @@
 ;author Benji Dial
-;name Big Nothing
+;name Bait
 
 start
   for 19
diff --git a/warriors/dwarf-replicator.red b/warriors/dwarf-replicator.red
deleted file mode 100644
index c5022a2..0000000
--- a/warriors/dwarf-replicator.red
+++ /dev/null
@@ -1,55 +0,0 @@
-;author Benji Dial
-;name Dwarf Replicator
-
-;not a particularly good warrior, but is sufficient to test a few things
-
-start
-  mov 0, 2908
-  nop }start, >start
-  jmp 2
-
-  dat
-
-  seq.a #the_end - start, start
-  jmp start
-  jmp 2
-
-  dat
-
-  sub.ab #the_end - start, start
-  spl @start
-  jmp 2, <start
-
-  dat
-
-dwarf
-  mov the_end, the_end + 4
-  add.ab #4, dwarf
-  jmp 2
-
-  dat
-
-  seq.ab #start + 723 - dwarf, dwarf
-  jmp dwarf
-  jmp 2
-
-  dat
-
-core_clear
-  mov the_end, the_end + 1
-  add.ab #1, -1
-  jmp 2
-
-  dat
-
-  seq.a #0-1, core_clear
-  jmp core_clear
-  jmp 2
-
-  dat
-
-  mov.ab #the_end + 1, core_clear
-  jmp core_clear
-  dat
-
-the_end
diff --git a/warriors/dwarf.red b/warriors/dwarf.red
index d2df37e..a43ef50 100644
--- a/warriors/dwarf.red
+++ b/warriors/dwarf.red
@@ -2,5 +2,5 @@
 ;name Dwarf
 
 mov 3, 7
-add.ab #4, -1
+add.ab #4948, -1
 jmp -2
diff --git a/warriors/train.red b/warriors/train.red
new file mode 100644
index 0000000..556896b
--- /dev/null
+++ b/warriors/train.red
@@ -0,0 +1,25 @@
+;author Benji Dial
+;name Train
+
+step equ 4943
+
+  spl 1
+  spl 1
+  spl 1
+
+paper
+  mov.f var + 1, var
+  spl @var
+  mov }var, >var
+
+  mov.a #step / 2, the_end + 2
+
+stone
+  mov the_end + 1, }the_end + 2
+  jmp stone, }the_end + 2
+
+var
+  dat
+  dat paper + 1, paper + step + 1
+
+the_end