diff --git a/redo/ui.idl b/redo/ui.idl
index 8031e3cd..aec29eb9 100644
--- a/redo/ui.idl
+++ b/redo/ui.idl
@@ -48,7 +48,8 @@ interface Control {
 	func PreferredSize(d *Sizing, width *intmax_t, height *intmax_t);
 	func Resize(x intmax_t, y intmax_t, width intmax_t, height intmax_t, d *Sizing);
 	func QueueResize(void);
-	func ComputeChildSizeArea(x *intmax_t, y *intmax_t, width *intmax_t, height *intmax_t, d *Sizing);
+	func GetSizing(d *Sizing);
+	func ComputeChildSize(x *intmax_t, y *intmax_t, width *intmax_t, height *intmax_t, d *Sizing);
 	func Visible(void) int;
 	func Show(void);
 	func Hide(void);
@@ -57,7 +58,7 @@ interface Control {
 	func ContainerEnable(void);
 	func ContainerDisable(void);
 	func SysFunc(p *uiControlSysFuncParams);
-	func StartZOrderSysFunc(p *uiControlSysFuncParams) int;
+	func StartZOrder(p *uiControlSysFuncParams) int;
 };
 
 func MakeContainer(c *Control);
diff --git a/redo/ui_windows.h b/redo/ui_windows.h
index 9c1bc4a9..adc63a33 100644
--- a/redo/ui_windows.h
+++ b/redo/ui_windows.h
@@ -42,11 +42,6 @@ struct uiSizingSys {
 	int BaseX;
 	int BaseY;
 	LONG InternalLeading;
-
-	// This is the window handle to pass to the hWndInsertAfter parameter of SetWindowPos().
-	// You should set this to your own window handle when done.
-	// Controls made with uiWindowsMakeControl() do this for you; you only need to do this if you are implementing uiControlResize() yourself.
-	HWND InsertAfter;
 };
 // Use these in your preferredSize() implementation with baseX and baseY.
 #define uiWindowsDlgUnitsToX(dlg, baseX) MulDiv((dlg), baseX, 4)
@@ -63,6 +58,7 @@ _UI_EXTERN void uiWindowsControlSetText(uiControl *, const char *);
 struct uiControlSysFuncParams {
 	int Func;
 	BOOL HasTabStops;
+	HWND InsertAfter;
 };
 
 enum {
@@ -75,6 +71,9 @@ enum {
 	// Controls created with uiWindowsMakeControl() check for the window being enabled and the presence of WS_TABSTOP.
 	// The name is "has tab stops" because it is used by uiTabs to say "does the current tab page have tab stops?".
 	uiWindowsSysFuncHasTabStops,
+	// This tells the current control to set its Z order to be after the control in the InsertAfter field.
+	// You should also set your own handle to the InsertAfter field for the next control.
+	uiWindowsSysFuncSetZOrder,
 };
 
 #endif
diff --git a/redo/windows/control.c b/redo/windows/control.c
new file mode 100644
index 00000000..38063425
--- /dev/null
+++ b/redo/windows/control.c
@@ -0,0 +1,254 @@
+// 6 april 2015
+#include "uipriv_windows.h"
+
+struct singleHWND {
+	HWND hwnd;
+	BOOL (*onWM_COMMAND)(uiControl *, WORD, LRESULT *);
+	BOOL (*onWM_NOTIFY)(uiControl *, NMHDR *, LRESULT *);
+	void (*onDestroy)(void *);
+	void *onDestroyData;
+	uiContainer *parent;
+	int hidden;
+	int userDisabled;
+	int containerDisabled;
+};
+
+static void singleDestroy(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	if (s->parent != NULL)
+		complain("attempt to destroy a uiControl at %p while it still has a parent", c);
+	(*(s->onDestroy))(s->onDestroyData);
+	if (DestroyWindow(s->hwnd) == 0)
+		logLastError("error destroying control in singleDestroy()");
+	uiFree(s);
+}
+
+static uintptr_t singleHandle(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	return (uintptr_t) (s->hwnd);
+}
+
+static uiControl *singleParent(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	return s->parent;
+}
+
+static void singleSetParent(uiControl *c, uiContainer *parent)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+	uiContainer *oldparent;
+	HWND newParentHWND;
+
+	oldparent = s->parent;
+	s->parent = parent;
+	newParentHWND = utilWindow;
+	if (s->parent != NULL)
+		newParentHWND = (HWND) uiControlHandle(uiControl(s->parent));
+	if (SetParent(s->hwnd, newParentHWND) == NULL)
+		logLastError("error setting control parent in singleSetParent()");
+}
+
+static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	moveWindow(s->hwnd, x, y, width, height);
+}
+
+static void singleQueueResize(uiControl *c)
+{
+	queueResize(c);
+}
+
+static void singleGetSIzing(uiControl *c, uiSizing *d)
+{
+	// TODO
+}
+
+static void singleComputeChildSize(uiControl *c, intmax_t *x, intmax_t *y, intmax_t *width, intmax_t *height, uiSizing *d)
+{
+	complain("attempt to call uiControlComputeChildSize() on a non-container");
+}
+
+static int singleVisible(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	return !s->hidden;
+}
+
+static void singleShow(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	ShowWindow(s->hwnd, SW_SHOW);
+	s->hidden = 0;
+	if (s->parent != NULL)
+		uiContainerUpdate(s->parent);
+}
+
+static void singleHide(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	ShowWindow(s->hwnd, SW_HIDE);
+	s->hidden = 1;
+	if (s->parent != NULL)
+		uiContainerUpdate(s->parent);
+}
+
+static void singleEnable(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	s->userDisabled = 0;
+	if (!s->containerDisabled)
+		EnableWindow(s->hwnd, TRUE);
+}
+
+static void singleDisable(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	s->userDisabled = 1;
+	EnableWindow(s->hwnd, FALSE);
+}
+
+static void singleContainerEnable(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	s->containerDisabled = 0;
+	if (!s->userDisabled)
+		EnableWindow(s->hwnd, TRUE);
+}
+
+static void singleContainerDisable(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	s->containerDisabled = 1;
+	EnableWindow(s->hwnd, FALSE);
+}
+
+static void singleSysFunc(uiControl *c, uiControlSysFuncParams *p)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+
+	switch (p->Func) {
+	case uiWindowsSysFuncHasTabStops:
+		if (IsWindowEnabled(s->hwnd) != 0)
+			if ((getStyle(s->hwnd) & WS_TABSTOP) != 0)
+				p->HasTabStops = TRUE;
+		return;
+	case uiWindowSysFuncSetZOrder:
+		// TODO
+		return;
+	}
+	complain("unknown p->Func %d in singleSysFunc()", p->Func);
+}
+
+static void singleStartZOrder(uiControl *c, uiControlSysFuncParams *p)
+{
+	// TODO
+}
+
+static LRESULT CALLBACK singleSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
+{
+	uiControl *c = (uiControl *) dwRefData;
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+	LRESULT lResult;
+
+	switch (uMsg) {
+	case msgCOMMAND:
+		if ((*(s->onWM_COMMAND))(c, HIWORD(wParam), &lResult) != FALSE)
+			return lResult;
+		break;
+	case msgNOTIFY:
+		if ((*(s->onWM_NOTIFY))(c, (NMHDR *) lParam, &lResult) != FALSE)
+			return lResult;
+		break;
+	case WM_NCDESTROY:
+		if (RemoveWindowSubclass(hwnd, singleSubclassProc, uIdSubclass) == FALSE)
+			logLastError("error removing Windows control subclass in singleSubclassProc()");
+		break;
+	}
+	return DefSubclassProc(hwnd, uMsg, wParam, lParam);
+}
+
+void uiWindowsMakeControl(uiControl *c, uiWindowsMakeControlParams *p)
+{
+	struct singleHWND *s;
+
+	s = uiNew(struct singleHWND);
+	s->hwnd = CreateWindowExW(p->dwExStyle,
+		p->lpClassName, p->lpWindowName,
+		p->dwStyle | WS_CHILD | WS_VISIBLE,
+		0, 0,
+		// use a nonzero initial size just in case some control breaks with a zero initial size
+		100, 100,
+		initialParent, NULL, p->hInstance, p->lpParam);
+	if (s->hwnd == NULL)
+		logLastError("error creating control in uiWindowsMakeControl()");
+	s->onWM_COMMAND = p->onWM_COMMAND;
+	s->onWM_NOTIFY = p->onWM_NOTIFY;
+
+	s->onDestroy = p->onDestroy;
+	s->onDestroyData = p->onDestroyData;
+
+	if (p->useStandardControlFont)
+		SendMessageW(s->hwnd, WM_SETFONT, (WPARAM) hMessageFont, (LPARAM) TRUE);
+
+	// this handles redirected notification messages
+	if (SetWindowSubclass(s->hwnd, singleSubclassProc, 0, (DWORD_PTR) c) == FALSE)
+		logLastError("error subclassing Windows control in uiWindowsMakeControl()");
+
+	uiControl(c)->Internal = s;
+	uiControl(c)->Destroy = singleDestroy;
+	uiControl(c)->Handle = singleHandle;
+	uiControl(c)->Parent = singleParent;
+	uiControl(c)->SetParent = singleSetParent;
+	// PreferredSize() implemented by the individual controls
+	uiControl(c)->Resize = singleResize;
+	uiControl(c)->QueueResize = singleQueueResize;
+	uiControl(c)->GetSizing = singleGetSizing;
+	uiControl(c)->ComputeChildSize = singleComputeChildSize;
+	uiControl(c)->Visible = singleVisible;
+	uiControl(c)->Show = singleShow;
+	uiControl(c)->Hide = singleHide;
+	uiControl(c)->Enable = singleEnable;
+	uiControl(c)->Disable = singleDisable;
+	uiControl(c)->ContainerEnable = singleContainerEnable;
+	uiControl(c)->ContainerDisable = singleContainerDisable;
+	uiControl(c)->SysFunc = singleSysFunc;
+	uiControl(c)->StartZOrder = singleStartZOrder;
+}
+
+char *uiWindowsControlText(uiControl *c)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+	WCHAR *wtext;
+	char *text;
+
+	wtext = windowText(s->hwnd);
+	text = toUTF8(wtext);
+	uiFree(wtext);
+	return text;
+}
+
+void uiWindowsControlSetText(uiControl *c, const char *text)
+{
+	struct singleHWND *s = (struct singleHWND *) (c->Internal);
+	WCHAR *wtext;
+
+	wtext = toUTF16(text);
+	if (SetWindowTextW(s->hwnd, wtext) == 0)
+		logLastError("error setting control text in uiWindowsControlSetText()");
+	uiFree(wtext);
+}
diff --git a/redo/windows/resize.c b/redo/windows/resize.c
index 6e88e089..e54e3b6b 100644
--- a/redo/windows/resize.c
+++ b/redo/windows/resize.c
@@ -35,7 +35,8 @@ void doResizes(void)
 		if (parent == NULL)		// not in a parent; can't resize
 			continue;			// this is for uiBox, etc.
 		d.sys = &sys;
-		uiControlComputeChildSizeArea(parent, &x, &y, &width, &height, &d);
+		uiControlGetSizing(parent, &d);
+		uiControlComputeChildSize(parent, &x, &y, &width, &height, &d);
 		uiControlResize(c, x, y, width, height, &d);
 		hwnd = (HWND) uiControlHandle(c);
 		// we used SWP_NOREDRAW; we need to queue a redraw ourselves