diff --git a/Tools/idle/Debugger.py b/Tools/idle/Debugger.py
index e83a29b..80b8e8e 100644
--- a/Tools/idle/Debugger.py
+++ b/Tools/idle/Debugger.py
@@ -3,6 +3,8 @@
 import traceback
 from Tkinter import *
 
+import StackViewer
+
 
 class Debugger(bdb.Bdb):
     
@@ -85,6 +87,13 @@
         self.status.pack(anchor="w")
         self.error = Label(top, anchor="w")
         self.error.pack(anchor="w")
+        #
+        self.fstack = Frame(top, height=1)
+        self.fstack.pack(expand=1, fill="both")
+        self.flocals = Frame(top)
+        self.flocals.pack(expand=1, fill="both")
+        self.fglobals = Frame(top, height=1)
+        self.fglobals.pack(expand=1, fill="both")
     
     def interaction(self, frame, info=None):
         self.frame = frame
@@ -115,6 +124,15 @@
         if sv:
             stack, i = self.get_stack(self.frame, tb)
             sv.load_stack(stack, i)
+        lv = self.localsviewer
+        gv = self.globalsviewer
+        if lv:
+            if not gv or self.frame.f_locals is not self.frame.f_globals:
+                lv.load_dict(self.frame.f_locals)
+            else:
+                lv.load_dict(None)
+        if gv:
+            gv.load_dict(self.frame.f_globals)
         if self.vsource.get():
             self.sync_source_line()
         for b in self.buttons:
@@ -159,9 +177,8 @@
 
     def show_stack(self):
         if not self.stackviewer and self.vstack.get():
-            import StackViewer
             self.stackviewer = sv = StackViewer.StackViewer(
-                self.top, self.flist, self)
+                self.fstack, self.flist, self)
             if self.frame:
                 stack, i = self.get_stack(self.frame, None)
                 sv.load_stack(stack, i)
@@ -170,16 +187,37 @@
             if sv and not self.vstack.get():
                 self.stackviewer = None
                 sv.close()
+            self.fstack['height'] = 1
     
     def show_source(self):
         if self.vsource.get():
             self.sync_source_line()
 
     def show_frame(self, (frame, lineno)):
-        print frame, lineno
+        pass
+
+    localsviewer = None
 
     def show_locals(self):
-        pass
-    
+        lv = self.localsviewer
+        if not lv and self.vlocals.get():
+            self.localsviewer = lv = StackViewer.NamespaceViewer(
+                self.flocals, "Locals")
+            if self.frame:
+                lv.load_dict(self.frame.f_locals)
+        elif lv and not self.vlocals.get():
+            self.localsviewer = None
+            lv.close()
+
+    globalsviewer = None
+
     def show_globals(self):
-        pass
+        lv = self.globalsviewer
+        if not lv and self.vglobals.get():
+            self.globalsviewer = lv = StackViewer.NamespaceViewer(
+                self.fglobals, "Locals")
+            if self.frame:
+                lv.load_dict(self.frame.f_globals)
+        elif lv and not self.vglobals.get():
+            self.globalsviewer = None
+            lv.close()
diff --git a/Tools/idle/StackViewer.py b/Tools/idle/StackViewer.py
index 878d5fc..71014d9 100644
--- a/Tools/idle/StackViewer.py
+++ b/Tools/idle/StackViewer.py
@@ -107,7 +107,8 @@
 ##        else:
 ##            l["height"] = len(stack)
 ##            self.topframe.pack(expand=0)
-        for frame, lineno in stack:
+        for i in range(len(stack)):
+            frame, lineno = stack[i]
             try:
                 modname = frame.f_globals["__name__"]
             except:
@@ -122,6 +123,8 @@
             else:
                 item = "%s.%s(), line %d: %s" % (modname, funcname,
                                                  lineno, sourceline)
+            if i == index:
+                item = "> " + item
             self.append(item)
         if index is not None:
             self.select(index)
@@ -189,20 +192,24 @@
 
 class NamespaceViewer:
     
-    def __init__(self, master, title, dict):
+    def __init__(self, master, title, dict=None):
         width = 0
-        height = 20*len(dict) # XXX 20 == observed height of Entry widget
+        height = 40
+        if dict:
+            height = 20*len(dict) # XXX 20 == observed height of Entry widget
         self.master = master
         self.title = title
         self.dict = dict
         self.repr = Repr()
         self.repr.maxstring = 60
         self.repr.maxother = 60
-        self.label = Label(master, text=title, borderwidth=2, relief="groove")
+        self.frame = frame = Frame(master)
+        self.frame.pack(expand=1, fill="both")
+        self.label = Label(frame, text=title, borderwidth=2, relief="groove")
         self.label.pack(fill="x")
-        self.vbar = vbar = Scrollbar(master, name="vbar")
+        self.vbar = vbar = Scrollbar(frame, name="vbar")
         vbar.pack(side="right", fill="y")
-        self.canvas = canvas = Canvas(master,
+        self.canvas = canvas = Canvas(frame,
                                       height=min(300, max(40, height)),
                                       scrollregion=(0, 0, width, height))
         canvas.pack(side="left", fill="both", expand=1)
@@ -210,34 +217,43 @@
         canvas["yscrollcommand"] = vbar.set
         self.subframe = subframe = Frame(canvas)
         self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw")
-        names = dict.keys()
-        names.sort()
-        row = 0
-        for name in names:
-            value = dict[name]
-            svalue = self.repr.repr(value) # repr(value)
-            l = Label(subframe, text=name)
-            l.grid(row=row, column=0, sticky="nw")
-##            l = Label(subframe, text=svalue, justify="l", wraplength=300)
-            l = Entry(subframe, width=0, borderwidth=0)
-            l.insert(0, svalue)
-##            l["state"] = "disabled"
-            l.grid(row=row, column=1, sticky="nw")
-            row = row+1
+        self.load_dict(dict)
+    
+    def load_dict(self, dict):
+        subframe = self.subframe
+        frame = self.frame
+        for c in subframe.children.values():
+            c.destroy()
+        if not dict:
+            l = Label(subframe, text="None")
+            l.grid(row=0, column=0)
+        else:
+            names = dict.keys()
+            names.sort()
+            row = 0
+            for name in names:
+                value = dict[name]
+                svalue = self.repr.repr(value) # repr(value)
+                l = Label(subframe, text=name)
+                l.grid(row=row, column=0, sticky="nw")
+    ##            l = Label(subframe, text=svalue, justify="l", wraplength=300)
+                l = Entry(subframe, width=0, borderwidth=0)
+                l.insert(0, svalue)
+    ##            l["state"] = "disabled"
+                l.grid(row=row, column=1, sticky="nw")
+                row = row+1
+        # XXX Could we use a <Configure> callback for the following?
         subframe.update_idletasks() # Alas!
         width = subframe.winfo_reqwidth()
         height = subframe.winfo_reqheight()
-        canvas["scrollregion"] = (0, 0, width, height)
-##        if height > 300:
-##            canvas["height"] = 300
-##            master.pack(expand=1)
-##        else:
-##            canvas["height"] = height
-##            master.pack(expand=0)
+        canvas = self.canvas
+        self.canvas["scrollregion"] = (0, 0, width, height)
+        if height > 300:
+            canvas["height"] = 300
+            frame.pack(expand=1)
+        else:
+            canvas["height"] = height
+            frame.pack(expand=0)
 
     def close(self):
-        for c in self.subframe, self.label, self.vbar, self.canvas:
-            try:
-                c.destroy()
-            except:
-                pass
+        self.frame.destroy()