diff --git a/tracks/app/views/project/_project_form.rhtml b/tracks/app/views/project/_project_form.rhtml
index e9f818d0..adcaba7c 100644
--- a/tracks/app/views/project/_project_form.rhtml
+++ b/tracks/app/views/project/_project_form.rhtml
@@ -6,9 +6,17 @@
   <%= @project.position %>
 </div>
 <div class="data">
-<label for="project_name">Name</label>
-<%= text_field 'project', 'name', :class => 'project-name'  %>
+<p>
 <label for="project_done">Project done?</label>
 <%= check_box 'project', 'done', :class => 'project-done' %>
+</p>
+<p>
+<label for="project_name">Name:</label><br>
+<%= text_field 'project', 'name', :class => 'project-name'  %>
+</p>
+<p>
+<label for="project_description">Description (optional):</label><br>
+<%= text_area 'project', 'description', "cols" => 30, "rows" => 4, :class => 'project-description'  %>
+</p>
 </div>
 <% @project = nil %>
\ No newline at end of file
diff --git a/tracks/app/views/project/_project_listing.rhtml b/tracks/app/views/project/_project_listing.rhtml
index 9607b23b..dcb9762e 100644
--- a/tracks/app/views/project/_project_listing.rhtml
+++ b/tracks/app/views/project/_project_listing.rhtml
@@ -38,7 +38,7 @@
 </div><!-- [end:project-project.id-display] -->
 <div id="project-<%= project.id %>-edit-form" class="edit-form" style="display:none;">
 <%= form_remote_tag  :url => { :controller => 'project', :action => 'update', :id => project.id },
-               :html => { :id => "form-project-#{project.id}", :class => "inline-form" },
+               :html => { :id => "form-project-#{project.id}", :class => "form" },
                :update => "project-#{project.id}-container",
                :complete => "new Effect.Appear('project-#{project.id}-container');" %>
   <%= render_partial 'project_form', project %>
diff --git a/tracks/app/views/project/list.rhtml b/tracks/app/views/project/list.rhtml
index 34be7628..3322988f 100644
--- a/tracks/app/views/project/list.rhtml
+++ b/tracks/app/views/project/list.rhtml
@@ -16,9 +16,10 @@
   :loading => "project.reset()",
   :complete => "Form.focus_first('project-form');",
   :html=> { :id=>'project-form', :name=>'project', :class => 'inline-form' } %>
-<label for="project_name">Name</label>
-  <%= text_field 'project', 'name'  %>
-  <input type="submit" value="Add" />
+  <label for="project_name">Name:</label><br />
+  <%= text_field 'project', 'name'  %><br />
+  <label for="project_description">Description (optional):</label><br />
+  <%= text_area 'project', 'description', "cols" => 30, "rows" => 4  %>  <input type="submit" value="Add" />
 <%= end_form_tag %>
 <!--[eoform:project]-->
 </div>
@@ -30,4 +31,4 @@
   <div class="warning"><%= @flash["warning"] %></div>
 <% end %>
 
-</div><!- End of display_box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
diff --git a/tracks/app/views/project/show.rhtml b/tracks/app/views/project/show.rhtml
index 3ce893cb..b9850d0f 100644
--- a/tracks/app/views/project/show.rhtml
+++ b/tracks/app/views/project/show.rhtml
@@ -2,6 +2,9 @@
 
 <div class="contexts">
 <h2><%= @project.name %></h2>
+<% if @project.description -%>
+  <div class="project_description"><%= @project.description %></div>
+<% end -%>
 
   <div id="next_actions">
     <% if @project.done == 1 -%>
diff --git a/tracks/db/tracks_1.031_mysql.sql b/tracks/db/tracks_1.031_mysql.sql
index c670bfd6..5925b665 100644
--- a/tracks/db/tracks_1.031_mysql.sql
+++ b/tracks/db/tracks_1.031_mysql.sql
@@ -26,6 +26,7 @@ CREATE TABLE `projects` (
   `position` int(11) NOT NULL default '0',
   `done` tinyint(1) default '0',
   `user_id` int(11) NOT NULL default '1',
+  `description` varchar(255) default '',
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
diff --git a/tracks/db/tracks_1.031_postgres.sql b/tracks/db/tracks_1.031_postgres.sql
index d49b0b58..7637f2a4 100644
--- a/tracks/db/tracks_1.031_postgres.sql
+++ b/tracks/db/tracks_1.031_postgres.sql
@@ -28,6 +28,7 @@ create table projects (
   position int not null,
   done int not null default 0,
   user_id int not null default 1,
+  description varchar(255) default '',
   primary key (id)
 );
 
diff --git a/tracks/db/tracks_1.031_sqlite.sql b/tracks/db/tracks_1.031_sqlite.sql
index 7ac8a5b2..65693bed 100644
--- a/tracks/db/tracks_1.031_sqlite.sql
+++ b/tracks/db/tracks_1.031_sqlite.sql
@@ -22,6 +22,7 @@ CREATE TABLE 'projects' (
   'name' varchar(255) NOT NULL default '',
   'position' int NOT NULL,
   'done' tinyint(4) NOT NULL default '0',
+  'description' varchar(255) default '',
   'user_id' int NOT NULL default '1'
 ) ;
 
diff --git a/tracks/doc/CHANGELOG b/tracks/doc/CHANGELOG
index 958dabf2..e5d159f0 100644
--- a/tracks/doc/CHANGELOG
+++ b/tracks/doc/CHANGELOG
@@ -24,6 +24,7 @@ Wiki (deprecated - please use Trac): http://www.rousette.org.uk/projects/wiki/
 7. Added loginhash to settings.yml.
 8. Modify signup to prevent is_admin being set by malicious user. Begin work on standardising layout for login controller.
 9. BIGGEST NEW FEATURE: Tracks is now properly multi-user, thanks to the work of Nicholas Lee. Any new users that you sign up can't view any of your next actions, contexts, projects or notes, and they get a clean slate to add their own. Great Things are planned in this direction...
+10. Projects now have a description field which you can edit in the form on [tracks_url]/projects. It's optional, but you can use it to remind you of the aims or purpose of the project. If you have a description, it's displayed in italics just under the project name.
 
 == Version 1.03
 
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index 64cecd38..93a67562 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -121,6 +121,7 @@ a.show_notes:hover {background-image: url(../images/notes_on.png); background-re
       margin-top: 0px;
       margin-left: -5px;
       margin-right: -5px;
+      margin-bottom: 0px; /* CHECK */      
       color: #fff;
       text-shadow: rgba(0,0,0,.4) 0px 2px 5px;
       }
@@ -422,6 +423,21 @@ div#list-projects, div#list-contexts {
     padding-bottom: 5px;
     }
 
+div.project_description {
+    background: #eee;
+    padding: 5px;
+    margin-top: 0px;
+    margin-left: -5px;
+    margin-right: -5px;
+    color: #666;
+    font-style: italic;
+    font-size: 12px;
+    font-weight: normal;
+    /* Uncomment line below if you want the description to have
+       shadowed text */
+    /* text-shadow: rgba(0,0,0,.4) 0px 2px 5px; */
+    }
+    
 /* Form elements */
 form {
     border: 1px solid #CCC;
diff --git a/tracks/test/fixtures/projects.yml b/tracks/test/fixtures/projects.yml
index 4f6dc14a..d346ddde 100644
--- a/tracks/test/fixtures/projects.yml
+++ b/tracks/test/fixtures/projects.yml
@@ -3,14 +3,20 @@
 timemachine:
   id: 1
   name: Build a working time machine
+  description: ''
+  done: 0
   user_id: 1
 
 moremoney:
   id: 2
   name: Make more money than Billy Gates
+  description: ''
+  done: 0  
   user_id: 1
 
 gardenclean:
   id: 3
   name: Evict dinosaurs from the garden
+  description: ''
+  done: 0  
   user_id: 1