diff --git a/examples/cluster.c b/examples/cluster.c
index c2f5923..836a216 100644
--- a/examples/cluster.c
+++ b/examples/cluster.c
@@ -63,17 +63,17 @@ static void draw_tachometer_needle(cairo_t *cr,
         rpm = 8000;
     }
 
-    draw_needle(cr, x, y,   0.77 * r,
-                          232    * (M_PI/180),
-                          488    * (M_PI/180),
-                          rpm / 8000);
-
     /*
      * Draw a tiny boi circle
      */
     cairo_set_source_rgb(cr, 1, 1, 1);
     cairo_arc(cr, x, y, 0.08 * r, 0, 2*M_PI);
     cairo_fill(cr);
+
+    draw_needle(cr, x, y,   0.77 * r,
+                          232    * (M_PI/180),
+                          488    * (M_PI/180),
+                          rpm / 8000);
 }
 
 static void draw_tachometer(cairo_t *cr,
diff --git a/include/hexagram/window.h b/include/hexagram/window.h
new file mode 100644
index 0000000..a2e41fb
--- /dev/null
+++ b/include/hexagram/window.h
@@ -0,0 +1,20 @@
+#ifndef _HEXAGRAM_WINDOW_H
+#define _HEXAGRAM_WINDOW_H
+
+#include <X11/Xlib.h>
+
+#define HEXAGRAM_WINDOW_EVENT_MASK (ButtonMotionMask  | ButtonPressMask | \
+                                    ButtonReleaseMask | ExposureMask    | \
+                                    StructureNotifyMask)
+
+typedef struct _hexagram_window hexagram_window;
+
+hexagram_window *hexagram_window_new_x11(const char *display,
+                                         int width,
+                                         int height);
+
+int hexagram_window_show(hexagram_window *window);
+
+void hexagram_window_destroy(hexagram_window *window);
+
+#endif /* _HEXAGRAM_WINDOW_H */