--- a/Commands/Debug - Delete All Breakpoints.tmCommand	
+++ b/Commands/Debug - Delete All Breakpoints.tmCommand	
@@ -11,17 +11,16 @@ require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/ruby_amp.rb"
 
 d = RubyAMP::RemoteDebugger.new
 
-count_breakpoints = d.evaluate("Debugger.breakpoints.length", :control)
+count_breakpoints = d.breakpoint.list.length
 if count_breakpoints == 0
   puts "There are no breakpoints set"
   exit
 end
 
-d.evaluate("Debugger.breakpoints.map{ |b| b.id }.each { |b_id| Debugger.remove_breakpoint(b_id) }", :control)
+count_deleted = d.breakpoint.delete_all
 
-new_count_breakpoints = d.evaluate("Debugger.breakpoints.length", :control)
-if new_count_breakpoints == 0
-  puts "Deleted all #{count_breakpoints} breakpoint(s)"
+if count_deleted == count_breakpoints
+  puts "Deleted all #{count_deleted} breakpoint(s)"
 else
   puts "Error deleting breakpoints."
 end</string>

--- a/Commands/Debug - Set Breakpoint at Current Line.tmCommand	
+++ b/Commands/Debug - Set Breakpoint at Current Line.tmCommand	
@@ -12,17 +12,14 @@ require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/ruby_amp.rb"
 d = RubyAMP::RemoteDebugger.new
 exit unless d.connected?
 
-result = d.evaluate <<-EOF, :control
-  bp = Debugger.add_breakpoint #{ENV['TM_FILEPATH'].to_s.inspect}, #{ENV['TM_LINE_NUMBER']}
-  if bp
-    "Set breakpoint at \#{bp.source}:\#{bp.pos}"
-  else
-    "Failed to set breakpoint."
-  end
-EOF
+source = ENV['TM_FILEPATH']
+line = ENV['TM_LINE_NUMBER']
 
-puts result
-</string>
+if d.breakpoint.add(source, line)
+  puts "Set breakpoint at #{source}:#{line}"
+else
+  puts "Failed to set breakpoint."
+end</string>
 	<key>fallbackInput</key>
 	<string>line</string>
 	<key>input</key>

--- a/Commands/Debug - Show Breakpoints Menu.tmCommand	
+++ b/Commands/Debug - Show Breakpoints Menu.tmCommand	
@@ -16,19 +16,19 @@ require "#{ENV["TM_BUNDLE_SUPPORT"]}/lib/ruby_tm_helpers.rb"
 require "#{ENV['TM_SUPPORT_PATH']}/lib/ui.rb"
 
 d = RubyAMP::RemoteDebugger.new
-breakpoints = d.evaluate("Debugger.breakpoints.map{|b| {:source => b.source, :line => b.pos} }", :control)
+breakpoints = d.breakpoint.list
 
 if breakpoints.empty?
   puts "No breakpoints"
   exit_show_tool_tip
 end
 
-b_index = TextMate::UI.menu(breakpoints.map{|b| "#{b[:source]}:#{b[:line]}"})
+b_index = TextMate::UI.menu(breakpoints.map{|b| "#{b.source}:#{b.line}"})
 
 exit_discard if b_index.nil?
 
 breakpoint = breakpoints[b_index]
-tm_open(breakpoint[:source], :line =&gt; breakpoint[:line])</string>
+tm_open(breakpoint.source, :line =&gt; breakpoint.line)</string>
 	<key>input</key>
 	<string>none</string>
 	<key>keyEquivalent</key>

--- a/Support/lib/ruby_amp/remote_debugger.rb
+++ b/Support/lib/ruby_amp/remote_debugger.rb
@@ -116,6 +116,26 @@ module RubyAMP
         raw_evaluate(expression)
       end
     end
+    
+    AUTO_LOAD = {
+      :BreakpointCommander  => 'breakpoint_commander.rb',
+      :CommanderBase        => 'commander_base.rb',
+    }
+
+    def self.const_missing(name)
+      @looked_for ||= {}
+      raise "Class not found: #{name}" if @looked_for[name]
+
+      return super unless AUTO_LOAD[name]
+      @looked_for[name] = true
+
+      require File.join(RUBYAMP_ROOT, "remote_debugger", AUTO_LOAD[name])
+      const_get(name)
+    end
+    
+    def breakpoint
+      @breakpoint ||= BreakpointCommander.new(self)
+    end
   end
 end
 

--- /dev/null
+++ b/Support/lib/ruby_amp/remote_debugger/breakpoint_commander.rb
@@ -0,0 +1,40 @@
+module RubyAMP
+  class RemoteDebugger
+    class BreakpointCommander < CommanderBase
+      def list
+        base.evaluate("Debugger.breakpoints.map{|b| {:id => b.id, :source => b.source, :line => b.pos} }", :control).map do |bp_options|
+          Breakpoint.new(base, self, bp_options)
+        end
+      end
+      
+      def delete_all
+        base.evaluate <<-EOF, :control
+          breakpoint_ids = Debugger.breakpoints.map { |b| b.id }
+          begin
+            breakpoint_ids.each { |b_id| Debugger.remove_breakpoint(b_id) }
+            breakpoint_ids.length
+          rescue
+            0
+          end
+        EOF
+      end
+      
+      def add(source, line)
+        base.evaluate <<-EOF, :control
+          bp = Debugger.add_breakpoint #{ENV['TM_FILEPATH'].to_s.inspect}, #{ENV['TM_LINE_NUMBER']}
+          bp ? true : false
+        EOF
+      end
+    end
+    
+    class Breakpoint
+      attr_accessor :source, :line, :id
+      
+      def initialize(base, parent, options = {})
+        self.id = options[:id]
+        self.source = options[:source]
+        self.line = options[:line]
+      end
+    end
+  end
+end
\ No newline at end of file

--- /dev/null
+++ b/Support/lib/ruby_amp/remote_debugger/commander_base.rb
@@ -0,0 +1,10 @@
+module RubyAMP
+  class RemoteDebugger
+    class CommanderBase
+      attr_accessor :base
+      def initialize(base)
+        @base = base
+      end
+    end
+  end
+end