diff --git a/code_examples/Reporting2.pm b/code_examples/Reporting2.pm
index 86dc5d0..32495de 100644
--- a/code_examples/Reporting2.pm
+++ b/code_examples/Reporting2.pm
@@ -1,5 +1,13 @@
 package TBB::Reporting2;
 
+{
+'foo',
+'bar',
+}
+
+
+foo();
+
 my $cat = "cat";
 $cat =~ s/cat/dog/g;
 
diff --git a/method.py b/method.py
index 1ea7cfd..15388f4 100644
--- a/method.py
+++ b/method.py
@@ -442,6 +442,19 @@ class DeleteRightWhitespace(Method):
             w.kill(c, p)
 
 # random stuff
+class DumpMarkers(Method):
+    '''Dump all tab markers (tab debugging)'''
+    def _execute(self, w, **vargs):
+        lines = []
+        if w.mode.tabber:
+            for i in range(0, len(w.mode.tabber.lines)):
+                line = w.mode.tabber.lines[i]
+                lines.append("LINE %d: %r" % (i, line))
+                lines.append("    %s" % repr(w.mode.tabber.markers[i]))
+        else:
+            lines.append("no tokens")
+        output = "\n".join(lines)
+        w.application.data_buffer("marker-dump", output, switch_to=True)
 class DumpTokens(Method):
     '''Dump all lexical tokens (syntax highlighting debugging)'''
     def _execute(self, w, **vargs):
@@ -506,15 +519,19 @@ class InsertTab(Method):
     '''Insert tab into buffer, or tabbify line, depending on mode'''
     def _execute(self, w, **vargs):
         cursor = w.logical_cursor()
-        #i = w.mode.get_indentation_level(cursor.y)
-        i = None
+        if w.mode.tabber:
+            i = w.mode.tabber.get_level(cursor.y)
+        else:
+            i = None
+
         if i is None:
+            #raise Exception, repr(w.mode.tabber.lines)
             w.insert_string_at_cursor('    ')
         else:
             j = w.buffer.count_leading_whitespace(cursor.y)
             if i != j:
                 KillWhitespace().execute(w)
-                w.insert(Point(0, cursor.y), ' ' * i)
+                w.insert_string(Point(0, cursor.y), ' ' * i * 4)
             else:
                 w.goto(Point(j, cursor.y))
 class KillWhitespace(Method):
@@ -1291,11 +1308,6 @@ class CloseTag(Method):
     closetags = {')': '(', '}': '{', ']': '['}
     mytag     = ')'
     def _execute(self, w, **vargs):
-        # if w.mode doesn't do tag matching, just insert the character return
-        if not w.mode.tag_matching:
-            w.insert_string_at_cursor(self.mytag)
-            return
-
         # first, de-reference some variables and actually do the insertion
         # NOTE: we derence the cursor *before* inserting the character, so it is
         # expecected that the cursor variable should be the point the new
diff --git a/mode.py b/mode.py
index 6eeb634..c8a9957 100644
--- a/mode.py
+++ b/mode.py
@@ -152,7 +152,6 @@ class Fundamental(Handler):
             self.add_binding('insert-string-%s' % c, c)
         
         # initialize some stuff
-        self.tag_matching = False
         self.grammar      = None
         self.lexer        = None
         self.tabber       = None
diff --git a/mode2.py b/mode2.py
index 48232f6..270f99b 100644
--- a/mode2.py
+++ b/mode2.py
@@ -1,10 +1,7 @@
-import os
-import sets, string
-
-import color, default, method, point
+import os, sets, string
+import color, lex2
 
 DEBUG = False
-#DEBUG = True
 
 class Handler:
     def __init__(self):
@@ -58,12 +55,20 @@ class Handler:
 
 class Fundamental(Handler):
     '''This is the default mode'''
+    tabbercls     = None
+    grammar       = None
+    lexer         = None
+    tabber        = None
     def __init__(self, w):
         self.window = w
 
+        # we need to defer this due to curses startup
+        self.default_color = color.pairs('default', 'default')
+        self.colors        = {}
+
         Handler.__init__(self)
 
-        self.bindings = {}
+        # first let's add all the "default" actions
         self.add_bindings('start-of-line', ('C-a', 'HOME',))
         self.add_bindings('end-of-line', ('C-e', 'END',))
         self.add_bindings('backward', ('C-b', 'L_ARROW',))
@@ -136,26 +141,18 @@ class Fundamental(Handler):
         self.add_bindings('cmd-help-buffer', ('M-h',))
         self.add_bindings('set-mode', ('C-x m',))
         self.add_bindings('cancel', ('C-]',))
-        self.add_bindings('close-paren', (')',))
-        self.add_bindings('close-brace', ('}',))
-        self.add_bindings('close-bracket', (']',))
 
-        # create all the insert actions for the character ranges we like
+        # create all the insert actions for the basic text input
         for c in string.letters + string.digits + string.punctuation:
-            # closing tags are handled differently
-            if c == ')' or c == ']' or c == '}':
-                continue
             self.add_binding('insert-string-%s' % c, c)
-        
-        # initialize some stuff
-        self.tag_matching = False
-        self.grammar      = None
-        self.lexer        = None
-        self.tabber       = None
 
-        # initialize the default colors, highlighter, etc.
-        self.default_color = color.pairs('default', 'default')
-        self.colors = {}
+        # lexing for highlighting, etc.
+        if self.grammar:
+            self.lexer = lex2.Lexer(self.name(), self.grammar)
+
+        # tab handling
+        if self.tabbercls:
+            self.tabber = self.tabbercls(self)
 
     # get mode name
     def name(self):
@@ -190,3 +187,10 @@ class Fundamental(Handler):
                 else:
                     err = "%s in mode '%s'" % (e, self.name())
                     self.window.application.set_error(err)
+
+    def region_added(self, p, newlines):
+        if self.tabber is not None:
+            self.tabber.region_added(p, newlines)
+    def region_removed(self, p1, p2):
+        if self.tabber is not None:
+            self.tabber.region_removed(p1, p2)
diff --git a/mode_perl.py b/mode_perl.py
index 0c296b6..5d6df9f 100644
--- a/mode_perl.py
+++ b/mode_perl.py
@@ -1,5 +1,5 @@
 import re, sets, string, sys
-import color, commands, default, lex2, method, mode2, regex
+import color, commands, default, lex2, method, mode2, regex, tab2
 from point2 import Point
 from lex2 import Grammar, ConstantRule, PatternRule, ContextPatternRule, \
     RegionRule, DualRegionRule
@@ -101,13 +101,14 @@ class PerlGrammar(Grammar):
     ]
 
 class Perl(mode2.Fundamental):
+    #tabbercls = tab2.Tabber
+    tabbercls = tab2.StackTabber
+    grammar   = PerlGrammar()
+    opentags  = {'(': ')', '[': ']', '{': '}'}
+    closetags = {')': '(', ']': '[', '}': '{'}
     def __init__(self, w):
         mode2.Fundamental.__init__(self, w)
 
-        self.tag_matching = True
-        self.grammar      = PerlGrammar()
-        self.lexer        = lex2.Lexer(self.name(), self.grammar)
-
         self.add_action_and_bindings(PerlCheckSyntax(), ('C-c s',))
         self.add_action_and_bindings(PerlHashCleanup(), ('C-c h',))
         #self.add_action_and_bindings(PerlHashCleanup2(), ('C-c h',))
diff --git a/mode_python.py b/mode_python.py
index 33c0533..8f9d8d3 100644
--- a/mode_python.py
+++ b/mode_python.py
@@ -121,26 +121,24 @@ class PythonGrammar(Grammar):
     ]
 
 class Python(mode2.Fundamental):
-    grammar = PythonGrammar
-    tabber = tab2.Tabber
+    #tabbercls = tab2.Tabber
+    grammar   = PythonGrammar()
+    opentags  = {'(': ')', '[': ']', '{': '}'}
+    closetags = {')': '(', ']': '[', '}': '{'}
     def __init__(self, w):
         mode2.Fundamental.__init__(self, w)
 
-        self.tag_matching = True
-        self.grammar      = PythonGrammar()
-        self.lexer        = lex2.Lexer(self.name(), self.grammar)
-
+        # add python-specific methods
         self.add_action_and_bindings(PythonCheckSyntax(), ('C-c s',))
         self.add_action_and_bindings(PythonDictCleanup(), ('C-c h',))
         self.add_action_and_bindings(PythonUpdateTags(), ('C-c t',))
         self.add_action_and_bindings(PythonTagComplete(), ('C-c k',))
 
+        # we want to do these kinds of tag matching
         self.add_bindings('close-paren', (')',))
         self.add_bindings('close-brace', ('}',))
         self.add_bindings('close-bracket', (']',))
 
-        self.default_color = color.build('default', 'default')
-
         self.colors = {
             'keyword':     color.build('cyan', 'default'),
             'reserved':    color.build('cyan', 'default'),
@@ -155,9 +153,6 @@ class Python(mode2.Fundamental):
             'string.format':  color.build('yellow', 'default'),
             'string.end':     color.build('green', 'default'),
     
-            #'integer':   color.build('red', 'default'),
-            #'float':     color.build('red', 'default'),
-            #'imaginary': color.build('red', 'default'),
             'integer':   color.build('default', 'default'),
             'float':     color.build('default', 'default'),
             'imaginary': color.build('default', 'default'),
@@ -172,37 +167,9 @@ class Python(mode2.Fundamental):
     
             'comment':           color.build('red', 'default'),
             'continuation':      color.build('red', 'default'),
-            #'operator':         color.build('yellow', 'default'),
-            #'delimiter':        color.build('magenta', 'default'),
             'system_identifier': color.build('cyan', 'default'),
-            #'bound method':     color.build(color.build('yellow', 'default'), 'default'),
-            'import':  color.build('magenta', 'default'),
-            #'bizzaro':          color.build('magenta', 'default'),
         }
 
-#        self.colors = {
-#            'keyword'            : color.build('cyan', 'default', 'bold'),
-#            'pseudo-keyword'     : color.build('cyan', 'default', 'bold'),
-#            'built-in method'    : color.build('cyan', 'default', 'bold'),
-#            'method declaration' : color.build('blue', 'default', 'bold'),
-#            'class declaration'  : color.build('green', 'default'),
-#            'string4'            : color.build('green', 'default'),
-#            'string3'            : color.build('green', 'default'),
-#            'string2'            : color.build('green', 'default'),
-#            'string1'            : color.build('green', 'default'),
-#            'comment'            : color.build('red', 'default'),
-#            'continuation'       : color.build('red', 'default'),
-#            #'operator'          : color.build('yellow', 'default'),
-#            #'delimiter'         : color.build('magenta', 'default'),
-#            'system_identifier'  : color.build('cyan', 'default', 'bold'),
-#            #'bound method'      : color.build('yellow', 'default'),
-#            'import statement'   : color.build('magenta', 'green'),
-#            'bizzaro'            : color.build('magenta', 'green'),
-#        }
-
-        #self.tabber = tab_python.PythonTabber(self)
-        #self.ctagger = ctag_python.PythonCTagger()
-
     def name(self):
         return "Python"
 
@@ -248,7 +215,6 @@ class PythonTagComplete(method.Method):
         start  = cursor.x
 
         word_chars = string.letters + string.digits + '_'
-        #word_chars = string.letters + string.digits + string.punctuation
         if start == 0:
             w.application.set_error('walrus 1')
             return
diff --git a/window2.py b/window2.py
index 5c25cc4..1d8e2f7 100644
--- a/window2.py
+++ b/window2.py
@@ -152,6 +152,7 @@ class Window(object):
                 self.cursor = Point(len(newlines[-1]) + x - p.x, y + l - 1)
         elif y == p.y and x >= p.x:
             self.cursor = Point(x + len(newlines[0]), y)
+        self.mode.region_added(p, newlines)
         self.assure_visible_cursor()
 
     # region removed
@@ -166,6 +167,7 @@ class Window(object):
             self.cursor = Point(self.cursor.x - p2.x + p1.x, p1.y)
         else:
             self.cursor = Point(self.cursor.x, self.cursor.y - p2.y + p1.y)
+        self.mode.region_removed(p1, p2)
         self.assure_visible_cursor()
 
     def point_is_visible(self, p):