diff --git a/.gitignore b/.gitignore
index 3635d19d..548b3fbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,8 @@ project.lock.json
 C7.ini
 log.txt
 *.csproj.old*
+# testing save.json save file
+C7/Text/save.json
 
 # Build results
 [Dd]ebug/
diff --git a/C7/Art/grid.png.import b/C7/Art/grid.png.import
new file mode 100644
index 00000000..c967a101
--- /dev/null
+++ b/C7/Art/grid.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ddwhuw1mk34rf"
+path="res://.godot/imported/grid.png-78ae50a518b22416c81002ab51b5507d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Art/grid.png"
+dest_files=["res://.godot/imported/grid.png-78ae50a518b22416c81002ab51b5507d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/C7/Credits.tscn b/C7/Credits.tscn
index 63cd3075..efbf3217 100644
--- a/C7/Credits.tscn
+++ b/C7/Credits.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://i4j8a5aipkok"]
 
-[ext_resource path="res://Credits.cs" type="Script" id=1]
+[ext_resource type="Script" path="res://Credits.cs" id="1"]
 
 [node name="Node2D" type="Node2D"]
-script = ExtResource( 1 )
+script = ExtResource("1")
diff --git a/C7/Game.cs b/C7/Game.cs
index b9c90b26..00b13c5a 100644
--- a/C7/Game.cs
+++ b/C7/Game.cs
@@ -58,16 +58,18 @@ public override void _Ready() {
 		GetTree().AutoAcceptQuit = false;
 		Global = GetNode<GlobalSingleton>("/root/GlobalSingleton");
 		try {
-			var animSoundPlayer = new AudioStreamPlayer();
+			AudioStreamPlayer animSoundPlayer = new();
 			AddChild(animSoundPlayer);
 			civ3AnimData = new AnimationManager(animSoundPlayer);
 			animTracker = new AnimationTracker(civ3AnimData);
 
 			controller = CreateGame.createGame(Global.LoadGamePath, Global.DefaultBicPath); // Spawns engine thread
+			GetNode<GameStatus>("CanvasLayer/Control/GameStatus").CurrentPlayer = controller;
+
 			Global.ResetLoadGamePath();
 			camera = GetNode<MapViewCamera>("MapViewCamera");
 
-			using (var gameDataAccess = new UIGameDataAccess()) {
+			using (UIGameDataAccess gameDataAccess = new()) {
 				GameMap map = gameDataAccess.gameData.map;
 				Util.setModPath(gameDataAccess.gameData.scenarioSearchPath);
 				log.Debug("RelativeModPath ", map.RelativeModPath);
@@ -417,6 +419,10 @@ private void processActions() {
 			this.OnPlayerEndTurn();
 		}
 
+		if (Input.IsActionJustPressed(C7Action.SaveGame)) {
+			OnSaveGame("./Text/save.json");
+		}
+
 		if (this.HasCurrentlySelectedUnit()) {
 			// TODO: replace bool with an invalid TileDirection enum
 			TileDirection dir = TileDirection.NORTH;
@@ -472,10 +478,9 @@ private void processActions() {
 		}
 
 		if (Input.IsActionJustPressed(C7Action.UnitWait)) {
-			using (var gameDataAccess = new UIGameDataAccess()) {
-				UnitInteractions.waitUnit(gameDataAccess.gameData, CurrentlySelectedUnit.id);
-				GetNextAutoselectedUnit(gameDataAccess.gameData);
-			}
+			using UIGameDataAccess gameDataAccess = new();
+			UnitInteractions.waitUnit(gameDataAccess.gameData, CurrentlySelectedUnit.id);
+			GetNextAutoselectedUnit(gameDataAccess.gameData);
 		}
 
 		if (Input.IsActionJustPressed(C7Action.UnitFortify)) {
@@ -507,14 +512,12 @@ private void processActions() {
 		}
 
 		if (Input.IsActionJustPressed(C7Action.UnitBuildCity) && CurrentlySelectedUnit.canBuildCity()) {
-			using (var gameDataAccess = new UIGameDataAccess()) {
-				MapUnit currentUnit = gameDataAccess.gameData.GetUnit(CurrentlySelectedUnit.id);
-				log.Debug(currentUnit.Describe());
-				if (currentUnit.canBuildCity()) {
-					PopupOverlay popupOverlay = GetNode<PopupOverlay>(PopupOverlay.NodePath);
-					popupOverlay.ShowPopup(new BuildCityDialog(controller.GetNextCityName()),
-						PopupOverlay.PopupCategory.Advisor);
-				}
+			using UIGameDataAccess gameDataAccess = new();
+			MapUnit currentUnit = gameDataAccess.gameData.GetUnit(CurrentlySelectedUnit.id);
+			log.Debug(currentUnit.Describe());
+			if (currentUnit.canBuildCity()) {
+				PopupOverlay popupOverlay = GetNode<PopupOverlay>(PopupOverlay.NodePath);
+				popupOverlay.ShowPopup(new BuildCityDialog(controller.GetNextCityName()), PopupOverlay.PopupCategory.Advisor);
 			}
 		}
 
@@ -557,4 +560,9 @@ public override void _Notification(int what) {
 	private void OnBuildCity(string name) {
 		new MsgBuildCity(CurrentlySelectedUnit.id, name).send();
 	}
+
+	private void OnSaveGame(string path) {
+		log.Debug($"Saving game to {path}");
+		new MsgSaveGame(path).send();
+	}
 }
diff --git a/C7/GlobalSingleton.cs b/C7/GlobalSingleton.cs
index 75be8165..ff5ebb10 100644
--- a/C7/GlobalSingleton.cs
+++ b/C7/GlobalSingleton.cs
@@ -2,9 +2,9 @@
 using QueryCiv3;
 
 /****
-    Need to pass values from one scene to another, particularly when loading
-    a game in main menu. This script is set to auto load in project settings.
-    See https://docs.godotengine.org/en/stable/getting_started/step_by_step/singletons_autoload.html
+	Need to pass values from one scene to another, particularly when loading
+	a game in main menu. This script is set to auto load in project settings.
+	See https://docs.godotengine.org/en/stable/getting_started/step_by_step/singletons_autoload.html
 ****/
 public partial class GlobalSingleton : Node {
 	// Will have main menu file picker set this and Game.cs pass it to C7Engine.createGame
diff --git a/C7/MainMenu.cs b/C7/MainMenu.cs
index 2b209c32..1a213724 100644
--- a/C7/MainMenu.cs
+++ b/C7/MainMenu.cs
@@ -30,11 +30,13 @@ public override void _Ready()
 		// To pass data between scenes, putting path string in a global singleton and reading it later in createGame
 		Global = GetNode<GlobalSingleton>("/root/GlobalSingleton");
 		Global.ResetLoadGamePath();
-		LoadDialog = new Util.Civ3FileDialog();
-		LoadDialog.RelPath = @"Conquests/Saves";
+		LoadDialog = new Util.Civ3FileDialog {
+			RelPath = @"Conquests/Saves"
+		};
 		LoadDialog.Connect("file_selected",new Callable(this,nameof(_on_FileDialog_file_selected)));
-		LoadScenarioDialog = new Util.Civ3FileDialog();
-		LoadScenarioDialog.RelPath = @"Conquests/Scenarios";
+		LoadScenarioDialog = new Util.Civ3FileDialog {
+			RelPath = @"Conquests/Scenarios"
+		};
 		LoadScenarioDialog.Connect("file_selected",new Callable(this,nameof(_on_FileDialog_file_selected)));
 		GetNode<CanvasLayer>("CanvasLayer").AddChild(LoadDialog);
 		SetCiv3Home = GetNode<Button>("CanvasLayer/SetCiv3Home");
diff --git a/C7/UIElements/GameStatus/GameStatus.cs b/C7/UIElements/GameStatus/GameStatus.cs
index 7262ece5..e010ed1d 100644
--- a/C7/UIElements/GameStatus/GameStatus.cs
+++ b/C7/UIElements/GameStatus/GameStatus.cs
@@ -1,15 +1,21 @@
 using Godot;
-using System;
 using C7GameData;
 using Serilog;
 
 public partial class GameStatus : MarginContainer
 {
-
 	private ILogger log = LogManager.ForContext<GameStatus>();
 
 	LowerRightInfoBox LowerRightInfoBox = new LowerRightInfoBox();
-	Timer endTurnAlertTimer;
+
+	private Player player;
+	public Player CurrentPlayer {
+		get => player;
+		set {
+			player = value;
+			LowerRightInfoBox.PlayerCivilization = player.civilization.name;
+		}
+	}
 
 	[Signal] public delegate void BlinkyEndTurnButtonPressedEventHandler();
 
diff --git a/C7/UIElements/GameStatus/LowerRightInfoBox.cs b/C7/UIElements/GameStatus/LowerRightInfoBox.cs
index e76ce446..0e2db9bb 100644
--- a/C7/UIElements/GameStatus/LowerRightInfoBox.cs
+++ b/C7/UIElements/GameStatus/LowerRightInfoBox.cs
@@ -1,5 +1,4 @@
 using Godot;
-using System;
 using ConvertCiv3Media;
 using C7GameData;
 using Serilog;
@@ -17,9 +16,16 @@ public partial class LowerRightInfoBox : TextureRect
 	Label attackDefenseMovement = new Label();
 	Label terrainType = new Label();
 	Label yearAndGold = new Label();
+	Label civAndGovt = new Label(){
+		Position = new Vector2(0, 90),
+		AnchorLeft = 0.5f,
+		AnchorRight = 0.5f,
+		HorizontalAlignment = HorizontalAlignment.Center,
+	};
 
 	Timer blinkingTimer = new Timer();
-	Boolean timerStarted = false;	//This "isStopped" returns false if it's never been started.  So we need this to know if we've ever started it.
+
+	bool timerStarted = false; //This "isStopped" returns false if it's never been started.  So we need this to know if we've ever started it.
 
 	// Called when the node enters the scene tree for the first time.
 	public override void _Ready()
@@ -27,13 +33,24 @@ public override void _Ready()
 		this.CreateUI();
 	}
 
+	private string displayCiv;
+	public string PlayerCivilization {
+		get => displayCiv;
+		set {
+			displayCiv = value;
+			civAndGovt.Text = $"{displayCiv} - Despotism (5.5.0)";
+			civAndGovt.OffsetLeft = -1 * (civAndGovt.Size.X/2.0f);
+		}
+	}
+
 	private void CreateUI() {
 		Pcx boxRightColor = new Pcx(Util.Civ3MediaPath("Art/interface/box right color.pcx"));
 		Pcx boxRightAlpha = new Pcx(Util.Civ3MediaPath("Art/interface/box right alpha.pcx"));
 		ImageTexture boxRight = PCXToGodot.getImageFromPCXWithAlphaBlend(boxRightColor, boxRightAlpha);
-		TextureRect boxRightRectangle = new TextureRect();
-		boxRightRectangle.Texture = boxRight;
-		boxRightRectangle.SetPosition(new Vector2(0, 0));
+		TextureRect boxRightRectangle = new() {
+			Texture = boxRight,
+			Position = new Vector2(0, 0),
+		};
 		AddChild(boxRightRectangle);
 
 		Pcx nextTurnColor = new Pcx(Util.Civ3MediaPath("Art/interface/nextturn states color.pcx"));
@@ -75,14 +92,8 @@ private void CreateUI() {
 		//Then, when they are visible, we add a left margin that's negative and equal to half
 		//their width.
 		//Seems like there probably is an easier way, but I haven't found it yet.
-		Label civAndGovt = new Label();
-		civAndGovt.Text = "Carthage - Despotism (5.5.0)";
-		civAndGovt.HorizontalAlignment = HorizontalAlignment.Center;
-		civAndGovt.SetPosition(new Vector2(0, 90));
-		civAndGovt.AnchorLeft = 0.5f;
-		civAndGovt.AnchorRight = 0.5f;
 		boxRightRectangle.AddChild(civAndGovt);
-		civAndGovt.OffsetLeft = -1 * (civAndGovt.Size.X/2.0f);
+		PlayerCivilization = ""; // set empty string as placeholder
 
 		yearAndGold.Text = "Turn 0  10 Gold (+0 per turn)";
 		yearAndGold.HorizontalAlignment = HorizontalAlignment.Center;
diff --git a/C7/Util.cs b/C7/Util.cs
index ba1a3e26..7fe7a65b 100644
--- a/C7/Util.cs
+++ b/C7/Util.cs
@@ -5,41 +5,41 @@
 using C7Engine;
 using Godot;
 using ConvertCiv3Media;
-using C7GameData;
 using QueryCiv3;
+using System.IO;
 
 public partial class Util {
-	static public string Civ3Root = Civ3Location.GetCiv3Path();
-	public partial class Civ3FileDialog : FileDialog
-	// Use this instead of a scene-based FileDialog to avoid it saving the local dev's last browsed folder in the repo
-	// While instantiated it will return to the last-accessed folder when reopened
-	{
-		public string RelPath= "";
-		public Civ3FileDialog(FileDialog.FileModeEnum mode = FileDialog.FileModeEnum.OpenFile) {
+	public static string Civ3Root = Civ3Location.GetCiv3Path();
+	public partial class Civ3FileDialog : FileDialog {
+		// Use this instead of a scene-based FileDialog to avoid it saving the local dev's last browsed folder in the repo
+		// While instantiated it will return to the last-accessed folder when reopened
+		public string RelPath = "";
+		public Civ3FileDialog(FileModeEnum mode = FileModeEnum.OpenFile) {
 			FileMode = mode;
 		}
 
 		public override void _Ready() {
 			Access = AccessEnum.Filesystem;
-			CurrentDir = Civ3Root + "/" + RelPath;
-			// Resizable = true;
-			// OffsetRight = 550;
-			// OffsetBottom = 750;
+			CurrentDir = Path.Join(Civ3Root, RelPath);
+			Vector2I windowSize = DisplayServer.WindowGetSize();
+			Vector2I windowMiddle = windowSize / 2;
+			Size = new Vector2I(windowSize.X / 2, windowSize.Y / 2);
+			Position = windowMiddle - Size / 2;
 			base._Ready();
 		}
 	}
 
-	static private string SteamCommonDir() {
+	private static string SteamCommonDir() {
 		string home = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
 		if (home == null) { return null; }
-		return System.IO.Path.Combine(home, "Library/Application Support/Steam/steamapps/common");
+		return Path.Combine(home, "Library/Application Support/Steam/steamapps/common");
 	}
 
-	static private bool FolderIsCiv3(System.IO.DirectoryInfo di) {
+	private static bool FolderIsCiv3(System.IO.DirectoryInfo di) {
 		return di.EnumerateFiles().Any(f => f.Name == "civ3id.mb");
 	}
 
-	static public string GetCiv3Path() {
+	public static string GetCiv3Path() {
 		// Use CIV3_HOME env var if present
 		string path = System.Environment.GetEnvironmentVariable("CIV3_HOME");
 		if (path != null) { return path; }
@@ -65,7 +65,7 @@ static public string GetCiv3Path() {
 		return "/civ3/path/not/found";
 	}
 
-	static public string Civ3PathFromRegistry() {
+	public static string Civ3PathFromRegistry() {
 		// Assuming 64-bit platform, get vanilla Civ3 install folder from registry
 		// Return null if value not present or if key not found
 		object path = Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Infogrames Interactive\Civilization III", "install_path", null);
@@ -173,7 +173,7 @@ private static string CheckForCiv3Media(string relPath, string rootPath) {
 	}
 
 	//Send this function a path (e.g. Art/title.pcx) and it will load it up and convert it to a texture for you.
-	static public ImageTexture LoadTextureFromPCX(string relPath) {
+	public static ImageTexture LoadTextureFromPCX(string relPath) {
 		if (textureCache.ContainsKey(relPath)) {
 			return textureCache[relPath];
 		}
@@ -183,16 +183,16 @@ static public ImageTexture LoadTextureFromPCX(string relPath) {
 		return texture;
 	}
 
-	static public (ImageTexture, ImageTexture) LoadTextureFromFlicData(byte[] image, byte[,] pallete, int width, int height) {
-		var (baseImage, tintImage) = PCXToGodot.ByteArrayWithTintToImage(image, pallete, width, height, shadows: true);
+	public static (ImageTexture, ImageTexture) LoadTextureFromFlicData(byte[] image, byte[,] pallete, int width, int height) {
+		(Image baseImage, Image tintImage) = PCXToGodot.ByteArrayWithTintToImage(image, pallete, width, height, shadows: true);
 		return (ImageTexture.CreateFromImage(baseImage), ImageTexture.CreateFromImage(tintImage));
 	}
 
-	static public Flic LoadFlic(string path) {
-		return new ConvertCiv3Media.Flic(Util.Civ3MediaPath(path));
+	public static Flic LoadFlic(string path) {
+		return new Flic(Civ3MediaPath(path));
 	}
 
-	static private string getProjectDirectoryPath() {
+	private static string getProjectDirectoryPath() {
 		// see issue https://github.com/godotengine/godot/issues/24222#issuecomment-709092664
 		// - use local resource folder in debug mode
 		// - use executable folder in release mode
@@ -202,7 +202,7 @@ static private string getProjectDirectoryPath() {
 	// Send this function a path (e.g. Title_Screen.jpg) and it will
 	// load it up and convert it in both debug and release modes.
 	// Note: We probably will need variants of this for other file types, too.
-	static public ImageTexture LoadTextureFromC7JPG(string relPath) {
+	public static ImageTexture LoadTextureFromC7JPG(string relPath) {
 		Image img = Image.LoadFromFile(Util.getProjectDirectoryPath().PathJoin(relPath));
 		return ImageTexture.CreateFromImage(img);
 	}
@@ -210,7 +210,7 @@ static public ImageTexture LoadTextureFromC7JPG(string relPath) {
 	private static Dictionary<string, ImageTexture> textureCache = new Dictionary<string, ImageTexture>();
 	//Send this function a path (e.g. Art/exitBox-backgroundStates.pcx), and the coordinates of the extracted image you need from that PCX
 	//file, and it'll load it up and return you what you need.
-	static public ImageTexture LoadTextureFromPCX(string relPath, int leftStart, int topStart, int width, int height) {
+	public static ImageTexture LoadTextureFromPCX(string relPath, int leftStart, int topStart, int width, int height) {
 		string key = relPath + "-" + leftStart + "-" + topStart + "-" + width + "-" + height;
 		if (textureCache.ContainsKey(key)) {
 			return textureCache[key];
@@ -221,14 +221,14 @@ static public ImageTexture LoadTextureFromPCX(string relPath, int leftStart, int
 		return texture;
 	}
 
-	static public ImageTexture LoadFogOfWarPCX(string relPath) => PCXToGodot.getImageTextureFromFogOfWarPCX(LoadPCX(relPath));
+	public static ImageTexture LoadFogOfWarPCX(string relPath) => PCXToGodot.getImageTextureFromFogOfWarPCX(LoadPCX(relPath));
 
 	private static Dictionary<string, Pcx> PcxCache = new Dictionary<string, Pcx>();
 
 	/**
 	 * Utility method for loading PCX files that will cache them, so we don't have to load them from disk so often.
 	 **/
-	static public Pcx LoadPCX(string relPath) {
+	public static Pcx LoadPCX(string relPath) {
 		if (PcxCache.ContainsKey(relPath)) {
 			return PcxCache[relPath];
 		}
@@ -248,16 +248,16 @@ public static ImageTexture createPaletteTexture(byte[,] raw) {
 			for (int k = 0; k < 3; k++)
 				flatPalette[k + 3 * n] = raw[n, k];
 
-		var img = Image.CreateFromData(16, 16, false, Image.Format.Rgb8, flatPalette);
+		Image img = Image.CreateFromData(16, 16, false, Image.Format.Rgb8, flatPalette);
 		return ImageTexture.CreateFromImage(img);
 	}
 
 	// Creates textures from a PCX file without de-palettizing it. Returns two ImageTextures, the first is 16x16 with RGB8 format containing the
 	// color palette and the second is the size of the image itself and contains the indices in R8 format.
 	public static (ImageTexture palette, ImageTexture indices) loadPalettizedPCX(string filePath) {
-		var pcx = LoadPCX(filePath);
+		Pcx pcx = LoadPCX(filePath);
 
-		var imgIndices = Image.CreateFromData(pcx.Width, pcx.Height, false, Image.Format.R8, pcx.ColorIndices);
+		Image imgIndices = Image.CreateFromData(pcx.Width, pcx.Height, false, Image.Format.R8, pcx.ColorIndices);
 		ImageTexture texIndices = ImageTexture.CreateFromImage(imgIndices);
 
 		return (createPaletteTexture(pcx.Palette), texIndices);
@@ -271,41 +271,44 @@ public struct FlicSheet {
 
 	// Loads a Flic and also converts it into a sprite sheet
 	public static (FlicSheet, Flic) loadFlicSheet(string filePath) {
-		var flic = new Flic(Util.Civ3MediaPath(filePath));
+		Flic flic = new Flic(Civ3MediaPath(filePath));
 
-		var texPalette = Util.createPaletteTexture(flic.Palette);
+		ImageTexture texPalette = createPaletteTexture(flic.Palette);
 
-		var countColumns = flic.Images.GetLength(1); // Each column contains one frame
-		var countRows = flic.Images.GetLength(0); // Each row contains one animation
-		var countImages = countColumns * countRows;
+		int countColumns = flic.Images.GetLength(1); // Each column contains one frame
+		int countRows = flic.Images.GetLength(0); // Each row contains one animation
 
 		byte[] allIndices = new byte[countRows * countColumns * flic.Width * flic.Height];
 		// row, col loop over the sprites, each one a frame of the animation
-		for (int row = 0; row < countRows; row++)
-			for (int col = 0; col < countColumns; col++)
+		for (int row = 0; row < countRows; row++) {
+			for (int col = 0; col < countColumns; col++) {
 				// x, y loop over pixels within each sprite
-				for (int y = 0; y < flic.Height; y++)
+				for (int y = 0; y < flic.Height; y++) {
 					for (int x = 0; x < flic.Width; x++) {
 						int pixelRow = row * flic.Height + y,
 							pixelCol = col * flic.Width + x,
 							pixelIndex = pixelRow * countColumns * flic.Width + pixelCol;
 						allIndices[pixelIndex] = flic.Images[row, col][y * flic.Width + x];
 					}
-
-		var imgIndices = Image.CreateFromData(countColumns * flic.Width, countRows * flic.Height, false, Image.Format.R8, allIndices);
+				}
+			}
+		}
+		Image imgIndices = Image.CreateFromData(countColumns * flic.Width, countRows * flic.Height, false, Image.Format.R8, allIndices);
 		ImageTexture texIndices = ImageTexture.CreateFromImage(imgIndices);
 
 		return (new FlicSheet { palette = texPalette, indices = texIndices, spriteWidth = flic.Width, spriteHeight = flic.Height }, flic);
 	}
 
-	static public AudioStreamWav LoadWAVFromDisk(string path) {
-		FileAccess file = FileAccess.Open(path, FileAccess.ModeFlags.Read);
+	public static AudioStreamWav LoadWAVFromDisk(string path) {
+		Godot.FileAccess file = Godot.FileAccess.Open(path, Godot.FileAccess.ModeFlags.Read);
 
 		string riffString = System.Text.Encoding.UTF8.GetString(file.GetBuffer(4));
 		if (riffString != "RIFF") {
 			throw new Exception("Unsupported file");
 		}
-		uint fileSize = file.Get32();   //minus 8 bytes
+
+		// file size:
+		_ = file.Get32(); // minus 8 bytes
 
 		string waveString = System.Text.Encoding.UTF8.GetString(file.GetBuffer(4));
 		if (waveString != "WAVE") {
@@ -336,15 +339,12 @@ static public AudioStreamWav LoadWAVFromDisk(string path) {
 				//to match up with the current FormatEnum.  I'm going to go out on
 				//a limb and say the GDScript is probably more current relative
 				//to what AudioStreamWAV supports.  But that could be wrong.
-				ushort compressionCode = file.Get16();
-				if (compressionCode == 1) {
-					wav.Format = AudioStreamWav.FormatEnum.Format16Bits;
-				} else if (compressionCode == 0) {
-					wav.Format = AudioStreamWav.FormatEnum.Format8Bits;
-				} else if (compressionCode == 2) {
-					wav.Format = AudioStreamWav.FormatEnum.ImaAdpcm;
-				}
-
+				wav.Format = file.Get16() switch {
+					1 => AudioStreamWav.FormatEnum.Format16Bits,
+					0 => AudioStreamWav.FormatEnum.Format8Bits,
+					2 => AudioStreamWav.FormatEnum.ImaAdpcm,
+					_ => wav.Format, // whatever the default was
+				};
 				ushort channels = file.Get16();
 				if (channels == 2) {
 					wav.Stereo = true;
diff --git a/C7/project.godot b/C7/project.godot
index 023bff70..40e8ed11 100644
--- a/C7/project.godot
+++ b/C7/project.godot
@@ -183,6 +183,11 @@ unit_build_road={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"echo":false,"script":null)
 ]
 }
+save_game={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":true,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
 
 [mono]
 
diff --git a/C7Engine/EntryPoints/CreateGame.cs b/C7Engine/EntryPoints/CreateGame.cs
index de8ac4c5..4b3b6217 100644
--- a/C7Engine/EntryPoints/CreateGame.cs
+++ b/C7Engine/EntryPoints/CreateGame.cs
@@ -19,7 +19,7 @@ public static Player createGame(string loadFilePath, string defaultBicPath)
 			EngineStorage.createThread();
 			EngineStorage.gameDataMutex.WaitOne();
 
-			SaveGame save = SaveGame.Load(loadFilePath);
+			SaveGame save = SaveManager.LoadSave(loadFilePath, defaultBicPath);
 			GameData gameData = save.ToGameData();
 
 			EngineStorage.gameData = gameData;
@@ -37,7 +37,6 @@ public static Player createGame(string loadFilePath, string defaultBicPath)
 			};
 
 			EngineStorage.uiControllerID = humanPlayer.id;
-			TurnHandling.OnBeginTurn(); // Call for the first turn
 			TurnHandling.AdvanceTurn();
 
 			EngineStorage.gameDataMutex.ReleaseMutex();
diff --git a/C7Engine/EntryPoints/MessageToEngine.cs b/C7Engine/EntryPoints/MessageToEngine.cs
index 2cb7f1c4..b07999da 100644
--- a/C7Engine/EntryPoints/MessageToEngine.cs
+++ b/C7Engine/EntryPoints/MessageToEngine.cs
@@ -1,10 +1,9 @@
 using Serilog;
+using C7GameData;
+using C7GameData.Save;
 
 namespace C7Engine
 {
-	using System;
-	using C7GameData;
-
 	public abstract class MessageToEngine {
 		public abstract void process();
 
@@ -206,4 +205,16 @@ public override void process()
 			EngineStorage.animationsEnabled = enabled;
 		}
 	}
+
+	public class MsgSaveGame : MessageToEngine {
+		private string path;
+
+		public MsgSaveGame(string path) {
+			this.path = path;
+		}
+
+		public override void process() {
+			SaveManager.Save(this.path, SaveCompression.None);
+		}
+	}
 }
diff --git a/C7Engine/EntryPoints/MessageToUI.cs b/C7Engine/EntryPoints/MessageToUI.cs
index 9805f13c..6ef3e7c2 100644
--- a/C7Engine/EntryPoints/MessageToUI.cs
+++ b/C7Engine/EntryPoints/MessageToUI.cs
@@ -59,4 +59,6 @@ public MsgTileDiscovered(Tile tile) {
 		}
 	}
 
+	public class MsgFinishSave : MessageToUI {}
+
 }
diff --git a/C7Engine/SaveManager.cs b/C7Engine/SaveManager.cs
index f87b7fc8..185468f5 100644
--- a/C7Engine/SaveManager.cs
+++ b/C7Engine/SaveManager.cs
@@ -1,47 +1,46 @@
-namespace C7Engine
-{
-	using System.IO;
-	using C7GameData;
-	using C7GameData.Save;
+using System.IO;
+using C7GameData;
+using C7GameData.Save;
+
+namespace C7Engine {
 
 	enum SaveFileFormat {
 		Sav,
 		Biq,
 		C7,
+		C7Zip,
 		Invalid,
 	}
 
 	// The engine performs all save file creating, reading, and updating
 	// via the SaveManager
-	public static class SaveManager
-	{
-		private static SaveFileFormat getFileFormat(string path)
-		{
+	public static class SaveManager {
+		private static SaveFileFormat getFileFormat(string path) {
 			return Path.GetExtension(path).ToUpper() switch {
 				".SAV" => SaveFileFormat.Sav,
 				".BIQ" => SaveFileFormat.Biq,
 				".JSON" => SaveFileFormat.C7,
-				".ZIP" => SaveFileFormat.C7,
+				".ZIP" => SaveFileFormat.C7Zip,
 				_ => SaveFileFormat.Invalid,
 			};
 		}
 
 		// Load and initialize a save
-		public static SaveGame LoadSave(string path, string bicPath)
-		{
+		public static SaveGame LoadSave(string path, string bicPath) {
 			SaveGame save = getFileFormat(path) switch {
 				SaveFileFormat.Sav => ImportCiv3.ImportSav(path, bicPath),
 				SaveFileFormat.Biq => ImportCiv3.ImportBiq(path, bicPath),
-				SaveFileFormat.C7 => SaveGame.Load(path),
+				SaveFileFormat.C7 => SaveGame.Load(path, SaveCompression.None),
+				SaveFileFormat.C7Zip => SaveGame.Load(path, SaveCompression.Zip),
 				_ => throw new FileLoadException("invalid save format"),
 			};
 			return save;
 		}
 
-		public static void Save(string path) {
+		public static void Save(string path, SaveCompression compression) {
 			GameData gameData = EngineStorage.gameData;
 			SaveGame save = SaveGame.FromGameData(gameData);
-			save.Save(path);
+			save.Save(path, compression);
 		}
 
 	}
diff --git a/C7GameData/Actions.cs b/C7GameData/Actions.cs
index 939d8bff..b5a884ba 100644
--- a/C7GameData/Actions.cs
+++ b/C7GameData/Actions.cs
@@ -10,6 +10,7 @@ public static class C7Action {
 		public static readonly string MoveUnitNorthwest = "move_unit_northwest";
 		public static readonly string MoveUnitNorth = "move_unit_north";
 		public static readonly string MoveUnitNortheast = "move_unit_northeast";
+		public static readonly string SaveGame = "save_game";
 		public static readonly string ToggleAnimations = "toggle_animations";
 		public static readonly string ToggleGrid = "toggle_grid";
 		public static readonly string ToggleZoom = "toggle_zoom";
diff --git a/C7GameData/GameData.cs b/C7GameData/GameData.cs
index 34e1493b..296e7773 100644
--- a/C7GameData/GameData.cs
+++ b/C7GameData/GameData.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 using Serilog;
 
 namespace C7GameData
diff --git a/C7GameData/Save/SaveGame.cs b/C7GameData/Save/SaveGame.cs
index d0bacd48..04b8d833 100644
--- a/C7GameData/Save/SaveGame.cs
+++ b/C7GameData/Save/SaveGame.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -23,9 +24,12 @@ public static void IgnoreDefaultValues(JsonTypeInfo jsonTypeInfo) {
 			}
 		}
 	}
+	public enum SaveCompression {
+		None,
+		Zip,
+	}
 
 	public class SaveGame {
-
 		private static JsonSerializerOptions JsonOptions {
 			get => new JsonSerializerOptions {
 				PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -54,23 +58,27 @@ public static SaveGame FromGameData(GameData data) {
 				TerrainTypes = data.terrainTypes,
 				Resources = data.Resources,
 				BarbarianInfo = data.barbarianInfo,
-				Units = data.mapUnits.ConvertAll(unit => new SaveUnit(unit, data.map)),
+				Units = data.mapUnits.ConvertAll(unit => new SaveUnit(unit)),
 				UnitPrototypes = data.unitPrototypes.Values.ToList(),
 				Players = data.players.ConvertAll(player => new SavePlayer(player)),
 				Cities = data.cities.ConvertAll(city => new SaveCity(city)),
 				ExperienceLevels = data.experienceLevels,
+				StrengthBonuses = new(){
+					data.fortificationBonus,
+					data.riverCrossingBonus,
+					data.cityLevel1DefenseBonus,
+					data.cityLevel2DefenseBonus,
+					data.cityLevel3DefenseBonus,
+				},
+				HealRates = new(){
+					{"friendly_field", data.healRateInFriendlyField},
+					{"neutral_field", data.healRateInNeutralField},
+					{"hostile_field", data.healRateInHostileField},
+					{"city", data.healRateInCity},
+				},
+				ScenarioSearchPath = data.scenarioSearchPath,
+				DefaultExperienceLevel = data.defaultExperienceLevelKey,
 			};
-			save.StrengthBonuses.Add(data.fortificationBonus);
-			save.StrengthBonuses.Add(data.riverCrossingBonus);
-			save.StrengthBonuses.Add(data.cityLevel1DefenseBonus);
-			save.StrengthBonuses.Add(data.cityLevel2DefenseBonus);
-			save.StrengthBonuses.Add(data.cityLevel3DefenseBonus);
-			save.HealRates["friendly_field"] = data.healRateInFriendlyField;
-			save.HealRates["neutral_field"] = data.healRateInNeutralField;
-			save.HealRates["hostile_field"] = data.healRateInHostileField;
-			save.HealRates["city"] = data.healRateInCity;
-			save.ScenarioSearchPath = data.scenarioSearchPath;
-			save.DefaultExperienceLevel = data.defaultExperienceLevelKey;
 			return save;
 		}
 
@@ -177,13 +185,44 @@ public GameData ToGameData() {
 		public List<StrengthBonus> StrengthBonuses = new List<StrengthBonus>();
 		public Dictionary<string, int> HealRates = new Dictionary<string, int>();
 		public string ScenarioSearchPath; // TODO: what is this
-		public void Save(string path) {
-			byte[] json = JsonSerializer.SerializeToUtf8Bytes(this, JsonOptions);
+
+		private void SaveJson(SaveGame save, string path) {
+			byte[] json = JsonSerializer.SerializeToUtf8Bytes(save, JsonOptions);
 			File.WriteAllBytes(path, json);
 		}
 
-		public static SaveGame Load(string path) {
+		private void SaveZip(SaveGame save, string path) {
+			byte[] json = JsonSerializer.SerializeToUtf8Bytes(save, JsonOptions);
+			using MemoryStream zipStream = new();
+			using ZipArchive archive = new(zipStream, ZipArchiveMode.Create);
+			ZipArchiveEntry entry = archive.CreateEntry("save");
+			using Stream stream = entry.Open();
+			stream.Write(json, 0, json.Length);
+			archive.Dispose();
+			File.WriteAllBytes(path, zipStream.ToArray());
+		}
+
+		public void Save(string path, SaveCompression compression) {
+			if (compression == SaveCompression.None) {
+				SaveJson(this, path);
+			} else {
+				SaveZip(this, path);
+			}
+		}
+
+		private static SaveGame LoadJson(string path) {
 			return JsonSerializer.Deserialize<SaveGame>(File.ReadAllText(path), JsonOptions);
 		}
+
+		private static SaveGame LoadZip(string path) {
+			using ZipArchive archive = new(new FileStream(path, FileMode.Open), ZipArchiveMode.Read);
+			ZipArchiveEntry entry = archive.GetEntry("save");
+			using Stream stream = entry.Open();
+			return JsonSerializer.Deserialize<SaveGame>(stream, JsonOptions);
+		}
+
+		public static SaveGame Load(string path, SaveCompression compression) {
+			return compression == SaveCompression.None ? LoadJson(path) : LoadZip(path);
+		}
 	}
 }
diff --git a/C7GameData/Save/SaveUnit.cs b/C7GameData/Save/SaveUnit.cs
index 3543a141..95594c5f 100644
--- a/C7GameData/Save/SaveUnit.cs
+++ b/C7GameData/Save/SaveUnit.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace C7GameData.Save {
 
@@ -17,7 +19,7 @@ public class SaveUnit {
 		public string experience;
 		public SaveUnit() { }
 
-		public SaveUnit(MapUnit unit, GameMap map) {
+		public SaveUnit(MapUnit unit) {
 			id = unit.id;
 			prototype = unit.unitType.name;
 			owner = unit.owner.id;
@@ -48,8 +50,8 @@ public MapUnit ToMapUnit(List<UnitPrototype> prototypes, List<ExperienceLevel> e
 				movementPoints = new MovementPoints(),
 				isFortified = action == "fortified",
 			};
-			unit.location.unitsOnTile.Add(unit);
 			unit.movementPoints.reset(movePointsRemaining);
+			unit.location.unitsOnTile.Add(unit);
 			return unit;
 		}
 	}
diff --git a/C7GameData/SaveFormat.cs b/C7GameData/SaveFormat.cs
deleted file mode 100644
index e16c4f14..00000000
--- a/C7GameData/SaveFormat.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System.Linq;
-
-namespace C7GameData
-/*
-	The save format is intended to be serialized to JSON upon saving
-	and deserialized from JSON upon loading.
-
-	The names are capitalized per C#, but I intend to use JsonSerializer
-	settings to use camel case instead, unless there is reason not to.
-*/
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.IO.Compression;
-	using System.Text.Json;
-
-	public enum SaveCompression {
-		None,
-		Zip,
-		Invalid,
-	}
-
-	public class C7SaveFormat {
-		public string Version = "v0.0early-prototype";
-
-		// This naming is probably bad form, but it makes sense to me to name it as such here
-		public GameData GameData;
-
-		public C7SaveFormat() {
-			GameData = new GameData();
-		}
-
-		public C7SaveFormat(GameData gameData) {
-			GameData = gameData;
-		}
-
-		public bool PostLoadProcess() {
-			GameData.PerformPostLoadActions();
-
-			return true;
-		}
-
-		static SaveCompression getCompression(string path) {
-			var ext = Path.GetExtension(path);
-			if (ext.Equals(".JSON", StringComparison.CurrentCultureIgnoreCase)) {
-				return SaveCompression.None;
-			} else if (ext.Equals(".ZIP", StringComparison.CurrentCultureIgnoreCase)) {
-				return SaveCompression.Zip;
-			}
-			return SaveCompression.Invalid;
-		}
-
-		public static C7SaveFormat Load(string path) {
-			SaveCompression format = getCompression(path);
-			C7SaveFormat save = null;
-			if (format == SaveCompression.None) {
-				save = JsonSerializer.Deserialize<C7SaveFormat>(File.ReadAllText(path), JsonOptions);
-			} else {
-				using (var archive = new ZipArchive(new FileStream(path, FileMode.Open), ZipArchiveMode.Read)) {
-					ZipArchiveEntry entry = archive.GetEntry("save");
-					using (Stream stream = entry.Open()) {
-						save = JsonSerializer.Deserialize<C7SaveFormat>(stream, JsonOptions);
-					}
-				}
-			}
-
-			// Inflate things that are stored by reference, first tiles
-			foreach (Tile tile in save.GameData.map.tiles) {
-				if (tile.ResourceKey == "NONE") {
-					tile.Resource = Resource.NONE;
-				} else {
-					tile.Resource = save.GameData.Resources.Find(r => r.Key == tile.ResourceKey);
-				}
-				tile.baseTerrainType = save.GameData.terrainTypes.Find(t => t.Key == tile.baseTerrainTypeKey);
-				tile.overlayTerrainType = save.GameData.terrainTypes.Find(t => t.Key == tile.overlayTerrainTypeKey);
-			}
-
-			// Inflate experience levels
-			Dictionary<string, ExperienceLevel> levelsByKey = new Dictionary<string, ExperienceLevel>();
-			foreach (ExperienceLevel eL in save.GameData.experienceLevels) {
-				levelsByKey.Add(eL.key, eL);
-			}
-			save.GameData.defaultExperienceLevel = levelsByKey[save.GameData.defaultExperienceLevelKey];
-			foreach (MapUnit unit in save.GameData.mapUnits) {
-				unit.experienceLevel = levelsByKey[unit.experienceLevelKey];
-			}
-
-			//Inflate barbarian info
-			List<UnitPrototype> prototypes = save.GameData.unitPrototypes.Values.ToList();
-			save.GameData.barbarianInfo.basicBarbarian =
-				prototypes[save.GameData.barbarianInfo.basicBarbarianIndex];
-			save.GameData.barbarianInfo.advancedBarbarian =
-				prototypes[save.GameData.barbarianInfo.advancedBarbarianIndex];
-			save.GameData.barbarianInfo.barbarianSeaUnit =
-				prototypes[save.GameData.barbarianInfo.barbarianSeaUnitIndex];
-
-			return save;
-		}
-
-		public static void Save(C7SaveFormat save, string path) {
-			SaveCompression format = getCompression(path);
-			byte[] json = JsonSerializer.SerializeToUtf8Bytes(save, JsonOptions);
-			if (format == SaveCompression.Zip) {
-				using (var zipStream = new MemoryStream()) {
-					var archive = new ZipArchive(zipStream, ZipArchiveMode.Create);
-					ZipArchiveEntry entry = archive.CreateEntry("save");
-					using (Stream stream = entry.Open()) {
-						stream.Write(json, 0, json.Length);
-					}
-					// ZipArchive needs to be disposed in order for its content
-					// to be written to the MemoryStream
-					// https://stackoverflow.com/questions/12347775/ziparchive-creates-invalid-zip-file#12350106
-					archive.Dispose();
-					File.WriteAllBytes(path, zipStream.ToArray());
-				}
-			} else {
-				File.WriteAllBytes(path, json);
-			}
-		}
-
-		public static JsonSerializerOptions JsonOptions {
-			get => new JsonSerializerOptions {
-				// Lower-case the first letter in JSON because JSON naming standards
-				PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-				// Pretty print during development; may change this for production
-				WriteIndented = true,
-				// By default it only serializes getters, this makes it serialize fields, too
-				IncludeFields = true,
-
-				Converters = {
-					// Serialize 2D array types
-					new Json2DArrayConverter(),
-					new IDJsonConverter(),
-				},
-			};
-		}
-
-	}
-}
diff --git a/C7GameDataTests/SaveTest.cs b/C7GameDataTests/SaveTest.cs
index 09719db1..f36a0c1b 100644
--- a/C7GameDataTests/SaveTest.cs
+++ b/C7GameDataTests/SaveTest.cs
@@ -42,12 +42,12 @@ public void SimpleSave()
 
 		string developerSave = getBasePath("../C7/Text/c7-static-map-save.json");
 
-		SaveGame saveNeverGameData = SaveGame.Load(developerSave);
+		SaveGame saveNeverGameData = SaveGame.Load(developerSave, SaveCompression.None);
 
-		saveNeverGameData.Save(outputNeverGameDataPath);
+		saveNeverGameData.Save(outputNeverGameDataPath, SaveCompression.None);
 		GameData gameData = saveNeverGameData.ToGameData();
 		SaveGame saveWasGameData = SaveGame.FromGameData(gameData);
-		saveWasGameData.Save(outputWasGameDataPath);
+		saveWasGameData.Save(outputWasGameDataPath, SaveCompression.None);
 
 		byte[] original = File.ReadAllBytes(developerSave);
 		byte[] savedNeverGameData = File.ReadAllBytes(outputNeverGameDataPath);
@@ -60,13 +60,27 @@ public void SimpleSave()
 		// saved files should be the same as the original
 		Assert.Equal(original, savedNeverGameData);
 
-		// TODO: Currently the order of the properties in the json is different,
-		// so this fails. For testing, it would be convenient to sort SaveGame
-		// fields alphabetically before serializing to json.
-
 		Assert.Equal(original, savedWasGameData);
 	}
 
+	[Fact]
+	public void RoundTripZip() {
+		string zipOutput = getDataPath("output/round-trip-zip.zip");
+		string decompressedOutput = getDataPath("output/round-trip-zip.json");
+		string developerSave = getBasePath("../C7/Text/c7-static-map-save.json");
+		SaveGame saveGame = SaveGame.Load(developerSave, SaveCompression.None);
+		saveGame.Save(zipOutput, SaveCompression.Zip);
+		SaveGame loadedFromZip = SaveGame.Load(zipOutput, SaveCompression.Zip);
+		loadedFromZip.Save(decompressedOutput, SaveCompression.None);
+
+		byte[] original = File.ReadAllBytes(developerSave);
+		byte[] decompressed = File.ReadAllBytes(decompressedOutput);
+
+		Assert.NotEmpty(original);
+		Assert.NotEmpty(decompressed);
+		Assert.Equal(original, decompressed);
+	}
+
 	[Fact]
 	public void LoadGOTMWinners() {
 		string path = getDataPath("gotm");
@@ -90,7 +104,7 @@ public void LoadGOTMWinners() {
 			Assert.Null(ex);
 			Assert.NotNull(game);
 			Assert.NotNull(gd);
-			game.Save(Path.Combine(testDirectory, "data", "output", $"gotm_save_{i}.json"));
+			game.Save(Path.Combine(testDirectory, "data", "output", $"gotm_save_{i}.json"), SaveCompression.None);
 			i++;
 		}
 	}
@@ -122,7 +136,7 @@ public void LoadAllConquests() {
 			Assert.Null(ex);
 			Assert.NotNull(game);
 			Assert.NotNull(gd);
-			game.Save(Path.Combine(testDirectory, "data", "output", $"conquest_{name[0]}.json"));
+			game.Save(Path.Combine(testDirectory, "data", "output", $"conquest_{name[0]}.json"), SaveCompression.None);
 		}
 	}
 }
diff --git a/_Console/BuildDevSave/Program.cs b/_Console/BuildDevSave/Program.cs
index ef8d51c5..837a2944 100644
--- a/_Console/BuildDevSave/Program.cs
+++ b/_Console/BuildDevSave/Program.cs
@@ -28,7 +28,7 @@ static void Main(string[] args) {
 			string fullSavePath = args[0];
 			string outputPath = Path.Combine(C7DefaultSaveDir, "c7-static-map-save.json");
 			SaveGame output = ImportCiv3.ImportSav(fullSavePath, GetCiv3Path + @"/Conquests/conquests.biq");
-			output.Save(outputPath);
+			output.Save(outputPath, SaveCompression.None);
 			Info(outputPath, output);
 		}
 	}