diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index c4e05d7d0..8346bb7dd 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -1,160 +1,169 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3 or later.  See
-*   the COPYRIGHT file.
-*/
+ *   licensed under the Affero General Public License version 3 or later.  See
+ *   the COPYRIGHT file.
+ */
 
-function decrementRequestsCounter() {
-  var $new_requests     = $(".new_requests");
-  var request_html      = $new_requests.html();
-  var old_request_count = request_html.match(/\d+/);
+var AspectEdit = {
 
-  if( old_request_count == 1 ) {
-    $new_requests.html(
-      request_html.replace(/ \(\d+\)/,'')
-    );
-  } else {
-    $new_requests.html(
-      request_html.replace(/\d+/,old_request_count-1)
-    );
-  }
-}
+  initialize: function() {
+    $("ul .person").draggable({
+      revert: true,
+      start: AspectEdit.startDrag,
+      drag: AspectEdit.duringDrag,
+      stop: AspectEdit.stopDrag
+    });
 
-// Dragging person between aspects
-$(function() {
-  $("ul .person").draggable({
-    revert: true,
-    start: function(event,ui){
-      $(this).children("img").animate({'height':80, 'width':80, 'opacity':0.8},200)
-             .tipsy("hide");
-      $(".draggable_info").fadeIn(100);
-    },
-    drag: function(event,ui){
-      $(this).children("img").tipsy("hide"); //ensure this is hidden
-    },
-    stop: function(event,ui){
-      $(this).children("img").animate({'height':70, 'width':70, 'opacity':1},200);
-      $(".draggable_info").fadeOut(100);
+    $(".aspect ul.dropzone").droppable({
+      hoverClass: 'active',
+      drop: AspectEdit.onDropMove
+    });
+
+    $(".aspect_remove ul").droppable({
+      hoverClass: 'active',
+      drop: AspectEdit.onDropDelete
+    });
+
+    $(".delete").live("click", AspectEdit.deletePerson);
+    $(".aspect h3").live('focus', AspectEdit.changeName);
+  },
+
+  startDrag: function(event, ui) {
+    $(this).children("img").animate({'height':80, 'width':80, 'opacity':0.8}, 200)
+      .tipsy("hide");
+    $(".draggable_info").fadeIn(100);
+  },
+
+  duringDrag: function(event, ui) {
+    $(this).children("img").tipsy("hide"); //ensure this is hidden
+  },
+
+  stopDrag: function(event, ui) {
+    $(this).children("img").animate({'height':70, 'width':70, 'opacity':1}, 200);
+    $(".draggable_info").fadeOut(100);
+  },
+
+  onDropMove: function(event, ui) {
+    var dropzone = $(this);
+    var person = ui.draggable;
+
+    if (person.hasClass('request')) {
+      $.ajax({
+        type: "DELETE",
+        url: "/requests/" + person.attr('data-guid'),
+        data: {"accept" : true, "aspect_id" : dropzone.attr('data-aspect_id') },
+        success: function(data) {
+          AspectEdit.decrementRequestsCounter();
+        }
+      });
     }
-  });
 
-  $(".aspect ul.dropzone").droppable({
-    hoverClass: 'active',
-    drop: function(event, ui) {
+    if (dropzone.attr('data-aspect_id') != person.attr('data-aspect_id')) {
+      $.ajax({
+        url: "/aspects/move_friend/",
+        data: {"friend_id" : person.attr('data-guid'),
+          "from"      : person.attr('data-aspect_id'),
+          "to"        : { "to" : dropzone.attr('data-aspect_id') }},
+        success: function(data) {
+          person.attr('data-aspect_id', dropzone.attr('data-aspect_id'));
+        }});
+    }
 
-      var dropzone = $(this);
-      var person   = ui.draggable;
+    dropzone.closest("ul").append(person);
+  },
+
+  onDropDelete: function(event, ui) {
+    var person = ui.draggable;
+
+    if (person.attr('data-guid').length == 1) {
+      alert("You can not remove the person from the last aspect");
+
+    } else {
+      if (!person.hasClass('request')) {
+
+        $.ajax({
+          type: "POST",
+          url: "/aspects/remove_from_aspect",
+          data:{
+            'friend_id' : person.attr('data-guid'),
+            'aspect_id' : person.attr('data-aspect_id') }
+        });
+      }
+      person.fadeOut(400, function() {
+        person.remove();
+      });
+    }
+  },
+
+  changeName:  function() {
+
+    var $this = $(this);
+    var id = $this.closest("li.aspect").attr("data-guid");
+    var link = "/aspects/" + id;
+
+    $this.keypress(function(e) {
+      if (e.which == 13) {
+        e.preventDefault();
+        $this.blur();
+
+        //save changes
+        $.ajax({
+          type: "PUT",
+          url: link,
+          data: {"aspect" : {"name" : $this.text() }}
+        });
+      }
+      //update all other aspect links
+      $this.keyup(function(e) {
+        $("#aspect_nav a[href='" + link + "']").text($this.text());
+      });
+    });
+  },
+
+  deletePerson: function() {
+    var person = $(this).closest("li.person");
+
+    if (person.hasClass('request')) {
+      if (confirm("Ignore request?")) {
+        var request_id = person.attr("data-guid");
 
-      if( person.hasClass('request') ){
         $.ajax({
           type: "DELETE",
-          url: "/requests/" + person.attr('data-guid'),
-          data: {"accept" : true, "aspect_id" : dropzone.attr('data-aspect_id') },
-          success: function(data){
-            decrementRequestsCounter();
+          url: "/requests/" + request_id,
+          success: function () {
+            AspectEdit.decrementRequestsCounter();
           }
         });
-      };
+      }
+    } else {
+      if (confirm("Remove this person from all aspects?")) {
+        var person_id = $(this).closest("li.person").attr('data-guid');
 
-
-      if( dropzone.attr('data-aspect_id') != person.attr('data-aspect_id' )){
         $.ajax({
-          url: "/aspects/move_friend/",
-          data: {"friend_id" : person.attr('data-guid'),
-                 "from"      : person.attr('data-aspect_id'),
-                 "to"        : { "to" : dropzone.attr('data-aspect_id') }},
-          success: function(data){
-            person.attr('data-aspect_id', dropzone.attr('data-aspect_id'));
-          }});
-        }
-
-      dropzone.closest("ul").append(person);
-    }
-  });
-
-
-  $(".aspect_remove ul").droppable({
-    hoverClass: 'active',
-    drop: function(event, ui) {
-
-      var person = ui.draggable;
-
-      if ( person.attr('data-guid').length == 1 ) {
-        alert("You can not remove the person from the last aspect");
-
-      } else {
-        if( !person.hasClass('request') ){
-
-          $.ajax({
-            type: "POST",
-            url: "/aspects/remove_from_aspect",
-            data:{
-                  'friend_id' : person.attr('data-guid'),
-                  'aspect_id' : person.attr('data-aspect_id') }
-          });
-        }
-      person.fadeOut(400, function(){person.remove();});
+          type: "DELETE",
+          url: "/people/" + person_id,
+          success: function() {
+            person.fadeOut(200);
+          }
+        });
       }
     }
-  });
-});
+  },
 
+  decrementRequestsCounter: function() {
+    var $new_requests = $(".new_requests");
+    var request_html = $new_requests.html();
+    var old_request_count = request_html.match(/\d+/);
 
-// Person deletion
-$(".delete").live("click", function() {
-
-  var person = $(this).closest("li.person");
-
-  if (person.hasClass('request')){
-    if( confirm("Ignore request?") ){
-      var request_id = person.attr("data-guid");
-
-      $.ajax({
-        type: "DELETE",
-        url: "/requests/" + request_id,
-        success: function () {
-          decrementRequestsCounter();
-        }
-      });
-    }
-
-  } else {
-    if( confirm("Remove this person from all aspects?") ){
-      var person_id = $(this).closest("li.person").attr('data-guid');
-
-      $.ajax({
-        type: "DELETE",
-        url: "/people/" + person_id,
-        success: function() {
-          person.fadeOut(200);
-        }
-      });
+    if (old_request_count == 1) {
+      $new_requests.html(
+        request_html.replace(/ \(\d+\)/, '')
+        );
+    } else {
+      $new_requests.html(
+        request_html.replace(/\d+/, old_request_count - 1)
+        );
     }
   }
-});
+};
 
-
-// Editing aspect name
-$(".aspect h3").live('focus', function() {
-
-  var $this = $(this);
-  var id    = $this.closest("li.aspect").attr("data-guid");
-  var link  = "/aspects/"+ id;
-
-  $this.keypress(function(e) {
-    if (e.which == 13) {
-      e.preventDefault();
-      $this.blur();
-
-      //save changes
-      $.ajax({
-        type: "PUT",
-        url: link,
-        data: {"aspect" : {"name" : $this.text() }}
-      });
-    }
-    //update all other aspect links
-    $this.keyup(function(e) {
-      $("#aspect_nav a[href='"+link+"']").text($this.text());
-    });
-  });
-});
+$(document).ready(AspectEdit.initialize);
\ No newline at end of file
diff --git a/spec/javascripts/aspect-edit-spec.js b/spec/javascripts/aspect-edit-spec.js
index 5405f480e..9c2da4621 100644
--- a/spec/javascripts/aspect-edit-spec.js
+++ b/spec/javascripts/aspect-edit-spec.js
@@ -1,27 +1,30 @@
-describe("editing aspects", function() {
+describe("AspectEdit", function() {
+
+//  describe("initialize", function() {
+//
+//  });
 
   describe("decrementRequestsCounter", function() {
     describe("when there is one request", function() {
       it("removes the counter from the new requests div", function() {
         $('#jasmine_content').html("<div class='new_requests'>Requests (1)</div>");
-        decrementRequestsCounter();
+        AspectEdit.decrementRequestsCounter();
         expect($('.new_requests').first().html()).toEqual("Requests");
       });
     });
     describe("when there is more than one request", function() {
       it("decrements the request counter", function() {
         $('#jasmine_content').html("<div class='new_requests'>Requests (67)</div>");
-        decrementRequestsCounter();
+        AspectEdit.decrementRequestsCounter();
         expect($('.new_requests').first().html()).toEqual("Requests (66)");
       });
     });
     describe("error cases", function() {
       it("fails silently if there are no requests", function() {
         $('#jasmine_content').html("<div class='new_requests'>Requests</div>");
-        decrementRequestsCounter();
+        AspectEdit.decrementRequestsCounter();
         expect($('.new_requests').first().html()).toEqual("Requests");
       });
     });
   });
-
 });
\ No newline at end of file
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 74645d1e6..dda4a5fdb 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -12,6 +12,7 @@
 #
 src_files:
   - public/javascripts/jquery142.js
+  - public/javascripts/jquery-ui-1.8.4.custom.min.js
   - public/javascripts/aspect-edit.js
 
 # stylesheets