diff --git a/tracks/app/controllers/todo_controller.rb b/tracks/app/controllers/todo_controller.rb
index 7a9b98b2..9f1ea15b 100644
--- a/tracks/app/controllers/todo_controller.rb
+++ b/tracks/app/controllers/todo_controller.rb
@@ -25,9 +25,27 @@ class TodoController < ApplicationController
 	#
   def completed
     @page_title = "Completed tasks"
-    @done = Todo.find_all( "done=1", "completed DESC" )
+    today_query = "DATE_SUB(CURDATE(),INTERVAL 1 DAY) <= completed"
+    week_query = "DATE_SUB(CURDATE(),INTERVAL 2 DAY) >= completed 
+                  AND DATE_SUB(CURDATE(),INTERVAL 7 DAY) <= completed"
+    month_query = "DATE_SUB(CURDATE(),INTERVAL 8 DAY) >= completed 
+                  AND DATE_SUB(CURDATE(),INTERVAL 31 DAY) <= completed"
+    @done_today = Todo.find_by_sql( "SELECT * FROM todos WHERE done = 1 AND #{today_query} 
+                  ORDER BY completed DESC;" )
+    @done_this_week = Todo.find_by_sql( "SELECT * FROM todos WHERE done = 1 AND #{week_query} 
+                  ORDER BY completed DESC;" )
+    @done_this_month = Todo.find_by_sql( "SELECT * FROM todos WHERE done = 1 AND #{month_query}     
+                  ORDER BY completed DESC;" )
   end
   
+  # Archived completed items, older than 31 days
+	#
+  def completed_archive
+    @page_title = "Archived completed tasks"
+    archive_query = "DATE_SUB(CURDATE(),INTERVAL 32 DAY) >= completed"
+    @done_archive = Todo.find_by_sql( "SELECT * FROM todos WHERE done = 1 AND #{archive_query} 
+                  ORDER BY completed DESC;" )
+  end
 	
 	# Called by a form button
 	# Parameters from form fields should be passed to create new item
diff --git a/tracks/app/helpers/todo_helper.rb b/tracks/app/helpers/todo_helper.rb
index bd33f44f..07404715 100644
--- a/tracks/app/helpers/todo_helper.rb
+++ b/tracks/app/helpers/todo_helper.rb
@@ -12,4 +12,5 @@ module TodoHelper
 	  return count
 	end
 	
+	
 end
diff --git a/tracks/app/views/todo/completed.rhtml b/tracks/app/views/todo/completed.rhtml
index 581ac05e..9d8ba71c 100644
--- a/tracks/app/views/todo/completed.rhtml
+++ b/tracks/app/views/todo/completed.rhtml
@@ -1,10 +1,26 @@
 <div id="display_box_projects">
 
+<p>You have completed <%= @done_today.length %> actions so far today.</p>
 <div class="contexts">
-  <h2>Completed items</h2>
+  <h2>Completed today</h2>
   <table class="next_actions" cellspacing="5" cellpadding="0" border="0">
-    <%= render_collection_of_partials "done", @done %>
+    <%= render_collection_of_partials "done", @done_today %>
   </table>
 </div>
 
+<div class="contexts">
+  <h2>Completed in last 7 days</h2>
+  <table class="next_actions" cellspacing="5" cellpadding="0" border="0">
+    <%= render_collection_of_partials "done", @done_this_week %>
+  </table>
+</div>
+
+<div class="contexts"
+  <h2>Completed in the last 31 days</h2>
+  <table class="next_actions" cellspacing="5" cellpadding="0" border="0">
+    <%= render_collection_of_partials "done", @done_this_month %>
+  </table>
+</div>
+
+<p>Older completed items: <%= link_to( "Older than 31 days", :controller => "todo", :action => "completed_archive" ) %></p>
 </div><!- End of display_box -->
diff --git a/tracks/app/views/todo/completed_archive.rhtml b/tracks/app/views/todo/completed_archive.rhtml
new file mode 100644
index 00000000..15643012
--- /dev/null
+++ b/tracks/app/views/todo/completed_archive.rhtml
@@ -0,0 +1,11 @@
+<div id="display_box_projects">
+
+<p>There are <%= @done_archive.length %> completed actions in the archive.</p>
+<div class="contexts">
+  <h2>Completed more than 31 days ago</h2>
+  <table class="next_actions" cellspacing="5" cellpadding="0" border="0">
+    <%= render_collection_of_partials "done", @done_archive %>
+  </table>
+</div>
+
+</div><!- End of display_box -->
diff --git a/tracks/doc/CHANGENOTES.txt b/tracks/doc/CHANGENOTES.txt
index fee53359..4eb4d952 100644
--- a/tracks/doc/CHANGENOTES.txt
+++ b/tracks/doc/CHANGENOTES.txt
@@ -16,6 +16,9 @@ Project wiki: <http://www.rousette.org.uk/projects/wiki/>
 7. Changed the method of adding due dates to drop-down option lists. It's more obvious and less error prone than typing in the date. Your preferences for date formatting are still honoured when displaying due dates.
 8. Added a favicon, kindly produced by Jim Ray.
 9. Added border="0" to the button images to stop Firefox putting a red border around them.
+10. Added a new path:, base: setting in settings.yml. This is used in constructing URLs in standard.rhtml and other places for the javascripts and stylesheets. You need to specify it in the format,
+  http://my.domain.tld/subdir/tracks
+or whatever the full URL is. This should help people who put Tracks in a subdirectory.
 
 ## Version 1.01