diff --git a/OpenRA.FileFormats/Map/Map.cs b/OpenRA.FileFormats/Map/Map.cs
index c9389ff6e3..45605f9d3f 100644
--- a/OpenRA.FileFormats/Map/Map.cs
+++ b/OpenRA.FileFormats/Map/Map.cs
@@ -22,7 +22,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Reflection;
 
 namespace OpenRA.FileFormats
@@ -204,6 +203,7 @@ namespace OpenRA.FileFormats
 			
 			writer.Flush();
 			writer.Close();
+			File.Delete(filepath);
 			File.Move(filepath+".tmp",filepath);
 		}
 		
diff --git a/OpenRA.FileFormats/Map/MapStub.cs b/OpenRA.FileFormats/Map/MapStub.cs
index ceb648331a..aba7a918bd 100644
--- a/OpenRA.FileFormats/Map/MapStub.cs
+++ b/OpenRA.FileFormats/Map/MapStub.cs
@@ -18,12 +18,8 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Reflection;
+using System.Drawing;
 
 namespace OpenRA.FileFormats
 {
@@ -37,16 +33,16 @@ namespace OpenRA.FileFormats
 		public string Description;
 		public string Author;
 		public int PlayerCount;
-		public string Preview;
 		public string Tileset;
 		
 		public int2 TopLeft;
 		public int2 BottomRight;
 		public int Width {get {return BottomRight.X - TopLeft.X;}}
 		public int Height {get {return BottomRight.Y - TopLeft.Y;}}
+		public Lazy<Bitmap> Preview;
 		
 		static List<string> Fields = new List<string>() {
-			"Uid", "Title", "Description", "Author", "PlayerCount", "Tileset", "Preview", "TopLeft", "BottomRight"
+			"Uid", "Title", "Description", "Author", "PlayerCount", "Tileset", "TopLeft", "BottomRight"
 		};
 		
 		public MapStub() {}
@@ -55,8 +51,12 @@ namespace OpenRA.FileFormats
 		{			
 			Package = package;
 			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
-						
 			FieldLoader.LoadFields(this,yaml,Fields);
+			
+			Preview = Lazy.New(
+				() => {return new Bitmap(Package.GetContent("preview.png"));}
+			);
 		}
+		
 	}
 }
diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs
index 64ca607c2d..280a8b10c7 100644
--- a/OpenRA.Game/Chrome.cs
+++ b/OpenRA.Game/Chrome.cs
@@ -294,28 +294,26 @@ namespace OpenRA
 				{
 					showMapChooser = false;
 				});
-			/*
+			
 			if (mapPreviewDirty)
 			{
-				if (mapChooserSheet == null || mapChooserSheet.Size.Width != currentMap.Map.MapSize.X || mapChooserSheet.Size.Height != currentMap.Map.MapSize.Y)
-					mapChooserSheet = new Sheet(renderer, new Size(currentMap.Map.MapSize.X, currentMap.Map.MapSize.Y));
+				if (mapChooserSheet == null || mapChooserSheet.Size.Width != currentMap.Width || mapChooserSheet.Size.Height != currentMap.Height)
+					mapChooserSheet = new Sheet(renderer, new Size(currentMap.Width, currentMap.Height));
 				
-				var b = Minimap.RenderTerrainBitmapWithSpawnPoints(currentMap.Map, Game.world.TileSet);	// tileset -> hack
-				mapChooserSheet.Texture.SetData(b);
-				mapChooserSprite = new Sprite(mapChooserSheet, 
-					Minimap.MakeMinimapBounds(currentMap.Map), TextureChannel.Alpha);
+				mapChooserSheet.Texture.SetData(currentMap.Preview.Value);
+				mapChooserSprite = new Sprite(mapChooserSheet, new Rectangle(0,0,currentMap.Width, currentMap.Height), TextureChannel.Alpha);
 				mapPreviewDirty = false;
 			}
-			*/
+			
 			var mapRect = new Rectangle(r.Right - 280, r.Top + 30, 256, 256);
-			/*
+			
 			DrawDialogBackground(mapRect, "dialog2");
 			rgbaRenderer.DrawSprite(mapChooserSprite, 
 				new float2(mapRect.Location) + new float2(4, 4), 
 				"chrome", 
 				new float2(mapRect.Size) - new float2(8, 8));
 			rgbaRenderer.Flush();
-			*/
+			
 			var y = r.Top + 50;
 			
 			int maxListItems = ((r.Bottom - 60 - y ) / 20);
diff --git a/mods/cnc/maps/scm01ea/map.bin b/mods/cnc/maps/scm01ea/map.bin
new file mode 100644
index 0000000000..9de6407931
Binary files /dev/null and b/mods/cnc/maps/scm01ea/map.bin differ
diff --git a/mods/cnc/maps/scm01ea/map.yaml b/mods/cnc/maps/scm01ea/map.yaml
new file mode 100644
index 0000000000..c0b47a3ce9
--- /dev/null
+++ b/mods/cnc/maps/scm01ea/map.yaml
@@ -0,0 +1,94 @@
+Uid: testmap
+
+MapFormat: 1
+
+Title: GREEN ACRES
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: TEMPERAT
+
+MapSize: 64,64
+
+TopLeft: 3,11
+
+BottomRight: 61,60
+
+Actors:
+	Actor0: tc04 Neutral 44,15
+	Actor1: tc03 Neutral 42,15
+	Actor2: tc03 Neutral 34,35
+	Actor3: tc04 Neutral 33,33
+	Actor4: tc04 Neutral 53,42
+	Actor5: tc02 Neutral 55,41
+	Actor6: t02 Neutral 25,39
+	Actor7: t01 Neutral 28,40
+	Actor8: split2 Neutral 13,26
+	Actor9: split3 Neutral 20,45
+	Actor10: split3 Neutral 42,54
+	Actor11: split3 Neutral 29,35
+	Actor12: split2 Neutral 54,22
+	Actor13: split3 Neutral 34,11
+	Actor14: tc01 Neutral 15,30
+	Actor15: t17 Neutral 13,31
+	Actor16: tc05 Neutral 4,27
+	Actor17: tc04 Neutral 10,32
+	Actor18: tc04 Neutral 18,18
+	Actor19: tc02 Neutral 16,31
+	Actor20: t07 Neutral 18,29
+	Actor21: t06 Neutral 29,37
+	Actor22: t07 Neutral 36,28
+	Actor23: t06 Neutral 35,22
+	Actor24: t07 Neutral 34,24
+	Actor25: t07 Neutral 42,27
+	Actor26: t07 Neutral 31,44
+	Actor27: t16 Neutral 33,46
+	Actor28: t17 Neutral 30,45
+	Actor29: tc02 Neutral 31,45
+	Actor30: tc04 Neutral 41,25
+	Actor31: tc04 Neutral 41,41
+	Actor32: tc04 Neutral 16,41
+	Actor33: t02 Neutral 51,11
+	Actor34: t02 Neutral 12,12
+	Actor35: t03 Neutral 11,12
+	Actor36: t16 Neutral 12,43
+	Actor37: tc02 Neutral 19,56
+	Actor38: t16 Neutral 36,17
+	Actor39: t17 Neutral 38,12
+	Actor40: tc01 Neutral 38,13
+	Actor41: tc02 Neutral 46,12
+	Actor42: t07 Neutral 21,52
+	Actor43: tc04 Neutral 22,51
+	Actor44: tc04 Neutral 32,15
+	Actor45: tc02 Neutral 31,19
+	Actor46: tc01 Neutral 21,15
+	Actor47: t01 Neutral 17,18
+	Actor48: tc04 Neutral 47,32
+	Actor49: tc01 Neutral 47,31
+	Actor50: split2 Neutral 13,42
+	Actor51: split2 Neutral 38,21
+	Actor52: split3 Neutral 46,43
+	Actor53: t01 Neutral 60,53
+	Actor54: tc05 Neutral 58,25
+	Actor55: tc04 Neutral 56,26
+	Actor56: tc03 Neutral 54,26
+	Actor57: tc02 Neutral 52,26
+	Actor58: tc01 Neutral 51,27
+	Actor59: tc02 Neutral 49,35
+	Actor60: tc04 Neutral 45,34
+	Actor61: tc03 Neutral 47,36
+
+Waypoints:
+	spawn7: 8,54
+	spawn6: 53,55
+	spawn5: 58,35
+	spawn4: 33,58
+	spawn3: 40,34
+	spawn2: 57,14
+	spawn1: 18,12
+	spawn0: 5,19
+
+Rules:
+
diff --git a/mods/cnc/maps/scm01ea/preview.png b/mods/cnc/maps/scm01ea/preview.png
new file mode 100644
index 0000000000..f59646f95a
Binary files /dev/null and b/mods/cnc/maps/scm01ea/preview.png differ
diff --git a/mods/cnc/maps/multimap/map.bin b/mods/cnc/maps/scm02ea/map.bin
similarity index 100%
rename from mods/cnc/maps/multimap/map.bin
rename to mods/cnc/maps/scm02ea/map.bin
diff --git a/mods/cnc/maps/multimap/map.yaml b/mods/cnc/maps/scm02ea/map.yaml
similarity index 98%
rename from mods/cnc/maps/multimap/map.yaml
rename to mods/cnc/maps/scm02ea/map.yaml
index 8e74a84603..a136351814 100644
--- a/mods/cnc/maps/multimap/map.yaml
+++ b/mods/cnc/maps/scm02ea/map.yaml
@@ -1,4 +1,4 @@
-Uid: 305604695
+Uid: 119926504
 
 MapFormat: 1
 
diff --git a/mods/cnc/maps/multimap/preview.png b/mods/cnc/maps/scm02ea/preview.png
similarity index 100%
rename from mods/cnc/maps/multimap/preview.png
rename to mods/cnc/maps/scm02ea/preview.png
diff --git a/mods/cnc/maps/scm03ea/map.bin b/mods/cnc/maps/scm03ea/map.bin
new file mode 100644
index 0000000000..8d890a6e72
Binary files /dev/null and b/mods/cnc/maps/scm03ea/map.bin differ
diff --git a/mods/cnc/maps/scm03ea/map.yaml b/mods/cnc/maps/scm03ea/map.yaml
new file mode 100644
index 0000000000..35d9e7a2df
--- /dev/null
+++ b/mods/cnc/maps/scm03ea/map.yaml
@@ -0,0 +1,77 @@
+Uid: 708244922
+
+MapFormat: 1
+
+Title: Lost Arena
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: TEMPERAT
+
+MapSize: 64,64
+
+TopLeft: 2,1
+
+BottomRight: 61,62
+
+Actors:
+	Actor0: tc05 Neutral 47,54
+	Actor1: t01 Neutral 53,25
+	Actor2: t05 Neutral 53,26
+	Actor3: t06 Neutral 52,26
+	Actor4: t11 Neutral 49,25
+	Actor5: t08 Neutral 52,28
+	Actor6: t12 Neutral 48,25
+	Actor7: t10 Neutral 56,16
+	Actor8: tc04 Neutral 44,1
+	Actor9: tc03 Neutral 42,1
+	Actor10: tc05 Neutral 58,1
+	Actor11: tc04 Neutral 13,32
+	Actor12: tc05 Neutral 10,32
+	Actor13: tc04 Neutral 2,25
+	Actor14: tc05 Neutral 18,29
+	Actor15: t08 Neutral 23,14
+	Actor16: t07 Neutral 22,13
+	Actor17: t07 Neutral 15,11
+	Actor18: t02 Neutral 16,10
+	Actor19: split2 Neutral 58,34
+	Actor20: split2 Neutral 33,21
+	Actor21: split3 Neutral 45,11
+	Actor22: split2 Neutral 2,10
+	Actor23: split2 Neutral 19,2
+	Actor24: split3 Neutral 47,29
+	Actor25: split2 Neutral 35,58
+	Actor26: split3 Neutral 6,49
+	Actor27: tc02 Neutral 2,53
+	Actor28: tc03 Neutral 24,46
+	Actor29: tc02 Neutral 26,46
+	Actor30: tc02 Neutral 35,49
+	Actor31: tc01 Neutral 32,47
+	Actor32: tc02 Neutral 33,46
+	Actor33: tc03 Neutral 16,53
+	Actor34: tc05 Neutral 13,53
+	Actor35: split2 Neutral 43,51
+	Actor36: split3 Neutral 42,52
+	Actor37: tc04 Neutral 39,50
+	Actor38: tc03 Neutral 47,41
+	Actor39: tc04 Neutral 40,44
+	Actor40: tc05 Neutral 53,46
+	Actor41: tc03 Neutral 34,48
+	Actor42: tc05 Neutral 21,46
+	Actor43: tc05 Neutral 37,44
+	Actor44: split3 Neutral 55,40
+
+Waypoints:
+	spawn7: 56,31
+	spawn6: 32,25
+	spawn5: 10,4
+	spawn4: 7,31
+	spawn3: 5,59
+	spawn2: 27,39
+	spawn1: 57,59
+	spawn0: 49,4
+
+Rules:
+
diff --git a/mods/cnc/maps/scm03ea/preview.png b/mods/cnc/maps/scm03ea/preview.png
new file mode 100644
index 0000000000..ef4313898d
Binary files /dev/null and b/mods/cnc/maps/scm03ea/preview.png differ
diff --git a/mods/cnc/maps/testmap/map.bin b/mods/cnc/maps/testmap/map.bin
deleted file mode 100644
index 9197ff0f9f..0000000000
Binary files a/mods/cnc/maps/testmap/map.bin and /dev/null differ
diff --git a/mods/cnc/maps/testmap/map.yaml b/mods/cnc/maps/testmap/map.yaml
deleted file mode 100644
index 245f0c7d29..0000000000
--- a/mods/cnc/maps/testmap/map.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-MapFormat: 1
-Uid: testmap
-Title: GDI Mission 2
-Author: Westwood Studios
-PlayerCount: 1
-Tileset: TEMPERAT
-MapSize: 64,64
-TopLeft: 31,31
-BottomRight: 62,62
-
-Actors:
-	Actor0: sbag Neutral 50,55
-	Actor1: sbag Neutral 49,55
-	Actor2: sbag Neutral 48,55
-	Actor3: sbag Neutral 51,54
-	Actor4: sbag Neutral 50,54
-	Actor5: sbag Neutral 61,38
-	Actor6: sbag Neutral 60,38
-	Actor7: sbag Neutral 59,38
-	Actor8: sbag Neutral 58,38
-	Actor9: sbag Neutral 57,38
-	Actor10: sbag Neutral 53,38
-	Actor11: sbag Neutral 52,38
-	Actor12: sbag Neutral 51,38
-	Actor13: sbag Neutral 50,38
-	Actor14: sbag Neutral 49,38
-	Actor15: sbag Neutral 48,38
-	Actor16: sbag Neutral 47,38
-	Actor17: sbag Neutral 44,38
-	Actor18: sbag Neutral 43,38
-	Actor19: sbag Neutral 42,38
-	Actor20: sbag Neutral 61,37
-	Actor21: sbag Neutral 47,37
-	Actor22: sbag Neutral 42,37
-	Actor23: sbag Neutral 61,36
-	Actor24: sbag Neutral 47,36
-	Actor25: sbag Neutral 42,36
-	Actor26: sbag Neutral 61,35
-	Actor27: sbag Neutral 61,34
-	Actor28: sbag Neutral 47,34
-	Actor29: sbag Neutral 61,33
-	Actor30: sbag Neutral 47,33
-	Actor31: sbag Neutral 61,32
-	Actor32: sbag Neutral 47,32
-	Actor33: sbag Neutral 61,31
-	Actor34: sbag Neutral 60,31
-	Actor35: sbag Neutral 59,31
-	Actor36: sbag Neutral 58,31
-	Actor37: sbag Neutral 57,31
-	Actor38: sbag Neutral 56,31
-	Actor39: sbag Neutral 55,31
-	Actor40: sbag Neutral 54,31
-	Actor41: sbag Neutral 53,31
-	Actor42: sbag Neutral 52,31
-	Actor43: sbag Neutral 51,31
-	Actor44: sbag Neutral 50,31
-	Actor45: sbag Neutral 49,31
-	Actor46: sbag Neutral 48,31
-	Actor47: sbag Neutral 47,31
-	Actor48: tc04 Neutral 49,42
-	Actor49: t02 Neutral 36,48
-	Actor50: t01 Neutral 39,51
-	Actor51: t02 Neutral 48,53
-	Actor52: t16 Neutral 56,46
-	Actor53: tc04 Neutral 57,45
-	Actor54: tc05 Neutral 56,42
-	Actor55: t01 Neutral 57,49
-	Actor56: t02 Neutral 59,47
-	Actor57: t01 Neutral 46,50
-	Actor58: t01 Neutral 49,48
-	Actor59: tc02 Neutral 48,47
-	Actor60: t16 Neutral 43,48
-	Actor61: t07 Neutral 42,40
-	Actor62: t02 Neutral 44,48
-	Actor63: tc02 Neutral 44,49
-	Actor64: tc01 Neutral 42,41
-	Actor65: tc01 Neutral 44,50
-	Actor66: t06 Neutral 40,54
-	Actor67: tc02 Neutral 58,49
-	Actor68: t07 Neutral 41,40
-	Actor69: t07 Neutral 61,40
-	Actor70: t06 Neutral 39,35
-	Actor71: tc05 Neutral 31,34
-	Actor72: tc04 Neutral 37,34
-	Actor73: tc02 Neutral 31,37
-	Actor74: tc02 Neutral 55,45
-	Actor75: tc01 Neutral 54,42
-	Actor76: t01 Neutral 32,31
-	Actor77: tc02 Neutral 33,31
-#	Actor78: pyle GoodGuy 55,51
-	Actor79: silo BadGuy 57,32
-	Actor80: silo BadGuy 59,32
-	Actor81: nuke BadGuy 55,32
-	Actor82: fact BadGuy 52,32
-#	Actor83: nuke GoodGuy 53,52
-	Actor84: proc BadGuy 57,34
-	Actor85: bggy BadGuy 52,39
-	Actor86: harv BadGuy 50,35
-#	Actor87: jeep GoodGuy 54,49
-#	Actor88: jeep GoodGuy 57,49
-	Actor89: bggy BadGuy 33,37
-	Actor90: bggy BadGuy 51,50
-	Actor91: bggy BadGuy 59,39
-#	Actor92: jeep GoodGuy 56,54
-	Actor93: e1 BadGuy 48,32
-	Actor94: e1 BadGuy 35,31
-	Actor95: e1 BadGuy 39,31
-	Actor96: e1 BadGuy 49,32
-	Actor97: e1 BadGuy 37,32
-	Actor98: e1 BadGuy 50,34
-	Actor99: e1 BadGuy 50,32
-	Actor100: e1 BadGuy 36,31
-	Actor101: e1 BadGuy 49,34
-	Actor102: e1 BadGuy 36,32
-	Actor103: e1 BadGuy 49,33
-	Actor104: e1 BadGuy 48,33
-	Actor105: e1 BadGuy 46,33
-	Actor106: e1 BadGuy 46,34
-	Actor107: e1 BadGuy 40,37
-	Actor108: e1 BadGuy 40,38
-	Actor109: e1 BadGuy 41,37
-	Actor110: e1 BadGuy 41,38
-	Actor111: e1 BadGuy 50,39
-	Actor112: e1 BadGuy 60,36
-	Actor113: e1 BadGuy 60,37
-	Actor114: e1 BadGuy 60,37
-	Actor115: e1 BadGuy 35,39
-	Actor116: e1 BadGuy 50,37
-	Actor117: e1 BadGuy 58,39
-	Actor118: e1 BadGuy 60,40
-	Actor119: e1 BadGuy 61,39
-	Actor120: e1 BadGuy 59,34
-	Actor121: e1 BadGuy 60,34
-	Actor122: e1 BadGuy 56,32
-	Actor123: e1 BadGuy 51,32
-	Actor124: e1 BadGuy 60,34
-	Actor125: e1 BadGuy 52,53
-	Actor126: e1 BadGuy 38,49
-	Actor127: e1 BadGuy 38,48
-	Actor128: e1 BadGuy 53,40
-	Actor129: e1 BadGuy 45,36
-#	Actor130: e1 GoodGuy 50,51
-#	Actor131: e1 GoodGuy 50,50
-#	Actor132: e1 GoodGuy 53,49
-#	Actor133: e1 GoodGuy 51,49
-	Actor134: e1 BadGuy 52,40
-#	Actor135: e1 GoodGuy 52,50
-#	Actor136: e1 GoodGuy 56,49
-	Actor137: e1 BadGuy 55,42
-	Actor138: e1 BadGuy 56,42
-	Actor139: e1 BadGuy 45,36
-	Actor140: e1 BadGuy 44,36
-	Actor141: e1 BadGuy 54,48
-	Actor142: e1 BadGuy 52,52
-	Actor143: e1 BadGuy 48,37
-	Actor144: e1 BadGuy 37,37
-	Actor145: e1 BadGuy 50,37
-	Actor146: e1 BadGuy 38,32
-	Actor147: e1 BadGuy 49,36
-	Actor148: e1 BadGuy 48,36
-
-Waypoints:
-	spawn0: 54,55
-
-Rules:
-
diff --git a/mods/ra/maps/scm01ea/map.bin b/mods/ra/maps/scm01ea/map.bin
new file mode 100644
index 0000000000..d0d5d3dca7
Binary files /dev/null and b/mods/ra/maps/scm01ea/map.bin differ
diff --git a/mods/ra/maps/scm01ea/map.yaml b/mods/ra/maps/scm01ea/map.yaml
new file mode 100644
index 0000000000..35006a10be
--- /dev/null
+++ b/mods/ra/maps/scm01ea/map.yaml
@@ -0,0 +1,109 @@
+Uid: testmap
+
+MapFormat: 1
+
+Title: Coastal Influence (4-6)
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 13,18
+
+BottomRight: 107,112
+
+Actors:
+	Actor0: t08 Neutral 105,86
+	Actor1: t17 Neutral 106,85
+	Actor2: t12 Neutral 94,82
+	Actor3: tc03 Neutral 87,87
+	Actor4: tc04 Neutral 91,82
+	Actor5: tc05 Neutral 93,83
+	Actor6: tc05 Neutral 93,97
+	Actor7: tc03 Neutral 32,66
+	Actor8: t01 Neutral 14,30
+	Actor9: tc05 Neutral 33,31
+	Actor10: tc02 Neutral 90,30
+	Actor11: tc01 Neutral 91,28
+	Actor12: tc04 Neutral 38,69
+	Actor13: t02 Neutral 32,84
+	Actor14: t01 Neutral 28,89
+	Actor15: tc04 Neutral 13,40
+	Actor16: tc01 Neutral 18,40
+	Actor17: tc03 Neutral 30,45
+	Actor18: tc05 Neutral 26,53
+	Actor19: t03 Neutral 26,72
+	Actor20: t12 Neutral 34,77
+	Actor21: tc04 Neutral 45,75
+	Actor22: tc03 Neutral 15,20
+	Actor23: tc02 Neutral 22,18
+	Actor24: t07 Neutral 93,28
+	Actor25: t10 Neutral 68,37
+	Actor26: tc03 Neutral 97,46
+	Actor27: t01 Neutral 47,98
+	Actor28: tc03 Neutral 28,99
+	Actor29: tc04 Neutral 28,94
+	Actor30: tc02 Neutral 18,106
+	Actor31: tc01 Neutral 81,107
+	Actor32: t16 Neutral 105,109
+	Actor33: tc02 Neutral 105,110
+	Actor34: tc04 Neutral 13,96
+	Actor35: tc04 Neutral 15,73
+	Actor36: tc01 Neutral 16,74
+	Actor37: t16 Neutral 16,72
+	Actor38: t16 Neutral 61,54
+	Actor39: tc02 Neutral 84,54
+	Actor40: tc04 Neutral 104,53
+	Actor41: tc04 Neutral 14,86
+	Actor42: tc01 Neutral 13,88
+	Actor43: tc04 Neutral 15,34
+	Actor44: tc05 Neutral 84,40
+	Actor45: tc04 Neutral 80,48
+	Actor46: tc03 Neutral 87,45
+	Actor47: tc02 Neutral 78,42
+	Actor48: tc04 Neutral 25,46
+	Actor49: tc05 Neutral 33,46
+	Actor50: tc04 Neutral 43,62
+	Actor51: tc05 Neutral 44,63
+	Actor52: tc03 Neutral 41,64
+	Actor53: tc05 Neutral 104,71
+	Actor54: t01 Neutral 106,73
+	Actor55: t03 Neutral 104,72
+	Actor56: t12 Neutral 50,78
+	Actor57: tc02 Neutral 48,79
+	Actor58: tc02 Neutral 103,25
+	Actor59: tc01 Neutral 96,17
+	Actor60: tc03 Neutral 85,95
+	Actor61: tc04 Neutral 87,73
+	Actor62: t01 Neutral 78,64
+	Actor63: t15 Neutral 73,66
+	Actor64: tc01 Neutral 67,61
+	Actor65: t01 Neutral 21,45
+	Actor66: mine Neutral 50,94
+	Actor67: mine Neutral 102,57
+	Actor68: mine Neutral 97,107
+	Actor69: mine Neutral 100,21
+	Actor70: mine Neutral 37,22
+	Actor71: mine Neutral 21,70
+	Actor72: mine Neutral 19,90
+	Actor73: mine Neutral 53,55
+	Actor74: t01 Neutral 54,24
+	Actor75: t03 Neutral 78,21
+	Actor76: tc01 Neutral 55,35
+
+Waypoints:
+	spawn0: 24,26
+	spawn1: 101,35
+	spawn2: 100,92
+	spawn3: 25,102
+	spawn4: 61,83
+	spawn5: 63,44
+	spawn6: 19,52
+	spawn7: 95,65
+
+Rules:
+
diff --git a/mods/ra/maps/scm01ea/preview.png b/mods/ra/maps/scm01ea/preview.png
new file mode 100644
index 0000000000..20332f3e99
Binary files /dev/null and b/mods/ra/maps/scm01ea/preview.png differ
diff --git a/mods/ra/maps/scm02ea/map.bin b/mods/ra/maps/scm02ea/map.bin
new file mode 100644
index 0000000000..464010b961
Binary files /dev/null and b/mods/ra/maps/scm02ea/map.bin differ
diff --git a/mods/ra/maps/scm02ea/map.yaml b/mods/ra/maps/scm02ea/map.yaml
new file mode 100644
index 0000000000..076ac22e69
--- /dev/null
+++ b/mods/ra/maps/scm02ea/map.yaml
@@ -0,0 +1,61 @@
+Uid: 1134734410
+
+MapFormat: 1
+
+Title: Middle Mayhem (2)
+
+Author: Westwood Studios
+
+PlayerCount: 2
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 27,26
+
+BottomRight: 102,91
+
+Actors:
+	Actor0: tc05 Neutral 62,58
+	Actor1: tc04 Neutral 64,63
+	Actor2: tc03 Neutral 73,60
+	Actor3: tc03 Neutral 55,48
+	Actor4: tc01 Neutral 58,51
+	Actor5: tc01 Neutral 54,68
+	Actor6: t17 Neutral 60,68
+	Actor7: tc02 Neutral 48,57
+	Actor8: tc05 Neutral 68,63
+	Actor9: t16 Neutral 71,63
+	Actor10: t16 Neutral 70,55
+	Actor11: tc01 Neutral 83,57
+	Actor12: tc02 Neutral 62,54
+	Actor13: t08 Neutral 62,56
+	Actor14: t01 Neutral 49,80
+	Actor15: tc04 Neutral 50,81
+	Actor16: t16 Neutral 53,82
+	Actor17: tc02 Neutral 42,79
+	Actor18: tc03 Neutral 27,26
+	Actor19: t01 Neutral 29,48
+	Actor20: t02 Neutral 31,50
+	Actor21: t03 Neutral 32,59
+	Actor22: tc05 Neutral 56,88
+	Actor23: tc03 Neutral 54,89
+	Actor24: t16 Neutral 56,89
+	Actor25: t15 Neutral 52,89
+	Actor26: t14 Neutral 64,78
+	Actor27: tc01 Neutral 27,44
+	Actor28: tc01 Neutral 45,39
+	Actor29: t17 Neutral 76,26
+	Actor30: mine Neutral 68,53
+	Actor31: mine Neutral 54,57
+	Actor32: mine Neutral 53,65
+	Actor33: mine Neutral 65,68
+	Actor34: mine Neutral 80,61
+
+Waypoints:
+	spawn0: 34,84
+	spawn1: 35,34
+
+Rules:
+
diff --git a/mods/ra/maps/scm02ea/preview.png b/mods/ra/maps/scm02ea/preview.png
new file mode 100644
index 0000000000..8d3d4015b4
Binary files /dev/null and b/mods/ra/maps/scm02ea/preview.png differ
diff --git a/mods/ra/maps/scm03ea/map.bin b/mods/ra/maps/scm03ea/map.bin
new file mode 100644
index 0000000000..43f1688ba7
Binary files /dev/null and b/mods/ra/maps/scm03ea/map.bin differ
diff --git a/mods/ra/maps/scm03ea/map.yaml b/mods/ra/maps/scm03ea/map.yaml
new file mode 100644
index 0000000000..9802108e10
--- /dev/null
+++ b/mods/ra/maps/scm03ea/map.yaml
@@ -0,0 +1,58 @@
+Uid: 846202401
+
+MapFormat: 1
+
+Title: Equal Opportunity (2)
+
+Author: Westwood Studios
+
+PlayerCount: 5
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 28,26
+
+BottomRight: 99,97
+
+Actors:
+	Actor0: sbag Neutral 61,96
+	Actor1: tc03 Neutral 38,66
+	Actor2: tc03 Neutral 55,35
+	Actor3: tc02 Neutral 45,37
+	Actor4: tc03 Neutral 71,71
+	Actor5: tc02 Neutral 72,72
+	Actor6: t01 Neutral 61,62
+	Actor7: t03 Neutral 67,77
+	Actor8: t06 Neutral 53,87
+	Actor9: t10 Neutral 62,70
+	Actor10: t02 Neutral 66,51
+	Actor11: t05 Neutral 71,57
+	Actor12: tc01 Neutral 76,47
+	Actor13: t07 Neutral 81,53
+	Actor14: t12 Neutral 73,54
+	Actor15: t06 Neutral 69,56
+	Actor16: t11 Neutral 39,84
+	Actor17: t14 Neutral 77,32
+	Actor18: t12 Neutral 69,43
+	Actor19: tc02 Neutral 62,52
+	Actor20: tc03 Neutral 74,86
+	Actor21: tc05 Neutral 76,62
+	Actor22: tc04 Neutral 48,62
+	Actor23: mine Neutral 40,45
+	Actor24: mine Neutral 89,85
+	Actor25: mine Neutral 75,64
+	Actor26: mine Neutral 46,64
+	Actor27: mine Neutral 87,37
+	Actor28: mine Neutral 49,87
+
+Waypoints:
+	spawn0: 46,43
+	spawn1: 80,80
+	spawn2: 77,39
+	spawn3: 47,81
+	spawn4: 47,81
+
+Rules:
+
diff --git a/mods/ra/maps/scm03ea/preview.png b/mods/ra/maps/scm03ea/preview.png
new file mode 100644
index 0000000000..0875f2bf40
Binary files /dev/null and b/mods/ra/maps/scm03ea/preview.png differ
diff --git a/mods/ra/maps/testmap/map.bin b/mods/ra/maps/testmap/map.bin
deleted file mode 100644
index dab3d1318a..0000000000
Binary files a/mods/ra/maps/testmap/map.bin and /dev/null differ
diff --git a/mods/ra/maps/testmap/map.yaml b/mods/ra/maps/testmap/map.yaml
deleted file mode 100644
index 56b47b0999..0000000000
--- a/mods/ra/maps/testmap/map.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
-MapFormat: 1
-Uid: testmap
-Title: Lesson in Blood
-
-Author: Westwood Studios
-
-PlayerCount: 2
-
-Tileset: SNOW
-
-Tiledata: testmap.bin
-
-MapSize: 128,128
-
-TopLeft: 32,47
-
-BottomRight: 64,85
-
-Actors:
-	Actor0: wood Neutral 44,50
-	Actor1: wood Neutral 44,51
-	Actor2: wood Neutral 44,52
-	Actor3: wood Neutral 44,53
-	Actor4: wood Neutral 45,53
-	Actor5: crate Neutral 40,64
-	Actor6: wood Neutral 56,65
-	Actor7: v14 Neutral 54,66
-	Actor8: v14 Neutral 55,66
-	Actor9: wood Neutral 56,66
-	Actor10: wood Neutral 53,67
-	Actor11: wood Neutral 55,67
-	Actor12: wood Neutral 56,67
-	Actor13: wood Neutral 45,69
-	Actor14: wood Neutral 46,69
-	Actor15: wood Neutral 47,69
-	Actor16: wood Neutral 45,70
-	Actor17: wood Neutral 51,70
-	Actor18: wood Neutral 53,71
-	Actor19: wood Neutral 52,72
-	Actor20: wood Neutral 53,72
-	Actor21: T16 Neutral 53,52
-	Actor22: TC03 Neutral 60,61
-	Actor23: TC01 Neutral 48,47
-	Actor24: T06 Neutral 73,59
-	Actor25: T01 Neutral 49,74
-	Actor26: T14 Neutral 60,69
-	Actor27: T16 Neutral 59,72
-	Actor28: T14 Neutral 60,72
-	Actor29: T07 Neutral 62,72
-	Actor30: T10 Neutral 54,74
-	Actor31: TC02 Neutral 46,49
-	Actor32: T01 Neutral 53,57
-	Actor33: TC05 Neutral 41,51
-	Actor34: T06 Neutral 44,53
-	Actor35: T01 Neutral 44,70
-	Actor36: T16 Neutral 52,72
-	Actor37: TC02 Neutral 32,51
-	Actor38: TC04 Neutral 32,55
-	Actor39: TC05 Neutral 32,60
-	Actor40: TC02 Neutral 42,57
-	Actor41: TC02 Neutral 43,68
-	Actor42: TC01 Neutral 42,67
-	Actor43: TC04 Neutral 32,72
-	Actor44: TC03 Neutral 51,77
-	Actor45: TC01 Neutral 39,72
-	Actor46: T17 Neutral 35,76
-	Actor47: T15 Neutral 59,75
-	Actor48: TC03 Neutral 35,65
-	Actor49: T01 Neutral 35,56
-	Actor50: T10 Neutral 47,59
-	Actor51: T08 Neutral 48,64
-	Actor52: barl GoodGuy 33,54
-	Actor53: brl3 GoodGuy 57,53
-	Actor54: v08 France 41,54
-	Actor55: v07 France 54,65
-	Actor56: v07 France 38,52
-	Actor57: v06 France 46,51
-	Actor58: v05 France 36,55
-	Actor59: v04 France 35,51
-	Actor60: v02 France 36,57
-	Actor61: brl3 GoodGuy 34,52
-	Actor62: barl GoodGuy 57,54
-	Actor63: barl GoodGuy 55,54
-	Actor64: brl3 Germany 51,72
-	Actor65: brl3 Germany 51,71
-	Actor66: brl3 Germany 47,71
-	Actor67: barl Germany 46,71
-	Actor68: barl Germany 47,70
-	Actor69: brl3 GoodGuy 43,50
-	Actor70: brl3 GoodGuy 45,52
-	Actor71: barl France 41,51
-	Actor72: barl Germany 50,72
-	Actor73: barl GoodGuy 42,50
-	Actor74: afld USSR 35,81
-	Actor75: powr USSR 43,82
-	Actor76: barl GoodGuy 56,53
-	Actor77: barl GoodGuy 58,53
-	Actor78: brl3 GoodGuy 59,53
-	Actor79: brl3 GoodGuy 54,53
-	Actor80: barl GoodGuy 59,56
-	Actor81: brl3 GoodGuy 48,66
-	Actor82: barl GoodGuy 45,65
-	Actor83: barl GoodGuy 34,57
-	Actor84: brl3 GoodGuy 35,58
-	Actor85: barl GoodGuy 46,67
-	Actor86: barl GoodGuy 48,67
-	Actor87: brl3 GoodGuy 38,65
-	Actor88: barl GoodGuy 40,52
-	Actor89: barl GoodGuy 39,64
-	Actor90: brl3 GoodGuy 41,53
-	Actor91: brl3 GoodGuy 46,66
-	Actor92: afld USSR 39,77
-	Actor93: powr USSR 45,82
-	Actor94: afld USSR 37,79
-	Actor95: barl GoodGuy 35,56
-	Actor96: brl3 GoodGuy 38,64
-	Actor97: brl3 GoodGuy 34,55
-	Actor98: barl GoodGuy 35,55
-	Actor99: barl GoodGuy 45,50
-	Actor100: v04 France 58,54
-	Actor101: v02 France 56,54
-	Actor102: dome USSR 45,79
-	Actor103: barl GoodGuy 46,61
-	Actor104: brl3 GoodGuy 43,66
-	Actor105: barl GoodGuy 43,67
-	Actor106: brl3 GoodGuy 59,57
-	Actor107: barl GoodGuy 57,58
-	Actor108: barl GoodGuy 58,58
-	Actor109: brl3 GoodGuy 59,58
-	Actor110: brl3 GoodGuy 56,58
-	Actor111: barl GoodGuy 56,59
-	Actor112: barl GoodGuy 56,60
-	Actor113: barl GoodGuy 41,68
-	Actor114: barl GoodGuy 42,67
-	Actor115: brl3 GoodGuy 49,55
-	Actor116: barl GoodGuy 48,55
-	Actor117: barl GoodGuy 47,56
-	Actor118: brl3 GoodGuy 46,56
-	Actor119: pbox France 46,55
-	Actor120: pbox France 48,54
-	Actor121: barl GoodGuy 34,51
-	Actor122: v05 France 48,62
-	Actor123: v01 France 40,63
-	Actor124: jeep France 46,52
-	Actor125: jeep France 44,76
-	Actor126: jeep France 55,57
-	Actor127: jeep France 39,65
-#	Actor128: c9 France 50,64
-#	Actor129: c8 France 47,61
-#	Actor130: c8 Turkey 41,50
-#	Actor131: c6 France 46,61
-#	Actor132: c5 France 46,61
-#	Actor133: c4 France 44,67
-#	Actor134: c2 France 40,54
-#	Actor135: c2 France 45,61
-	Actor136: e1 France 54,60
-	Actor137: e1 France 49,60
-#	Actor138: c5 France 45,51
-	Actor139: e1 France 34,58
-	Actor140: e1 France 53,54
-	Actor141: e1 France 58,56
-	Actor142: e1 France 58,52
-	Actor143: e1 France 54,64
-#	Actor144: c7 France 56,54
-	Actor145: e1 France 40,51
-	Actor146: e1 France 35,53
-	Actor147: e1 France 35,54
-	Actor148: e1 France 43,64
-	Actor149: e1 France 56,63
-	Actor150: e1 France 40,67
-	Actor151: e1 USSR 42,81
-
-Waypoints:
-	spawn3: 47,51
-	spawn6: 58,55
-
-Rules:
-