diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 2996a23ecd8e145f3c5b9b6d288cbb2f14809ff4..eb165ca2d5ffeb639c247ed9b4ff2405eb05f6ea 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -21,6 +21,7 @@ class PhotosController < ApplicationController
   
   def new
     @photo = Photo.new
+    render :partial => "new_photo"
   end
   
   def destroy
diff --git a/app/models/user.rb b/app/models/user.rb
index c26e02f1ceb5bf7fb2bf1fc86032efe57508f486..fe4cb1ea9fefb4a1d4372ae2a7e585104f7dc24a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,6 +46,9 @@ class User
     options.delete(:group_id)
 
     model_class = class_name.to_s.camelize.constantize
+    
+    pp options
+
     post = model_class.instantiate(options)
     post.creator_signature = post.sign_with_key(encryption_key)
     post.save
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index da2b73eb838fc655e8c9b66e98369df48e2d4688..8432ac92aabe28d0d5127a3472495200de1e9be8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -13,7 +13,6 @@
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142', 'rails', 'google'
-    = javascript_include_tag 'tiny_mce/tiny_mce'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
     
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index b577315967f91457c485f21d5f9071c9c61618da..0704c0244bfac9ddd146bd81c599cad231600213 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -12,8 +12,9 @@
         $("#add_photo_loader").fadeOut(400);
 
         $("#photo_title_status").text("Done!");
-        $("#progress_report").html("Great job!");
-      },
+        $("#progress_report").html("");
+        resetPhotoButton
+       },
       onStart: function(event, total){
         $("#add_photo_button").html( "Uploading Photos" );
         $("#add_photo_loader").fadeIn(400);
@@ -26,6 +27,14 @@
     });
   });
 
+  function resetPhotoButton{
+      $("#add_photo_button").click(function (evt){
+      $("#new_photo_pane").html($.get("photos/ajax_new"));
+      $("#add_photo_button").unbind();
+      $("#add_photo_button").fancybox();
+    }
+  }
+
 %h1
   %span{:id=>"photo_title_status"}
     Add photos to