diff --git a/apps/reader/views.py b/apps/reader/views.py
index dc989e23a..224c6a3ea 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -248,10 +248,10 @@ def load_single_feed(request):
 
 def load_feed_page(request):
     feed = Feed.objects.get(id=request.REQUEST.get('feed_id'))
-    if feed.page_data:
-        data = feed.page_data
+    if feed.feed_page and feed.feed_page.page_data:
+        data = feed.feed_page.page_data
     else:
-        data = "Give it 10 minutes...<br /><br />Your feed will be here in under 5 minutes (on average).<br />Soon there will be a progress bar. Until then, take a deep breath."
+        data = "Give it 5-10 minutes...<br /><br />Your feed will be here in under 5 minutes (on average).<br />Soon there will be a progress bar. Until then, take a deep breath."
     
     return HttpResponse(data, mimetype='text/html')
     
diff --git a/apps/rss_feeds/importer.py b/apps/rss_feeds/importer.py
index d0ee44807..7e0cfebaa 100644
--- a/apps/rss_feeds/importer.py
+++ b/apps/rss_feeds/importer.py
@@ -3,6 +3,7 @@ import logging
 import re
 import urlparse
 import multiprocessing
+from apps.rss_feeds.models import FeedPage
 
 class PageImporter(object):
     
@@ -63,9 +64,10 @@ class PageImporter(object):
         
     def save_page(self, html):
         if html and len(html) > 100:
-            self.feed.page_data = html
+            feed_page, _ = FeedPage.objects.get_or_create(feed=self.feed)
+            feed_page.page_data = html
             self.lock.acquire()
             try:
-                self.feed.save()
+                feed_page.save()
             finally:
                 self.lock.release()
diff --git a/apps/rss_feeds/management/commands/calculate_subscribers.py b/apps/rss_feeds/management/commands/calculate_subscribers.py
index 8b5adfb8a..13bb53d0d 100644
--- a/apps/rss_feeds/management/commands/calculate_subscribers.py
+++ b/apps/rss_feeds/management/commands/calculate_subscribers.py
@@ -14,6 +14,6 @@ class Command(BaseCommand):
         else:
             feeds = Feed.objects.all()
 
-        for f in feeds:
+        for f in feeds.iterator():
             f.calculate_subscribers(verbose=options['verbose'])
         
\ No newline at end of file
diff --git a/apps/rss_feeds/migrations/0002_page_data.py b/apps/rss_feeds/migrations/0002_page_data.py
new file mode 100644
index 000000000..e5502c287
--- /dev/null
+++ b/apps/rss_feeds/migrations/0002_page_data.py
@@ -0,0 +1,89 @@
+
+from south.db import db
+from django.db import models
+from apps.rss_feeds.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        feeds = Feed.objects.all()
+        for feed in feeds.iterator():
+            print feed.feed_title
+            feed_page, _ = FeedPage.objects.get_or_create(feed=feed)
+            feed_page.page_data = feed.page_data
+            feed_page.save()
+            feed.page_data = None
+            feed.save()
+    
+    def backwards(self, orm):
+        "Write your backwards migration here"
+    
+    
+    models = {
+        'rss_feeds.feed': {
+            'Meta': {'db_table': "'feeds'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'creation': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'days_to_trim': ('django.db.models.fields.IntegerField', [], {'default': '90'}),
+            'etag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'feed_address': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255'}),
+            'feed_link': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '200'}),
+            'feed_tagline': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024'}),
+            'feed_title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_load_time': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'last_modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'default': '0', 'auto_now': 'True', 'blank': 'True'}),
+            'min_to_decay': ('django.db.models.fields.IntegerField', [], {'default': '15'}),
+            'next_scheduled_update': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'num_subscribers': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'page_data': ('StoryField', [], {'null': 'True', 'blank': 'True'}),
+            'stories_per_month': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'rss_feeds.feedpage': {
+            'feed': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'feed_page'", 'unique': 'True', 'to': "orm['rss_feeds.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page_data': ('StoryField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'rss_feeds.feedupdatehistory': {
+            'average_per_feed': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '1'}),
+            'fetch_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'number_of_feeds': ('django.db.models.fields.IntegerField', [], {}),
+            'seconds_taken': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'rss_feeds.feedxml': {
+            'feed': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'feed_xml'", 'unique': 'True', 'to': "orm['rss_feeds.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rss_xml': ('StoryField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'rss_feeds.story': {
+            'Meta': {'db_table': "'stories'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'story_author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rss_feeds.StoryAuthor']"}),
+            'story_content': ('StoryField', [], {'null': 'True', 'blank': 'True'}),
+            'story_content_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'story_date': ('django.db.models.fields.DateTimeField', [], {}),
+            'story_feed': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stories'", 'to': "orm['rss_feeds.Feed']"}),
+            'story_guid': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            'story_guid_hash': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'story_original_content': ('StoryField', [], {'null': 'True', 'blank': 'True'}),
+            'story_past_trim_date': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'story_permalink': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            'story_tags': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            'story_title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['rss_feeds.Tag']"})
+        },
+        'rss_feeds.storyauthor': {
+            'author_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'feed': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rss_feeds.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'rss_feeds.tag': {
+            'feed': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rss_feeds.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+    
+    complete_apps = ['rss_feeds']