diff --git a/BizHawk.MultiClient/tools/Cheat.cs b/BizHawk.MultiClient/tools/Cheat.cs
index 3103f03dfe..ce7bb9f435 100644
--- a/BizHawk.MultiClient/tools/Cheat.cs
+++ b/BizHawk.MultiClient/tools/Cheat.cs
@@ -44,13 +44,13 @@ namespace BizHawk.MultiClient
         public void Enable()
         {
             enabled = true;
-            //TODO: freeze
+            domain.SetFreeze(address, new MemoryDomain.FreezeData(MemoryDomain.FreezeData.Flag.Frozen, value));
         }
 
         public void Disable()
         {
             enabled = false;
-            //TODO: freeze
+            domain.SetFreeze(address, MemoryDomain.FreezeData.Empty);
         }
 
         public bool IsEnabled()
diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index 2bbf553ff3..10c34fd511 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -15,7 +15,7 @@ namespace BizHawk.MultiClient
     {
         //Open/Close rom should start a new cheat list
         //Implement Options menu settings
-        //Implement Freeze/Unfreeze on enabled changed in Cheat object
+        //Implement Freeze functions in all memory domains
         //Save - implement (should default to SaveAs if no cheats file)
         //Restore Window Size should restore column order as well
 
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index d694d6207a..3aec8c09b1 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -22,7 +22,6 @@ namespace BizHawk.MultiClient
         //address num digits based on domain size
         //Restore window size should restore column order as well
         //When receiving a watch from a different domain, should something be done?
-        //Save should default to SaveAs if no watch file
 
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;