--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,7 +9,16 @@ class User < ActiveRecord::Base
   has_many :donation_requests
   has_many :job_posts
   has_many :volunteer_opportunities
+  has_many :member_organizations
+  has_many :membered_organizations, :through => :member_organizations, :source => :organization
+  has_many :organization_volunteers
+  has_many :voluntered_organizations, :source => :organization, :through => :organization_volunteers
+  has_many :organization_supporters
+  has_many :supported_organizations, :source => :organization, :through => :organization_supporters
+
+  # probably and mostly removed
   has_one  :organization
+
   include Authentication
   include Authentication::ByPassword
   include Authentication::ByCookieToken


--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -13,15 +13,22 @@ class Organization < ActiveRecord::Base
   has_many :job_posts
   has_many :volunteer_opportunities

-#  has_many :member_organizations
-#  has_many :members, :through => :member_organizations, :class_name = 'User'
+  has_many :member_organizations
+  has_many :members, :through => :member_organizations, :source => :user
+  has_many :organization_volunteers
+  has_many :volunteers, :through => :organization_volunteers, :source => :user
+  has_many :organization_supporters
+  has_many :supporters, :through => :organization_supporters, :source => :user
+
+
   belongs_to :primary_member, :class_name => 'User'

   validates_presence_of :name, :primary_member
   validates_uniqueness_of :name
   validates_associated :primary_member

-  def after_save
-    self.primary_member.register!
+  def before_save
+    # needs to be worked out
+    self.primary_member.register! if self.new_record?
   end
 end