diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index b5ac8c9f..4569f380 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,83 +1,89 @@
-class PhotosController < ApplicationController
-  # GET /photos
-  # GET /photos.json
-  def index
-    @photos = Photo.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @photos }
-    end
-  end
-
-  # GET /photos/1
-  # GET /photos/1.json
-  def show
-    @photo = Photo.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @photo }
-    end
-  end
-
-  # GET /photos/new
-  # GET /photos/new.json
-  def new
-    @photo = Photo.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @photo }
-    end
-  end
-
-  # GET /photos/1/edit
-  def edit
-    @photo = Photo.find(params[:id])
-  end
-
-  # POST /photos
-  # POST /photos.json
-  def create
-    @photo = Photo.new(params[:photo])
-
-    respond_to do |format|
-      if @photo.save
-        format.html { redirect_to @photo, notice: 'Photo was successfully created.' }
-        format.json { render json: @photo, status: :created, location: @photo }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @photo.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /photos/1
-  # PUT /photos/1.json
-  def update
-    @photo = Photo.find(params[:id])
-
-    respond_to do |format|
-      if @photo.update_attributes(params[:photo])
-        format.html { redirect_to @photo, notice: 'Photo was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @photo.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /photos/1
-  # DELETE /photos/1.json
-  def destroy
-    @photo = Photo.find(params[:id])
-    @photo.destroy
-
-    respond_to do |format|
-      format.html { redirect_to photos_url }
-      format.json { head :no_content }
-    end
-  end
-end
+class PhotosController < ApplicationController
+  # GET /photos
+  # GET /photos.json
+  def index
+    @photos = Photo.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @photos }
+    end
+  end
+
+  # GET /photos/1
+  # GET /photos/1.json
+  def show
+    @photo = Photo.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @photo }
+    end
+  end
+
+  # GET /photos/new
+  # GET /photos/new.json
+  def new
+    @photo = Photo.new
+	
+	@all_sites = Site.all
+	@all_projects = Project.all
+	
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @photo }
+    end
+  end
+
+  # GET /photos/1/edit
+  def edit
+    @photo = Photo.find(params[:id])
+	
+	@all_sites = Site.all
+	@all_projects = Project.all
+  end
+
+  # POST /photos
+  # POST /photos.json
+  def create
+    @photo = Photo.new(params[:photo])
+
+    respond_to do |format|
+      if @photo.save
+        format.html { redirect_to @photo, notice: 'Photo was successfully created.' }
+        format.json { render json: @photo, status: :created, location: @photo }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @photo.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /photos/1
+  # PUT /photos/1.json
+  def update
+    @photo = Photo.find(params[:id])
+
+    respond_to do |format|
+      if @photo.update_attributes(params[:photo])
+        format.html { redirect_to @photo, notice: 'Photo was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @photo.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /photos/1
+  # DELETE /photos/1.json
+  def destroy
+    @photo = Photo.find(params[:id])
+    @photo.destroy
+
+    respond_to do |format|
+      format.html { redirect_to photos_url }
+      format.json { head :no_content }
+    end
+  end
+end
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 849160e3..430b42ac 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,8 +1,12 @@
-class Photo < ActiveRecord::Base
-  belongs_to :imageable, :polymorphic => true
-  attr_accessible :copyright, :uri, :description
-  
-  validates :uri, :presence => true
-  validates_format_of :uri, :with => URI::regexp(%w(http https))
-  validates :copyright, :presence => true
-end
+class Photo < ActiveRecord::Base
+  belongs_to :imageable, :polymorphic => true
+  attr_accessible :copyright, :uri, :description, :imageable_type, :imageable_id
+  
+  # http://stackoverflow.com/questions/6778269/rails-3-polymorphic-liking-of-entities-by-user-how
+  # http://stackoverflow.com/questions/746387/labels-for-radio-buttons-in-rails-form
+  validates :uri, :presence => true
+  validates_format_of :uri, :with => URI::regexp(%w(http https))
+  validates :copyright, :presence => true
+  
+  
+end
diff --git a/app/views/photos/_form.html.erb b/app/views/photos/_form.html.erb
index cf0643ad..328884d1 100644
--- a/app/views/photos/_form.html.erb
+++ b/app/views/photos/_form.html.erb
@@ -1,25 +1,40 @@
-<%= form_for(@photo) do |f| %>
-  <% if @photo.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@photo.errors.count, "error") %> prohibited this photo from being saved:</h2>
-
-      <ul>
-      <% @photo.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :uri %><br />
-    <%= f.text_field :uri %>
-  </div>
-  <div class="field">
-    <%= f.label :copyright %><br />
-    <%= f.text_area :copyright %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
+<%= form_for(@photo) do |f| %>
+  <% if @photo.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@photo.errors.count, "error") %> prohibited this photo from being saved:</h2>
+
+      <ul>
+      <% @photo.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field">
+    <%= f.label :uri %><br />
+    <%= f.text_field :uri %>
+  </div>
+  <div class="field">
+    <%= f.label :copyright %><br />
+    <%= f.text_field :copyright %>
+  </div>
+  <div class="field">
+    <%= f.label :description %><br />
+    <%= f.text_area :description %>
+  </div>
+  <% @all_sites.each do |site| %>
+    <input id="photo_site_id_<%= site.id %>" name="photo[imageable_id]" type="radio" value="<%= site.id %>" <%= (@photo.imageable_id == site.id && @photo.imageable_type == 'Site') ? 'checked' : '' %>>
+	<label for="photo_site_id_<%= site.id %>"><%= site.name %></label>
+	<input id="photo_site_type_<%= site.id %>" name="photo[imageable_type]" type="radio" value="Site" <%= (@photo.imageable_id == site.id && @photo.imageable_type == 'Site') ? 'checked' : '' %>>
+	<label for="photo_site_type_<%= site.id %>">Site</label><br>
+  <% end %>
+  <% @all_projects.each do |project| %>
+    <input id="photo_project_id_<%= project.id %>" name="photo[imageable_id]" type="radio" value="<%= project.id %>" <%= (@photo.imageable_id == project.id && @photo.imageable_type == 'Project') ? 'checked' : '' %>>
+	<label for="photo_project_id_<%= project.id %>"><%= project.name %></label>
+	<input id="photo_project_type_<%= project.id %>" name="photo[imageable_type]" type="radio" value="Project" <%= (@photo.imageable_id == project.id && @photo.imageable_type == 'Project') ? 'checked' : '' %>>
+	<label for="photo_project_type_<%= project.id %>">project</label><br>
+  <% end %>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb
index e5f98114..77a3a7a3 100644
--- a/app/views/photos/index.html.erb
+++ b/app/views/photos/index.html.erb
@@ -1,25 +1,31 @@
-<h1>Listing photos</h1>
-
-<table>
-  <tr>
-    <th>Uri</th>
-    <th>Copyright</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @photos.each do |photo| %>
-  <tr>
-    <td><%= photo.uri %></td>
-    <td><%= photo.copyright %></td>
-    <td><%= link_to 'Show', photo %></td>
-    <td><%= link_to 'Edit', edit_photo_path(photo) %></td>
-    <td><%= link_to 'Destroy', photo, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Photo', new_photo_path %>
+<h1>Listing photos</h1>
+
+<table>
+  <tr>
+    <th>Uri</th>
+    <th>Copyright</th>
+	<th>Description</th>
+	<th>Ref Id</th>
+	<th>Ref Table</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @photos.each do |photo| %>
+  <tr>
+    <td><%= photo.uri %></td>
+    <td><%= photo.copyright %></td>
+	<td><%= photo.description %></td>
+	<td><%= photo.imageable_id %></td>
+	<td><%= photo.imageable_type %></td>
+    <td><%= link_to 'Show', photo %></td>
+    <td><%= link_to 'Edit', edit_photo_path(photo) %></td>
+    <td><%= link_to 'Destroy', photo, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Photo', new_photo_path %>
diff --git a/app/views/photos/show.html.erb b/app/views/photos/show.html.erb
index b7f61ff2..311f15b5 100644
--- a/app/views/photos/show.html.erb
+++ b/app/views/photos/show.html.erb
@@ -1,15 +1,24 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Uri:</b>
-  <%= @photo.uri %>
-</p>
-
-<p>
-  <b>Copyright:</b>
-  <%= @photo.copyright %>
-</p>
-
-
-<%= link_to 'Edit', edit_photo_path(@photo) %> |
-<%= link_to 'Back', photos_path %>
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Uri:</b>
+  <%= @photo.uri %>
+</p>
+
+<p>
+  <b>Copyright:</b>
+  <%= @photo.copyright %>
+</p>
+
+<p>
+  <b>Description:</b>
+  <%= @photo.description %>
+</p>
+
+<p>
+  <b>Parent:</b>
+  <%= @photo.imageable %>
+</p>
+
+<%= link_to 'Edit', edit_photo_path(@photo) %> |
+<%= link_to 'Back', photos_path %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index dec17cf3..1d2bc866 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,29 +1,35 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @project.name %>
-</p>
-
-<p>
-  <b>Description:</b>
-  <%= @project.description %>
-</p>
-
-<p>
-  <b>Urn:</b>
-  <%= @project.urn %>
-</p>
-
-<p>
-  <b>Notes:</b>
-  <%= @project.notes %>
-</p>
-
-<p>
-  <b>Sites:</b>
-  <%= @project.sites %>
-</p>
-
-<%= link_to 'Edit', edit_project_path(@project) %> |
-<%= link_to 'Back', projects_path %>
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Name:</b>
+  <%= @project.name %>
+</p>
+
+<p>
+  <b>Description:</b>
+  <%= @project.description %>
+</p>
+
+<p>
+  <b>Urn:</b>
+  <%= @project.urn %>
+</p>
+
+<p>
+  <b>Notes:</b>
+  <%= @project.notes %>
+</p>
+
+<p>
+  <b>Sites:</b>
+  <%= @project.sites %>
+</p>
+
+<p>
+  <b>Photos:</b>
+  <%= @project.photos %>
+</p>
+
+
+<%= link_to 'Edit', edit_project_path(@project) %> |
+<%= link_to 'Back', projects_path %>
diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb
index 2ab56d97..5eab39c6 100644
--- a/app/views/sites/show.html.erb
+++ b/app/views/sites/show.html.erb
@@ -1,25 +1,29 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
-  <%= @site.name %>
-</p>
-
-<p>
-  <b>Latitude:</b>
-  <%= @site.latitude %>
-</p>
-
-<p>
-  <b>Longitude:</b>
-  <%= @site.longitude %>
-</p>
-
-<p>
-  <b>Notes:</b>
-  <%= @site.notes %>
-</p>
-
-
-<%= link_to 'Edit', edit_site_path(@site) %> |
-<%= link_to 'Back', sites_path %>
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Name:</b>
+  <%= @site.name %>
+</p>
+
+<p>
+  <b>Latitude:</b>
+  <%= @site.latitude %>
+</p>
+
+<p>
+  <b>Longitude:</b>
+  <%= @site.longitude %>
+</p>
+
+<p>
+  <b>Notes:</b>
+  <%= @site.notes %>
+</p>
+
+<p>
+  <b>Photos:</b>
+  <%= @site.photos %>
+</p>
+
+<%= link_to 'Edit', edit_site_path(@site) %> |
+<%= link_to 'Back', sites_path %>