diff --git a/site/controllers/units_controller.php b/site/controllers/units_controller.php
index 2e2fc84..af1f27c 100644
--- a/site/controllers/units_controller.php
+++ b/site/controllers/units_controller.php
@@ -153,17 +153,31 @@ class UnitsController extends AppController {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>''));
     }
-    $this->Unit->recursive = 4;
-    $this->Unit->UnitSize->unbindModel(array('hasMany' => array('Unit')));
-    $this->Unit->UnitSize->UnitType->unbindModel(array('hasMany' => array('UnitSize')));
-    $this->Unit->Lease->unbindModel(array('belongsTo' => array('Unit')));
-    $this->Unit->Lease->LeaseType->unbindModel(array('hasMany' => array('Lease')));
-    $this->Unit->Lease->Charge->unbindModel(array('belongsTo' => array('Lease')));
-    $this->Unit->Lease->Charge->ChargeType->unbindModel(array('hasMany' => array('Charge')));
-    $this->Unit->Lease->Charge->Receipt->unbindModel(array('hasMany' => array('ChargesReceipt')));
 
-    $unit  = $this->Unit->read(null, $id);
-    $title = 'Unit ' . $unit['Unit']['name'];
+    $this->Unit->Behaviors->attach('Containable');
+    $this->Unit->contain
+      (array(// Models
+	     'UnitSize',
+	     'Lease' =>
+	     array('order' => 'movein_date',
+		   'conditions' => array('Lease.lease_date IS NOT NULL',
+					 ),
+		   // Models
+		   'Contact' =>
+		   array(//'order'  => array('sort_order'),
+			 'fields' => array('id', 'display_name'),
+			 ),
+		   'Charge' =>
+		   array('order'  => array('charge_date'),
+			 // Models
+			 'ChargeType',
+			 'Receipt'
+			 //=> array('Payment'),
+			 )
+		   )
+	     )
+       );
+    $unit = $this->Unit->read(null, $id);
 
     $outstanding_deposit = 0;
     $outstanding_balance = 0;
@@ -186,6 +200,7 @@ class UnitsController extends AppController {
     $this->sidemenu_links[] =
       array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
 
+    $title = 'Unit ' . $unit['Unit']['name'];
     $this->set(compact('unit', 'title',
 		       'outstanding_balance',
 		       'outstanding_deposit'));