diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
index f162f36f26..ba74866c1d 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
@@ -115,10 +115,18 @@ namespace BizHawk.Client.EmuHawk
 
 		public void UpdateValues()
 		{
+			// TODO: probably none of this
 			RegisterPanel.UpdateValues();
 			UpdateDisassembler();
 		}
 
+		private void FullUpdate()
+		{
+			RegisterPanel.UpdateValues();
+			UpdateDisassembler();
+			// TODO: update breakpoint list
+		}
+
 		public void FastUpdate()
 		{
 			// TODO
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 79266dd141..6cd7e77ad9 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -247,17 +247,29 @@ namespace BizHawk.Client.EmuHawk
 
 		private void StepIntoMenuItem_Click(object sender, EventArgs e)
 		{
-			MessageBox.Show("TODO");
+			if (CanStepInto)
+			{
+				Debuggable.Step(StepType.Into);
+				FullUpdate();
+			}
 		}
 
 		private void StepOverMenuItem_Click(object sender, EventArgs e)
 		{
-			MessageBox.Show("TODO");
+			if (CanStepOver)
+			{
+				Debuggable.Step(StepType.Over);
+				FullUpdate();
+			}
 		}
 
 		private void StepOutMenuItem_Click(object sender, EventArgs e)
 		{
-			MessageBox.Show("TODO");
+			if (CanStepOut)
+			{
+				Debuggable.Step(StepType.Out);
+				FullUpdate();
+			}
 		}
 
 		#endregion
@@ -307,19 +319,19 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 		{
-			if (keyData == Keys.F10)
+			if (keyData == Keys.F11)
 			{
 				StepIntoMenuItem_Click(null, null);
 				return true;
 			}
 			else if (keyData == (Keys.F11 | Keys.Shift))
 			{
-				StepOverMenuItem_Click(null, null);
+				StepOutMenuItem_Click(null, null);
 				return true;
 			}
-			else if (keyData == Keys.F11)
+			else if (keyData == Keys.F10)
 			{
-				StepOutMenuItem_Click(null, null);
+				StepOverMenuItem_Click(null, null);
 				return true;
 			}
 			else