'merge' with window-management branch; single frame for now