diff --git a/tracks/app/models/context.rb b/tracks/app/models/context.rb
index df2cb434..f6b88dc1 100644
--- a/tracks/app/models/context.rb
+++ b/tracks/app/models/context.rb
@@ -40,15 +40,6 @@ class Context < ActiveRecord::Base
     s += "Context is #{hidden? ? 'Hidden' : 'Active'}. "
     s += "</p>"
     s
-  end
-  
-  def created_at
-     read_attribute(:created_at) || Time.now.utc
-  end
-  
-  def updated_at
-     read_attribute(:updated_at) || Time.now.utc
-  end
-  
+  end  
 
 end
diff --git a/tracks/app/models/project.rb b/tracks/app/models/project.rb
index a583cb55..5ea67b50 100644
--- a/tracks/app/models/project.rb
+++ b/tracks/app/models/project.rb
@@ -59,15 +59,7 @@ class Project < ActiveRecord::Base
   def title
     name
   end
-  
-  def created_at
-     read_attribute(:created_at) || Time.now
-  end
-  
-  def updated_at
-     read_attribute(:updated_at) || Time.now
-  end
-  
+    
   def summary(undone_todo_count)
     project_description = ''
     project_description += sanitize(markdown( description )) if description_present?
diff --git a/tracks/db/migrate/030_set_nil_timestamps.rb b/tracks/db/migrate/030_set_nil_timestamps.rb
new file mode 100644
index 00000000..6f2e944c
--- /dev/null
+++ b/tracks/db/migrate/030_set_nil_timestamps.rb
@@ -0,0 +1,25 @@
+class SetNilTimestamps < ActiveRecord::Migration
+
+  class Project < ActiveRecord::Base; end
+  class Context < ActiveRecord::Base; end
+
+  def self.up
+    Project.find_all_by_created_at(nil).each do |p|
+      Project.update( p.id, {:created_at => Time.now.utc} )
+    end
+    Project.find_all_by_updated_at(nil).each do |p|
+      Project.update( p.id, {:updated_at => Time.now.utc} )
+    end
+    Context.find_all_by_created_at(nil).each do |p|
+      Context.update( p.id, {:created_at => Time.now.utc} )
+    end
+    Context.find_all_by_updated_at(nil).each do |p|
+      Context.update( p.id, {:updated_at => Time.now.utc} )
+    end
+    
+  end
+
+  def self.down
+    #nothing to do here...
+  end
+end
diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb
index e2b6f1b5..3bcd23ef 100644
--- a/tracks/db/schema.rb
+++ b/tracks/db/schema.rb
@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 29) do
+ActiveRecord::Schema.define(:version => 30) do
 
   create_table "contexts", :force => true do |t|
     t.column "name",       :string,                :default => "", :null => false
diff --git a/tracks/test/fixtures/contexts.yml b/tracks/test/fixtures/contexts.yml
index 0dd32e5c..a6ac6f0b 100644
--- a/tracks/test/fixtures/contexts.yml
+++ b/tracks/test/fixtures/contexts.yml
@@ -57,8 +57,8 @@ library:
   position: 6
   hide: false
   user_id: 1
-  created_at: nil
-  updated_at: nil
+  created_at: <%= today %>
+  updated_at: <%= today %>
 
 freetime:
   id: 7
diff --git a/tracks/test/fixtures/projects.yml b/tracks/test/fixtures/projects.yml
index f3d90895..f1bc2bdb 100644
--- a/tracks/test/fixtures/projects.yml
+++ b/tracks/test/fixtures/projects.yml
@@ -24,8 +24,8 @@ moremoney:
   position: 2
   state: 'active'
   user_id: 1
-  created_at: nil
-  updated_at: nil
+  created_at: <%= today %>
+  updated_at: <%= today %>
 
 gardenclean:
   id: 3
diff --git a/tracks/test/unit/context_test.rb b/tracks/test/unit/context_test.rb
index 028e4d86..3f9deb8e 100644
--- a/tracks/test/unit/context_test.rb
+++ b/tracks/test/unit/context_test.rb
@@ -112,13 +112,5 @@ class ContextTest < Test::Unit::TestCase
   def test_title_reader_returns_name
     assert_equal @agenda.name, @agenda.title
   end
-  
-  def test_created_at_returns_now_when_field_null
-    assert_equal Time.now.utc.to_s, @library.created_at.to_s
-  end
-  
-  def test_updated_at_returns_now_when_field_null
-    assert_equal Time.now.utc.to_s, @library.updated_at.to_s
-  end
-  
+    
 end
diff --git a/tracks/test/unit/project_test.rb b/tracks/test/unit/project_test.rb
index 24f0a45f..9f2eb098 100644
--- a/tracks/test/unit/project_test.rb
+++ b/tracks/test/unit/project_test.rb
@@ -146,13 +146,5 @@ class ProjectTest < Test::Unit::TestCase
   def test_title_reader_returns_name
     assert_equal @timemachine.name, @timemachine.title
   end
-  
-  def test_created_at_returns_now_when_field_null
-    assert_equal Time.now.to_s, @moremoney.created_at.to_s
-  end
-  
-  def test_updated_at_returns_now_when_field_null
-    assert_equal Time.now.to_s, @moremoney.updated_at.to_s
-  end
-  
+    
 end