diff -r ec22622da589 -r 99121cc7181d app/soc/modules/ghop/models/work_submission.py
--- a/app/soc/modules/ghop/models/work_submission.py	Sun Aug 30 17:34:47 2009 +0200
+++ b/app/soc/modules/ghop/models/work_submission.py	Sun Aug 30 22:00:07 2009 +0530
@@ -27,14 +27,15 @@
 
 from django.utils.translation import ugettext
 
-import soc.models.linkable
+import soc.models.base
 import soc.models.user
 
+from soc.modules.ghop.models import organization as ghop_org_model
 from soc.modules.ghop.models import program as ghop_program_model
 from soc.modules.ghop.models import task as task_model
 
 
-class GHOPWorkSubmission(soc.models.linkable.Linkable):
+class GHOPWorkSubmission(soc.models.base.ModelWithFieldAttributes):
   """Model for work submissions for a task by students.
 
   Scope will be set to the Organization to which this work has been submitted.
@@ -47,6 +48,11 @@
                               required=True,
                               collection_name='work_submissions')
 
+  #: Organization to which this work belongs to
+  org = db.ReferenceProperty(
+      reference_class=ghop_org_model.GHOPOrganization,
+      required=True, collection_name='work_submissions')
+
   #: Program to which this work belongs to
   program = db.ReferenceProperty(
       reference_class=ghop_program_model.GHOPProgram,