diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm
index 4a79040..4ad724a 100644
--- a/lib/admin/Controller/peering.pm
+++ b/lib/admin/Controller/peering.pm
@@ -64,6 +64,11 @@ sub index : Private {
 	$c->stash->{contracts} = $contracts;
     }
 
+    if(exists $c->session->{garefill}) {
+        $c->stash->{garefill} = $c->session->{garefill};
+        delete $c->session->{garefill};
+    }
+
     return 1;
 }
 
@@ -112,18 +117,17 @@ sub create_grp : Local {
     my %messages;
     my %settings;
 
-    my $grpname = $c->request->params->{grpname};
+    $settings{name} = $c->request->params->{grpname};
     $messages{cpeererr} = 'Client.Syntax.MalformedPeerGroupName'
-        unless $grpname =~ /^[a-zA-Z0-9_\-]+/;
-    my $priority = $c->request->params->{priority};
-    my $grpdesc = $c->request->params->{grpdesc};
+        unless $settings{name} =~ /^[a-zA-Z0-9_\-]+/;
+    $settings{priority} = $c->request->params->{priority};
+    $settings{description} = $c->request->params->{grpdesc};
+    $settings{peering_contract_id} = $c->request->params->{peering_contract_id}
+        if $c->request->params->{peering_contract_id};
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_peer_group',
-                                                 { name => $grpname,
-												   priority => $priority,
-												   description => $grpdesc
-                                                 },
+                                                 { %settings },
                                                  undef
                                                ))
         {
@@ -131,22 +135,14 @@ sub create_grp : Local {
             $c->session->{messages} = \%messages;
             $c->response->redirect("/peering");
             return;
-		}
-		else
-		{
-        	$messages{cpeererr} = 'Client.Voip.InputErrorFound';
-		}
+        }
     } else {
-		my %arefill = ();
-		$arefill{name} = $grpname;
-		$arefill{priority} = $priority;
-		$arefill{desc} = $grpdesc;
-
-		$c->stash->{arefill} = \%arefill;
+        $messages{cpeererr} = 'Client.Voip.InputErrorFound';
     }
 
+    $c->session->{garefill} = \%settings;
     $c->session->{messages} = \%messages;
-    $c->response->redirect("/peering");
+    $c->response->redirect("/peering#create_group");
     return;
 }
 
@@ -163,30 +159,24 @@ sub edit_grp : Local {
     my %messages;
     my %settings;
 
-    my $grpid = $c->request->params->{grpid};
-    my $priority = $c->request->params->{priority};
-    my $grpdesc = $c->request->params->{grpdesc};
+    $settings{id} = $c->request->params->{grpid};
+    $settings{priority} = $c->request->params->{priority};
+    $settings{description} = $c->request->params->{grpdesc};
+    $settings{peering_contract_id} = $c->request->params->{peering_contract_id} || undef;
 
 #$c->log->debug('*** edit grp');
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_group',
-                                                 { id => $grpid,
-												   priority => $priority,
-												   description => $grpdesc
-                                                 },
+                                                 \%settings,
                                                  undef
                                                ))
         {
             $messages{epeermsg} = 'Server.Voip.SavedSettings';
-		}
-		else
-		{
-        	$messages{epeererr} = 'Client.Voip.InputErrorFound';
-		}
+        }
     }
     $c->session->{messages} = \%messages;
-    $c->response->redirect("/peering");
+    $c->response->redirect("/peering#groups");
     return;
 }
 
@@ -833,7 +823,7 @@ sub contract_detail : Local {
     return 1;
 }
 
-=head2 save_account 
+=head2 save_contract 
 
 Create or update details of a SIP peering contract.
 
@@ -869,9 +859,9 @@ sub save_contract : Local {
                                                      },
                                                      undef))
             {
-                $messages{conmsg} = 'Server.Voip.SavedSettings';
+                $messages{topmsg} = 'Web.Contract.Updated';
                 $c->session->{messages} = \%messages;
-                $c->response->redirect("/peering/contract_detail?edit_contract=1&amb;contract_id=$contract_id");
+                $c->response->redirect("/peering");
                 return;
             }
         } else {
@@ -879,9 +869,9 @@ sub save_contract : Local {
                                                      { data => \%settings },
                                                      \$contract_id))
             {
-                $messages{conmsg} = 'Web.Account.Created';
+                $messages{topmsg} = 'Web.Contract.Created';
                 $c->session->{messages} = \%messages;
-                $c->response->redirect("/peering/contract_detail?edit_contract=1&amb;contract_id=$contract_id");
+                $c->response->redirect("/peering");
                 return;
             }
         }
@@ -910,7 +900,7 @@ sub terminate_contract : Local {
                                              { id => $contract_id },
                                              undef))
     {
-        $messages{topmsg} = 'Server.Voip.SubscriberDeleted';
+        $messages{topmsg} = 'Web.Contract.Deleted';
         $c->session->{messages} = \%messages;
         $c->response->redirect("/peering");
         return;
@@ -938,7 +928,7 @@ sub delete_contract : Local {
                                              { id => $contract_id },
                                              undef))
     {
-        $messages{topmsg} = 'Server.Voip.SubscriberDeleted';
+        $messages{topmsg} = 'Web.Contract.Deleted';
         $c->session->{messages} = \%messages;
         $c->response->redirect("/peering");
         return;
diff --git a/root/tt/peering.tt b/root/tt/peering.tt
index 20801fd..56e77cd 100644
--- a/root/tt/peering.tt
+++ b/root/tt/peering.tt
@@ -39,7 +39,7 @@
 
       [% END %]
 
-        <h3>SIP Peering Groups</h3>
+        <h3 id="groups">SIP Peering Groups</h3>
 
         <div class="p1">
           [% IF messages.epeermsg %]<div class="goodmsg">[% messages.epeermsg %]</div>[% END %]
@@ -51,6 +51,9 @@
               <td>Name</td>
               <td>Priority</td>
               <td>Description</td>
+              [% IF Catalyst.config.billing_features %]
+                <td>Peering Contract</td>
+              [% END %]
               <td style="width:40px;" />
               <td style="width:60px;" />
             </tr>
@@ -74,6 +77,18 @@
                       <input type="text" id="addtxt" title="string, description of group"
                              name="grpdesc" value="[% grp.description %]" />
                     </td>
+                  [% IF Catalyst.config.billing_features %]
+                    <td>
+                      <select size="1" name="peering_contract_id">
+                        <option value="0" [% UNLESS grp.peering_contract_id %]selected="selected"[% END %]>&nbsp;</option>
+                        [% FOREACH contract = contracts %]
+                          <option value="[% contract.id %]"
+                                  [% IF grp.peering_contract_id == contract.id %]selected="selected"[% END %]
+                                 >[% contract.id %]</option>
+                        [% END %]
+                      </select>
+                    </td>
+                  [% END %]
                     <td>
                       <div class="postlink">
                         <label for="grpsave[% id %]">save</label>
@@ -86,6 +101,9 @@
                   <td><a href="/peering/detail?group_id=[%grp.id%]" class="aaction">[% grp.name %]</a></td>
                   <td>[% grp.priority %]</td>
                   <td>[% grp.description %]</td>
+                  [% IF Catalyst.config.billing_features %]
+                    <td>[% grp.peering_contract_id %]</td>
+                  [% END %]
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
                     <a href="/peering?editid=[% grp.id %]" class="aaction">edit</a>
@@ -115,7 +133,7 @@
         </div>
 
       [% UNLESS Catalyst.session.admin.read_only %]
-        <h3>Create Peering Group</h3>
+        <h3 id="create_group">Create Peering Group</h3>
 
         <div class="p1">
           [% IF messages.cpeermsg %]<div class="goodmsg">[% messages.cpeermsg %]</div>[% END %]
@@ -126,6 +144,9 @@
               <td>Name</td>
               <td>Priority</td>
               <td>Description</td>
+              [% IF Catalyst.config.billing_features %]
+                <td>Peering Contract</td>
+              [% END %]
               <td style="width:40px;" />
               <td style="width:60px;" />
             </tr>
@@ -133,21 +154,33 @@
               <tr>
                 <td>
                   <input type="text" size="20" name="grpname" title="string, name of group"
-                         id="addtxt" value="[% arefill.name %]" />
+                         id="addtxt" value="[% garefill.name %]" />
                 </td>
                 <td>
                   <select title="string, priority" size="1" name="priority">
-					[% count = 1 %]
-					[% WHILE count < 10 %]
-				  		<option [% "selected" IF 1 == count %]>[% count %]</option>
-				  		[% count = count + 1 %]
-					[% END %]
-				  </select>
+                    [% count = 1 %]
+                    [% WHILE count < 10 %]
+                      <option [% IF garefill.priority == count %]selected="selected"[% END %]>[% count %]</option>
+                      [% count = count + 1 %]
+                    [% END %]
+                  </select>
                 </td>
                 <td>
                   <input type="text" size="20" name="grpdesc" title="string, description of group"
-                         id="addtxt" value="[% arefill.desc %]" />
+                         id="addtxt" value="[% garefill.description %]" />
                 </td>
+              [% IF Catalyst.config.billing_features %]
+                <td>
+                  <select size="1" name="peering_contract_id">
+                    <option value="0" [% UNLESS garefill.peering_contract_id %]selected="selected"[% END %]>&nbsp;</option>
+                    [% FOREACH contract = contracts %]
+                      <option value="[% contract.id %]"
+                              [% IF garefill.peering_contract_id == contract.id %]selected="selected"[% END %]
+                             >[% contract.id %]</option>
+                    [% END %]
+                  </select>
+                </td>
+              [% END %]
                 <td>
                   <div class="postlink">
                     <label for="grpadd">add</label>