diff --git a/roo_e/src/gui/wmwindow.c b/roo_e/src/gui/wmwindow.c
index ac513ed..7d3baca 100644
--- a/roo_e/src/gui/wmwindow.c
+++ b/roo_e/src/gui/wmwindow.c
@@ -528,9 +528,6 @@ static void windowPaint(struct WidgetS *widget, ...) {
 	mode = va_arg(args, int);
 	va_end(args);
 
-	// ***TODO*** Icon needs to be cached in a surface so we can calculate
-	// damaged areas for rendering.
-
 	if (mode == WINDOW_PAINT_ICONS) {
 		// Are we minimized?
 		if (w->flags & WIN_IS_ICON) {
@@ -647,7 +644,7 @@ static WidgetT *windowWidgetFinder(WidgetT *widget, uint16_t x, uint16_t y, int1
 				br.x = *localX;
 				br.y = *localY;
 				w = w->reg->findWidget(w, br.x, br.y, localX, localY);
-				if (w) logWrite("Over %s\n", w->reg->widgetName);
+				//if (w) logWrite("Over %s\n", w->reg->widgetName);
 				return w;
 			}
 		}
@@ -978,6 +975,12 @@ void wmRender(void) {
 		arrfree(damageList);
 
 	}  // Do we have windows?
+
+	// ***DEBUG***
+	surfaceSet(__guiBackBuffer);
+	for (i=0; i<arrlen(_windowList); i++) {
+	}
+
 }
 
 
diff --git a/test/src/main.c b/test/src/main.c
index 353cc99..61c4082 100644
--- a/test/src/main.c
+++ b/test/src/main.c
@@ -52,9 +52,9 @@ int main(int argc, char *argv[]) {
 	memoryStartup(argv[0]);
 	logOpenByHandle(memoryLogHandleGet());
 
-	if (guiStartup(800, 600, 8) == SUCCESS) {
+	if (guiStartup(800, 600, 16) == SUCCESS) {
 
-		for (i=1; i<4; i++) {
+		for (i=1; i<2; i++) {
 			sprintf(title, "Testing %d", i);
 			w = windowCreate(i * 50, i * 50, 500, 300, title, WIN_STANDARD, 640, 480);