diff --git a/lib/jam_ruby/models/connection.rb b/lib/jam_ruby/models/connection.rb
index 49ffaed14..7d6f4382c 100644
--- a/lib/jam_ruby/models/connection.rb
+++ b/lib/jam_ruby/models/connection.rb
@@ -1,15 +1,8 @@
 module JamRuby
   class Connection < ActiveRecord::Base
 
-    attr_accessor :user_id, :client_id
-
-  	self.primary_key = 'id'
+    self.primary_key = 'id'
     belongs_to :user, :class_name => "JamRuby::User"
 
-    def initialize(user_id, client_id)
-      @user_id = user_id
-      @client_id = client_id
-    end
-
   end
 end
\ No newline at end of file
diff --git a/lib/jam_ruby/models/friendship.rb b/lib/jam_ruby/models/friendship.rb
index 1af8ca24c..021014ca4 100644
--- a/lib/jam_ruby/models/friendship.rb
+++ b/lib/jam_ruby/models/friendship.rb
@@ -1,10 +1,10 @@
 module JamRuby
 	class Friendship < ActiveRecord::Base
 
-    self.primary_key = 'id'
+	    self.primary_key = 'id'
 
-    belongs_to :user, :class_name => "JamRuby::User"
-    belongs_to :friend, :class_name => "JamRuby::User"
+	    belongs_to :user
+	    belongs_to :friend, :class_name => "JamRuby::User"
 
 	end
 end
\ No newline at end of file
diff --git a/lib/jam_ruby/models/user.rb b/lib/jam_ruby/models/user.rb
index 5ac99c726..b9eca6713 100644
--- a/lib/jam_ruby/models/user.rb
+++ b/lib/jam_ruby/models/user.rb
@@ -39,6 +39,10 @@ module JamRuby
       updating_password || new_record?
     end
 
+    def friends?(user)
+      return self.friends.exists?(user)
+    end
+
     def to_s
       return email unless email.nil?
       return name unless name.nil?
diff --git a/spec/jam_ruby/models/connection_spec.rb b/spec/jam_ruby/models/connection_spec.rb
index 6cac8147d..8b66ffc16 100644
--- a/spec/jam_ruby/models/connection_spec.rb
+++ b/spec/jam_ruby/models/connection_spec.rb
@@ -2,19 +2,4 @@ require 'spec_helper'
 
 describe Connection do
 
-  it 'can grant access to valid user' do
-
-    user1 = FactoryGirl.create(:user)  # in the jam session
-    user2 = FactoryGirl.create(:user)  # in the jam session
-    user3 = FactoryGirl.create(:user)  # not in the jam session
-
-    jam_session = FactoryGirl.create(:jam_session, :creator => user1)
-
-    jam_session_member1 = FactoryGirl.create(:jam_session_member, :user => user1, :jam_session => jam_session)
-    jam_session_member2 = FactoryGirl.create(:jam_session_member, :user => user2, :jam_session => jam_session)
-
-    jam_session.access?(user1).should == true
-    jam_session.access?(user2).should == true
-    jam_session.access?(user3).should == false
-  end
 end
\ No newline at end of file