diff --git a/src/main/java/com/graywolf336/jail/JailMain.java b/src/main/java/com/graywolf336/jail/JailMain.java
index 38c767d..7277c8d 100644
--- a/src/main/java/com/graywolf336/jail/JailMain.java
+++ b/src/main/java/com/graywolf336/jail/JailMain.java
@@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import com.graywolf336.jail.beans.Jail;
 import com.graywolf336.jail.command.CommandHandler;
 import com.graywolf336.jail.listeners.BlockListener;
 import com.graywolf336.jail.listeners.EntityListener;
@@ -37,6 +38,10 @@ public class JailMain extends JavaPlugin {
 	}
 
 	public void onDisable() {
+		if(jm != null)
+			for(Jail j : jm.getJails())
+				io.saveJail(j);
+		
 		cmdHand = null;
 		jm = null;
 		io = null;
diff --git a/src/main/java/com/graywolf336/jail/beans/Jail.java b/src/main/java/com/graywolf336/jail/beans/Jail.java
index 84d418f..93f0b79 100644
--- a/src/main/java/com/graywolf336/jail/beans/Jail.java
+++ b/src/main/java/com/graywolf336/jail/beans/Jail.java
@@ -131,6 +131,7 @@ public class Jail {
 	
 	/** Adds a cell to the Jail. */
 	public void addCell(Cell cell) {
+		plugin.getJailIO().saveJail(this);
 		this.cells.put(cell.getName(), cell);
 	}