--- a/Support/app/controllers/commit_controller.rb
+++ b/Support/app/controllers/commit_controller.rb
@@ -1,5 +1,5 @@
 CW = ENV['TM_SUPPORT_PATH'] + '/bin/CommitWindow.app/Contents/MacOS/CommitWindow'
-
+require LIB_ROOT + '/partial_commit_worker.rb'
 class CommitController < ApplicationController
   def index
     if git.merge_message
@@ -23,68 +23,21 @@ class CommitController < ApplicationController
   end
   
   protected
-    
-    def ok_to_proceed_with_partial_commit?
-      (! git.branch.current_name.nil?) || git.initial_commit_pending?
-    end
-    
     def run_partial_commit
-      @base = git.git_base
-      
-      unless ok_to_proceed_with_partial_commit?
-        render "not_on_a_branch"
-        return false
-      end
-      
-      target_file_or_dir = git.paths.first
-      
-      puts "<h1>"
-      if params[:type] == "amend"
-        puts "Amending the commit"
-      else
-        puts "Committing Files"
-      end
-      puts " in ‘#{htmlize(shorten(target_file_or_dir, ENV['TM_PROJECT_DIRECTORY'] || @base))}’ on branch ‘#{htmlize(git.branch.current_name)}’</h1>"
+      puts "<h2>#{commit_worker.title}</h2>"
       flush
-
-      files, statuses = [], []
-      git.status(target_file_or_dir).each do |e|
-        files  << e_sh(shorten(e[:path], @base))
-        statuses << e_sh(e[:status][:short])
-      end
-      
-      if files.empty?
-        puts (git.clean_directory? ? "Working directory is clean (nothing to commit)" : "No changes to commit within the current scope. (Try selecting the root folder in the project drawer?)")
-        return
-      end
-      
-      msg, files = show_commit_dialog(files, statuses)
-
-      unless files.empty?
-        git.auto_add_rm(files)
-        res = git.commit(msg, files, :amend => (params[:type] == "amend"))
-        render "_commit_result", :locals => { :files => files, :message => msg, :result => res}
-      end
+      result = commit_worker.run
+      render "_commit_result", :locals => result if result
+    rescue PartialCommitWorker::NotOnBranchException
+      render "not_on_a_branch"
+      false
+    rescue PartialCommitWorker::NothingToCommitException
+      puts(git.clean_directory? ? "Working directory is clean (nothing to commit)" : "No changes to commit within the current scope. (Try selecting the root folder in the project drawer?)")
+    rescue PartialCommitWorker::CommitCanceledException
+      puts "<strong>Canceled</strong>"
     end
     
-    def show_commit_dialog(files, statuses)
-      status_helper_tool = ENV['TM_BUNDLE_SUPPORT'] + '/gateway/commit_dialog_helper.rb'
-      
-      res = %x{#{e_sh CW}                 \
-        --diff-cmd   '#{git.git},diff'        \
-        --action-cmd "M,D:Revert,#{status_helper_tool},revert" \
-        --status #{statuses.join ':'}       \
-        #{files.join ' '} 2>/dev/console
-      }
-
-      if $? != 0
-        puts "<strong>Cancel</strong>"
-        abort
-      end
-
-      res   = Shellwords.shellwords(res)
-      msg = res[1]
-      files = res[2..-1]
-      return msg, files
+    def commit_worker
+      @commit_worker ||= PartialCommitWorker.factory(params[:type], git)
     end
 end
\ No newline at end of file

--- /dev/null
+++ b/Support/lib/partial_commit_worker.rb
@@ -0,0 +1,93 @@
+module PartialCommitWorker
+  class NotOnBranchException < Exception; end
+  class NothingToCommitException < Exception; end
+  class CommitCanceledException < Exception; end
+  
+  def self.factory(_type, *args)
+    klass = case _type
+    when "amend" then
+      PartialCommitWorker::Amend
+    else
+      PartialCommitWorker::Normal
+    end
+    
+    klass.new(*args)
+  end
+  
+  class Base
+    attr_reader :git
+    
+    def initialize(git)
+      @git = git
+      @base = git.git_base
+    end
+  
+    def ok_to_proceed_with_partial_commit?
+      (! git.branch.current_name.nil?) || git.initial_commit_pending?
+    end
+    
+    def target_file_or_dir
+      @target_file_or_dir ||= git.paths.first
+    end
+    
+    def show_commit_dialog(files, statuses)
+      status_helper_tool = ENV['TM_BUNDLE_SUPPORT'] + '/gateway/commit_dialog_helper.rb'
+      
+      res = %x{#{e_sh CW}                 \
+        --diff-cmd   '#{git.git},diff'        \
+        --action-cmd "M,D:Revert,#{status_helper_tool},revert" \
+        --status #{statuses.join ':'}       \
+        #{files.join ' '} 2>/dev/console
+      }
+
+      raise CommitCanceledException if $? != 0
+
+      res   = Shellwords.shellwords(res)
+      msg = res[1]
+      files = res[2..-1]
+      return msg, files
+    end
+    
+    def run
+      raise NotOnBranchException unless ok_to_proceed_with_partial_commit?
+      
+      files, statuses = [], []
+      git.status(target_file_or_dir).each do |e|
+        files  << e_sh(shorten(e[:path], @base))
+        statuses << e_sh(e[:status][:short])
+      end
+      
+      raise NothingToCommitException if files.empty?
+    
+      msg, files = show_commit_dialog(files, statuses)
+
+      git.auto_add_rm(files)
+      res = git.commit(msg, files, :amend => amend)
+      { :files => files, :message => msg, :result => res}
+    end
+    
+    def title
+      "#{title_prefix} in ‘#{htmlize(shorten(target_file_or_dir, ENV['TM_PROJECT_DIRECTORY'] || @base))}’ on branch ‘#{htmlize(git.branch.current_name)}’"
+    end
+  end
+  
+  class Normal < Base
+    def title_prefix
+      "Committing Files"
+    end
+    
+    def amend
+      false
+    end
+  end
+  
+  class Amend < Base
+    def title_prefix
+      "Amending the commit"
+    end
+    
+    def amend
+      true
+    end
+  end
+end

--- a/Support/spec/controllers/commit_controller_spec.rb
+++ b/Support/spec/controllers/commit_controller_spec.rb
@@ -16,7 +16,8 @@ describe CommitController do
     before(:each) do
       @message = "My commit message"
       @git.should_receive(:merge_message).and_return(nil)
-      @controller.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
+      @worker = PartialCommitWorker::Normal.singleton_new(@git)
+      @worker.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
       
       @git.should_receive(:commit).
         with("My commit message", ["file1.txt", "file2.txt"], :amend => false).
@@ -45,11 +46,12 @@ describe CommitController do
     end
   end
   
-  describe "Ammend commit" do
+  describe "Amend commit" do
     before(:each) do
       @message = "My commit message"
       @git.should_receive(:merge_message).and_return(nil)
-      @controller.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
+      @worker = PartialCommitWorker::Amend.singleton_new(@git)
+      @worker.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
       
       @git.should_receive(:commit).
         with("My commit message", ["file1.txt", "file2.txt"], :amend => true).
@@ -83,20 +85,6 @@ describe CommitController do
     end
   end
   
-  it "should NOT be OK to proceed when not on a branch but performing an initial commit" do
-    @git.branch.should_receive(:current_name).and_return(nil)
-    @git.should_receive(:initial_commit_pending?).and_return(false)
-    
-    @controller.send(:ok_to_proceed_with_partial_commit?).should == false
-  end
-  
-  it "should be OK to proceed when not on a branch but performing an initial commit" do
-    @git.branch.should_receive(:current_name).and_return(nil)
-    @git.should_receive(:initial_commit_pending?).and_return(true)
-    
-    @controller.send(:ok_to_proceed_with_partial_commit?).should == true
-  end
-  
   describe "when in the middle of a merge" do
     it "should run the mege dialog" do
       @merge_message = "Merged some branch into another branch..."

--- /dev/null
+++ b/Support/spec/lib/partial_commit_worker_spec.rb
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require LIB_ROOT + "/partial_commit_worker"
+
+describe PartialCommitWorker do
+  before(:each) do
+    @git = Git.singleton_new
+  end
+  
+  it "should NOT be OK to proceed when not on a branch but performing an initial commit" do
+    @git.branch.should_receive(:current_name).and_return(nil)
+    @git.should_receive(:initial_commit_pending?).and_return(false)
+    PartialCommitWorker::Base.new(@git).ok_to_proceed_with_partial_commit?.should == false
+  end
+  
+  it "should be OK to proceed when not on a branch but performing an initial commit" do
+    @git.branch.should_receive(:current_name).and_return(nil)
+    @git.should_receive(:initial_commit_pending?).and_return(true)
+    PartialCommitWorker::Base.new(@git).ok_to_proceed_with_partial_commit?.should == true
+  end
+end

--- a/Support/tmvc/lib/application_controller.rb
+++ b/Support/tmvc/lib/application_controller.rb
@@ -53,6 +53,7 @@ class ApplicationController
   
   def initialize
     @output_buffer = StringIO.new
+    @params = {}
   end
   
   def puts(*args)