diff --git a/Capy64/LuaRuntime/Libraries/Graphics.cs b/Capy64/LuaRuntime/Libraries/Graphics.cs
index 3ab7c05..032f882 100644
--- a/Capy64/LuaRuntime/Libraries/Graphics.cs
+++ b/Capy64/LuaRuntime/Libraries/Graphics.cs
@@ -15,6 +15,16 @@ public class Graphics : IPlugin
     }
 
     private LuaRegister[] GfxLib = new LuaRegister[] {
+        new()
+        {
+            name = "plot",
+            function = L_Plot,
+        },
+        new()
+        {
+            name = "plots",
+            function = L_Plots,
+        },
         new()
         {
             name = "drawPoint",
@@ -22,8 +32,38 @@ public class Graphics : IPlugin
         },
         new()
         {
-            name = "drawPoints",
-            function = L_DrawPoints,
+            name = "drawCircle",
+            function = L_DrawCircle
+        },
+        new()
+        {
+            name = "drawLine",
+            function = L_DrawLine
+        },
+        new()
+        {
+            name = "drawRectangle",
+            function = L_DrawRectangle
+        },
+        new()
+        {
+            name = "drawPolygon",
+            function = L_DrawPolygon
+        },
+        new()
+        {
+            name = "drawEllipse",
+            function = L_DrawEllipse
+        },
+        new()
+        {
+            name = "drawString",
+            function = L_DrawString
+        },
+        new()
+        {
+            name = "measureString",
+            function = L_MeasureString
         },
         new(), // NULL
     };
@@ -40,22 +80,21 @@ public class Graphics : IPlugin
         return 1;
     }
 
-    private static int L_DrawPoint(IntPtr state)
+    private static int L_Plot(IntPtr state)
     {
         var L = Lua.FromIntPtr(state);
 
-        var x = L.CheckInteger(1) - 1;
-        var y = L.CheckInteger(2) - 1;
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
         var c = L.CheckInteger(3);
-        var s = L.OptInteger(4, 1);
 
         Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
-        _game.Drawing.DrawPoint(new(x, y), new Color(r, g, b), (int)s);
+        _game.Drawing.Plot(new Point(x, y), new Color(r, g, b));
 
         return 0;
     }
 
-    private static int L_DrawPoints(IntPtr state)
+    private static int L_Plots(IntPtr state)
     {
         var L = Lua.FromIntPtr(state);
 
@@ -89,4 +128,151 @@ public class Graphics : IPlugin
 
         return 0;
     }
+
+    private static int L_DrawPoint(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        var c = L.CheckInteger(3);
+        var s = (int)L.OptNumber(4, 1);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawPoint(new(x, y), new Color(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawCircle(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        var rad = (int)L.CheckNumber(3);
+        var c = L.CheckInteger(4);
+        var s = (int)L.OptNumber(5, 1);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawCircle(new(x, y), rad, new Color(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawLine(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x1 = (int)L.CheckNumber(1) - 1;
+        var y1 = (int)L.CheckNumber(2) - 1;
+        var x2 = (int)L.CheckNumber(3) - 1;
+        var y2 = (int)L.CheckNumber(4) - 1;
+        var c = L.CheckInteger(5);
+        var s = (int)L.OptNumber(6, 1);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawLine(new(x1, y1), new(x2, y2), new Color(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawRectangle(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        var w = (int)L.CheckNumber(3);
+        var h = (int)L.CheckNumber(4);
+        var c = L.CheckInteger(5);
+        var s = (int)L.OptNumber(6, 1);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawRectangle(new(x, y), new(w, h), new Color(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawPolygon(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        L.CheckType(3, LuaType.Table);
+        var c = L.CheckInteger(4);
+        var s = (int)L.OptNumber(5, 1);
+
+        int size = (int)L.Length(3);
+
+        L.ArgumentCheck(size % 2 == 0, 1, "expected an even table");
+
+        List<Vector2> pts = new();
+        for (int i = 1; i <= size; i += 2)
+        {
+            L.GetInteger(3, i);
+            L.ArgumentCheck(L.IsNumber(-1), 1, "expected number at index " + i);
+            var xp = (int)L.ToNumber(-1) - 1;
+            L.Pop(1);
+
+            L.GetInteger(3, i + 1);
+            L.ArgumentCheck(L.IsNumber(-1), 1, "expected number at index " + (i + 1));
+            var yp = (int)L.ToNumber(-1) - 1;
+            L.Pop(1);
+
+            pts.Add(new(xp, yp));
+        }
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawPolygon(new(x, y), pts.ToArray(), new(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawEllipse(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        var rx = (int)L.CheckNumber(3);
+        var ry = (int)L.CheckNumber(4);
+        var c = L.CheckInteger(5);
+        var s = (int)L.OptNumber(6, 1);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawEllipse(new(x, y), new(rx, ry), new Color(r, g, b), s);
+
+        return 0;
+    }
+
+    private static int L_DrawString(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var x = (int)L.CheckNumber(1) - 1;
+        var y = (int)L.CheckNumber(2) - 1;
+        var c = L.CheckInteger(3);
+        var t = L.CheckString(4);
+
+        Utils.UnpackRGB((uint)c, out var r, out var g, out var b);
+        _game.Drawing.DrawString(new Vector2(x, y), t, new Color(r, g, b));
+
+        return 0;
+    }
+
+    private static int L_MeasureString(IntPtr state)
+    {
+        var L = Lua.FromIntPtr(state);
+
+        var t = L.CheckString(1);
+
+        var sizes = _game.Drawing.MeasureString(t);
+
+        L.PushNumber((int)sizes.X);
+        L.PushNumber((int)sizes.Y);
+
+        return 2;
+    }
 }