diff --git a/structs.go b/structs.go
index a48f1c0..e5e8520 100644
--- a/structs.go
+++ b/structs.go
@@ -137,17 +137,31 @@ func (s GuiBox) AddTab(title string, custom ui.Control) {
 	tab.Append(title, custom)
 }
 
-func (s GuiBox) AddDemoTab(title string) {
+func (s GuiBox) AddTab2(title string, custom ui.Control) *ui.Tab {
 	if (s.Window == nil) {
-		return
+		return nil
 	}
 	if (s.Window.UiTab == nil) {
-		return
+		return nil
 	}
 
 	tab := s.Window.UiTab
+	tab.Append(title, custom)
+	return tab
+}
 
-	tab.Append(title, makeWindowTemplate())
+func (s GuiBox) AddBoxTab(title string) *GuiBox {
+	uiTab := s.AddTab2(title, InitBlankWindow())
+
+	var box *GuiBox
+	box = HardBox(s.Window, Xaxis, "jcarrAddBoxTab")
+	box.Window.UiTab = uiTab
+        return box
+
+}
+
+func (s GuiBox) AddDemoTab(title string) {
+	s.AddTab(title, makeWindowTemplate())
 }
 
 // Note: every mouse click is handled
diff --git a/window.go b/window.go
index 7c0250d..2bd9291 100644
--- a/window.go
+++ b/window.go
@@ -204,6 +204,11 @@ func CreateBlankWindow(title string, x int, y int) *GuiBox {
 	newGuiWindow.Name       = title
 	newGuiWindow.UiWindow   = window
 
+	newGuiWindow.BoxMap     = make(map[string]*GuiBox)
+        newGuiWindow.EntryMap   = make(map[string]*GuiEntry)
+
+	Data.WindowMap[newGuiWindow.Name]    = &newGuiWindow
+
 	var box GuiBox
 	box.Window = &newGuiWindow