diff --git a/.gitignore b/.gitignore
index 89b33da60..0025a86f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gpg/diaspora-production/*.gpg
 gpg/*/random_seed
 public/uploads/*
 .rvmrc
+config/app_config.yml
diff --git a/COPYRIGHT b/COPYRIGHT
index c1e5ed876..f1bed1a6b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1 +1,23 @@
-Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted.  Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a modified version of the MIT/X11 license.  All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files.  Attribution information for Diaspora is contained in the AUTHORS file.
+Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed
+under the Affero General Public License version 3, the text of which can
+be found in GNU-AGPL-3.0, or any later version of the AGPL, unless otherwise
+noted.  Components of Diaspora, including Rails, JQuery, and Devise, are
+licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a
+modified version of the MIT/X11 license.  All unmodified files from these
+and other sources retain their original copyright and license notices: see
+the relevant individual files.  Attribution information for Diaspora is
+contained in the AUTHORS file.
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations
+including the two.
+
+You must obey the GNU Affero General Public License V3 or later in all respects
+for all of the code used other than OpenSSL or the components mentioned
+above.  If you modify file(s) with this exception, you may extend this 
+exception to your version of the file(s), but you are not obligated to 
+do so.  If you do not wish to do so, delete this exception statement from your
+version.  If you delete this exception statement from all source files in the 
+program, then also delete it here.
diff --git a/README.md b/README.md
index 066e4171c..0d5cee400 100644
--- a/README.md
+++ b/README.md
@@ -1,46 +1,85 @@
 ## Commit Guidlines
-You are welcome to contribute, add and extend Diaspora however you see fit.  We will do our best to incorporate everything that meets our guidelines.
 
-We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches.  The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered.  You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). 
+You are welcome to contribute, add to and extend Diaspora however you see fit.  We
+will do our best to incorporate everything that meets our guidelines.
 
-All commits must be tested, and after each commit, all tests should be green before a pull request is sent.  Please write your tests in Rspec.
+We need you to fill out a
+[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
+before we can accept your patches.  The agreement gives Diaspora joint
+ownership of the patch so the copyright isn't scattered.  You can find it
+[here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq).
 
-GEMS:  We would like to keep external dependencies unduplicated.  We're using Nokogiri, and Mongomapper, and EM::HttpRequest as much as possible.  We have a few gems in the project we'd rather not use, but if you can, use dependencies we already have.
+All commits must be tested, and after each commit, all tests should be green
+before a pull request is sent.  Please write your tests in Rspec.
+
+GEMS: We would like to keep external dependencies unduplicated.  We're using
+Nokogiri, Mongomapper, and EM::HttpRequest as much as possible.  We have a few
+gems in the project we'd rather not use, but if you can, use dependencies we
+already have.
 
 # Diaspora
 
-The privacy aware, personally controlled, do-it-all, open source social network.
+The privacy aware, personally controlled, do-it-all, open source social
+network.
 
 **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
-**PLEASE, DO NOT RUN IN PRODUCTION.  IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN**
+**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
+TO BE BROKEN**
 
-Also, we really want to continue to focus on features and improving the code base. When we think it is 
-ready for general use, we will post more detailed instructions.
+We are continuing to build features and improve the code base.
+When we think it is ready for general use, we will post more detailed
+instructions.
 
+## Notice
 
+We currently run Diaspora with the [thin](http://code.macournoyer.com/thin/) as
+our webserver, behind [nginx](http://wiki.nginx.org/Main). Diaspora uses an
+asynchronous [EventMachine](http://rubyeventmachine.com/) queue inside the appserver
+to send messages between seeds.  If you use mod_rails, mongrel, or another 
+non-eventmachine based application server, federation may not work.
 
-These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X.  We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest.
+If you don't like thin, you can always try
+[Rainbows!](http://rainbows.rubyforge.org/) We will try to fully support more
+webservers later, but that is what works for now.
+
+These instructions are for machines running [Ubuntu](http://www.ubuntu.com/),
+[Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora
+for the latest and greatest browsers, so please update your Firefox, Chrome or
+Safari to the latest and greatest.
 
 ## Preparing your system
-In order to run Diaspora, you will need to download the following dependencies (specific instructions follow):
+
+In order to run Diaspora, you will need to download the following dependencies
+(specific instructions follow):
 
 - Build Tools - Packages needed to compile the components that follow.
-- [Ruby](http://www.ruby-lang.org) - The Ruby programming language.  (We're using **1.8.7**.  It comes preinstalled on Mac OS X.)
+- [Ruby](http://www.ruby-lang.org) - The Ruby programming language.
+  (We're using **1.8.7**.  It comes preinstalled on Mac OS X.)
 - [MongoDB](http://www.mongodb.org) - A snappy noSQL database.
-- [OpenSSL](http://www.openssl.org/) - An encryption library.  (It comes preinstalled on Mac OS X and Ubuntu.)
-- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos.
+- [OpenSSL](http://www.openssl.org/) - An encryption library.
+  (It comes preinstalled on Mac OS X and Ubuntu.)
+- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used
+  to resize uploaded photos.
 - [Git](http://git-scm.com/) - The fast version control system.
 
-After you have Ruby installed on your system, you will need to get RubyGems, then install Bundler:
+After you have Ruby installed on your system, you will need to get RubyGems,
+then install Bundler:
 
 - [RubyGems](http://rubygems.org/) - Source for Ruby gems.
 - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects.
 
-**We suggest using a package management system to download these dependencies.  Trust us, it's going to make your life a lot easier.  If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed); if you're using Fedora simply use [yum](http://yum.baseurl.org/).  The instructions below assume you have these installed.**
+**We suggest using a package management system to download these dependencies.
+Trust us, it's going to make your life a lot easier.  If you're using Mac OS X,
+you can use [homebrew](http://mxcl.github.com/homebrew/); if you're using
+Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes
+pre-installed); if you're using Fedora simply use
+[yum](http://yum.baseurl.org/). The instructions below assume you have these
+installed.**
 
 ### Build Tools
 
-To install build tools on **Ubuntu**, run the following (includes the gcc and xml parsing dependencies):
+To install build tools on **Ubuntu**, run the following (includes the gcc and
+xml parsing dependencies):
 
 		sudo apt-get install build-essential libxslt1.1 libxslt1-dev libxml2
 
@@ -48,7 +87,8 @@ To install build tools on **Fedora**, run the following:
 
 		sudo yum install libxslt libxslt-devel libxml2 libxml2-devel
 
-To install build tools on **Mac OS X**, you need to download and install [Xcode](http://developer.apple.com/technologies/tools/xcode.html).
+To install build tools on **Mac OS X**, you need to download and install
+[Xcode](http://developer.apple.com/technologies/tools/xcode.html).
 
 ### Ruby
 
@@ -56,35 +96,49 @@ To install Ruby 1.8.7 on **Ubuntu**, run the following command:
 
 		sudo apt-get install ruby-full
 
-Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. 
+Please note that you need to have Universe enabled in your
+/etc/apt/sources.list file to install ruby using apt-get.
 
-At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby installation. A semi automated method for doing this is available. It is highly recommended that you review the script before running it so you understand what will occur. The script can be executed by running the following command:
+At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to
+use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby
+installation.  A semi automated method for doing this is available.  It is
+highly recommended that you review the script before running it so you
+understand what will occur.  The script can be executed by running the
+following command:
 
 		./script/bootstrap-fedora-diaspora.sh
 
-After reviewing and executing the above script you will need to follow the "MongoDB" section and then you should skip all the way down to "Start Mongo".
-
+After reviewing and executing the above script you will need to follow the
+"MongoDB" section and then you should skip all the way down to "Start Mongo".
 
 If you're on **Mac OS X**, you already have Ruby on your system.  Yay!
 
 ### MongoDB
 
-To install MongoDB on **Ubuntu**, add the official MongoDB repository from this link:
+To install MongoDB on **Ubuntu**, add the official MongoDB repository
+[here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages).
 
-http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages
-
-For Lucid, add the following line to your /etc/apt/sources.list (for other distros, see http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages):
+For Lucid, add the following line to your /etc/apt/sources.list (for other
+distros, see http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages):
 
 		deb http://downloads.mongodb.org/distros/ubuntu 10.4 10gen
 
-And then run:
+Then run:
 		sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
 		sudo apt-get update
 		sudo apt-get install mongodb-stable
 
 You can also run the binary directly by doing the following:
 
-If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`.  If you're running a 64-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`.
+If you're running a 32-bit system, run:
+
+		wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz
+
+If you're running a 64-bit system, run:
+
+		wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz
+
+Then run:
 
 		# extract
 		tar xzf mongodb-linux-i686-1.4.0.tgz
@@ -93,7 +147,10 @@ If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mon
 		sudo chmod -Rv 777 /data/
 
 
-To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB repository from MongoDB (http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into /etc/yum.repos.d/10gen.repo:
+To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB
+repository from MongoDB
+(http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into
+/etc/yum.repos.d/10gen.repo:
 
 		[10gen]
 		name=10gen Repository
@@ -101,13 +158,14 @@ To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB repos
 		gpgcheck=0
 		enabled=1
 
-
 Then use yum to install the packages:
 
 		sudo yum install mongo-stable mongo-stable-server
 
-
-If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`.  If you're running a 64-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`.
+If you're running a 32-bit system, run `wget
+http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're
+running a 64-bit system, run `wget
+http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`.
 
 		# extract
 		tar xzf mongodb-linux-i686-1.4.0.tgz
@@ -115,7 +173,6 @@ If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mon
 		sudo mkdir -p /data/db
 		sudo chmod -Rv 777 /data/
 
-
 To install MongoDB on **Mac OS X**, run the following:
 
 		brew install mongo
@@ -124,7 +181,8 @@ To install MongoDB on **Mac OS X**, run the following:
 
 ### OpenSSL
 
-If you're running either **Ubuntu**, **Fedora** or **Mac OS X** you already have OpenSSL installed!
+If you're running either **Ubuntu**, **Fedora** or **Mac OS X** you already
+have OpenSSL installed!
 
 ### ImageMagick
 
@@ -164,78 +222,117 @@ On **Ubuntu** 10.04, run the following:
 		sudo apt-get update
 		sudo apt-get install rubygems
 
-This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version of rubygems is in the repositories.
+This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version
+of rubygems is in the repositories.
 
 On **Fedora**, run the following:
 
 		sudo yum install rubygems
 
-On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update it for use with the latest Bundler.  To update RubyGems, run `sudo gem update --system`.
+On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update
+it for use with the latest Bundler. To update RubyGems, run `sudo gem update
+--system`.
 
 
 ### Bundler
 
-After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler.  If you're using Ubuntu repository .debs, bundler is found at /var/lib/gems/1.8/bin/bundle
+After RubyGems is updated, simply run `sudo gem install bundler` to get
+Bundler. If you're using Ubuntu repository .debs, bundler is found at
+/var/lib/gems/1.8/bin/bundle
 
 
 ## Getting Diaspora
 
 		git clone http://github.com/diaspora/diaspora.git
 
-If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup.
+If you have never used github before, their
+[help desk](http://help.github.com/) has a pretty awesome guide on getting
+setup.
 
 
 ## Running Diaspora
 
 ### Install required gems
-To start the app server for the first time, you need to use Bundler to install Diaspora's gem depencencies.  Run `bundle install` from Diaspora's root directory.  Bundler will also warn you if there is a new dependency and you need to bundle install again.
+
+To start the app server for the first time, you need to use Bundler to install
+Diaspora's gem depencencies.  Run `bundle install` from Diaspora's root
+directory.  Bundler will also warn you if there is a new dependency and you
+need to bundle install again.
 
 ### Start Mongo
-If you installed the Ubuntu package, MongoDB should already be running (if not, run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo.
 
-If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo.
+If you installed the Ubuntu package, MongoDB should already be running (if not,
+run `service mongodb start`). If you installed the binary manually, run `sudo
+mongod` from where mongo is installed to start mongo.
 
-If you installed the OsX package through "brew", MongoDB will need to be started via `sudo launchctl load /Library/LaunchDaemons/org.mongodb.mongod.plist`. (before you have to go to /Library/LaunchDaemons and add a symlink to /usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist)
+If you installed the Fedora package, MongoDB will need to be started via
+`service mongodb start`. If you installed the binary manually, run `sudo
+mongod` from where Mongo is installed to start Mongo.
 
-Diaspora will not run unless mongo is running.  Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora.
+If you installed the OsX package through "brew", MongoDB will need to be
+started via `sudo launchctl load
+/Library/LaunchDaemons/org.mongodb.mongod.plist`. (before you have to go to
+/Library/LaunchDaemons and add a symlink to
+/usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist)
+
+Diaspora will not run unless Mongo is running.  Mongo will not run by default,
+and will need to be started every time you wish to use or run the test suite
+for Diaspora.
+
+### Configure Diaspora
+
+Diaspora needs to know where on the internet it is.  Copy config/app_config_example.yml
+to config/app_config.yml, put your url into the url field, and make any other
+needed configuration changes.
 
 ### Run the server
-`./script/server` will start both thin and the websocket server.  If you want to run a different app server, you will have to run them separately.  See below for instructions.
+
+`./script/server` will start both thin and the websocket server.  If you want
+to run a different app server, you will have to run them separately.  See below
+for instructions.
 
 ### Run the app server
-Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory.  This will start the app server in development mode[.](http://bit.ly/9mwtUw)
+
+Once mongo is running and bundler has finished, run `bundle exec thin start`
+from the root Diaspora directory.  This will start the app server in
+development mode[.](http://bit.ly/9mwtUw)
 
 ### Run the websocket server
-run `bundle exec ruby ./script/websocket_server` to start the websocket server on port 8080.  Change the port in config/app_config.yml.
 
-### Logging in
-Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb.
+run `bundle exec ruby ./script/websocket_server` to start the websocket server
+on port 8080. Change the port in config/app_config.yml.
 
+### Logging in with a sample user
+
+Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`.
+More details in db/seeds/tom.rb.
 
 ### Testing
-Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework.  In order to run the tests, run `bundle exec rspec spec`.
+
+Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven
+testing framework.  In order to run the tests, run `bundle exec rspec spec`.
 
 ## Resources
 
-We are maintaining a [public tracker project](http://www.pivotaltracker.com/projects/61641) and a [roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap).  Also, you can file [bug reports](https://github.com/diaspora/diaspora/issues) right here on github.
+We are maintaining a
+[public tracker project](http://www.pivotaltracker.com/projects/61641)
+and a
+[roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can
+file [bug reports](https://github.com/diaspora/diaspora/issues) right here on
+github.
 
 Ongoing discussion:
 - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
 - [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
 - [Diaspora Q&A site](http://diaspora.shapado.com/)
-- [#diaspora-dev](irc://irc.freenode.net/#diaspora-dev)
+- [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)
+  ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev))
 
-More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [twitter](http://twitter.com/joindiaspora).  Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk).
-
-If you wish to contact us privately about any exploits in Diaspora you may find, you can email [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
-
-
-## License
-Copyright 2010 Diaspora Inc.
-
-Diaspora is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-Diaspora is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+More general info and updates about the project can be found on:
+[Our blog](http://joindiaspora.com),
+[and on Twitter](http://twitter.com/joindiaspora). 
+Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk).
 
+If you wish to contact us privately about any exploits in Diaspora you may
+find, you can email
+[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index 71204c22d..9e4859830 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -15,8 +15,11 @@ class AlbumsController < ApplicationController
   end
 
   def create
-    aspect =  params[:album][:to]
-    @album = current_user.post(:album, params[:album])
+    aspect = params[:album][:to]
+
+    data = clean_hash(params[:album])
+
+    @album = current_user.post(:album, data)
     flash[:notice] = I18n.t 'albums.create.success', :name  => @album.name
     redirect_to :action => :show, :id => @album.id, :aspect => aspect
   end
@@ -26,7 +29,7 @@ class AlbumsController < ApplicationController
   end
 
   def destroy
-    @album = current_user.album_by_id params[:id]
+    @album = current_user.find_visible_post_by_id params[:id]
     @album.destroy
     flash[:notice] =  I18n.t 'albums.destroy.success', :name  => @album.name
     respond_with :location => albums_url
@@ -34,20 +37,22 @@ class AlbumsController < ApplicationController
 
   def show
     @photo = Photo.new
-    @album = Album.find_by_id params[:id]
+    @album = current_user.find_visible_post_by_id( params[:id] )
     @album_photos = @album.photos
-
     respond_with @album
   end
 
   def edit
-    @album = current_user.album_by_id params[:id]
+    @album = current_user.find_visible_post_by_id params[:id]
     redirect_to @album unless current_user.owns? @album
   end
 
   def update
-    @album = current_user.album_by_id params[:id]
-    if @album.update_attributes params[:album]
+    @album = current_user.find_visible_post_by_id params[:id]
+
+    data = clean_hash(params[:album])
+
+    if current_user.update_post( @album, data )
       flash[:notice] =  I18n.t 'albums.update.success', :name  => @album.name
       respond_with @album
     else
@@ -56,4 +61,11 @@ class AlbumsController < ApplicationController
     end
   end
 
+  private
+  def clean_hash(params)
+    return {
+      :name => params[:name],
+      :to   => params[:to]
+    }
+  end
 end
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 5d572742a..2bf1edb76 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -25,7 +25,7 @@ class AspectsController < ApplicationController
   end
 
   def destroy
-    @aspect = Aspect.find_by_id params[:id]
+    @aspect = current_user.aspect_by_id params[:id]
 
     begin
       current_user.drop_aspect @aspect
@@ -38,7 +38,7 @@ class AspectsController < ApplicationController
   end
 
   def show
-    @aspect   = Aspect.find_by_id params[:id]
+    @aspect  = current_user.aspect_by_id params[:id]
     @friends = @aspect.people
     @posts   = current_user.visible_posts( :by_members_of => @aspect ).paginate :per_page => 15, :order => 'created_at DESC'
 
@@ -51,8 +51,10 @@ class AspectsController < ApplicationController
   end
 
   def update
-    @aspect = Aspect.find_by_id(params[:id])
-    @aspect.update_attributes(params[:aspect])
+    @aspect = current_user.aspect_by_id(params[:id])
+
+    data = clean_hash(params[:aspect])
+    @aspect.update_attributes( data )
     flash[:notice] = i18n.t 'aspects.update.success',:name => @aspect.name
     respond_with @aspect
   end
@@ -62,25 +64,33 @@ class AspectsController < ApplicationController
       move = move[1]
       unless current_user.move_friend(move)
         flash[:error] = i18n.t 'aspects.move_friends.failure', :real_name => Person.find_by_id( move[:friend_id] ).real_name
-        redirect_to Aspect.first, :action => "edit"
+        redirect_to aspects_manage_path
         return
       end
     }
 
     flash[:notice] = i18n.t 'aspects.move_friends.success'
-    redirect_to Aspect.first, :action => "edit"
+    redirect_to aspects_manage_path
   end
 
   def move_friend
     unless current_user.move_friend( :friend_id => params[:friend_id], :from => params[:from], :to => params[:to][:to])
       flash[:error] = I18n.t 'aspects.move_friend.error',:inspect => params.inspect
     end
-    if aspect = Aspect.first(:id => params[:to][:to])
-      flash[:notice] = I18n.t 'aspects.move_friend.notice'
-      respond_with aspect
+    if aspect = current_user.aspect_by_id(params[:to][:to])
+      flash[:notice] = I18n.t 'aspects.move_friend.success'
+      render :nothing => true
     else
-      flash[:notice] = I18n.t 'aspects.move_friend.notice'
-      respond_with Person.first(:id => params[:friend_id])
+      flash[:notice] = I18n.t 'aspects.move_friend.failure'
+      render aspects_manage_path
     end
   end
+
+  private
+  def clean_hash(params)
+    return {
+      :name => params[:name]
+    }
+  end
+
 end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index dc115ab5b..4caeb1414 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -17,9 +17,4 @@ class CommentsController < ApplicationController
     render :nothing => true
   end
 
-  def show
-    @comment = Comment.find_by_id params[:id]
-    respond_with @comment
-  end
-
 end
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index bcb0dd4f7..30d1a1799 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -7,24 +7,6 @@ class DevUtilitiesController < ApplicationController
   before_filter :authenticate_user!, :except => [:set_backer_number]
   include ApplicationHelper
   include RequestsHelper
-def warzombie
-    render :nothing => true
-    if current_user.email == "tom@tom.joindiaspora.com" && StatusMessage.where(:message => "There's a bomb in the lasagna!?").first == nil
-      current_user.post(:status_message, :message => "There's a bomb in the lasagna!?")
-      current_user.post(:status_message, :message => "xkcd \nhttp://xkcd.com/743/" )
-      current_user.post(:status_message, :message => "I switched to Motoroi today, a Motorola Android-based phone, in Korea. Now, I am using Android phones in both the U.S. and Korea", :created_at => Time.now-930)
-      current_user.post(:status_message, :message => "I had 5 hours to study for it :-( GREs on Thursday. Wunderbar.", :created_at => Time.now-43990)
-      current_user.post(:status_message, :message => "Spotted in toy story 3: google maps, OSX, and windows XP. Two out of three isn't bad.", :created_at => Time.now-4390)
-      current_user.post(:status_message,  :message => "Reddit\nhttp://reddit.com", :created_at => Time.now-54390)
-      current_user.post(:status_message, :message => "Commercials for IE make me SO MAD and my friends just don't get why.", :created_at => Time.now-30900)
-      current_user.post(:status_message, :message => "Zombo.com\nhttp://zombo.com", :created_at => Time.now-9090)
-      current_user.post(:status_message, :message => "Why do I have \"No More Heroes\" by Westlife on repeat all day?", :created_at => Time.now-590000)
-      current_user.post(:status_message, :message => "Mmm. Friday night. Acknowledged.", :created_at => Time.now-503900)
-      current_user.post(:status_message, :message => "Getting a universal remote is the epitome of laziness, I do declare.", :created_at => Time.now-4400)
-      current_user.post(:status_message, :message => "Does anyone know how to merge two Skype contact entries of the same person? (i.e. one Skype ID and one mobile number)", :created_at => Time.now-400239)
-      current_user.post(:status_message, :message => "A cool, cool morning for once.", :created_at => Time.now-150000)
-    end
-  end
 
   def zombiefriends
     render :nothing => true
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index d85c67691..08acdd424 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -22,7 +22,7 @@ class PeopleController < ApplicationController
     @profile = @person.profile
     @aspects_with_person = current_user.aspects_with_person(@person)
     @aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
-    @posts = current_user.visible_posts_from_others(:from => @person).paginate :page => params[:page], :order => 'created_at DESC'
+    @posts = current_user.visible_posts(:from => @person).paginate :page => params[:page], :order => 'created_at DESC'
     @latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
     @post_count = @posts.count
     respond_with @person
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 203a748f6..3433c0cf4 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -10,9 +10,7 @@ class PhotosController < ApplicationController
   respond_to :json, :only => :show
 
   def create
-
     album = Album.find_by_id params[:album_id]
-
     begin
 
       ######################## dealing with local files #############
@@ -33,7 +31,11 @@ class PhotosController < ApplicationController
 
 
       params[:user_file] = file
-      @photo = current_user.post(:photo, params)
+
+      data = clean_hash(params)
+
+
+      @photo = current_user.post(:photo, data)
 
       respond_to do |format|
         format.json{render(:layout => false , :json => {"success" => true, "data" => @photo}.to_json )}
@@ -61,29 +63,32 @@ class PhotosController < ApplicationController
   end
 
   def destroy
-    @photo = Photo.find_by_id params[:id]
+    @photo = current_user.find_visible_post_by_id params[:id]
+
     @photo.destroy
     flash[:notice] = I18n.t 'photos.destroy.notice'
     respond_with :location => @photo.album
   end
 
   def show
-    @photo = Photo.find_by_id params[:id]
+    @photo = current_user.find_visible_post_by_id params[:id]
     @album = @photo.album
-
     respond_with @photo, @album
   end
 
   def edit
-    @photo = Photo.find_by_id params[:id]
+    @photo = current_user.find_visible_post_by_id params[:id]
     @album = @photo.album
 
     redirect_to @photo unless current_user.owns? @album
   end
 
   def update
-    @photo = Photo.find_by_id params[:id]
-    if @photo.update_attributes params[:photo]
+    @photo = current_user.find_visible_post_by_id params[:id]
+
+    data = clean_hash(params)
+
+    if current_user.update_post( @photo, data[:photo] )
       flash[:notice] = I18n.t 'photos.update.notice'
       respond_with @photo
     else
@@ -91,4 +96,22 @@ class PhotosController < ApplicationController
       render :action => :edit
     end
   end
+
+
+  private
+  def clean_hash(params)
+    if params[:photo]
+      return {
+        :photo => {
+          :caption   => params[:photo][:caption],
+        }
+      }
+    else
+      return{
+        :album_id  => params[:album_id],
+        :user_file => params[:user_file]
+      }
+    end
+  end
+
 end
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 6f2b09c43..d7f4825de 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -10,7 +10,6 @@ class PublicsController < ApplicationController
 
   def hcard
     @person = Person.find_by_id params[:id]
-    puts @person
     unless @person.nil? || @person.owner.nil?
       render 'hcard'
     end
@@ -33,9 +32,10 @@ class PublicsController < ApplicationController
     render :nothing => true
     return unless params[:xml]
     begin
-      @user = Person.first(:id => params[:id]).owner
+      person = Person.first(:id => params[:id])
+      @user = person.owner
     rescue NoMethodError => e
-      Rails.logger.error("Received post #{params[:xml]} for nonexistent person #{params[:id]}")
+      Rails.logger.error("Received post for nonexistent person #{params[:id]}")
       return
     end
     @user.receive_salmon params[:xml]
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 854f19e1a..b630c6617 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,9 +15,7 @@ class RegistrationsController < Devise::RegistrationsController
       flash[:error] = e.message
     end
     if user
-      #set_flash_message :notice, :signed_up
       flash[:notice] = I18n.t 'registrations.create.success'
-      #redirect_to root_url
       sign_in_and_redirect(:user, user)
     else
       redirect_to new_user_registration_path
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 2586592c2..e0b81ba8a 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -47,7 +47,7 @@ class RequestsController < ApplicationController
     begin
       @request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
     rescue Exception => e
-      raise e unless e.message.include? "already friends"
+      raise e unless e.message.include? "already"
       flash[:notice] = I18n.t 'requests.create.already_friends', :destination_url => params[:request][:destination_url]
       respond_with :location => aspect
       return
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 5a588fb99..5a8efbe06 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -11,18 +11,29 @@ class StatusMessagesController < ApplicationController
 
   def create
     params[:status_message][:to] = params[:aspect_ids]
-    @status_message = current_user.post(:status_message, params[:status_message])
+
+    data = clean_hash params[:status_message]
+
+    @status_message = current_user.post(:status_message, data)
     respond_with @status_message
   end
 
   def destroy
-    @status_message = StatusMessage.find_by_id params[:id]
+    @status_message = current_user.find_visible_post_by_id params[:id]
     @status_message.destroy
     respond_with :location => root_url
   end
 
   def show
-    @status_message = StatusMessage.find_by_id params[:id]
+    @status_message = current_user.find_visible_post_by_id params[:id]
     respond_with @status_message
   end
+
+  private
+  def clean_hash(params)
+    return {
+      :message => params[:message],
+      :to      => params[:to]
+    }
+  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 72666bc30..dbb69d1a2 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,14 +17,15 @@ class UsersController < ApplicationController
 
   def update
     @user = current_user
-    prep_image_url(params[:user])
 
-    @user.update_profile params[:user]
+    data = clean_hash params[:user]
+    prep_image_url(data)
+
+    @user.update_profile data
     respond_with(@user, :location => root_url)
   end
 
   private
-
   def prep_image_url(params)
     if params[:profile][:image_url].empty?
       params[:profile].delete(:image_url)
@@ -32,4 +33,16 @@ class UsersController < ApplicationController
       params[:profile][:image_url] = "http://" + request.host + ":" + request.port.to_s + params[:profile][:image_url]
     end
   end
+
+  def clean_hash(params)
+    return {
+      :profile =>
+        {
+        :first_name => params[:profile][:first_name],
+        :last_name => params[:profile][:last_name],
+        :image_url => params[:profile][:image_url]
+        }
+    }
+  end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 018d1da7f..89df26155 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,7 +4,6 @@
 
 
 module ApplicationHelper
-
   def current_aspect?(aspect)
     !@aspect.is_a?(Symbol) && @aspect.id == aspect.id
   end
@@ -28,7 +27,7 @@ module ApplicationHelper
   end
 
   def how_long_ago(obj)
-    "#{time_ago_in_words(obj.created_at)} ago."
+    "#{time_ago_in_words(obj.created_at)} ago"
   end
 
   def person_url(person)
@@ -43,11 +42,11 @@ module ApplicationHelper
   end
 
   def owner_image_tag
-    person_image_tag(current_user)
+    person_image_tag(current_user.person)
   end
 
   def owner_image_link
-    person_image_link(current_user)
+    person_image_link(current_user.person)
   end
 
   def person_image_tag(person)
@@ -68,5 +67,4 @@ module ApplicationHelper
   def post_yield_tag(post)
     (':' + post.id.to_s).to_sym
   end
-
 end
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index 5f6abe8e9..271b68253 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -4,8 +4,7 @@
 
 
 module DashboardsHelper
-
   def title_for_page
-      I18n.t('dashboards.helper.home')
+    I18n.t('dashboards.helper.home')
   end
 end
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 2d0ddad6e..2737d3a2d 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -4,7 +4,6 @@
 
 
 module PhotosHelper
-
   def linked_scaled_photo(photo, album)
     link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
   end
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index 9e76f59f7..46e778e2b 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -9,7 +9,6 @@ module PublicsHelper
     subscriber ||= Subscriber.new(:url => opts[:callback], :topic => opts[:topic])
 
     if subscriber.save
-
       if opts[:verify] == 'sync'
         204
       elsif opts[:verify] == 'async'
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 32ce79fd9..fec093aac 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -4,7 +4,6 @@
 
 
 module RequestsHelper
-
   def subscription_mode(profile)
     if diaspora?(profile)
       :friend
@@ -39,5 +38,4 @@ module RequestsHelper
     end
     { action => person }
   end
-
 end
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index cbe465e7b..69135092a 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -33,7 +33,4 @@ module SocketsHelper
 
     action_hash.to_json
   end
-
-
-
 end
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index 96f94e8fe..b60142671 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -39,5 +39,6 @@ class Aspect
       }
     }
   end
+
 end
 
diff --git a/app/models/person.rb b/app/models/person.rb
index b1e7e3745..f2209f0ce 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -35,6 +35,7 @@ class Person
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
   def self.search(query)
+    query = Regexp.escape( query.to_s.strip )
     Person.all('profile.first_name' => /^#{query}/i) | Person.all('profile.last_name' => /^#{query}/i)
   end
 
@@ -76,9 +77,11 @@ class Person
   end
 
   def self.by_webfinger( identifier, opts = {})
-    local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', ''))
-
+    #need to check if this is a valid email structure, maybe should do in JS
+    local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', '').to_s.downcase)
+    
      if local_person
+       Rails.logger.info("Do not need to webfinger, found a local person #{local_person.real_name}")
        local_person
      elsif  !identifier.include?("localhost") && !opts[:local]
        begin
@@ -101,8 +104,8 @@ class Person
     
     return nil unless public_key_entry
     
-    public_key = public_key_entry.first.href
-    new_person.exported_key = Base64.decode64 public_key
+    pubkey = public_key_entry.first.href
+    new_person.exported_key = Base64.decode64 pubkey
 
     guid = profile.links.select{|x| x.rel == 'http://joindiaspora.com/guid'}.first.href
     new_person.id = guid
diff --git a/app/models/request.rb b/app/models/request.rb
index da62edd93..739500e4e 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -26,8 +26,8 @@ class Request
   validates_presence_of :destination_url, :callback_url
   before_validation :clean_link
 
-  scope :for_user,  lambda{ |user| where(:destination_url    => user.receive_url) }
-  scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) }
+  scope :for_user,  lambda{ |user| where(:destination_url    => user.person.receive_url) }
+  scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_url) }
 
   def self.instantiate(options = {})
     person = options[:from]
diff --git a/app/models/user.rb b/app/models/user.rb
index 4ec528e70..8f74e2233 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,12 +5,14 @@
 
 require 'lib/diaspora/user/friending.rb'
 require 'lib/diaspora/user/querying.rb'
+require 'lib/diaspora/user/receiving.rb'
 require 'lib/salmon/salmon'
 
 class User
   include MongoMapper::Document
   include Diaspora::UserModules::Friending
   include Diaspora::UserModules::Querying
+  include Diaspora::UserModules::Receiving
   include Encryptor::Private
   QUEUE = MessageHandler.new
 
@@ -23,8 +25,6 @@ class User
   key :visible_post_ids,    Array
   key :visible_person_ids,  Array
 
-  key :url, String
-
   one :person, :class_name => 'Person', :foreign_key => :owner_id
 
   many :friends,           :in => :friend_ids,          :class_name => 'Person'
@@ -95,7 +95,6 @@ class User
 
   ######## Posting ########
   def post(class_name, options = {})
-
     if class_name == :photo
       raise ArgumentError.new("No album_id given") unless options[:album_id]
       aspect_ids = aspects_with_post( options[:album_id] )
@@ -104,17 +103,47 @@ class User
       aspect_ids = options.delete(:to)
     end
 
-    aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
-    raise ArgumentError.new("You must post to someone.") if aspect_ids.nil? || aspect_ids.empty?
+    aspect_ids = validate_aspect_permissions(aspect_ids)
 
+    intitial_post(class_name, aspect_ids, options)
+  end
+
+
+  def intitial_post(class_name, aspect_ids, options = {}) 
     post = build_post(class_name, options)
-
     post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
     push_to_aspects(post, aspect_ids)
+    post 
+  end
 
+  def repost( post, options = {} )
+    aspect_ids = validate_aspect_permissions(options[:to])
+    push_to_aspects(post, aspect_ids)
     post
   end
 
+  def update_post( post, post_hash = {} )
+    if self.owns? post
+      post.update_attributes(post_hash)
+    end
+  end
+
+  def validate_aspect_permissions(aspect_ids)
+    aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
+
+    if aspect_ids.nil? || aspect_ids.empty?
+      raise ArgumentError.new("You must post to someone.")
+    end
+
+    aspect_ids.each do |aspect_id|
+      unless aspect_id == "all" || self.aspects.find(aspect_id) 
+        raise ArgumentError.new("Cannot post to an aspect you do not own.")
+      end 
+    end
+
+    aspect_ids
+  end
+
   def build_post( class_name, options = {})
     options[:person] = self.person
     model_class = class_name.to_s.camelize.constantize
@@ -217,87 +246,10 @@ class User
     end
   end
 
-  ###### Receiving #######
-  def receive_salmon ciphertext
-    cleartext = decrypt( ciphertext)
-    Rails.logger.info("Received a salmon: #{cleartext}")
-    salmon = Salmon::SalmonSlap.parse cleartext
-    if salmon.verified_for_key?(salmon.author.public_key)
-      Rails.logger.info("data in salmon: #{salmon.data}")
-      self.receive(salmon.data)
-    end
-  end
-
-  def receive xml
-    object = Diaspora::Parser.from_xml(xml)
-    Rails.logger.debug("Receiving object for #{self.real_name}:\n#{object.inspect}")
-    Rails.logger.debug("From: #{object.person.inspect}") if object.person
-
-    if object.is_a? Retraction
-      if object.type == 'Person'
-
-        Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}")
-        unfriended_by visible_person_by_id(object.post_id)
-else
-        object.perform self.id
-        aspects = self.aspects_with_person(object.person)
-        aspects.each{ |aspect| aspect.post_ids.delete(object.post_id.to_id)
-                             aspect.save
-        }
-      end
-    elsif object.is_a? Request
-      person = Diaspora::Parser.parse_or_find_person_from_xml( xml )
-      person.serialized_key ||= object.exported_key
-      object.person = person
-      object.person.save
-      old_request =  Request.first(:id => object.id)
-      object.aspect_id = old_request.aspect_id if old_request
-      object.save
-      receive_friend_request(object)
-    elsif object.is_a? Profile
-      person = Diaspora::Parser.owner_id_from_xml xml
-      person.profile = object
-      person.save
-
-    elsif object.is_a?(Comment)
-      object.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if object.person.nil?
-      self.visible_people = self.visible_people | [object.person]
-      self.save
-      Rails.logger.debug("The person parsed from comment xml is #{object.person.inspect}") unless object.person.nil?
-      object.person.save
-    Rails.logger.debug("From: #{object.person.inspect}") if object.person
-      raise "In receive for #{self.real_name}, signature was not valid on: #{object.inspect}" unless object.post.person == self.person || object.verify_post_creator_signature
-      object.save
-      unless owns?(object)
-        dispatch_comment object
-      end
-      object.socket_to_uid(id)  if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
-    else
-      Rails.logger.debug("Saving object: #{object}")
-      object.user_refs += 1
-      object.save
-
-      self.raw_visible_posts << object
-      self.save
-
-      aspects = self.aspects_with_person(object.person)
-      aspects.each{ |aspect|
-        aspect.posts << object
-        aspect.save
-        object.socket_to_uid(id, :aspect_ids => [aspect.id]) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
-      }
-
-    end
-
-  end
-
   ###Helpers############
   def self.instantiate!( opts = {} )
-    hostname = opts[:url].gsub(/(https?:|www\.)\/\//, '')
-    hostname.chop! if hostname[-1, 1] == '/'
-    
-    opts[:person][:diaspora_handle] = "#{opts[:username]}@#{hostname}"
-    puts opts[:person][:diaspora_handle]
+    opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
+    opts[:person][:url] = APP_CONFIG[:pod_url]
     opts[:person][:serialized_key] = generate_key
     User.create(opts)
   end
@@ -308,7 +260,7 @@ else
   end
   
   def terse_url
-    terse = self.url.gsub(/(https?:|www\.)\/\//, '')
+    terse = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
     terse = terse.chop! if terse[-1, 1] == '/'
     terse
   end
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 56e5c617b..7b5e6c8be 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -17,11 +17,16 @@
   = render "shared/aspect_friends"
 
 - content_for :publish do
+  -if current_user.owns? @album
+    .right
+      =render 'photos/new_photo'
+      = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
   %h1
     = @album.name
   ="#{t('.updated')} #{how_long_ago(@album)}"
 
 
+
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
 -unless current_user.owns? @album
@@ -31,13 +36,7 @@
   - for photo in @album_photos
     .image_thumb
       = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
-  -if current_user.owns? @album
-    =render 'photos/new_photo'
 
 #content_bottom
   .back
     = link_to "⇧ #{t('.albums')}", albums_path
-
-  -if current_user.owns? @album
-    .right
-      = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 1a6bc3b0d..251a8d9a6 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -36,7 +36,9 @@
     %li.aspect
       
       .aspect_name
-        %h1{:contenteditable => true}= aspect.name
+        %span.edit_name_field
+          %h1{:contenteditable => true}= aspect.name
+          %span.tip click to edit
 
         %ul.tools
           %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
@@ -54,13 +56,16 @@
             %li.person{:id => person.id, :from_aspect_id => aspect.id}
               = person_image_tag(person)
               .name
-                = person.real_name
+                = link_to person.real_name, person
         .yo{:style => 'display:none'}
           %div{:id => "add_request_pane_#{aspect.id}"}
             = render "requests/new_request", :aspect => aspect
 
+<<<<<<< HEAD
 %p
   %br
   = link_to t('.update_aspects'), '#', :class => 'button', :id => "move_friends_link"
 
+=======
+>>>>>>> master
 #content_bottom
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 4252d9762..4fd46eb56 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -7,6 +7,6 @@
   = person_image_tag(post.person)
   %span.from
     = link_to post.person.real_name, post.person
-    = auto_link sanitize post.text
+    = post.text
   %div.time
     = "#{time_ago_in_words(post.updated_at)} #{t('.ago')}"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 1840d7acc..15880df0b 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,10 +1,16 @@
+%h1
+  This is a technology preview, do not provide any private information.
+%h3 
+  your account may be deleted until we move into a more stable development period. 
+%h3
+  USE AT YOUR OWN RISK!!
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
   #user
     %p.username
       = f.label :username
       = f.text_field :username
     %p.user_network
-      ="@#{request.host}"
+      ="@#{APP_CONFIG[:pod_url]}"
 
     %p
       = f.label :password
@@ -14,6 +20,7 @@
   /  = f.check_box :remember_me
   /  = f.label :remember_me
   = f.submit "Sign in"
+  = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
   %p
 = render :partial => "devise/shared/links"
 
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 1e75b8ab2..7e22a5570 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -2,14 +2,13 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => person.id}
 
   = person_image_link(person)
 
   .content
     %span.from
-      = link_to person.real_name, person
+      = link_to person.real_name, person_path(person)
 
     .info
       = person.diaspora_handle
@@ -17,6 +16,8 @@
     .right{ :style => "display:inline;top:0;" }
       - if person.id == current_user.person.id
         thats you!
+      - elsif current_user.friends.include?(person)
+        Already friends
       - elsif current_user.pending_requests.find_by_person_id(person.id)
         = link_to =t('.pending_request'), aspects_manage_path
       - else
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 93705f15c..23e6ea64d 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -4,7 +4,7 @@
 
 
 - content_for :page_title do
-  = @person.real_name
+  profile
 
 - content_for :left_pane do
   #profile
diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index 065a9aa49..f837c92de 100644
--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
@@ -2,7 +2,6 @@
 
 
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
-  = f.hidden_field :url, :value => request.host
   %p
     = f.label :username
     = f.text_field :username
@@ -17,8 +16,6 @@
     = f.password_field :password_confirmation
 
   = f.fields_for :person do |p|
-    = p.hidden_field :url, :value => request.host
-
     = p.fields_for :profile do |pr|
       %p
         = pr.label :first_name
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 9ba5a5ee4..8e900e42d 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -6,7 +6,7 @@
 #aspect_nav
   %ul
     - for aspect in @aspects
-      %li{:id => aspect.id, :class => ("selected" if current_aspect?(aspect))}
+      %li{:class => ("selected" if current_aspect?(aspect))}
         = link_for_aspect aspect
 
   %ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 9dadf4905..040d3e3c2 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -10,7 +10,7 @@
     = f.error_messages
     %p
       %label{:for => "status_message_message"} Message
-      = f.text_area :message, :rows => 2
+      = f.text_area :message, :rows => 2, :value => params[:prefill]
 
     %ul.aspect_selector{ :style => "display:none;"}
       going to...
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
new file mode 100644
index 000000000..0b4120d52
--- /dev/null
+++ b/app/views/shared/_reshare.haml
@@ -0,0 +1,27 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3.  See
+-#   the COPYRIGHT file.
+
+
+
+:javascript
+  $(".reshare_button").toggle(function(e){
+    e.preventDefault();
+    $(this).parent(".reshare_pane").children(".reshare_box").fadeIn(200);
+  }, function(e) {
+    e.preventDefault();
+    $(this).parent(".reshare_pane").children(".reshare_box").fadeOut(200);
+  });
+
+.reshare_pane
+  %span.reshare_button
+    = link_to "Reshare", "#"
+
+  %ul.reshare_box
+    - for aspect in current_user.aspects_with_post( post.id )
+    
+      %li.currently_sharing= aspect.name
+
+    - for aspect in current_user.aspects
+      - unless aspect.posts.include? post
+        %li.aspect_to_share= link_to aspect, :controller => "aspects", :action => "show", :id => aspect.id, :prefill => post.message
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index f6cac9155..4d73f4251 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -10,16 +10,16 @@
   .content
     %span.from
       = link_to post.person.real_name, post.person 
-      = auto_link sanitize post.message
+      = post.message
       
     .info
-      = link_to(how_long_ago(post), object_path(post))
+      %span.time= link_to(how_long_ago(post), object_path(post))
       \--
       = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
 
-    = render   "comments/comments", :post => post 
-
+    = render "comments/comments", :post => post 
 
   - if current_user.owns?(post)
     .destroy_link
       = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+      = render "shared/reshare", :post => post, :current_user => current_user 
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index b27208d2b..ae4ece073 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -2,21 +2,13 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-- title t('.status_message')
-
-%p
-  %strong="#{t('.message')}:"
+%h1
+  = link_to @status_message.person.real_name, @status_message.person
   = @status_message.message
-  
-%p
-  %strong="#{t('.owner')}:"
-  = @status_message.person.real_name
 
 %h4= "#{t('.comments')} (#{@status_message.comments.count})"
 = render "comments/comments", :post => @status_message
 
 %p
-  = link_to t('.destroy'), @status_message, :confirm => t('.are_you_sure'), :method => :delete
-  |
-  = link_to t('.view_all'), status_messages_path
+  - if current_user.owns? @status_message
+    = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure?'), :method => :delete
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 42263b230..25668776f 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -16,11 +16,11 @@
 
     %h3="#{t('.picture')}"
     %div#image_picker
-      = p.hidden_field :image_url, :value => (@profile.image_url.sub(@user.url,'/') if @profile.image_url), :id => 'image_url_field'
+      = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
 
       - unless @photos.nil? || @photos.empty?
         - for photo in @photos
-          - if @profile.image_url && (photo.url(:thumb_medium) == @profile.image_url.sub(@user.url,'/'))
+          - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
             %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
               = check_box_tag 'checked_photo', true, true
               = link_to image_tag(photo.url(:thumb_medium)), "#"
@@ -52,10 +52,6 @@
       = p.label :last_name 
       = p.text_field :last_name, :value => @profile.last_name
 
-  %p
-    = f.label :email
-    = f.text_field :email
-
   #submit_block
     = link_to t('.cancel'), root_path
     or
diff --git a/config/app_config.yml b/config/app_config.yml.example
similarity index 59%
rename from config/app_config.yml
rename to config/app_config.yml.example
index 354dc75b2..5ee07c405 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml.example
@@ -3,25 +3,21 @@
 #   the COPYRIGHT file.
 
 
-
-development:
+default:
+  pod_url: "http://example.org/"
   debug: false
   socket_debug : false
   socket_host: 0.0.0.0
   socket_port: 8080
   socket_collection_name: 'websocket'
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
+  mongo_host: 'localhost'
+  mongo_post: 27017
+  
+development:
 
 test:
-  debug: false
-  socket_debug : false
-  socket_host: 0.0.0.0
+  pod_url: "http://example.org/"
   socket_port: 8081
-  pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
 production:
-  debug: false
-  socket_debug : false
-  socket_host: 0.0.0.0
-  socket_port: 8080
-  pubsub_server: 'https://pubsubhubbub.appspot.com/'
diff --git a/config/application.rb b/config/application.rb
index b409f91d3..bf3b5699a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -51,5 +51,6 @@ module Diaspora
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    config.filter_parameters += [:xml]
   end
 end
diff --git a/config/deploy.rb b/config/deploy.rb
index c84d25556..2f8065134 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -53,6 +53,11 @@ namespace :deploy do
     run "ln -s -f #{shared_path}/bundle #{current_path}/vendor/bundle"
   end
 
+  task :symlink_config do
+    run "touch #{shared_path}/app_config.yml"
+    run "ln -s -f #{shared_path}/app_config.yml #{current_path}/config/app_config.yml"
+  end
+
    task :start do
       start_mongo
       start_thin
@@ -150,4 +155,4 @@ namespace :db do
 
 end
 
-after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle"
+after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle", 'deploy:symlink_config'
diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
new file mode 100644
index 000000000..e739941e9
--- /dev/null
+++ b/config/initializers/_load_app_config.rb
@@ -0,0 +1,26 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+def load_config_yaml filename
+  YAML.load(File.read(filename))
+end
+
+if File.exist? "#{Rails.root}/config/app_config.yml"
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml"
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" unless all_envs
+else
+  puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help."
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example"
+end
+
+if all_envs[Rails.env.to_s]
+  APP_CONFIG = all_envs['default'].merge(all_envs[Rails.env.to_s]).symbolize_keys
+else
+  APP_CONFIG = all_envs['default'].symbolize_keys
+end
+
+APP_CONFIG[:terse_pod_url] = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '') 
+APP_CONFIG[:terse_pod_url].chop! if APP_CONFIG[:terse_pod_url][-1, 1] == '/'
+
+puts "WARNING: Please modify your app_config.yml to have a proper pod_url!" if APP_CONFIG[:terse_pod_url] == "example.org" && Rails.env != :test
diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb
index 0409d6d71..8948a0c59 100644
--- a/config/initializers/_mongo.rb
+++ b/config/initializers/_mongo.rb
@@ -5,7 +5,7 @@
 if ENV['MONGOHQ_URL']
   MongoMapper.config = {RAILS_ENV => {'uri' => ENV['MONGOHQ_URL']}}
 else
-  MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+  MongoMapper.connection = Mongo::Connection.new(APP_CONFIG['mongo_host'], APP_CONFIG['mongo_port'])
 end
 
 MongoMapper.database = "diaspora-#{Rails.env}"
@@ -16,3 +16,4 @@ if defined?(PhusionPassenger)
    end
 end
 
+Magent.connection  = Mongo::Connection.new(APP_CONFIG['mongo_host'], APP_CONFIG['mongo_port'])
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
new file mode 100644
index 000000000..7c0e0e758
--- /dev/null
+++ b/config/locales/devise.de.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+de:
+  errors:
+    messages:
+      not_found: "nicht gefunden"
+      already_confirmed: "wurde bereits bestätigt"
+      not_locked: "war nicht gesperrt"
+
+  devise:
+    failure:
+      unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.'
+      unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.'
+      locked: 'Dein Konto ist gesperrt.'
+      invalid: 'Ungültige E-Mail-Adresse oder Passwort.'
+      invalid_token: 'Ungültiger Authentifizierungstoken.'
+      timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren.'
+      inactive: 'Dein Konto wurde noch nicht aktiviert.'
+    sessions:
+      signed_in: 'Erfolgreich angemeldet.'
+      signed_out: 'Erfolgreich abgemeldet.'
+    passwords:
+      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt.'
+      updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet.'
+    confirmations:
+      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.'
+      confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.'
+    registrations:
+      signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.'
+      updated: 'Dein Konto wurde aktualisiert.'
+      destroyed: 'Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen.'
+    unlocks:
+      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.'
+      unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.'
+    mailer:
+      confirmation_instructions: 'Instruktionen zur Bestätigung'
+      reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts'
+      unlock_instructions: 'Instruktionen zum Entsperren'
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 70209ff79..06002aa63 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -18,10 +18,10 @@ es:
       signed_in: 'Has ingresado correctamente.'
       signed_out: 'Has salido correctamente.'
     passwords:
-      send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en poco minutos.'
+      send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos.'
       updated: 'Tu contraseña ha sido modificada. Ya has accedido a tu cuenta.'
     confirmations:
-      send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en poco minutos.'
+      send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos.'
       confirmed: 'Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta.'
     registrations:
       signed_up: 'Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación.'
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 4ee6761f8..9109b40a8 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -13,7 +13,7 @@ fi:
   devise:
     failure:
       unauthenticated: 'Kirjaudu tai rekisteröidy ennen kuin voit jatkaa.'
-      unconfirmed: 'Sinun pitää vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
+      unconfirmed: 'Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
       locked: 'Käyttäjätilisi on lukittu.'
       invalid: 'Väärä sähköpostiosoite tai salasana.'
       invalid_token: 'Viallinen todennus.'
@@ -21,9 +21,9 @@ fi:
       inactive: 'Käyttätiliäsi ei ole vielä vahvistettu.'
     sessions:
       signed_in: 'Sisäänkirjautuminen onnistui.'
-      signed_out: 'Uoskirjautuminen onnistui.'
+      signed_out: 'Uloskirjautuminen onnistui.'
     passwords:
-      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten asetat salasanasi uudelleen.'
+      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten määrität salasanasi uudelleen.'
       updated: 'Salasanasi on vaihdettu. Olet nyt kirjautunut sisään.'
     confirmations:
       send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin.'
@@ -37,5 +37,5 @@ fi:
       unlocked: 'Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään.'
     mailer:
       confirmation_instructions: 'Ohjeet vahvistamiseen/todentamiseen'
-      reset_password_instructions: 'Ohjeet salananan uudelleenasettamiseksi'
+      reset_password_instructions: 'Ohjeet salananan uudelleenmäärittämiseksi'
       unlock_instructions: 'Ohjeet lukituksen poistamiseksi'
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
new file mode 100644
index 000000000..b8691eb3a
--- /dev/null
+++ b/config/locales/devise.fr.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+fr:
+  errors:
+    messages:
+      not_found: "introuvable"
+      already_confirmed: "a déjà été confirmé"
+      not_locked: "n’a pas été verrouillé"
+
+  devise:
+    failure:
+      unauthenticated: 'Vous devez vous connecter ou vous inscrire avant de continuer.'
+      unconfirmed: 'Vous devez confirmer votre compte avant de continuer.'
+      locked: 'Votre compte est verrouillé.'
+      invalid: 'E-mail ou mot de passe invalide.'
+      invalid_token: 'Jeton d’authentification invalide.'
+      timeout: 'Votre session a expiré, veuillez vous connecter de nouveau afin de continuer.'
+      inactive: 'Votre compte n’a pas encore été activé.'
+    sessions:
+      signed_in: 'Connecté avec succès.'
+      signed_out: 'Déconnecté avec succès.'
+    passwords:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment réinitialiser votre mot de passe.'
+      updated: 'Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté.'
+    confirmations:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment confirmer votre compte.'
+      confirmed: 'Votre compte a été confirmé avec succès. Vous êtes à présent connecté.'
+    registrations:
+      signed_up: 'Vous vous êtes inscrit avec succès. Si activée, une confirmation a été envoyée sur votre adresse e-mail.'
+      updated: 'Vous avez mis à jour votre compte avec succès.'
+      destroyed: 'Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt.'
+    unlocks:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment déverrouiller votre compte.'
+      unlocked: 'Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté.'
+    mailer:
+      confirmation_instructions: 'Instructions de confirmation'
+      reset_password_instructions: 'Réinitialiser les instructions du mot de passe'
+      unlock_instructions: 'Instructions de déverrouillage'
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 75b90affc..76f761e37 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,7 +12,7 @@ it:
 
   devise:
     failure:
-      unauthenticated: "Devi effettuare l'accesso o registrarci prima di continuare."
+      unauthenticated: "Devi effettuare l'accesso o registrarti prima di continuare."
       unconfirmed: "Devi confermare il tuo account prima di continuare."
       locked: "Il tuo account è bloccato."
       invalid: "Email o password errati."
@@ -31,11 +31,11 @@ it:
     registrations:
       signed_up: "Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email."
       updated: "Hai aggiornato il tuo account."
-      destroyed: "Ciao!Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
+      destroyed: "Ciao! Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
     unlocks:
       send_instructions: "Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account."
       unlocked: "Il tuo account è stato sbloccato. Hai appena effettuato l'accesso."
     mailer:
       confirmation_instructions: "Istruzioni sulla conferma"
       reset_password_instructions: "Istruzioni su come cambiare la password"
-      unlock_instructions: "Istruzione su come sbloccare l'account"
+      unlock_instructions: "Istruzioni su come sbloccare l'account"
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
new file mode 100644
index 000000000..a490a1a39
--- /dev/null
+++ b/config/locales/devise.pl.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+pl:
+  errors:
+    messages:
+      not_found: "nie znaleziono"
+      already_confirmed: "potwierdzono wcześniej"
+      not_locked: "nie był zablokowany"
+
+  devise:
+    failure:
+      unauthenticated: 'By kontynuować musisz się zalogować lub zarejestrować.'
+      unconfirmed: 'Musisz aktywować swoje konto.'
+      locked: 'Twoje konto jest zablokowane.'
+      invalid: 'Nieprawidłowy adres email lub hasło.'
+      invalid_token: 'Nieprawidłowy kod identyfikacyjny.'
+      timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.'
+      inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
+    sessions:
+      signed_in: 'Zalogowano pomyślnie.'
+      signed_out: 'Wylogowano.'
+    passwords:
+      send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła.'
+      updated: 'Twoje hasło zostało zmienione, zostałeś zalogowany.'
+    confirmations:
+      send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcje dotyczące aktywacji konta.'
+      confirmed: 'Twoje konto zostało aktywowane, zostałeś zalogowany.'
+    registrations:
+      signed_up: 'Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację.'
+      updated: 'Pomyślnie zaktualizowano informacje o Twoim koncie.'
+      destroyed: 'Żegnaj! Twoje konto zostało usunięte.'
+    unlocks:
+      send_instructions: 'W ciągu kilku minut otrzymasz email z instrukcjami odblokowania konta.'
+      unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.'
+    mailer:
+      confirmation_instructions: 'Instrukcje aktywacji'
+      reset_password_instructions: 'Instrukcje zmiany hasła'
+      unlock_instructions: 'Instrukcje odblokowania'
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
new file mode 100644
index 000000000..cf16fd20d
--- /dev/null
+++ b/config/locales/devise.pt-PT.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+pt-PT:
+  errors:
+    messages:
+      not_found: "não foi encontrado"
+      already_confirmed: "já foi confirmado"
+      not_locked: "não foi bloqueado"
+
+  devise:
+    failure:
+      unauthenticated: 'Faça login ou registre-se antes de continuar.'
+      unconfirmed: 'Confirme a sua conta antes de continuar.'
+      locked: 'A sua conta foi bloqueada.'
+      invalid: 'Endereço de correio ou senha inválida.'
+      invalid_token: 'Token de autenticação inválido.'
+      timeout: 'A sua sessão expirou, por favor faça login novamente para continuar.'
+      inactive: 'A sua conta ainda não foi activada.'
+    sessions:
+      signed_in: 'Login com sucesso.'
+      signed_out: 'Logout com sucesso.'
+    passwords:
+      send_instructions: 'Vai receber um email com instruções sobre como alterar a sua senha dentro de alguns minutos.'
+      updated: 'A sua senha foi alterada com sucesso. Está on-line.'
+    confirmations:
+      send_instructions: 'Vai receber um email com instruções sobre como confirmar a sua conta dentro de alguns minutos.'
+      confirmed: 'A sua conta foi confirmada com sucesso. Está on-line.'
+    registrations:
+      signed_up: 'Registou-se com sucesso. Se ligado, a confirmação foi enviada para o seu email.'
+      updated: 'Actualizou a sua conta com sucesso.'
+      destroyed: 'Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente.'
+    unlocks:
+      send_instructions: 'Vai receber uma mensagem sobre como desbloquear a sua conta dentro de alguns minutos.'
+      unlocked: 'A sua conta foi desbloqueada com sucesso. Está on-line.'
+    mailer:
+      confirmation_instructions: 'Instruções de confirmação'
+      reset_password_instructions: 'Instruções para alterar a sua senha'
+      unlock_instructions: 'Instruções para desbloquear'
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
new file mode 100644
index 000000000..670d57026
--- /dev/null
+++ b/config/locales/devise.ru.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+ru:
+  errors:
+    messages:
+      not_found: "не найден(о)"
+      already_confirmed: "уже подтвержден(о)"
+      not_locked: "не заблокирован(о)"
+
+  devise:
+    failure:
+      unauthenticated: 'Вам нужно войти либо зарегистрироваться, чтобы продолжить.'
+      unconfirmed: 'Вам нужно подтвердить вашу учётную запись, чтобы продолжить.'
+      locked: 'Ваша учётная запись заблокирована.'
+      invalid: 'Неверный e-mail или пароль.'
+      invalid_token: 'Неверный ключ аутентификации.'
+      timeout: 'Срок вашего сеанса истёк, пожалуйста, войдите в систему снова.'
+      inactive: 'Ваша учётная запись ещё не активирована.'
+    sessions:
+      signed_in: 'Вход в систему выполнен успешно.'
+      signed_out: 'Выход из системы выполнен успешно.'
+    passwords:
+      send_instructions: 'Вы получите e-mail с указаниями по сбросу пароля в течение нескольких минут.'
+      updated: 'Ваш пароль был изменён. Вы вошли в систему.'
+    confirmations:
+      send_instructions: 'Вы получите e-mail с указаниями по подтверждению учётной записи в течение нескольких минут.'
+      confirmed: 'Ваша учётная запись была подтверждена. Вы вошли в систему.'
+    registrations:
+      signed_up: 'Регистрация выполнена успешно. В зависимости от настроек, вам может прийти e-mail с подтверждением.'
+      updated: 'Обновление вашей учётной записи выполнено успешно.'
+      destroyed: 'До свидания! Ваша учётная запись была удалена. Надеемся, что вскоре вас увидим снова.'
+    unlocks:
+      send_instructions: 'Вы получите e-mail с указаниями по разблокированию учётной записи в течение нескольких минут.'
+      unlocked: 'Ваша учётная запись была разблокирована. Вы вошли в систему.'
+    mailer:
+      confirmation_instructions: 'Подтверждение учётной записи'
+      reset_password_instructions: 'Сброс пароля'
+      unlock_instructions: 'Разблокирование учётной записи'
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
new file mode 100644
index 000000000..b434666ce
--- /dev/null
+++ b/config/locales/devise.sv.yml
@@ -0,0 +1,40 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+ 		
+
+sv:
+  errors:
+    messages:
+      not_found: "kan ej hitta"
+      not_locked: "var ej låst"
+
+  devise:
+    failure:
+      unauthenticated: 'Du måste logga in innan du kan fortsätta.'
+      unconfirmed: 'Du måste verifiera ditt konto innan du kan fortsätta.'
+      locked: 'Ditt konto är låst.'
+      invalid: 'Felaktig användare eller lösenord.'
+      invalid_token: 'Ogiltig identifiering.'
+      timeout: 'Din session är avslutad, var vänlig logga in igen.'
+      inactive: 'Ditt konto är inte aktiverat.'
+    sessions:
+      signed_in: 'Inloggning ok.'
+      signed_out: 'Utloggning ok.'
+    passwords:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter.'
+      updated: 'Ditt lösenord har ändrats och du är inloggad.'
+    confirmations:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter.'
+      confirmed: 'Ditt konto har verifierats och du är inloggad.'
+    registrations:
+      signed_up: 'Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig.'
+      updated: 'Ditt konto har uppdateras.'
+      destroyed: 'Ditt konto är avslutat. Välkommen åter!'
+    unlocks:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att låsa upp ditt konto inom några minuter.'
+      unlocked: 'Ditt konto har är nu upplåst och du är inloggad'
+    mailer:
+      confirmation_instructions: 'Instruktioner för att verifiera ditt konto.'
+      reset_password_instructions: 'Instruktioner för att terställa ditt lösenord.'
+      unlock_instructions: 'Instruktioner för att låsa upp ditt konto.'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 296a560d0..5af6c70aa 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -6,7 +6,6 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-
 es:
   hello: "Hola Mundo"
   application:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9a0ac8d22..9754f52a0 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Localization file for French. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -47,7 +45,7 @@ fr:
           create: "créer"
           add_a_new_album: "Ajouter un nouvel album"
       show: 
-          edit_album: "Éditer l'album"
+          edit_album: "Éditer l’album"
           albums: "albums"
           updated: "mis à jour"
           by: "par"
@@ -63,6 +61,13 @@ fr:
       helper:
           friends_albums: "Friends Albums"
           your_albums: "Your Albums"
+      create:
+          success: "Tu as créé un album nommé %{name}."
+      update:
+          success: "L’album %{name} a été édité avec succès."
+          failure: "L’édition de l’album %{name} a échoué."
+      destroy:
+          success: "L’album %{name} a été supprimé."
   aspects:
       index:
           photos: "photos"
@@ -79,33 +84,22 @@ fr:
           add_a_new_aspect: "Ajouter un nouvel aspect"
           create: "Créer"
       create:
-          success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
-      destroy:
-          success: "%{name} was successfully removed."
-      update:
-          success: "Your aspect, %{name}, has been successfully edited."
-      move_friends:
-          failure: "Aspect editing failed for friend %{real_name}."
-          success: "Aspects edited successfully."
-      move_friend:
-          error: "didn't work %{inspect}"
-          notice: "You are now showing your friend a different aspect of yourself."
-      helper:
-          remove: "remove"
-          aspect_not_empty: "Aspect not empty"
+          success:"Cliquez sur plus situé sur le côté gauche afin d’en informer Diaspora qui peut voir votre nouvel aspect."
   users:
       edit:
           cancel: "Annuler"
-          update_profile: "Mise à jour du profil"
+          update_profile: "Mettre à jour le profil"
           home: "Accueil"
-          diaspora_username: "NOM D'UTILISATEUR DIASPORA"
-          info: "Info"
-          picture: "Photo"
+          diaspora_username: "NOM D’UTILISATEUR DIASPORA"
+          info: "Information"
+          picture: "Image"
           editing_profile: "Édition du profil"
           albums: "Albums"
+          you_dont_have_any_photos: "Vous n’avez aucune photo !  Rendez-vous sur la page"
+          page_to_upload_some:  "afin d’en transférer quelques-unes."
   comments:
       comment:
-          ago: "plus tôt"
+          ago: "il y a"
       new_comment:
           comment: "Commentaire"
   photos:
@@ -115,75 +109,52 @@ fr:
           next: "suivant"
           edit_photo: "Éditer la photo"
           delete_photo: "Supprimer la photo"
-          are_you_sure: "Êtes-vous sûr?"
+          are_you_sure: "Êtes-vous sûr ?"
           comments: "commentaires"
       edit:
           editing: "Édition"
-          are_you_sure: "Êtes-vous sûr?"
+          are_you_sure: "Êtes-vous sûr ?"
           delete_photo: "Supprimer la photo"
       photo:
-          show_comments: "Montrer les commentaires"
-          posted_a_new_photo_to: "posted a new photo to"
+          show_comments: "afficher les commentaires"
+          posted_a_new_photo_to: "a publié une nouvelle photo sur"
       new:
           new_photo: "Nouvelle photo"
-          back_to_list: "Retour à la liste"
-          post_it: "postez le !"
-      create:
-          runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-          integrity_error: "Photo upload failed.  Are you sure that was an image?"
-          type_error: "Photo upload failed.  Are you sure an image was added?"
-      update:
-          notice: "Photo successfully updated."
-          error:  "Failed to edit photo."
-      destroy:
-          notice: "Photo deleted."
+          back_to_list: "Retourner à la liste"
+          post_it: "publiez-la !"
   registrations:
       new:
-          sign_up: "Enregistrement"
-      create:
-          success: "You've joined Diaspora!"
+          sign_up: "Inscription"
   status_messages:
       new_status_message:
-          tell_me_something_good: "Dites quelque-chose de bien"
-          oh_yeah: "oh yeah!"
+          tell_me_something_good: "dites-moi quelque chose de bien"
+          oh_yeah: "oh ouais !"
       status_message:
-          show_comments: "Montrer les commentaires"
-          delete: "Suppression"
+          show_comments: "afficher les commentaires"
+          delete: "Supprimer"
           are_you_sure: "Êtes-vous sûr ?"
       show:
-          status_message: "Status Message"
+          status_message: "Message d’état"
           comments: "commentaires"
           are_you_sure: "Êtes-vous sûr ?"
-          destroy: "Destruction"
+          destroy: "Détruire"
           view_all: "Tout voir"
           message: "Message"
           owner: "Propriétaire"
-      helper:
-          no_message_to_display: "No message to display."
   people:
       index:
-          add_friend: "add friend"
-          real_name: "real name"
-          diaspora_handle: "diaspora handle"
-          thats_you: "that's you!"
-          friend_request_pending: "friend request pending"
-          you_have_a_friend_request_from_this_person: "you have a friend request from this person"
+          add_friend: "ajouter un ami"
+          real_name: "nom réel"
+          diaspora_handle: "maniement de diaspora"
+          thats_you: "c’est vous !"
+          friend_request_pending: "Requête d’ami en attente"
+          you_have_a_friend_request_from_this_person: "vous avez une requête d’ami de la part de cette personne"
       new:
-          new_person: "New Person"
-          back_to_list: "Back to List"
+          new_person: "Nouvelle personne"
+          back_to_list: "Retourner à la liste"
       show:
-          last_seen: "last seen: %{how_long_ago}"
-          friends_since: "friends since: %{how_long_ago}"
-          save: "save"
-          are_you_sure: "Are you sure?"
-          remove_friend: "remove friend"
-      destroy:
-          success: "You are now friends."
-          error: "Please select an aspect!"
-          ignore: "Ignored friend request."
-      create:
-          error: "No diaspora seed found with this email!"
-          already_friends: "You are already friends with %{destination_url}!"
-          success: "A friend request was sent to %{destination_url}."
-          horribly_wrong: "Something went horribly wrong."          
-
+          last_seen: "dernière connexion : %{how_long_ago}"
+          friends_since: "amis depuis : %{how_long_ago}"
+          save: "sauvegarder"
+          are_you_sure: "Êtes-vous sûr ?"
+          remove_friend: "supprimer un ami"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 67c077090..10425864b 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -7,4 +7,137 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 pt-BR:
-  hello: "Olá Mundo"
+  hello: "Olá mundo"
+  layouts:
+      application:
+          edit_profile: "editar perfil"
+          logout: "sair"
+  shared:
+      aspect_nav:
+          all_aspects: "Todos Aspectos"
+          manage: "Gerenciar"
+          manage_your_aspects: "Gerencie seus Aspectos"
+      sub_header:
+          all_aspects: "Todos Aspectos"
+          manage_aspects: "Gerenciar Aspectos"
+      publisher:
+          share: "Compartilhar"
+      aspect_friends:
+          add_friends: "adicionar amigos"
+  albums:
+      album:
+          you: "você"
+      new_album:
+          create: "criar"
+          add_a_new_album: "Adicionar novo álbum"
+      show:
+          edit_album: "Editar Álbum"
+          albums: "álbuns"
+          updated: "atualizado"
+          by: "por"
+      edit:
+          editing: "Editando"
+          updated: "atualizado"
+          are_you_sure: "Tem certeza?"
+          delete_album: "Excluir Álbum"
+          cancel: "Cancelar"
+      index:
+          home: "home"
+          new_album: "Novo Álbum"
+      create:
+          success: "Você criou com sucesso um álbum chamado %{name}."
+      update:
+          success: "O álbum %{name} foi editado com sucesso."
+          failure: "Erro ao editar o álbum %{name}."
+      destroy:
+          success: "O álbum %{name} foi excluído com sucesso."
+  aspects:
+      index:
+          photos: "photos"
+      show:
+          photos: "photos"
+      manage:
+          add_a_new_aspect: "Adicionar um novo aspecto"
+          add_a_new_friend:  "Adicionar um novo amigo"
+          show: "Exibir"
+          update_aspects: "Atualizar Aspectos"
+          requests: "Solicitações"
+          ignore_remove: "Ignorar/Excluir"
+      new_aspect:
+          add_a_new_aspect: "Adicionar um novo aspecto"
+          create: "Criar"
+      create:
+          success:"Clique no mais(+) do lado esquerdo para dizer ao Diaspora quem pode ver seu novo aspecto."
+  users:
+      edit:
+          cancel: "Cancelar"
+          update_profile: "Atualizar Perfil"
+          home: "Home"
+          diaspora_username: "USUÁRIO DIASPORA"
+          info: "Informações"
+          picture: "Imagem"
+          editing_profile: "Editando perfil"
+          albums: "Álbuns"
+          you_dont_have_any_photos: "Você não possui nenhuma photo!  Vá para"
+          page_to_upload_some:  "para fazer o upload de alguma."
+  comments:
+      comment:
+          ago: "atrás"
+      new_comment:
+          comment: "Comentário"
+  photos:
+      show:
+          prev: "anterior"
+          full_size: "tamanho máximo"
+          next: "próxima"
+          edit_photo: "Editar Foto"
+          delete_photo: "Excluir Foto"
+          are_you_sure: "Tem certeza?"
+          comments: "comentários"
+      edit:
+          editing: "Editando"
+          are_you_sure: "Tem certeza?"
+          delete_photo: "Excluir Foto"
+      photo:
+          show_comments: "exibir comentários"
+          posted_a_new_photo_to: "enviada um nova foto para"
+      new:
+          new_photo: "Nova Foto"
+          back_to_list: "Voltar para a Lista"
+          post_it: "enviar!"
+  registrations:
+      new:
+          sign_up: "Cadastro"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "diga-me qualquer coisa legal"
+          oh_yeah: "É isso aí!"
+      status_message:
+          show_comments: "exibir comentários"
+          delete: "Excluir"
+          are_you_sure: "Tem certeza?"
+      show:
+          status_message: "Mensagem de Status"
+          comments: "comentários"
+          are_you_sure: "Tem certeza?"
+          destroy: "Excluir"
+          view_all: "Exibir Todas"
+          message: "Mensagem"
+          owner: "Pertence a"
+  people:
+      index:
+          add_friend: "adicionar amigo(a)"
+          real_name: "nome real"
+          diaspora_handle: "diaspora handle"
+          thats_you: "esse é você!"
+          friend_request_pending: "pedido de amizade pendente"
+          you_have_a_friend_request_from_this_person: "você possui um pedido de amizade dessa pessoa"
+      new:
+          new_person: "Nova Pessoa"
+          back_to_list: "Voltar para a Lista"
+      show:
+          last_seen: "visto pela última vez a: %{how_long_ago}"
+          friends_since: "amigos desde: %{how_long_ago}"
+          save: "salvar"
+          are_you_sure: "Tem certeza?"
+          remove_friend: "excluir amigo"
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
new file mode 100644
index 000000000..ce3d9abbc
--- /dev/null
+++ b/config/locales/pt-PT.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+pt-PT:
+  hello: "Olá mundo"
diff --git a/config/initializers/load_app_config.rb b/config/locales/sv.yml
similarity index 50%
rename from config/initializers/load_app_config.rb
rename to config/locales/sv.yml
index 1a5094d9b..1caf878b8 100644
--- a/config/initializers/load_app_config.rb
+++ b/config/locales/sv.yml
@@ -3,5 +3,8 @@
 #   the COPYRIGHT file.
 
 
-raw_config = File.read("#{Rails.root}/config/app_config.yml")
-APP_CONFIG = YAML.load(raw_config)[Rails.env].symbolize_keys
+# Swedish localization file. 
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+sv:
+  hello: "Hej"
diff --git a/config/routes.rb b/config/routes.rb
index 188c4b137..0ac115b76 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,16 +7,17 @@
 Diaspora::Application.routes.draw do
   resources :people, :only => [:index, :show, :destroy]
   resources :users, :except => [:create, :new, :show]
-  resources :status_messages, :only => [:create, :destroy, :show]
+  resources :status_messages
   resources :comments, :except => [:index]
   resources :requests, :except => [:edit, :update]
   resources :photos, :except => [:index]
   resources :albums
 
-  match 'aspects/manage', :to => 'aspects#manage'
-  resources :aspects, :except => [:edit]
   match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends'
   match 'aspects/move_friend', :to => 'aspects#move_friend', :as => 'move_friend'
+  match 'aspects/manage', :to => 'aspects#manage'
+  resources :aspects, :except => [:edit]
+
 
   match 'warzombie',          :to => "dev_utilities#warzombie"
   match 'zombiefriends',      :to => "dev_utilities#zombiefriends"
diff --git a/config/sprinkle/deploy_key/id_rsa b/config/sprinkle/deploy_key/id_rsa
deleted file mode 100644
index 133715158..000000000
--- a/config/sprinkle/deploy_key/id_rsa
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvCyAkyAMbn+flqwLIEnPL08iY8dWpkel1wtXXjUtaINjuvZ7
-2XwK7ntnVHVRm49t+QFMWh8SpxDHnJDgb3X6uYem2DzB6L8HtuFVFN5lOUi+TeiI
-LJsBmiGHc1tQwGB0jqmCG0J2QBDpDiw//ktOJNlZJfnPGY+4viSXwWpYhhh1v3ij
-Inmp0+lw7z0+TyklNGVEsr6emwkgo5t20ClAQDmwy1BeYBcmtAehF55V3aSPQt1d
-+hCmwl11PR6BLuGYgRirr4Xyc/GmyZVKkz8dLv40X+/Bk2D7owO+N5hf74EB1e3r
-7Vu7LAfUOdtOFQJV5SWr3HTPo5vvU1oqR4VViQIBIwKCAQEApqsSy3QoRJzsb4Jw
-QStuXRo0ZwEDmpc7HY2zyHg+KV5uRoKK89REMlALEEqnXeVwCG7dOeEB5G3yoJ2T
-lewnNpy4WR/e8rfTofrHs2XkoHOhPbCzIDGFE3zIbXzD3ZdCqj5dS1gfl9R2picx
-XZMn9MCCKPMzxi7W1ExL5dM4dsOuPRvie+nYGWvvv/LXvFTLFXDVwGXOhfDkLocv
-r6STaUMj7RzLJneawOg1YS1Ivsj+Db4Q+abB4mRRhOe6igYu9Zd0ve8XAjJAHbx2
-Kzl5XKj8fhOSwXyLBh+enqHv0yLR7GaZn0odjNdUeWdD0kF9DnsL3VMa12wmNXtu
-48bX3wKBgQDzPRDyYmBIKp/eStzAEmkVz98JmQQoX3tF0VrVdLK0j0nLB19jbHl8
-poHaPG8qIgGfFMwdhLOJmJ6CXa4eHffLJ0c32Ow+jQ+Is70Ssn6WSq0962WuuoWA
-ARUwhyO9BaWvzTnMCYDI+dSydM26cvDmTTuvCJDbifmAkArgWGqM4wKBgQDGC9za
-VTqnfBHGBXebLk/PRA8YOD9CvRrIrjylUxeSrbScK9i6v+1WK3dZCl8j7H3yYJ3B
-8CT38FXxrHtGIn+5XU++fAeiLrnmNlYFCsn1nLt2SUqvODYYefxm/Vq1LQaWknHV
-itnZF1CIltLLMI2w2iVCA0xRqots6gX+SMarowKBgQC7pCMEIAEhuntTthgB4lEQ
-047M48Fg+TM13AQ+RBTUboliG6FbU64s9XodYdIZMC0i8slYmZHQi616gsgl3JqV
-Z3F0OaBNgsLXK5HbOT0U2oWky4j0gUJqD3a/CSoyuzasMJpM8WNZNcFWd1zgSgpL
-QuTmHI0BIUtxzjRGqptWvQKBgGAxpckiFSzHO9U12wI7ENJi4sKe+ie678CPJMVU
-PqZUXwoGqxjg4P332uIa+wLR9AgDCsvpq45eyqiVmvYuA4XrfoEXq++wS6pU5/PS
-ClK512VWzID+C6V9FDIGB3ySNmZkYy000DY+hjO2+KvVwSoDjnCFQlONWanuAuk5
-So3hAoGBALfkYFRtSilhvtjOnnil0hdyUbCcRmKeUYl2Yb/cb3JmUfi9xRur7K46
-Okwba+mnOJQT0kefFEUwsP9UPVLgppVh+llyAal1aJ5OnXn1o996TGTfNmy1aThr
-aaGeAU2u8GFBiBrz9tRwzZo8ixUEZZrGFFN/n53bDHpBsbhRvHGX
------END RSA PRIVATE KEY-----
diff --git a/config/sprinkle/deploy_key/id_rsa.pub b/config/sprinkle/deploy_key/id_rsa.pub
deleted file mode 100644
index e0b8e3715..000000000
--- a/config/sprinkle/deploy_key/id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvCyAkyAMbn+flqwLIEnPL08iY8dWpkel1wtXXjUtaINjuvZ72XwK7ntnVHVRm49t+QFMWh8SpxDHnJDgb3X6uYem2DzB6L8HtuFVFN5lOUi+TeiILJsBmiGHc1tQwGB0jqmCG0J2QBDpDiw//ktOJNlZJfnPGY+4viSXwWpYhhh1v3ijInmp0+lw7z0+TyklNGVEsr6emwkgo5t20ClAQDmwy1BeYBcmtAehF55V3aSPQt1d+hCmwl11PR6BLuGYgRirr4Xyc/GmyZVKkz8dLv40X+/Bk2D7owO+N5hf74EB1e3r7Vu7LAfUOdtOFQJV5SWr3HTPo5vvU1oqR4VViQ== Diaspora deploy key
diff --git a/config/sprinkle/deploy_key/known_hosts b/config/sprinkle/deploy_key/known_hosts
deleted file mode 100644
index 6b07b19ca..000000000
--- a/config/sprinkle/deploy_key/known_hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-|1|1DLdTjtEIabpLiLzhVOp7colQSQ=|/Nw4MuJAYIztcexQDWF3NQoEljs= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-|1|j1rKwLcrA2MgHhcpdVf04ig02Hs=|Y4Jl+8HpsTyFlhSwoVxSVeRsf3k= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
diff --git a/config/thin.yml b/config/thin.yml
index b0a3abf8d..ad91436c1 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -13,7 +13,7 @@ max_conns: 1024
 require: []
 
 max_persistent_conns: 512
-environment: production
+environment: development
 servers: 1
 daemonize: true
 #chdir: /usr/applications/localhash/current
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index b32b62377..20fe90fdf 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -15,25 +15,38 @@
 require 'config/environment'
 
 def create
+
+
   config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
   backer_info = config['servers']['backer']
 
   backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
-  # Create seed user
+
+  #set pod url
   username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
+  set_app_config username
+  require 'config/initializers/_load_app_config.rb'
+
+  # Create seed user
   user = User.instantiate!(:email => "#{username}@#{username}.joindiaspora.com",
                      :username => username,
                      :password => "#{username+backer_info[backer_number]['pin'].to_s}",
                      :password_confirmation => "#{username+backer_info[backer_number]['pin'].to_s}",
-                     :url=> "http://#{username}.joindiaspora.com/",
                      :person => Person.new(
-                       :diaspora_handle => "#{username}@#{username}.joindiaspora.com",
                        :profile => Profile.new( :first_name => backer_info[backer_number]['given_name'], :last_name => backer_info[backer_number]['family_name'],
-                                             :image_url => "http://#{username}.joindiaspora.com/images/user/#{username}.jpg"),
-                       :url=> "http://#{username}.joindiaspora.com/")
-                    )
+                                             :image_url => "http://#{username}.joindiaspora.com/images/user/#{username}.jpg")
+                    ))
   user.person.save!
 
   user.aspect(:name => "Presidents")
 end
 
+def set_app_config username
+  current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+  current_config[Rails.env.to_s] ||= {}
+  current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+  current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+  file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
+  file.write(current_config.to_yaml)
+  file.close
+end
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index 12c728ddf..e2d8a5495 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -6,31 +6,35 @@
 
 require 'config/environment'
 
-host = "localhost:3000"
-url = "http://#{host}/"
+def set_app_config username
+  current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+  current_config[Rails.env.to_s] ||= {}
+  current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+  current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+  file = File.new(Rails.root.join('config','app_config.yml'),'w')
+  file.write(current_config.to_yaml)
+  file.close
+end
+
 username = "tom"
+set_app_config username
+
 # Create seed user
 user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
                      :username => "tom",
                     :password => "evankorth",
                     :password_confirmation => "evankorth",
-                    :url=> "http://#{username}.joindiaspora.com/"
                     :person => Person.new(
-                      :diaspora_handle => "tom@tom.joindiaspora.com",
-                      :url => url,
                       :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
                   )
 user.person.save!
 
 user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
                      :username => "korth",
-                     :url=> "http://#{username}.joindiaspora.com/"
                     :password => "evankorth",
                     :password_confirmation => "evankorth",
-                    :person => Person.new( :diaspora_handle => "korth@tom.joindiaspora.com",
-                                          :url => url,
-                                          :profile => Profile.new( :first_name => "Evan",
-                                                                  :last_name => "Korth")))
+                    :person => Person.new(
+                      :profile => Profile.new( :first_name => "Evan", :last_name => "Korth")))
 
 user2.person.save!
 
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index 2e06913f2..cc3000d0b 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -6,17 +6,26 @@
 
 require 'config/environment'
 
-remote_url = "http://tom.joindiaspora.com/"
-remote_url = "http://localhost:3000/"
+def set_app_config username
+  current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
+  current_config[Rails.env.to_s] ||= {}
+  current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
+  current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+  file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
+  file.write(current_config.to_yaml)
+  file.close
+end
+
+set_app_config "tom"
+require 'config/initializers/_load_app_config.rb'
+
+
 # Create seed user
 user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
                      :username => "tom",
                     :password => "evankorth",
                     :password_confirmation => "evankorth",
-                    :url => remote_url,
                     :person => {
-                      :diaspora_handle => "tom@tom.joindiaspora.com",
-                      :url => remote_url,
                       :profile => { :first_name => "Alexander", :last_name => "Hamiltom",
                       :image_url => "http://tom.joindiaspora.com/images/user/tom.jpg"}}
                   )
@@ -26,11 +35,7 @@ user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com",
                     :password => "evankorth",
                     :password_confirmation => "evankorth",
                      :username => "korth",
-                     :url => remote_url,
-                    :person => { :diaspora_handle => "korth@tom.joindiaspora.com",
-                                          :url => remote_url,
-                                          :profile => { :first_name => "Evan",
-                                                                  :last_name => "Korth",
+                    :person => {:profile => { :first_name => "Evan", :last_name => "Korth",
                       :image_url => "http://tom.joindiaspora.com/images/user/korth.jpg"}})
 
 user2.person.save!
@@ -41,3 +46,5 @@ request = user.send_friend_request_to(user2, aspect)
 reversed_request = user2.accept_friend_request( request.id, user2.aspect(:name => "presidents").id )
 user.receive reversed_request.to_diaspora_xml
 user.aspect(:name => "Presidents")
+
+
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index e79608381..f3b30f9b3 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -8,6 +8,9 @@ module Diaspora
   module UserModules
     module Friending
       def send_friend_request_to(desired_friend, aspect)
+        # should have different exception types for these?
+        raise "You have already sent a friend request to that person!" if self.pending_requests.detect{ 
+          |x| x.destination_url == desired_friend.receive_url }
         raise "You are already friends with that person!" if self.friends.detect{
           |x| x.receive_url == desired_friend.receive_url}
         request = Request.instantiate(
@@ -86,7 +89,8 @@ module Diaspora
 
       def remove_friend(bad_friend)
         raise "Friend not deleted" unless self.friend_ids.delete( bad_friend.id )
-        aspects.each{|g| g.person_ids.delete( bad_friend.id )}
+        aspects.each{|aspect| 
+          aspect.person_ids.delete( bad_friend.id )}
         self.save
 
         self.raw_visible_posts.find_all_by_person_id( bad_friend.id ).each{|post|
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index ad023f2fb..bd4174c76 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -7,14 +7,9 @@
 module Diaspora
   module UserModules
     module Querying
-      def visible_posts_from_others(opts ={})
-        if opts[:from].class == Person
-            Post.where(:person_id => opts[:from].id, :_id.in => self.visible_post_ids)
-        elsif opts[:from].class == Aspect
-            Post.where(:_id.in => opts[:from].post_ids) unless opts[:from].user != self
-        else
-            Post.where(:_id.in => self.visible_post_ids)
-        end
+
+      def find_visible_post_by_id( id )
+        self.raw_visible_posts.find id
       end
 
       def visible_posts( opts = {} )
@@ -22,6 +17,8 @@ module Diaspora
           return raw_visible_posts if opts[:by_members_of] == :all
           aspect = self.aspects.find_by_id( opts[:by_members_of].id )
           aspect.posts
+        elsif opts[:from]
+          self.raw_visible_posts.find_all_by_person_id(opts[:from].id, :order => 'created_at DESC')
         end
       end
 
@@ -38,11 +35,6 @@ module Diaspora
         aspects.detect{|x| x.id == id }
       end
 
-      def album_by_id( id )
-        id = id.to_id
-        albums.detect{|x| x.id == id }
-      end
-
       def aspects_with_post( id )
         self.aspects.find_all_by_post_ids( id.to_id )
       end
diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
new file mode 100644
index 000000000..39b1af5d2
--- /dev/null
+++ b/lib/diaspora/user/receiving.rb
@@ -0,0 +1,93 @@
+module Diaspora
+  module UserModules
+    module Receiving
+      def receive_salmon ciphertext
+        cleartext = decrypt( ciphertext)
+        salmon = Salmon::SalmonSlap.parse cleartext
+        if salmon.verified_for_key?(salmon.author.public_key)
+          Rails.logger.info("data in salmon: #{salmon.data}")
+          self.receive(salmon.data)
+        end
+      end
+
+      def receive xml
+        object = Diaspora::Parser.from_xml(xml)
+        Rails.logger.debug("Receiving object for #{self.real_name}:\n#{object.inspect}")
+        Rails.logger.debug("From: #{object.person.inspect}") if object.person
+
+        if object.is_a? Retraction
+          receive_retraction object, xml
+        elsif object.is_a? Request
+          receive_request object, xml
+        elsif object.is_a? Profile
+          receive_profile object, xml
+        elsif object.is_a?(Comment)
+          receive_comment object, xml
+        else
+          receive_post object, xml
+        end
+      end
+
+      def receive_retraction retraction, xml
+        if retraction.type == 'Person'
+          Rails.logger.info( "the person id is #{retraction.post_id} the friend found is #{visible_person_by_id(retraction.post_id).inspect}")
+          unfriended_by visible_person_by_id(retraction.post_id)
+        else
+          retraction.perform self.id
+          aspects = self.aspects_with_person(retraction.person)
+          aspects.each{ |aspect| aspect.post_ids.delete(retraction.post_id.to_id)
+            aspect.save
+          }
+        end
+      end
+
+      def receive_request request, xml
+        person = Diaspora::Parser.parse_or_find_person_from_xml( xml )
+        person.serialized_key ||= request.exported_key
+        request.person = person
+        request.person.save
+        old_request =  Request.first(:id => request.id)
+        request.aspect_id = old_request.aspect_id if old_request
+        request.save
+        receive_friend_request(request)
+      end
+
+      def receive_profile profile, xml
+        person = Diaspora::Parser.owner_id_from_xml xml
+        person.profile = profile
+        person.save
+      end
+
+      def receive_comment comment, xml
+        comment.person = Diaspora::Parser.parse_or_find_person_from_xml( xml ).save if comment.person.nil?
+        self.visible_people = self.visible_people | [comment.person]
+        self.save
+        Rails.logger.debug("The person parsed from comment xml is #{comment.person.inspect}") unless comment.person.nil?
+        comment.person.save
+        Rails.logger.debug("From: #{comment.person.inspect}") if comment.person
+        raise "In receive for #{self.real_name}, signature was not valid on: #{comment.inspect}" unless comment.post.person == self.person || comment.verify_post_creator_signature
+        comment.save
+        unless owns?(comment)
+          dispatch_comment comment
+        end
+        comment.socket_to_uid(id)  if (comment.respond_to?(:socket_to_uid) && !self.owns?(comment))
+      end
+
+      def receive_post post, xml
+        Rails.logger.debug("Saving post: #{post}")
+        post.user_refs += 1
+        post.save
+
+        self.raw_visible_posts << post
+        self.save
+
+        aspects = self.aspects_with_person(post.person)
+        aspects.each{ |aspect|
+          aspect.posts << post
+          aspect.save
+          post.socket_to_uid(id, :aspect_ids => [aspect.id]) if (post.respond_to?(:socket_to_uid) && !self.owns?(post))
+        }
+      end
+    end
+  end
+end
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index 7149ee65e..0b55ee0f7 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -31,7 +31,7 @@ class MessageHandler
         http.callback { process; process}
       when :get
         http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT
-        http.callback {send_to_seed(query, http.response); process}
+        http.callback {process}
       else
         raise "message is not a type I know!"
       end
@@ -47,10 +47,6 @@ class MessageHandler
     } unless @queue.size == 0
   end
 
-  def send_to_seed(message, http_response)
-    #DO SOMETHING!
-  end
-
   def size
     @queue.size
   end
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index e07877cb7..9f9e5803e 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -20,28 +20,6 @@ function decrementRequestsCounter() {
 }
 
 $(function() {
-
-
-  $('#move_friends_link').live( 'click', function(){
-    $.post(
-      '/aspects/move_friends',
-      { 'moves' : $('#aspect_list').data() },
-      function() { 
-        $('#aspect_title').html("Groups edited successfully!");
-      }    
-    );
-    
-    // should the following logic be moved into the $.post() callback?
-    $("#aspect_list").removeData();
-
-    $(".person")
-      .css('background-color','none')
-      .attr('from_aspect_id', function() { 
-        return $(this).parent().attr('id')
-      });
-
-  });
-
   // Multiple classes here won't work
   $("ul .person").draggable({
     revert: true
@@ -65,26 +43,24 @@ $(function() {
           }
         });
 
-      } else {
-        var $aspect_list  = $('#aspect_list'), 
-            move = {};
-        
-        //  This is poor implementation            
-        move[ 'friend_id' ] = ui.draggable[0].id; // ui.draggable.attr('id')
-        move[ 'to' ]        = $(this)[0].id;//  $(this).attr('id');
-        move[ 'from' ]      = ui.draggable[0].getAttribute('from_aspect_id'); // ui.draggable.attr('from_aspect_id')
-        
-        // if created custom attr's - should be using `data-foo`
-        
-        
-        if (move['to'] == move['from']){
-          $aspect_list.data( ui.draggable[0].id, []);
-          ui.draggable.css('background-color','#eee');
+      };
+        var dropzone = $(this)[0];
+
+        if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){
+          ui.draggable.css('background','none');
         } else {
-          $aspect_list.data( ui.draggable[0].id, move);
           ui.draggable.css('background-color','orange');
+          $.ajax({
+            url: "/aspects/move_friend/",
+            data: {"friend_id" : ui.draggable[0].id,
+                   "from" : ui.draggable[0].getAttribute('from_aspect_id'),
+                   "to" : { "to" : dropzone.id }},
+            success: function(data){
+              ui.draggable.attr('from_aspect_id', dropzone.id);
+              ui.draggable.css('background','none');
+            }});
+
         }
-      }
       $(this).closest("ul").append(ui.draggable);
     }
   });
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index cf0856754..e8db10abd 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -14,14 +14,6 @@ $(document).ready(function(){
   });
 });//end document ready
 
-$("#stream li").live('mouseover',function() {
-  $(this).children(".destroy_link").fadeIn(0);
-});
-
-$("#stream li").live('mouseout',function() {
-  $(this).children(".destroy_link").fadeOut(0);
-});
-
 $(".show_post_comments").live('click', function(event) {
   event.preventDefault();
 
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 4713c7164..092d69f16 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -41,6 +41,12 @@ $(document).ready(function(){
     }
   );
 
+  $("#publisher textarea").keydown( function(e) {
+    if (e.shiftKey && e.keyCode == 13) {
+      $("#publisher form").submit();
+    }
+  });
+
 });//end document ready
 
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3fb38e98c..82bbd8b6d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -118,7 +118,6 @@ header {
         header #session_action ul li:last-child {
           margin-right: 0; }
   header #aspect_header {
-    z-index: 5;
     background-color: #eeeeee;
     border-top: 1px solid white;
     padding: 20px 0; }
@@ -129,7 +128,7 @@ header {
       color: #111111; }
       header #aspect_header a:hover {
         background: none;
-        color: #333333; }
+        color: #999999; }
     header #aspect_header .page_title {
       text-transform: uppercase;
       text-shadow: 0 2px 0 white;
@@ -143,8 +142,10 @@ ul#stream {
     list-style: none;
     padding: 12px 0;
     border-bottom: 1px solid #eeeeee; }
-  ul#stream > li:first-child {
-    padding-top: 0; }
+    ul#stream > li:hover {
+      background-color: #fafafa; }
+      ul#stream > li:hover .destroy_link {
+        display: inline; }
   ul#stream .right {
     top: 0; }
 
@@ -167,6 +168,43 @@ li.message {
     li.message .content div.info {
       color: #bababa;
       font-size: 70%; }
+      li.message .content div.info .time a {
+        color: #666666; }
+
+.reshare_pane {
+  margin-left: 5px;
+  margin-right: 5px;
+  display: inline;
+  position: relative; }
+  .reshare_pane ul.reshare_box {
+    width: 150px;
+    display: none;
+    z-index: 10;
+    position: absolute;
+    margin-top: 5px;
+    padding: 0;
+    background-color: #fafafa;
+    list-style: none;
+    border: 5px solid #666666;
+    -webkit-box-shadow: 0 0 5px #666666;
+    -moz-box-shadow: 0 0 5px #666666;
+    text-shadow: 0 2px white;
+    color: black; }
+    .reshare_pane ul.reshare_box > li {
+      font-weight: bold;
+      padding: 8px;
+        padding-right: 15px;
+      border-top: 1px solid white;
+      border-bottom: 1px solid #cccccc; }
+      .reshare_pane ul.reshare_box > li:first-child {
+        border-top: none; }
+      .reshare_pane ul.reshare_box > li:last-child {
+        border-bottom: none; }
+      .reshare_pane ul.reshare_box > li a {
+        display: block;
+        height: 100%; }
+        .reshare_pane ul.reshare_box > li a:hover {
+          background-color: #eeeeee; }
 
 form {
   position: relative;
@@ -262,11 +300,14 @@ ul.comment_set {
 
 .destroy_link, .request_button {
   position: absolute;
-  right: 0;
+  right: 2em;
   bottom: 15px; }
   .destroy_link a, .request_button a {
     color: #999999;
     font-weight: normal; }
+    .destroy_link a:hover, .request_button a:hover {
+      text-decoration: underline;
+      background: none; }
 
 .destroy_link {
   display: none;
@@ -343,12 +384,18 @@ label {
       margin-top: 26px; }
   #publisher textarea {
     width: 600px;
-    height: 40px;
+    height: 42px;
     margin-top: 0;
     margin-bottom: 0;
-    -webkit-box-shadow: 0 1px 0 white; }
+    box-shadow: 0 1px white;
+    -moz-box-shadow: 0 1px white;
+    -webkit-box-shadow: 0 1px white; }
   #publisher .button {
     margin-left: 100px; }
+  #publisher img {
+    -webkit-box-shadow: 0 1px 0 white;
+    border: 1px solid #bbbbbb;
+      border-top: 1px solid #666666; }
 
 #image_picker .small_photo {
   height: 100px;
@@ -458,8 +505,11 @@ h1.big_text {
     #aspect_nav ul > li {
       padding: 0;
       display: inline;
-      margin-right: 0.5em; }
+      margin-right: 2px; }
       #aspect_nav ul > li a {
+        text-shadow: 0 2px 0 #444444;
+        -webkit-border-radius: 3px 3px 0 0;
+        -moz-border-radius: 3px 3px 0 0;
         line-height: 22px;
         background-color: #444444;
         border: 1px solid #555555;
@@ -470,12 +520,16 @@ h1.big_text {
           background-color: #4e4e4e;
           color: #cccccc; }
       #aspect_nav ul > li.selected a {
+        -webkit-box-shadow: 0px -4px 6px -2px #777777;
+        -moz-box-shadow: 0px -4px 6px -2px #777777;
         text-shadow: 0 2px 0 white;
         padding-top: 4px;
         padding-bottom: 5px;
         line-height: 18px;
         font-weight: bold;
         background-color: #eeeeee;
+        background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#eeeeee));
+        background: -moz-linear-gradient(19% 75% 90deg, #eeeeee, white);
         border: 1px solid white;
           border-bottom: 1px solid #eeeeee;
         color: black; }
@@ -511,6 +565,16 @@ h1.big_text {
   .requests h1,
   .remove h1 {
     display: inline-block; }
+  .aspect .tip,
+  .requests .tip,
+  .remove .tip {
+    display: none;
+    color: #999999;
+    margin-left: 0.5em; }
+  .aspect .edit_name_field:hover .tip,
+  .requests .edit_name_field:hover .tip,
+  .remove .edit_name_field:hover .tip {
+    display: inline; }
   .aspect .aspect_name,
   .requests .aspect_name,
   .remove .aspect_name {
@@ -538,7 +602,8 @@ h1.big_text {
   .requests .grey,
   .remove .grey {
     color: #999999;
-    cursor: default; }
+    cursor: default;
+    text-shadow: 0 2px white; }
   .aspect ul.dropzone,
   .requests ul.dropzone,
   .remove ul.dropzone {
diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css
index 0e3f111a9..823c1b346 100755
--- a/public/stylesheets/fileuploader.css
+++ b/public/stylesheets/fileuploader.css
@@ -3,14 +3,14 @@
 .qq-upload-button {
     display:block; /* or inline-block */
     width: 105px; padding: 7px 0; text-align:center;    
-    background:#880000; border-bottom:1px solid #ddd;color:#fff;
+    background:#333; border-bottom:1px solid #999;color:#fff;
 }
-.qq-upload-button-hover {background:#cc0000;}
+.qq-upload-button-hover {background:#666;}
 .qq-upload-button-focus {outline:1px dotted black;}
 
 .qq-upload-drop-area {
     position:absolute; top:0; left:0; width:100%; height:100%; min-height: 70px; z-index:2;
-    background:#FF9797; text-align:center; 
+    background:#ccc; text-align:center; 
 }
 .qq-upload-drop-area span {
     display:block; position:absolute; top: 50%; width:100%; margin-top:-8px; font-size:16px;
@@ -28,4 +28,4 @@
 .qq-upload-size,.qq-upload-cancel {font-size:11px;}
 
 .qq-upload-failed-text {display:none;}
-.qq-upload-fail .qq-upload-failed-text {display:inline;}
\ No newline at end of file
+.qq-upload-fail .qq-upload-failed-text {display:inline;}
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9f9158741..7c77a0b79 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -146,7 +146,6 @@ header
             :right 0
 
   #aspect_header
-    :z-index 5
     :background
       :color #eee
     :border
@@ -162,7 +161,7 @@ header
       :color #111
       &:hover
         :background none
-        :color #333
+        :color #999
 
     .page_title
       :text
@@ -182,9 +181,12 @@ ul#stream
     :border
       :bottom 1px solid #eee
 
-  > li:first-child
-    :padding
-      :top 0
+    &:hover
+      :background
+        :color #fafafa
+
+      .destroy_link
+        :display inline
 
   .right
     :top 0
@@ -219,6 +221,63 @@ li.message
       :color #bababa
       :font-size 70%
 
+      .time
+        a
+          :color #666
+
+.reshare_pane
+  :margin
+    :left 5px
+    :right 5px
+  :display inline
+  :position relative
+
+  ul.reshare_box
+    :width 150px
+    :display none
+    :z-index 10
+    :position absolute
+    :margin
+      :top 5px
+    :padding 0
+    
+    :background
+      :color #fafafa
+
+    :list
+      :style none
+
+    :border 5px solid #666
+    :-webkit-box-shadow 0 0 5px #666
+    :-moz-box-shadow 0 0 5px #666
+
+    :text-shadow 0 2px #fff
+    :color #000
+
+    > li 
+      :font
+        :weight bold
+
+      :padding 8px
+        :right 15px
+      :border
+        :top 1px solid #fff
+        :bottom 1px solid #ccc
+
+      &:first-child
+        :border
+          :top none
+      &:last-child
+        :border
+          :bottom none
+      a
+        :display block
+        :height 100%
+
+        &:hover
+          :background
+            :color #eee
+
 
 form
   :position relative
@@ -348,12 +407,16 @@ ul.comment_set
   
 .destroy_link, .request_button
   :position absolute
-  :right 0
+  :right 2em
   :bottom 15px
   a
     :color #999
     :font
       :weight normal
+    &:hover
+      :text
+        :decoration underline
+      :background none
 
 .destroy_link
   :display none
@@ -447,16 +510,24 @@ label
 
   textarea
     :width 600px
-    :height 40px
+    :height 42px
     :margin
       :top 0
       :bottom 0
 
-    :-webkit-box-shadow 0 1px 0 #fff
+    :box-shadow 0 1px #fff
+    :-moz-box-shadow 0 1px #fff
+    :-webkit-box-shadow 0 1px #fff
 
   .button
     :margin-left 100px
 
+  img
+    :-webkit-box-shadow 0 1px 0 #fff
+    :border 1px solid #bbb
+      :top 1px solid #666
+    
+
 
 #image_picker
   .small_photo
@@ -604,13 +675,17 @@ h1.big_text
       :padding 0
       :display inline
       :margin
-        :right 0.5em
+        :right 2px
 
       a
+        :text-shadow 0 2px 0 #444
+        :-webkit-border-radius 3px 3px 0 0
+        :-moz-border-radius 3px 3px 0 0
         :line
           :height 22px
         :background
           :color #444
+
         :border 1px solid #555
 
         :padding 3px 8px
@@ -623,6 +698,9 @@ h1.big_text
           :color #ccc
 
       &.selected a
+        :-webkit-box-shadow 0px -4px 6px -2px #777
+        :-moz-box-shadow 0px -4px 6px -2px #777
+
         :text-shadow 0 2px 0 #fff
         :padding
           :top 4px
@@ -633,6 +711,10 @@ h1.big_text
           :weight bold
         :background
           :color #eee
+
+        :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#eee))
+        :background -moz-linear-gradient(19% 75% 90deg, #eee, #fff)
+
         :border 1px solid #fff
           :bottom 1px solid #eee
         :color #000
@@ -678,6 +760,17 @@ h1.big_text
   h1
     :display inline-block
 
+  .tip
+    :display none
+    :color #999
+    :margin
+      :left 0.5em
+
+  .edit_name_field:hover
+    .tip
+      :display inline
+
+
   .aspect_name
     :position relative
 
@@ -702,6 +795,7 @@ h1.big_text
   .grey
     :color #999
     :cursor default
+    :text-shadow 0 2px #fff
 
   ul.dropzone
     :min-height 20px
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index ce2bd305d..67b7d9a78 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -9,14 +9,14 @@ describe AlbumsController do
  render_views
   before do
     @user = Factory.create(:user)
-    @user.aspect(:name => "lame-os")
-    @album = Factory.create(:album)
+    @aspect = @user.aspect(:name => "lame-os")
+    @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     sign_in :user, @user
   end
 
   it "should update the name of an album" do
     sign_in :user, @user
-    put :update, :id => @album._id, :album => { :name => "new_name"}
+    put :update, :id => @album.id, :album => { :name => "new_name"}
     @album.reload.name.should eql("new_name")
   end
 
diff --git a/spec/factories.rb b/spec/factories.rb
index c1dfcd50a..21a7ad110 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -39,7 +39,10 @@ Factory.define :user do |u|
   u.sequence(:email) {|n| "bob#{n}@pivotallabs.com"}
   u.password "bluepin7"
   u.password_confirmation "bluepin7"
-  u.person { |a| Factory.create(:person_with_user, :owner_id => a._id)}
+  u.person { |a| Factory.create(:person_with_user,
+                                :owner_id => a._id,
+                                :diaspora_handle => "#{a.username}@#{APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '').chop!}")
+  }
 end
 
 Factory.define :status_message do |m|
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index 00db2a1b8..e6cd668e2 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -123,7 +123,6 @@ describe MessageHandler do
       request = FakeHttpRequest.new(:success)
       request.should_receive(:get).exactly(1).times.and_return(request)
       request.should_receive(:post).exactly(1).times.and_return(request)
-      @handler.should_receive(:send_to_seed).once
 
       EventMachine::HttpRequest.stub!(:new).and_return(request)
 
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index 018f5020d..edac7051a 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -19,18 +19,18 @@ describe Diaspora::WebSocket do
 
   describe 'queuing and dequeuing ' do
     before do
-      @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
       @channel = Magent::GenericChannel.new('websocket')
+      @messages = @channel.message_count
+      @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id)
     end
 
     it 'should send the queued job to Magent' do
-      @channel.message_count.should == 1
+      @channel.message_count.should == @messages + 1
     end
 
     it 'should dequeue the job successfully' do
-      messages = @channel.message_count
       @channel.dequeue
-      @channel.message_count.should == messages -1
+      @channel.message_count.should == @messages
     end
   end
 
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 4f236b733..3275d9245 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -15,6 +15,20 @@ describe Person do
     @aspect2 = @user2.aspect(:name => "Abscence of Babes")
   end
 
+  describe '#diaspora_handle' do
+    context 'local people' do
+      it 'uses the pod config url to set the diaspora_handle' do
+        @user.person.diaspora_handle.should == @user.username + "@example.org"
+      end
+    end
+    
+    context 'remote people' do
+      it 'stores the diaspora_handle in the database' do
+        @person.diaspora_handle.include?(@user.terse_url).should be false
+      end
+    end
+  end
+
   it 'should not allow two people with the same diaspora_handle' do
     person_two = Factory.build(:person, :url => @person.diaspora_handle)
     person_two.valid?.should == false
@@ -148,13 +162,11 @@ describe Person do
     end
 
     it 'should search by diaspora_handle exactly' do
-
       stub_success("tom@tom.joindiaspora.com")
       Person.by_webfinger(@friend_one.diaspora_handle).should == @friend_one
     end
 
     it 'should create a stub for a remote user' do
-
       stub_success("tom@tom.joindiaspora.com")
       tom = Person.by_webfinger('tom@tom.joindiaspora.com')
       tom.real_name.include?("Hamiltom").should be true
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index b1f6f71a8..d307e7a43 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -7,61 +7,95 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
-   before do
-     @user = Factory.create :user
-     @aspect = @user.aspect(:name => 'heroes')
-     @aspect1 = @user.aspect(:name => 'heroes')
 
-     @user2 = Factory.create(:user)
-     @aspect2 = @user2.aspect(:name => 'losers')
+  let(:user)  { Factory(:user) }
+  let(:user2) { Factory(:user) }
+  let(:user3) { Factory(:user) }
+  let(:user4) { Factory(:user) }
 
-     @user3 = Factory.create(:user)
-     @aspect3 = @user3.aspect(:name => 'heroes')
+  let(:aspect)   {user.aspect(:name => 'heroes')}
+  let!(:aspect1) {user.aspect(:name => 'heroes')}
+  let!(:aspect2) {user2.aspect(:name => 'losers')}
+  let!(:aspect3) {user3.aspect(:name => 'heroes')}
+  let!(:aspect4) {user4.aspect(:name => 'heroes')}
 
-     @user4 = Factory.create(:user)
-     @aspect4 = @user4.aspect(:name => 'heroes')
-
-     friend_users(@user, @aspect, @user2, @aspect2)
-     friend_users(@user, @aspect, @user3, @aspect3)
-     friend_users(@user, @aspect1, @user4, @aspect4)
-   end
-
-  it 'should not be able to post without a aspect' do
-    proc {@user.post(:status_message, :message => "heyheyhey")}.should raise_error /You must post to someone/
+  before do
+    friend_users(user, aspect, user2, aspect2)
+    friend_users(user, aspect, user3, aspect3)
+    friend_users(user, aspect1, user4, aspect4)
   end
 
-  it 'should put the post in the aspect post array' do
-    post = @user.post(:status_message, :message => "hey", :to => @aspect.id)
-    @aspect.reload
-    @aspect.post_ids.include?(post.id).should be true
+  context 'posting' do
+
+    describe '#validate_aspect_permissions' do
+      it 'should not be able to post without a aspect' do
+        proc {
+          user.validate_aspect_permissions([])
+        }.should raise_error /You must post to someone/
+      end
+
+      it 'should not be able to post to someone elses aspect' do
+        proc {
+          user.validate_aspect_permissions(aspect2.id)
+        }.should raise_error /Cannot post to an aspect you do not own./
+      end
+    end
+
+    describe '#post' do
+      it 'should put the post in the aspect post array' do
+        post = user.post(:status_message, :message => "hey", :to => aspect.id)
+        aspect.reload
+        aspect.posts.should include post
+      end
+
+      it 'should put an album in the aspect post array' do
+        album = user.post :album, :name => "Georges", :to => aspect.id
+        aspect.reload
+        aspect.posts.should include album
+      end
+    end
+
+    describe '#repost' do
+      let!(:status_message) { user.post(:status_message, :message => "hello", :to => aspect.id) }
+
+      it 'should make the post visible in another aspect' do
+        user.repost( status_message, :to => aspect1.id )
+        aspect1.reload
+        aspect1.posts.count.should be 1
+      end
+    end
+
+    describe '#update_post' do
+      let!(:album) { user.post(:album, :name => "Profile Photos", :to => aspect.id) }
+
+      it 'should update fields' do
+        update_hash = { :name => "Other Photos" }
+        user.update_post( album, update_hash )
+        album.name.should == "Other Photos"
+      end
+    end
   end
 
-  it 'should put an album in the aspect post array' do
-    album = @user.post :album, :name => "Georges", :to => @aspect.id
-    @aspect.reload
-    @aspect.post_ids.include?(album.id).should be true
-    @aspect.posts.include?(album).should be true
-  end
+  context 'dispatching' do
+    let!(:post) { user.build_post :status_message, :message => "hey" }
 
-  describe 'dispatching' do
-    before do
-      @post = @user.build_post :status_message, :message => "hey"
-    end
-    it 'should push a post to a aspect' do
-      @user.should_receive(:salmon).twice
-      @user.push_to_aspects(@post, @aspect.id)
+    describe '#push_to_aspects' do
+      it 'should push a post to a aspect' do
+        user.should_receive(:salmon).twice
+        user.push_to_aspects(post, aspect.id)
+      end
+
+      it 'should push a post to all aspects' do
+        user.should_receive(:salmon).exactly(3).times
+        user.push_to_aspects(post, :all)
+      end
     end
 
-    it 'should push a post to all aspects' do
-      @user.should_receive(:salmon).exactly(3).times
-      @user.push_to_aspects(@post, :all)
+    describe '#push_to_people' do
+      it 'should push to people' do
+        user.should_receive(:salmon).twice
+        user.push_to_people(post, [user2.person, user3.person])
+      end
     end
-
-    it 'should push to people' do
-      @user.should_receive(:salmon).twice
-      @user.push_to_people(@post, [@user2.person, @user3.person])
-    end
-
-
   end
 end
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index bef8fa416..67ed9f799 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -189,16 +189,14 @@ describe User do
       @user2 = Factory.create :user
       @aspect2 = @user2.aspect(:name => "Gross people")
 
-      request = @user.send_friend_request_to( @user2, @aspect)
-      request.reverse_for @user2
-      @user2.activate_friend(@user.person, @aspect2)
-      @user.receive request.to_diaspora_xml
+      friend_users(@user, @aspect, @user2, @aspect2)
+      @user.reload
+      @user2.reload
+      @aspect.reload
+      @aspect2.reload
     end
 
     it 'should unfriend the other user on the same seed' do
-      @user.reload
-      @user2.reload
-
       @user.friends.count.should == 1
       @user2.friends.count.should == 1
 
@@ -212,6 +210,25 @@ describe User do
       @aspect.people.count.should == 0
       @aspect2.people.count.should == 0
     end
+    context 'with a post' do
+      before do
+        @message = @user.post(:status_message, :message => "hi", :to => @aspect.id)
+        @user2.receive @message.to_diaspora_xml.to_s
+        @user2.unfriend @user.person
+        @user.unfriended_by @user2.person
+        @aspect.reload
+        @aspect2.reload
+        @user.reload
+        @user2.reload
+      end
+      it "deletes the unfriended user's posts from visible_posts" do
+        @user.raw_visible_posts.include?(@message.id).should be_false
+      end
+      it "deletes the unfriended user's posts from the aspect's posts" do
+        pending "We need to implement this"
+        @aspect2.posts.include?(@message).should be_false
+      end
+    end
   end
 
 
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index ffb220531..bcab473bc 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -7,70 +7,80 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
-   before do
-      @user = Factory.create(:user)
-      @aspect = @user.aspect(:name => 'heroes')
-      @aspect2 = @user.aspect(:name => 'losers')
+  let(:user) { Factory(:user) }
 
-      @user2 = Factory.create :user
-      @user2_aspect = @user2.aspect(:name => 'dudes')
+  let(:user2) { Factory(:user) }
+  let(:user3) { Factory(:user) }
+  let(:user4) { Factory(:user) }
 
-      friend_users(@user, @aspect, @user2, @user2_aspect)
+  let!(:aspect)  { user.aspect(:name => 'heroes') }
+  let!(:aspect2) { user.aspect(:name => 'losers') }
 
-      @user3 = Factory.create :user
-      @user3_aspect = @user3.aspect(:name => 'dudes')
-      friend_users(@user, @aspect2, @user3, @user3_aspect)
+  let!(:user2_aspect) { user2.aspect(:name => 'dudes') }
+  let!(:user3_aspect) { user3.aspect(:name => 'dudes') }
+  let!(:user4_aspect) { user4.aspect(:name => 'dudes') }
 
-      @user4 = Factory.create :user
-      @user4_aspect = @user4.aspect(:name => 'dudes')
-      friend_users(@user, @aspect2, @user4, @user4_aspect)
-   end
+  let(:status_message1) { user2.post :status_message, :message => "hi", :to => user2_aspect.id }
+  let(:status_message2) { user3.post :status_message, :message => "heyyyy", :to => user3_aspect.id }
+  let(:status_message3) { user4.post :status_message, :message => "yooo", :to => user4_aspect.id }
 
-    it 'should generate a valid stream for a aspect of people' do
-      status_message1 = @user2.post :status_message, :message => "hi", :to => @user2_aspect.id
-      status_message2 = @user3.post :status_message, :message => "heyyyy", :to => @user3_aspect.id
-      status_message3 = @user4.post :status_message, :message => "yooo", :to => @user4_aspect.id
+  before do
+    friend_users(user, aspect, user2, user2_aspect)
+    friend_users(user, aspect2, user3, user3_aspect)
+    friend_users(user, aspect2, user4, user4_aspect)
+  end
 
-      @user.receive status_message1.to_diaspora_xml
-      @user.receive status_message2.to_diaspora_xml
-      @user.receive status_message3.to_diaspora_xml
-      @user.reload
+  it 'should generate a valid stream for a aspect of people' do
+    (1..3).each{ |n|
+      eval("user.receive status_message#{n}.to_diaspora_xml")
+    }
 
-      @user.visible_posts(:by_members_of => @aspect).include?(status_message1).should be true
-      @user.visible_posts(:by_members_of => @aspect).include?(status_message2).should be false
-      @user.visible_posts(:by_members_of => @aspect).include?(status_message3).should be false
+    user.visible_posts(:by_members_of => aspect).should include status_message1
+    user.visible_posts(:by_members_of => aspect).should_not include status_message2
+    user.visible_posts(:by_members_of => aspect).should_not include status_message3
 
-      @user.visible_posts(:by_members_of => @aspect2).include?(status_message1).should be false
-      @user.visible_posts(:by_members_of => @aspect2).include?(status_message2).should be true
-      @user.visible_posts(:by_members_of => @aspect2).include?(status_message3).should be true
-    end
+    user.visible_posts(:by_members_of => aspect2).should_not include status_message1
+    user.visible_posts(:by_members_of => aspect2).should include status_message2
+    user.visible_posts(:by_members_of => aspect2).should include status_message3
+  end
 
-    describe 'albums' do
-      before do
-        @album = @user.post :album, :name => "Georges", :to => @aspect.id
-        @aspect.reload
-        @aspect2.reload
-        @user.reload
-
-        @album2 = @user.post :album, :name => "Borges", :to => @aspect.id
-        @aspect.reload
-        @aspect2.reload
-        @user.reload
-
-        @user.post :album, :name => "Luises", :to => @aspect2.id
-        @aspect.reload
-        @aspect2.reload
-        @user.reload
-      end
-
-      it 'should find all albums if passed :all' do
-        @user.albums_by_aspect(:all).size.should == 3
-      end
-
-      it 'should return the right number of albums' do
-        @user.albums_by_aspect(@aspect).size.should == 2
-        @user.albums_by_aspect(@aspect2).size.should == 1
+  context 'querying' do
+    describe '#find_visible_post_by_id' do
+      it 'should query' do
+        user2.find_visible_post_by_id(status_message1.id).should == status_message1
+        user.find_visible_post_by_id(status_message1.id).should == nil
       end
     end
+  end
+
+  context 'albums' do
+
+
+    before do
+      @album = user.post :album, :name => "Georges", :to => aspect.id
+      aspect.reload
+      aspect2.reload
+      user.reload
+
+      @album2 = user.post :album, :name => "Borges", :to => aspect.id
+      aspect.reload
+      aspect2.reload
+      user.reload
+
+      user.post :album, :name => "Luises", :to => aspect2.id
+      aspect.reload
+      aspect2.reload
+      user.reload
+    end
+
+    it 'should find all albums if passed :all' do
+      user.albums_by_aspect(:all).should have(3).albums
+    end
+
+    it 'should return the right number of albums' do
+      user.albums_by_aspect(aspect).should have(2).albums
+      user.albums_by_aspect(aspect2).should have(1).album
+    end
+  end
 end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 223881671..1608bbe58 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -7,55 +7,42 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe User do
-   before do
-      @user = Factory.create(:user)
-      @aspect = @user.aspect(:name => 'heroes')
-   end
-  
-  it 'should create with pivotal or allowed emails' do
-    user1 = Factory.create(:user, :email => "kimfuh@yahoo.com")
-    user2 = Factory.create(:user, :email => "awesome@sofaer.net")
-    user3 = Factory.create(:user, :email => "steveellis@pivotallabs.com")
-    user1.created_at.nil?.should be false
-    user2.created_at.nil?.should be false
-    user3.created_at.nil?.should be false
-  end
+  let(:user)   { Factory(:user) }
+  let(:aspect) { user.aspect(:name => 'heroes') }
 
-  describe 'profiles' do
-    it 'should be able to update their profile and send it to their friends' do
-      Factory.create(:person)
-
-      updated_profile = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}}
-
-      @user.update_profile(updated_profile).should == true
-      @user.profile.image_url.should == "http://clown.com"
+  describe '#diaspora_handle' do 
+    it 'uses the pod config url to set the diaspora_handle' do
+      user.diaspora_handle.should == user.username + "@example.org"
     end
   end
 
-  describe 'aspects' do
-    it 'should delete an empty aspect' do
-      @user.aspects.include?(@aspect).should == true
-      @user.drop_aspect(@aspect)
-      @user.reload
+  context 'profiles' do
+    it 'should be able to update their profile and send it to their friends' do
+      updated_profile = { :profile => {
+                            :first_name => 'bob',
+                            :last_name => 'billytown',
+                            :image_url => "http://clown.com"} }
 
-      @user.aspects.include?(@aspect).should == false
+      user.update_profile(updated_profile).should be true
+      user.profile.image_url.should == "http://clown.com"
+    end
+  end
+
+  context 'aspects' do
+    let(:user2)   { Factory(:user) }
+    let(:aspect2) { user2.aspect(:name => 'stuff') }
+
+    it 'should delete an empty aspect' do
+      user.drop_aspect(aspect)
+      user.aspects.include?(aspect).should == false
     end
 
     it 'should not delete an aspect with friends' do
-      user2   = Factory.create(:user)
-      aspect2 = user2.aspect(:name => 'stuff')
-      user2.reload
-      aspect2.reload
-
-      friend_users(@user, Aspect.find_by_id(@aspect.id), user2, Aspect.find_by_id(aspect2.id))
-      @aspect.reload
-      
-      @user.aspects.include?(@aspect).should == true
-
-      proc{@user.drop_aspect(@aspect)}.should raise_error /Aspect not empty/
-
-      @user.reload
-      @user.aspects.include?(@aspect).should == true
+      friend_users(user, Aspect.find_by_id(aspect.id), user2, Aspect.find_by_id(aspect2.id))
+      aspect.reload
+      proc{user.drop_aspect(aspect)}.should raise_error /Aspect not empty/
+      user.aspects.include?(aspect).should == true
     end
   end
+
 end