diff --git a/lib/WebGUI/Asset/File/Image/Photo.pm b/lib/WebGUI/Asset/File/Image/Photo.pm
index 82e6727e4..c5f075f48 100644
--- a/lib/WebGUI/Asset/File/Image/Photo.pm
+++ b/lib/WebGUI/Asset/File/Image/Photo.pm
@@ -223,9 +223,8 @@ sub getComment {
     my $self        = shift;
     my $commentId   = shift;
     
-    return $self->session->db->quickHashRef(
-        "SELECT * FROM Photo_comment WHERE assetId=? AND commentId=?",
-        [$self->getId, $commentId],
+    return $self->session->db->getRow(
+        "Photo_comment", "commentId", $commentId,
     );
 }
 
@@ -259,8 +258,14 @@ Get a WebGUI::Paginator for the comments for this Photo.
 sub getCommentPaginator {
     my $self        = shift;
     
-    # ...
-
+    my $p           = WebGUI::Paginator->new($session, $self->getUrl);
+    $p->setDataByQuery(
+        "SELECT * FROM Photo_comment WHERE assetId=? ORDER BY creationDate DESC",
+        undef, undef,
+        [$self->getId],
+    );
+    
+    return $p;
 }
 
 #----------------------------------------------------------------------------
@@ -281,7 +286,7 @@ sub getDownloadFileUrl {
     croak "Photo->getDownloadFileUrl: resolution doesn't exist for this Photo"
         unless grep /$resolution/, @{ $self->getResolutions };
 
-    # ...
+    return $self->getStorageLocation->getFileUrl( $resolution . ".jpg" );
 }
 
 #----------------------------------------------------------------------------
@@ -326,7 +331,7 @@ Get a hash reference of template variables shared by all views of this asset.
 
 sub getTemplateVars {
     my $self        = shift;
-    my $vars        = $self->get;
+    my $var         = $self->get;
     
     ### Format exif vars
     my $exif        = jsonToObj( delete $var->{exifData} );
@@ -338,7 +343,7 @@ sub getTemplateVars {
         push @{ $var->{exifLoop} }, { tag => $tag, value => $exif->{$tag} };
     }
 
-    return $vars;
+    return $var;
 }
 
 #----------------------------------------------------------------------------
@@ -406,7 +411,9 @@ sub makeResolutions {
 =head2 makeShortcut ( parentId [, overrides ] )
 
 Make a shortcut to this asset under the specified parent, optionally adding 
-the specified overrides.
+the specified hash reference of C<overrides>.
+
+Returns the created shortcut asset.
 
 =cut
 
@@ -418,14 +425,40 @@ sub makeShortcut {
 
     croak "Photo->makeShortcut: parentId must be defined"
         unless $parentId;
-    croak "Photo->makeShortcut: overrides must be hash reference"
-        if $overrides && ref $overrides ne "HASH";
 
     my $parent      = WebGUI::Asset->newByDynamicClass($session, $parentId)
                     || croak "Photo->makeShortcut: Could not instanciate asset '$parentId'";
 
-    # ...
+    my $shortcut
+        = $parent->addChild({ 
+            className           => "WebGUI::Asset::Shortcut",
+            shortcutToAssetId   => $self->getId,
+        });
+    
+    if ($overrides) {
+        $shortcut->setOverride( $overrides );
+    }
 
+    return $shortcut;
+}
+
+#----------------------------------------------------------------------------
+
+=head2 prepareView ( )
+
+Prepare the template to be used for the C<view> method.
+
+=cut
+
+sub prepareView {
+    my $self        = shift;
+    $self->SUPER::prepareView();
+
+    my $template    
+        = WebGUI::Asset::Template->new($self->session, $self->getGallery->get("templateIdViewFile"));
+    $template->prepare;
+
+    $self->{_viewTemplate}  = $template;
 }
 
 #----------------------------------------------------------------------------
@@ -444,6 +477,19 @@ sub processPropertiesFromFormPost {
 
 #----------------------------------------------------------------------------
 
+=head2 processStyle ( html )
+
+Returns the HTML from the Gallery's style.
+
+=cut
+
+sub processStyle {
+    my $self        = shift;
+    return $self->getGallery->processStyle( @_ );
+}
+
+#----------------------------------------------------------------------------
+
 =head2 setComment ( commentId, properties )
 
 Set a comment. If C<commentId> is C<"new">, create a new comment. C<properties>
@@ -461,7 +507,10 @@ sub setComment {
     croak "Photo->setComment: properties must be a hash reference"
         unless $properties && ref $properties eq "HASH";
 
-    # ...
+    $self->session->db->setRow( 
+        "Photo_comment", "commentId", 
+        { %$properties, commentId => $commentId }
+    );
 }
 
 #----------------------------------------------------------------------------
@@ -499,10 +548,9 @@ sub view {
     $var->{ fileIcon    } = $self->getFileIconUrl;
 
 
-    return $self->processTemplate($var,undef, $self->{_viewTemplate});
+    return $self->processTemplate($var, undef, $self->{_viewTemplate});
 }
 
-
 #----------------------------------------------------------------------------
 
 =head2 www_addCommentSave ( )
@@ -530,7 +578,15 @@ this Photo exists in.
 sub www_delete {
     my $self        = shift;
     
-    # ...
+    return $self->session->privilege->insufficient unless $self->canEdit;
+
+    my $var         = $self->getTemplateVar;
+    $var->{ url_yes     } = $self->getUrl("func=deleteConfirm");
+    $var->{ url_no      } = $self->getUrl();
+
+    return $self->processStyle(
+        $self->processTemplate( $var, $self->getGallery->get("templateIdDeletePhoto") )
+    );
 }
 
 #----------------------------------------------------------------------------
@@ -544,8 +600,16 @@ album.
 
 sub www_deleteConfirm {
     my $self        = shift;
-    
-    # ...
+
+    return $self->session->privilege->insufficient unless $self->canEdit;
+
+    my $i18n        = $self->i18n( $self->session );
+
+    $self->purge;
+
+    return $self->processStyle(
+        sprintf $i18n->get("delete message"), $self->getParent->getUrl,
+    );
 }
 
 #----------------------------------------------------------------------------
@@ -559,8 +623,21 @@ download the original file.
 
 sub www_download {
     my $self        = shift;
+    
+    return $self->session->privilege->insufficient unless $self->canView;
+    
+    my $storage     = $self->getStorageLocation;
 
-# ...
+    $self->session->http->setMimeType( "image/jpeg" );
+    $self->session->http->setLastModified( $self->getContentLastModified );
+
+    my $resolution  = $self->session->form->get("resolution");
+    if ($resolution) {
+        return $storage->getFileContentsAsScalar( $resolution . ".jpg" ); 
+    }
+    else {
+        return $storage->getFileContentsAsScalar( $self->get("filename") );
+    }
 }
 
 #----------------------------------------------------------------------------
@@ -625,6 +702,11 @@ sub www_edit {
             value           => ( $form->get("friendsOnly") || $self->get("friendsOnly") ),
             defaultValue    => undef,
         });
+
+
+    return $self->processStyle(
+        $self->processTemplate($var, $self->getGallery->get("templateIdEditFile"))
+    );
 }
 
 #----------------------------------------------------------------------------
@@ -642,8 +724,32 @@ sub www_makeShortcut {
     
     return $self->session->privilege->insufficient  unless $self->canEdit;
 
-    # ...
+    # Create the form to make a shortcut
+    my $var         = $self->getTemplateVars;
+    
+    $var->{ form_header }
+        = WebGUI::Form::formHeader( $session )
+        . WebGUI::Form::hidden( $session, { name => "func", value => "makeShortcutSave" });
+    $var->{ form_footer } 
+        = WebGUI::Form::formFooter( $session );
 
+    # Albums under this Gallery
+    my $albums          = $self->getGallery->getAlbumIds;
+    my %albumOptions;
+    for my $assetId ( @$albums ) {
+        $albumOptions{ $assetId } 
+            = WebGUI::Asset->newByDynamicClass($session, $assetId)->get("title");
+    }
+    $var->{ form_parentId }
+        = WebGUI::Form::selectBox( $session, {
+            name        => "parentId",
+            value       => $self->getParent->getId,
+            options     => \%albumOptions,
+        });
+
+    return $self->processStyle(
+        $self->processTemplate($var, $self->getGallery->get("templateIdMakeShortcut"))
+    );
 }
 
 #----------------------------------------------------------------------------
@@ -662,8 +768,35 @@ sub www_makeShortcutSave {
 
     return $self->session->privilege->insufficient unless $self->canEdit;
 
-    #...
+    my $shortcut    = $self->makeShortcut( $parentId );
+    
+    return $shortcut->www_view; 
+}
 
+#----------------------------------------------------------------------------
+
+=head2 www_view ( )
+
+Shows the output of L<view> inside of the style provided by the gallery this
+photo is in.
+
+=cut
+
+sub www_view {
+    my $self    = shift;
+
+    return $self->session->privilege->insufficient unless $self->canView;
+
+    $self->session->http->setLastModified($self->getContentLastModified);
+    $self->session->http->sendHeader;
+    $self->prepareView;
+    my $style = $self->processStyle("~~~");
+    my ($head, $foot) = split("~~~",$style);
+    $self->session->output->print($head, 1);
+    $self->session->output->print($self->view);
+    $self->session->output->print($foot, 1);
+    return "chunked";
+}
 }
 
 1;
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 06132567b..5d6410d88 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -636,6 +636,34 @@ sub processPropertiesFromFormPost {
 	$self->uncacheOverrides;
 }
 
+#----------------------------------------------------------------------------
+
+=head2 setOverride ( overrides )
+
+Set this shortcut's overrides. C<overrides> is a hash reference of overrides
+to set.
+
+=cut
+
+sub setOverride {
+    my $self        = shift;
+    my $override    = shift;
+
+    croak "Shortcut->setOverride - first argument must be hash reference" 
+        unless $override && ref $override eq "HASH";
+    
+    for my $key ( %$override ) {
+        $self->session->db->write(
+            "DELETE FROM Shortcut_overrides WHERE assetId=? AND fieldName=?",
+            [$self->getId, $key],
+        );
+        $self->session->db->write(
+            "INSERT INTO Shortcut_overrides VALUES (?,?,?)",
+            [$self->getId, $key, $override->{$key}],
+        );
+    }
+}
+
 #-------------------------------------------------------------------
 
 sub uncacheOverrides {
@@ -859,23 +887,23 @@ sub www_editOverride {
 
 #-------------------------------------------------------------------
 sub www_saveOverride {
-	my $self = shift;
-	return $self->session->privilege->insufficient() unless $self->canEdit;
-	my $fieldName = $self->session->form->process("overrideFieldName");
-	my %overrides = $self->getOverrides;
-	my $output = '';
-	my %props;
-	foreach my $def (@{$self->getShortcutOriginal->definition($self->session)}) {
-		%props = (%props,%{$def->{properties}});
-	}
-	my $fieldType = $props{$fieldName}{fieldType};
-	my $value = $self->session->form->process($fieldName,$fieldType);
-	$value = $self->session->form->process("newOverrideValueText") || $value;
-	$self->session->db->write("delete from Shortcut_overrides where assetId=".$self->session->db->quote($self->getId)." and fieldName=".$self->session->db->quote($fieldName));
-	$self->session->db->write("insert into Shortcut_overrides values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($fieldName).",".$self->session->db->quote($value).")");
-	$self->uncacheOverrides;
-	$self->getShortcutOriginal->purgeCache();
-	return $self->www_manageOverrides;
+    my $self = shift;
+    return $self->session->privilege->insufficient() unless $self->canEdit;
+    my $fieldName = $self->session->form->process("overrideFieldName");
+    my %overrides = $self->getOverrides;
+    my $output = '';
+    my %props;
+    foreach my $def (@{$self->getShortcutOriginal->definition($self->session)}) {
+        %props = (%props,%{$def->{properties}});
+    }
+    my $fieldType = $props{$fieldName}{fieldType};
+    my $value = $self->session->form->process($fieldName,$fieldType);
+    $value = $self->session->form->process("newOverrideValueText") || $value;
+    $self->session->db->write("delete from Shortcut_overrides where assetId=".$self->session->db->quote($self->getId)." and fieldName=".$self->session->db->quote($fieldName));
+    $self->session->db->write("insert into Shortcut_overrides values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($fieldName).",".$self->session->db->quote($value).")");
+    $self->uncacheOverrides;
+    $self->getShortcutOriginal->purgeCache();
+    return $self->www_manageOverrides;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Wobject/Gallery.pm b/lib/WebGUI/Asset/Wobject/Gallery.pm
index e5fb16462..f4ffb1010 100644
--- a/lib/WebGUI/Asset/Wobject/Gallery.pm
+++ b/lib/WebGUI/Asset/Wobject/Gallery.pm
@@ -81,13 +81,6 @@ sub definition {
             label           => $i18n->get("imageViewSize label"),
             hoverHelp       => $i18n->get("imageViewSize description"),
         },
-        imageViewCompression => {
-            tab             => "properties",
-            fieldType       => "integer",
-            defaultValue    => 0,
-            label           => $i18n->get("imageViewCompression label"),
-            hoverHelp       => $i18n->get("imageViewCompression description"),
-        },
         imageThumbnailSize => {
             tab             => "properties",
             fieldType       => "integer",
diff --git a/t/Asset/File/Image/Photo/exif.t b/t/Asset/File/Image/Photo/exif.t
index 81297cb96..6dc256ba5 100644
--- a/t/Asset/File/Image/Photo/exif.t
+++ b/t/Asset/File/Image/Photo/exif.t
@@ -19,6 +19,8 @@ use Scalar::Util qw( blessed );
 use WebGUI::Test;
 use WebGUI::Session;
 use Test::More; 
+use JSON;
+use Image::ExifTool;
 
 #----------------------------------------------------------------------------
 # Init
@@ -52,5 +54,26 @@ $photo
     = $album->addChild({
         className               => "WebGUI::Asset::File::Image::Photo",
     });
-$photo->setFile( WebGUI::Test->getCollateralPath("lamp.jpg") );
-my $exif    = $photo->get("exifData");
+$photo->setFile( WebGUI::Test->getTestCollateralPath("lamp.jpg") );
+my $exifData    = $photo->get("exifData");
+
+ok( defined $exifData, "exifData column is defined after setFile" );
+
+my $exif        = jsonToObj( $exifData );
+ok( ref $exif eq "HASH", "exifData is JSON hash" );
+
+#----------------------------------------------------------------------------
+# Test getTemplateVars exif data
+my $var         = $photo->getTemplateVars;
+
+is_deeply(
+    [ sort keys %$exif ],
+    [ sort map { s/exif_// } keys %$var ],
+    "getTemplateVars gets a hash of all exif tags",
+);
+
+is_deeply(
+    [ sort keys %$exif ],
+    [ sort map { $_->{tag} } @{ $var->{exifLoop} } ],
+    "getTemplateVars gets a loop over the tags",
+);