diff --git a/BizHawk.MultiClient/tools/NewRamWatch.cs b/BizHawk.MultiClient/tools/NewRamWatch.cs
index 1a87191b87..6590587311 100644
--- a/BizHawk.MultiClient/tools/NewRamWatch.cs
+++ b/BizHawk.MultiClient/tools/NewRamWatch.cs
@@ -12,113 +12,196 @@ namespace BizHawk.MultiClient
 {
 	public partial class NewRamWatch : Form
 	{
-        private WatchList Watches = new WatchList();
-        private string systemID = "NULL";
+		private WatchList Watches = new WatchList();
+		private string systemID = "NULL";
 
-        public NewRamWatch()
+		public NewRamWatch()
 		{
 			InitializeComponent();
+			WatchListView.QueryItemText += WatchListView_QueryItemText;
+			WatchListView.QueryItemBkColor += WatchListView_QueryItemBkColor;
+			WatchListView.VirtualMode = true;
 		}
 
-        public bool AskSave()
-        {
-            if (Global.Config.SupressAskSave) //User has elected to not be nagged
-            {
-                return true;
-            }
+		private void WatchListView_QueryItemBkColor(int index, int column, ref Color color)
+		{
+			if (index >= Watches.ItemCount)
+			{
+				return;
+			}
 
-            if (Watches.Changes)
-            {
-                Global.Sound.StopSound();
-                DialogResult result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
-                Global.Sound.StartSound();
-                if (result == DialogResult.Yes)
-                {
-                    Watches.Save();
-                }
-                else if (result == DialogResult.No)
-                {
-                    return true;
-                }
-                else if (result == DialogResult.Cancel)
-                {
-                    return false;
-                }
-            }
+			if (column == 0)
+			{
+				if (Watches[index].IsSeparator)
+				{
+					color = BackColor;
+				}
+				else if (Global.CheatList.IsActiveCheat(Watches.Domain, Watches[index].Address.Value))
+				{
+					color = Color.LightCyan;
+				}
+			}
+		}
 
-            return true;
-        }
+		void WatchListView_QueryItemText(int index, int column, out string text)
+		{
+			text = "";
 
-        private void DisplayWatches()
-        {
-            WatchListView.ItemCount = Watches.ItemCount;
-        }
+			if (index >= Watches.ItemCount || Watches[index].IsSeparator)
+			{
+				return;
+			}
 
-        private void UpdateWatchCount()
-        {
-            int count = Watches.WatchCount;
-            WatchCountLabel.Text = count.ToString() + (count == 1 ? " watch" : " watches");
-        }
+			switch (column)
+			{
+				case 0: // address
+					text = Watches[index].AddressString;
+					break;
+				case 1: // value
+					text = Watches[index].ValueString;
+					break;
+				case 2: // prev
+					text = "TODO";
+					//switch (Global.Config.RamWatchPrev_Type)
+					//{
+					//    case 1:
+					//        text = Watches[index].PrevString;
+					//        break;
+					//    case 2:
+					//        text = Watches[index].LastChangeString;
+					//        break;
+					//}
+					break;
+				case 3: // changes
+					text = "TODO";
+					//text = Watches[index].Changecount;
+					break;
+				case 4: // diff
+					text = "TODO";
+					//switch (Global.Config.RamWatchPrev_Type)
+					//{
+					//    case 1:
+					//        text = Watches[index].DiffPrevString;
+					//        break;
+					//    case 2:
+					//        text = Watches[index].DiffLastChangeString;
+					//        break;
+					//}
+					break;
+				case 5: // domain
+					text = Watches[index].DomainName;
+					break;
+				case 6: // notes
+					text = "TODO";
+					//text = Watches[index].Notes;
+					break;
+			}
+		}
 
-        private void SetMemoryDomain(int pos)
-        {
-            if (pos < Global.Emulator.MemoryDomains.Count)  //Sanity check
-            {
-                Watches.Domain = Global.Emulator.MemoryDomains[pos];
-            }
-            SetPlatformAndMemoryDomainLabel();
-            Update();
-        }
+		public void UpdateValues()
+		{
+			//TODO
+		}
 
-        private void SetPlatformAndMemoryDomainLabel()
-        {
-            string memoryDomain = Watches.Domain.ToString();
-            systemID = Global.Emulator.SystemId;
-            MemDomainLabel.Text = systemID + " " + memoryDomain;
-        }
+		public bool AskSave()
+		{
+			if (Global.Config.SupressAskSave) //User has elected to not be nagged
+			{
+				return true;
+			}
 
-        #region Winform Events
+			if (Watches.Changes)
+			{
+				Global.Sound.StopSound();
+				DialogResult result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
+				Global.Sound.StartSound();
+				if (result == DialogResult.Yes)
+				{
+					Watches.Save();
+				}
+				else if (result == DialogResult.No)
+				{
+					return true;
+				}
+				else if (result == DialogResult.Cancel)
+				{
+					return false;
+				}
+			}
 
-        private void NewRamWatch_Load(object sender, EventArgs e)
-        {
+			return true;
+		}
 
-        }
+		private void DisplayWatches()
+		{
+			WatchListView.ItemCount = Watches.ItemCount;
+		}
 
-        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (!AskSave())
-            {
-                return;
-            }
-            else
-            {
-                Close();
-            }
-        }
+		private void UpdateWatchCount()
+		{
+			int count = Watches.WatchCount;
+			WatchCountLabel.Text = count.ToString() + (count == 1 ? " watch" : " watches");
+		}
 
-        private void openToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var file = WatchCommon.GetFileFromUser(Watches.CurrentFileName);
-            if (file != null)
-            {
-                bool result = true;
-                if (Watches.Changes)
-                {
-                    result = AskSave();
-                }
+		private void SetMemoryDomain(int pos)
+		{
+			if (pos < Global.Emulator.MemoryDomains.Count)  //Sanity check
+			{
+				Watches.Domain = Global.Emulator.MemoryDomains[pos];
+			}
+			SetPlatformAndMemoryDomainLabel();
+			Update();
+		}
 
-                if (result)
-                {
-                    Watches.Load(file.FullName, details: true, append: false);
-                    DisplayWatches();
-                    MessageLabel.Text = Path.GetFileNameWithoutExtension(Watches.CurrentFileName);
-                    UpdateWatchCount();
-                    Global.Config.RecentWatches.Add(Watches.CurrentFileName);
-                    SetMemoryDomain(WatchCommon.GetDomainPos(Watches.Domain.ToString()));
-                }
-            }
-        }
+		private void SetPlatformAndMemoryDomainLabel()
+		{
+			string memoryDomain = Watches.Domain.ToString();
+			systemID = Global.Emulator.SystemId;
+			MemDomainLabel.Text = systemID + " " + memoryDomain;
+		}
 
-        #endregion
-    }
+		#region Winform Events
+
+		private void NewRamWatch_Load(object sender, EventArgs e)
+		{
+
+		}
+
+		private void exitToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (!AskSave())
+			{
+				return;
+			}
+			else
+			{
+				Close();
+			}
+		}
+
+		private void openToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var file = WatchCommon.GetFileFromUser(Watches.CurrentFileName);
+			if (file != null)
+			{
+				bool result = true;
+				if (Watches.Changes)
+				{
+					result = AskSave();
+				}
+
+				if (result)
+				{
+					Watches.Load(file.FullName, details: true, append: false);
+					DisplayWatches();
+					MessageLabel.Text = Path.GetFileNameWithoutExtension(Watches.CurrentFileName);
+					UpdateWatchCount();
+					Global.Config.RecentWatches.Add(Watches.CurrentFileName);
+					SetMemoryDomain(WatchCommon.GetDomainPos(Watches.Domain.ToString()));
+				}
+			}
+		}
+
+		#endregion
+	}
 }
diff --git a/BizHawk.MultiClient/tools/Watch.cs b/BizHawk.MultiClient/tools/Watch.cs
index cc5c7e3998..5200189320 100644
--- a/BizHawk.MultiClient/tools/Watch.cs
+++ b/BizHawk.MultiClient/tools/Watch.cs
@@ -920,6 +920,11 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+		public string DomainName
+		{
+			get { return _domain.Name; }
+		}
+
 		public static WatchSize SizeFromChar(char c)     //b = byte, w = word, d = dword
 		{
 			switch (c)