diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index ff5c3580d8..70a0bf936e 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -566,6 +566,7 @@
     <Compile Include="CoreFeatureAnalysis.Designer.cs">
       <DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControls\ControlRenderer\GdiPlusRenderer.cs" />
     <Compile Include="CustomControls\ControlRenderer\IControlRenderer.cs" />
     <Compile Include="CustomControls\ExceptionBox.cs">
       <SubType>Form</SubType>
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs
new file mode 100644
index 0000000000..3080dc55fd
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace BizHawk.Client.EmuHawk.CustomControls
+{
+	public class GdiPlusRenderer : IControlRenderer
+	{
+		private Graphics _graphics;
+		private int _width;
+		private int _height;
+
+		// TODO: see if caching has any benefit
+		private readonly Dictionary<Color, Pen> _penCache = new Dictionary<Color, Pen>();
+		private Pen _currentPen;
+
+		private readonly Dictionary<Color, Brush> _brushCache = new Dictionary<Color, Brush>();
+		private Brush _currentBrush;
+
+		private Font _currentFont = new Font("Arial", 8, FontStyle.Bold);
+		// TODO: cache this?
+		private Brush _currentStringBrush = new SolidBrush(Color.Black);
+
+		public GdiPlusRenderer()
+		{
+			_currentPen = new Pen(Color.Black);
+			_penCache.Add(Color.Black, _currentPen);
+
+			_currentBrush = new SolidBrush(Color.Black);
+			_brushCache.Add(Color.Black, _currentBrush);
+		}
+
+		private class GdiPlusGraphicsLock : IDisposable
+		{
+			private readonly GdiPlusRenderer _renderer;
+
+			public GdiPlusGraphicsLock(GdiPlusRenderer renderer)
+			{
+				_renderer = renderer;
+			}
+
+			public void Dispose()
+			{
+				// TODO
+			}
+		}
+
+		public void Dispose()
+		{
+			// TODO
+		}
+
+		public void DrawBitmap(Bitmap bitmap, Point point, bool blend = false)
+		{
+			// TODO: implement blend
+			_graphics.DrawImage(bitmap, point);
+		}
+
+		public void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
+		{
+			_graphics.DrawRectangle(
+				_currentPen,
+				new Rectangle(nLeftRect, nTopRect, nRightRect - nLeftRect, nBottomRect - nTopRect));
+		}
+
+		public void DrawString(string str, Point point)
+		{
+			_graphics.DrawString(str, _currentFont, _currentStringBrush, point);
+		}
+
+		public void FillRectangle(int x, int y, int w, int h)
+		{
+			_graphics.FillRectangle(
+				_currentBrush,
+				new Rectangle(x, y, w, h));
+		}
+
+		public void Line(int x1, int y1, int x2, int y2)
+		{
+			_graphics.DrawLine(_currentPen, x1, y1, x2, y2);
+		}
+
+		public IDisposable LockGraphics(Graphics g, int width, int height)
+		{
+			_graphics = g;
+			_width = width;
+			_height = height;
+			return new GdiPlusGraphicsLock(this);
+		}
+
+		public Size MeasureString(string str, Font font)
+		{
+			var size = _graphics.MeasureString(str, font);
+			return new Size((int)(size.Width + 0.5), (int)(size.Height + 0.5));
+		}
+
+		public void PrepDrawString(Font font, Color color, bool rotate = false)
+		{
+			// Implement TODO
+			if (rotate)
+			{
+				throw new NotImplementedException("rotate not implemented yet!");
+			}
+			
+			_currentFont = font;
+			_currentStringBrush = new SolidBrush(color);
+		}
+
+		public void SetBrush(Color color)
+		{
+			var result = _brushCache.TryGetValue(color, out Brush brush);
+			if (!result)
+			{
+				brush = new SolidBrush(color);
+				_brushCache.Add(color, brush);
+			}
+
+			_currentBrush = brush;
+		}
+
+		public void SetSolidPen(Color color)
+		{
+			var result = _penCache.TryGetValue(color, out Pen pen);
+			if (!result)
+			{
+				pen = new Pen(color);
+				_penCache.Add(color, pen);
+			}
+
+			_currentPen = pen;
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs
index 6bef52e7fa..a0d222c0ef 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs
@@ -26,6 +26,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
 		/// </summary>
 		void DrawString(string str, Point point);
 
+
 		void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 		void FillRectangle(int x, int y, int w, int h);
 
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
index a1b9d6f345..cd83bf34b6 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
@@ -65,7 +65,8 @@ namespace BizHawk.Client.EmuHawk
 			SetStyle(ControlStyles.SupportsTransparentBackColor, true);
 			SetStyle(ControlStyles.Opaque, true);
 
-			_renderer = new GdiRenderer();
+			//_renderer = new GdiRenderer();
+			_renderer = new GdiPlusRenderer();
 
 			using (var g = CreateGraphics())
 			using (_renderer.LockGraphics(g, Width, Height))