diff --git a/app/views/membership_editor/.index.rhtml.swp b/app/views/membership_editor/.index.rhtml.swp
deleted file mode 100644
index 2ac1380..0000000
Binary files a/app/views/membership_editor/.index.rhtml.swp and /dev/null differ
diff --git a/app/views/profile_members/affiliate.rhtml b/app/views/profile_members/affiliate.rhtml
new file mode 100644
index 0000000..808326a
--- /dev/null
+++ b/app/views/profile_members/affiliate.rhtml
@@ -0,0 +1,7 @@
+<h2> <%= @member.name %> </h2>
+
+<% form_tag( {:action => 'give_role'}, {:method => :post}) do %>
+  <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]})  %>
+  <%= hidden_field_tag 'person', current_user.person.id %>
+  <%= submit_tag _('Affiliate') %>
+<% end %>
diff --git a/app/views/profile_members/change_role.rhtml b/app/views/profile_members/change_role.rhtml
new file mode 100644
index 0000000..8ad72af
--- /dev/null
+++ b/app/views/profile_members/change_role.rhtml
@@ -0,0 +1,12 @@
+<%= _('Changing role of %s') % @member.name %>
+
+<% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
+  
+  <%= _('Roles: ') %> <br>
+  <% @roles.each do |r| %>
+    <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id, @associations.map(&:role).include?(r))) %>
+  <% end %>
+  <%= hidden_field_tag 'person', @member.id %>
+
+  <%= submit_tag  _('Save changes') %>
+<% end %>
diff --git a/app/views/profile_members/index.rhtml b/app/views/profile_members/index.rhtml
new file mode 100644
index 0000000..7e5bc26
--- /dev/null
+++ b/app/views/profile_members/index.rhtml
@@ -0,0 +1,11 @@
+<h2> <%= _('Listing Members') %> </h2>
+
+<%= link_to _('Affiliate'), :action => 'add_role', :person => current_user.person, :role => Role.find_by_name('member') %>
+
+<ul>
+  <% @members.each do |m| %>
+    <li> <%= m.name %> 
+         <%= link_to _('Edit member role'), :action => 'change_role', :id => m %> 
+         <%= link_to _('Remove member'), :action => 'unassociate', :id => m %></li>
+  <% end %>
+</ul>
--
libgit2 0.21.2