diff --git a/app/models/services/facebook.rb b/app/models/services/facebook.rb
index 189b4de90..b52cd87c7 100644
--- a/app/models/services/facebook.rb
+++ b/app/models/services/facebook.rb
@@ -21,8 +21,23 @@ class Services::Facebook < Service
 
   def finder(opts = {})
     Rails.logger.debug("event=friend_finder type=facebook sender_id=#{self.user_id}")
-    response = RestClient.get("https://graph.facebook.com/me/friends", {:params => {:access_token => self.access_token}})
-    data = JSON.parse(response.body)['data']
+ #RestClient.get("https://graph.facebook.com/me/friends", {:params => {:access_token => self.access_token}})
+    response = <<JSON
+      {
+        "data": [
+          {
+            "name": "Snow Crash",
+            "id": "12321"
+          },
+          {
+            "name": "Person to Invite",
+            "id": "abc123"
+          }
+        ]
+      }
+JSON
+    #data = JSON.parse(response.body)['data']
+    data = JSON.parse(response)['data']
 
     data_h = {}
     data.each do |d|
diff --git a/app/views/contacts/_share_with_list.html.haml b/app/views/contacts/_share_with_list.html.haml
new file mode 100644
index 000000000..92017ac2d
--- /dev/null
+++ b/app/views/contacts/_share_with_list.html.haml
@@ -0,0 +1,34 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+.aspect_list#aspects_list{:data=> {:contact_id=> (contact ? contact.id : nil)}}
+  %ul
+    - for aspect in aspects_with_person
+      = render :partial => 'aspects/aspect_list_item', 
+               :locals => {:aspect => aspect, :person => person,
+                           :contact => contact}
+
+    - for aspect in aspects_without_person
+      = render :partial => 'aspects/aspect_list_item', 
+               :locals => {:aspect => aspect, :person => person,
+                           :contact => contact}
+.add_aspect
+  = form_for(Aspect.new, :remote => true) do |aspect|
+    .right
+      = aspect.submit t('.add_new_aspect'), :class => 'button'
+    = aspect.error_messages
+    = aspect.hidden_field :person_id, :value => person.id if person
+    = aspect.hidden_field :contact_id, :value => contact.id if contact
+    = aspect.hidden_field :share_with, :value => true
+    %p
+      = aspect.text_field :name, :style => "display:inline;"
+    %p.checkbox_select
+      = aspect.label :contacts_visible, t('aspects.edit.make_aspect_list_visible')
+      = aspect.check_box :contacts_visible, :checked => true, :default => true
+
+-unless friend_finder ||= false
+  .done
+    .right
+      = link_to t('aspects.aspect_contacts.done_editing'), "#", :class => "button", :onClick => '$.facebox.close();'
+    - if contact
+      = link_to t('people.profile_sidebar.remove_contact'), contact, :confirm => t('are_you_sure'), :method => :delete
diff --git a/app/views/contacts/_share_with_pane.html.haml b/app/views/contacts/_share_with_pane.html.haml
index 06355e070..f7ed85c9a 100644
--- a/app/views/contacts/_share_with_pane.html.haml
+++ b/app/views/contacts/_share_with_pane.html.haml
@@ -11,32 +11,7 @@
         = t('.accepts', :name => person.first_name)
 
 
-  .aspect_list#aspects_list{:data=> {:contact_id=> (contact ? contact.id : nil)}}
-    %ul
-      - for aspect in aspects_with_person
-        = render :partial => 'aspects/aspect_list_item', 
-                 :locals => {:aspect => aspect, :person => person,
-                             :contact => contact}
-
-      - for aspect in aspects_without_person
-        = render :partial => 'aspects/aspect_list_item', 
-                 :locals => {:aspect => aspect, :person => person,
-                             :contact => contact}
-  .add_aspect
-    = form_for(Aspect.new, :remote => true) do |aspect|
-      .right
-        = aspect.submit t('.add_new_aspect'), :class => 'button'
-      = aspect.error_messages
-      = aspect.hidden_field :person_id, :value => person.id if person
-      = aspect.hidden_field :contact_id, :value => contact.id if contact
-      = aspect.hidden_field :share_with, :value => true
-      %p
-        = aspect.text_field :name, :style => "display:inline;"
-      %p.checkbox_select
-        = aspect.label :contacts_visible, t('aspects.edit.make_aspect_list_visible')
-        = aspect.check_box :contacts_visible, :checked => true, :default => true
-  .done
-    .right
-      = link_to t('aspects.aspect_contacts.done_editing'), "#", :class => "button", :onClick => '$.facebox.close();'
-    - if contact
-      = link_to t('people.profile_sidebar.remove_contact'), contact, :confirm => t('are_you_sure'), :method => :delete
+  = render :partial => 'contacts/share_with_list', 
+           :locals => {:person => person, :contact => contact, 
+                   :aspects_with_person => aspects_with_person,
+                   :aspects_without_person => aspects_without_person}
diff --git a/app/views/services/_remote_friend.html.haml b/app/views/services/_remote_friend.html.haml
index 28b64d409..361c33eea 100644
--- a/app/views/services/_remote_friend.html.haml
+++ b/app/views/services/_remote_friend.html.haml
@@ -39,3 +39,12 @@
       = link_to friend[:name], person_path(friend[:person])
     - else
       = friend[:name]
+
+%li{:style => "height:400px"}
+  - if friend[:person]
+    = render :partial => 'contacts/share_with_list',
+          :locals => {:person => friend[:person],
+            :contact => Contact.new,
+              :aspects_with_person => [],
+              :aspects_without_person => current_user.aspects,
+              :friend_finder => true}