diff --git a/docs/upgrades/upgrade_7.4.12-7.5.0.pl b/docs/upgrades/upgrade_7.4.12-7.5.0.pl
index 7c722c4eb..e445c19c6 100644
--- a/docs/upgrades/upgrade_7.4.12-7.5.0.pl
+++ b/docs/upgrades/upgrade_7.4.12-7.5.0.pl
@@ -35,6 +35,14 @@ sub addSearchWithContainers {
     print "DONE!\n" unless $quiet;
 }
 
+#-------------------------------------------------
+sub addGroupToEditPost {
+    my $session = shift;
+    print "\tAdding the Group to Edit Post field to the Collaboration system." unless $quiet;
+    $session->db->write("alter table Collaboration add column groupToEditPost varchar(22) not null");
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 sub addFriendsNetwork {
     my $session = shift;
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 52d2f484e..6f5133aa2 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -96,6 +96,7 @@ sub canEdit {
 	return (($self->session->form->process("func") eq "add" || ($self->session->form->process("assetId") eq "new" && $self->session->form->process("func") eq "editSave" && $self->session->form->process("class","className") eq "WebGUI::Asset::Post")) && $self->getThread->getParent->canPost) || # account for new posts
 
 		($self->isPoster && $self->getThread->getParent->get("editTimeout") > ($self->session->datetime->time() - $self->get("revisionDate"))) ||
+        $self->session->user->isInGroup($self->getThread->getParent->get('groupToEditPost')) ||
 		$self->getThread->getParent->canEdit;
 
 }
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 56d43fea2..327fd256c 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -729,11 +729,21 @@ sub definition {
         subscriptionGroupId =>{
 			fieldType=>"subscriptionGroup",
             tab=>'security',
-			label=>$i18n->get("subscription group label"),
-            hoverHelp=>$i18n->get("subscription group hoverHelp"),
+			label=>"subscription group label",
+            hoverHelp=>"subscription group hoverHelp",
             noFormPost=>1,
             defaultValue=>undef,
-			},
+        },
+        groupToEditPost=>{
+            tab=>"security",
+            label=>'Group to Edit Posts',
+            excludeGroups=>[1,7],
+            hoverHelp=>'Group to Edit Posts',
+            uiLevel=>6,
+            fieldType=>'group',
+            filter=>'fixId',
+            defaultValue=>'4'
+        },
         );
 
         push(@{$definition}, {
@@ -951,7 +961,7 @@ sub getThreadsPaginator {
     if ($sortBy eq 'rating') {
         $sortBy = 'threadRating';
     } 
-    $sortBy = $self->session->db->dbh->quote_identifier($sortBy);
+    #$sortBy = $self->session->db->dbh->quote_identifier($sortBy);
 	my $sql = "
 		select 
 			asset.assetId,
diff --git a/t/Asset/Post.t b/t/Asset/Post.t
new file mode 100755
index 000000000..4fbcfcd89
--- /dev/null
+++ b/t/Asset/Post.t
@@ -0,0 +1,130 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2007 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+# XXX I (chrisn) started this file to test the features I added to the
+# Collaboration / Post system for 7.5, but didn't have the time available to me
+# to do a full test suite for the Post Wobject. This means that this test suite
+# is *largely incomplete* and should be finished. What is here *is* the
+# following:
+#
+#
+# 1. The basic framework for a test suite for the Post Asset.
+# Includes setup, cleanup, boilerplate, etc. Basically the really boring,
+# repetitive parts of the test that you don't want to write yourself.
+# 2. The tests for the features I've implemented; namely, functionality and
+# general access controls on who can edit a post.
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+use WebGUI::Test;
+use WebGUI::Session;
+use Test::More tests => 5; # increment this value for each test you create
+use WebGUI::Asset::Wobject::Collaboration;
+use WebGUI::Asset::Post;
+use WebGUI::Asset::Post::Thread;
+use WebGUI::User;
+use WebGUI::Group;
+
+my $session = WebGUI::Test->session;
+
+# Do our work in the import node
+my $node = WebGUI::Asset->getImportNode($session);
+
+# Grab a named version tag
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+$versionTag->set({name=>"Collab setup"});
+
+# Need to create a Collaboration system in which the post lives.
+my $collab = $node->addChild({className => 'WebGUI::Asset::Wobject::Collaboration', editTimeout => '1'});
+
+# The Collaboration system must be committed before a post can be made.
+$versionTag->commit();
+
+# Need to do $post->canEdit tests, which test group membership. Therefore,
+# create three users and a group for the process. One user will be doing the
+# posting. This user will *not* be able to edit the post after the editTimeout
+# has expired. The second user will be in the groupToEditPosts group, and *will*
+# be able to edit the post. The third user will be in the groupIdEdit group,
+# which is *also* allowed edit rights for the post after the timeout has
+# expired.
+my $postingUser         = WebGUI::User->new($session, 'new');
+my $otherUser           = WebGUI::User->new($session, 'new');
+my $groupIdEditUser     = WebGUI::User->new($session, 'new');
+my $groupToEditPost     = WebGUI::Group->new($session, $collab->get('groupToEditPost'));
+my $groupIdEditGroup    = WebGUI::Group->new($session, $collab->get('groupIdEdit'));
+$postingUser->username('userForPosting');
+$otherUser->username('otherUser');
+
+# Add the posting user to the group allowd to post.
+$postingUser->addToGroups([$collab->get('postGroupId')]);
+
+# Add $otherUser to $groupToEditPost so that they can edit the posts after the
+# timeout has expired.
+$otherUser->addToGroups([$groupToEditPost->getId]);
+
+# Similarly, add $groupIdEditUser to $groupIdEditGroup so that they, too, can
+# edit posts after the timeout has expired.
+$groupIdEditUser->addToGroups([$groupIdEditGroup->getId]);
+
+# We need to become $postingUser to ensure that the canEdit tests below use
+# $postingUser's credentials rather than the default user assigned to the
+# WebGUI::Test->session user.
+$session->user({userId => $postingUser->userId});
+
+# finally, add the post to the collaboration system
+my $props = {
+    className   => 'WebGUI::Asset::Post::Thread',
+    content     => 'hello, world!',
+};
+
+my $post = $collab->addChild($props);
+
+# Test for a sane object type
+isa_ok($post, 'WebGUI::Asset::Post::Thread');
+
+# make the posting user own the post 
+
+# the collab system's properties are correct, the post has been posted and
+# belongs to the correct user. It's time to carry out the $post->canEdit tests.
+# sleep one second to ensure that the editTimeout has expired for $postingUser.
+# Then do the tests. ->canEdit() reads the user field from the session object,
+# so for the test that's supposed to pass (for $otherUser, who's in
+# $groupToEditPost), we need to change the session user a second time. The same
+# applies for $groupIdEditUser, for a total of three user changes.
+sleep 1;
+
+ok(!$post->canEdit(), "Posting user can't edit after editTime has passed");
+
+$session->user({userId => $otherUser->userId});
+ok($post->canEdit(), "User in groupToEditPost group can edit post after the timeout");
+
+$session->user({userId => $groupIdEditUser->userId});
+ok($post->canEdit(), "User in groupIdEditUserGroup group can edit post after the timeout");
+
+TODO: {
+    local $TODO = "Tests to make later";
+	ok(0, 'Whole lot more work to do here');
+}
+
+END {
+    # Clean up after thyself
+    $collab->purge();
+    $post->purge();
+    $versionTag->rollback();
+    $postingUser->delete();
+    $otherUser->delete();
+    $groupIdEditUser->delete();
+    $groupToEditPost->delete();
+    $groupIdEditGroup->delete();
+}
+
+
+# vim: syntax=perl filetype=perl
diff --git a/t/Asset/Wobject/Collaboration.t b/t/Asset/Wobject/Collaboration.t
new file mode 100755
index 000000000..049a40f63
--- /dev/null
+++ b/t/Asset/Wobject/Collaboration.t
@@ -0,0 +1,67 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+# XXX I (chrisn) started this file to test the features I added to the
+# Collaboration / Post system for 7.5, but didn't have the time available to me
+# to do a full test suite for the Collaboration Wobject. This means that this
+# test suite is *largely incomplete* and should be finished. What is here *is*
+# the following:
+#
+#
+# 1. The basic framework for a test suite for the Collaboration Wobject.
+# Includes setup, cleanup, boilerplate, etc. Basically the really boring,
+# repetitive parts of the test that you don't want to write yourself.
+# 2. The tests for the features I've implemented; namely, the groupToEditPost
+# functionality.
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../../lib";
+use WebGUI::Test;
+use WebGUI::Session;
+use WebGUI::User;
+use WebGUI::Group;
+use WebGUI::Asset::Wobject::Collaboration;
+use WebGUI::Asset::Post;
+use Data::Dumper;
+use Test::More tests => 3; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+# Do our work in the import node
+my $node = WebGUI::Asset->getImportNode($session);
+
+# Grab a named version tag
+#my $versionTag = WebGUI::VersionTag->getWorking($session);
+#$versionTag->set({name => 'Collaboration Test'});
+
+my $collab = $node->addChild({className => 'WebGUI::Asset::Wobject::Collaboration', editTimeout => '1'});
+#$versionTag->commit();
+
+# Test for a sane object type
+isa_ok($collab, 'WebGUI::Asset::Wobject::Collaboration');
+
+# Verify that the groupToEdit field exists
+ok(defined $collab->get('groupToEditPost'), 'groupToEditPost field is defined');
+
+# Verify sane defaults
+cmp_ok($collab->get('groupToEditPost'), 'eq', $collab->get('groupIdEdit'), 'groupToEditPost defaults to groupIdEdit correctly');
+
+TODO: {
+    local $TODO = "Tests to make later";
+    ok(0, 'A whole lot more work to do here');
+}
+
+END {
+    # Clean up after thyself
+    $collab->purge();
+    #$versionTag->rollback();
+}
+# vim: syntax=perl filetype=perl