diff --git a/docs/examples/core/ipy.vim b/docs/examples/core/ipy.vim
index cb05cf5..f3a46af 100644
--- a/docs/examples/core/ipy.vim
+++ b/docs/examples/core/ipy.vim
@@ -7,7 +7,9 @@ endif
 python import socket
 python import os
 python import vim
+python from IPython.Debugger import Pdb
 python IPYSERVER = None
+python reselect = True
 
 python << EOF
 # do we have a connection to the ipython instance?
@@ -47,6 +49,70 @@ def run_this_file():
         send('run %s' % (vim.current.buffer.name,))
     else:
         raise Exception, "Not connected to an IPython server"
+    print "\'run %s\' sent to ipython" % vim.current.buffer.name
+
+def run_this_line():
+    if check_server():
+        send(vim.current.line)
+        print "line \'%s\' sent to ipython"% vim.current.line
+    else:
+        raise Exception, "Not connected to an IPython server"
+
+def run_these_lines():
+    r = vim.current.range
+    if check_server():
+        #send(str((vim.current.range.start,vim.current.range.end)))
+        for l in vim.current.buffer[r.start:r.end+1]:
+            send(str(l)+'\n')
+            #send(str(vim.current.buffer[vim.current.range.start:vim.current.range.end]).join("\n"))
+        #print "lines %d-%d sent to ipython"% (r.start,r.end)
+    else:
+        raise Exception, "Not connected to an IPython server"
+    
+    #reselect the previously highlighted block
+    if reselect:
+        vim.command("normal gv")
+    #vim lines start with 1
+    print "lines %d-%d sent to ipython"% (r.start+1,r.end+1)
+
+def toggle_reselect():
+    global reselect
+    reselect=not reselect
+    print "F9 will%sreselect lines after sending to ipython"% (reselect and " " or " not ")
+
+def set_breakpoint():
+    if check_server():
+        send("__IP.InteractiveTB.pdb.set_break('%s',%d)" % (vim.current.buffer.name,
+                                                            vim.current.window.cursor[0]))
+        print "set breakpoint in %s:%d"% (vim.current.buffer.name, 
+                                          vim.current.window.cursor[0])
+    else:
+        raise Exception, "Not connected to an IPython server"
+    
+def clear_breakpoint():
+    if check_server():
+        send("__IP.InteractiveTB.pdb.clear_break('%s',%d)" % (vim.current.buffer.name,
+                                                              vim.current.window.cursor[0]))
+        print "clearing breakpoint in %s:%d" % (vim.current.buffer.name,
+                                                vim.current.window.cursor[0])
+    else:
+        raise Exception, "Not connected to an IPython server"
+
+def clear_all_breakpoints():
+    if check_server():
+        send("__IP.InteractiveTB.pdb.clear_all_breaks()");
+        print "clearing all breakpoints"
+    else:
+        raise Exception, "Not connected to an IPython server"
+
+def run_this_file_pdb():
+    if check_server():
+        send(' __IP.InteractiveTB.pdb.run(\'execfile("%s")\')' % (vim.current.buffer.name,))
+    else:
+        raise Exception, "Not connected to an IPython server"
+    print "\'run %s\' using pdb sent to ipython" % vim.current.buffer.name
+
+    #XXX: have IPYSERVER print the prompt (look at Leo example)
 EOF
 
 fun! <SID>toggle_send_on_save()
@@ -62,6 +128,16 @@ fun! <SID>toggle_send_on_save()
 endfun
 
 map <silent> <F5> :python run_this_file()<CR>
-imap <silent> <C-F5> <ESC><F5>a
-map <F7> :call <SID>toggle_send_on_save()<CR>
+map <silent> <S-F5> :python run_this_line()<CR>
+map <silent> <F9> :python run_these_lines()<CR>
+map <silent> <S-F9> :python toggle_reselect()<CR>
+map <silent> <C-F6> :python send('%pdb')<CR>
+map <silent> <F6> :python set_breakpoint()<CR>
+map <silent> <s-F6> :python clear_breakpoint()<CR>
+map <silent> <F7> :python run_this_file_pdb()<CR>
+map <silent> <s-F7> :python clear_all_breaks()<CR>
+imap <C-F5> <ESC><F5>a
+imap <S-F5> <ESC><S-F5>a
+imap <silent> <F5> <ESC><F5>a
+map <C-F5> :call <SID>toggle_send_on_save()<CR>
 py connect()