diff --git a/controllers/shipments_controller.php b/controllers/shipments_controller.php
index 24863dcc..345332d3 100644
--- a/controllers/shipments_controller.php
+++ b/controllers/shipments_controller.php
@@ -68,6 +68,20 @@ class ShipmentsController extends AppController {
 	    //$this->Shipment->create($this->data);
 
 	    if ($this->Shipment->saveAll($this->data)) {
+
+		$boxIDs = array();
+		foreach($this->data['Box'] as $box) {
+		    $boxIDs[] = $box['id'];
+		}
+
+		$invoiceIDs = array();
+		foreach($this->data['ShipmentInvoice'] as $si) {
+		    $invoiceIDs[] = $si['id'];
+		}
+
+
+
+
 		echo "SUCCESS";
 	    }
 	    else {
@@ -84,7 +98,7 @@ class ShipmentsController extends AppController {
 
 
     function ajax_add() {
-	$this->layout = 'ajax';
+	//$this->layout = 'ajax';
 	if(!empty($this->data)) {
 	    $this->Shipment->create($this->data);
 
diff --git a/models/shipment.php b/models/shipment.php
index 93686e0c..d8f45b30 100644
--- a/models/shipment.php
+++ b/models/shipment.php
@@ -26,8 +26,18 @@ class Shipment extends AppModel {
 			    'className' => 'User',
 			    'foreignKey' => 'user_id',
 			    'conditions' => array('User.type' => 'user')
+	    ),
+
+	    'Customer' => array(
+			    'className' => 'Customer',
+			    'foreignKey' => 'customer_id'
+	    ),
+	    'Address' => array(
+			    'className' => 'Address',
+			    'foreignKey' => 'address_id'
 	    )
 
+
     );
 
     var $hasMany = array(
@@ -107,5 +117,15 @@ class Shipment extends AppModel {
 	    )
     );
 
+
+ /*function beforeSave() {
+     $thisID = $this->data['Shipment']['id'];
+
+     $this->Box->deleteAll(array('Box.shipment_id'=>$thisID));
+     return true;
+
+ }*/
+
+
 }
 ?>
\ No newline at end of file
diff --git a/views/shipments/edit.ctp b/views/shipments/edit.ctp
index 0b934a65..971c5fa8 100644
--- a/views/shipments/edit.ctp
+++ b/views/shipments/edit.ctp
@@ -33,7 +33,7 @@ echo $form->input('id', array('type'=>'hidden'));
 	<li id="PrincipleID_<?=$principle['id']?>">
 	    <button class="removeFromList">X</button>
 		<?=$principle['name'];?>
-	    <input type="hidden" name="data[Principle][Principle[]" value="<?=$principle['id']?>">
+	    <input type="hidden" name="data[Principle][Principle][]" value="<?=$principle['id']?>">
 	</li>
 	<?php endforeach?>
     </ul>
@@ -49,7 +49,7 @@ echo $form->input('id', array('type'=>'hidden'));
 	<li id="PurchaseOrderID_<?=$po['id']?>">
 	    <button class="removeFromList">X</button>
 		<?=$po['title'];?>
-	    <input type="hidden" name="data[PurchaseOrder][PurchaseOrder[]" value="<?=$po['id']?>">
+	    <input type="hidden" name="data[PurchaseOrder][PurchaseOrder][]" value="<?=$po['id']?>">
 	</li>
 	<?php endforeach?>
     </ul>
@@ -63,10 +63,10 @@ echo $form->input('id', array('type'=>'hidden'));
 
     <ul id="jobsList" class="habtmList">
 	<?php foreach($this->data['Job'] as $job):?>
-	<li id="JobID_<?=$po['job']?>">
+	<li id="JobID_<?=$job['id']?>">
 	    <button class="removeFromList">X</button>
 		<?=$job['title'];?>
-	    <input type="hidden" name="data[PurchaseOrder][PurchaseOrder[]" value="<?=$job['id']?>">
+	    <input type="hidden" name="data[Job][Job][]" value="<?=$job['id']?>">
 	</li>
 	<?php endforeach?>
     </ul>
@@ -75,14 +75,14 @@ echo $form->input('id', array('type'=>'hidden'));
 
 <div id="customer" class="hiddenDefault">
     <?=$form->input('customer', array('id'=>'customer_autocomplete', 'label'=>'Customer'));?>
-    <?=$form->input('customer_id', array('type'=>'hidden', 'id'=>'customer_id'));?>
+    <?=$form->input('customer_id', array('type'=>'hidden', 'id'=>'customer_id', 'value'=>$this->data['Shipment']['customer_id']));?>
 </div>
 
 <div id="addressSpan" class="hiddenDefault">
     <span>Shipping Address:</span>
 </div>
 <div id="address" class="hiddenDefault">
-
+    <?=$form->input('address_id', array('type'=>'hidden', 'id'=>'address_id', 'value'=>$this->data['Shipment']['address_id']));?>
 </div>
 
 
@@ -101,6 +101,8 @@ echo $form->input('id', array('type'=>'hidden'));
     <?php foreach($this->data['Box'] as $box):?>
     <div id="" class="boxForm">
 	<button class="removeBox">X</button>
+	    <?=$form->input("Box.{$boxNo}.id", array('type'=>'hidden'));?>
+	    <?=$form->input("Box.{$boxNo}.shipment_id", array('type'=>'hidden', 'value'=>$this->data['Shipment']['id']));?>
 	    <?=$form->input("Box.{$boxNo}.length", array('label'=>'Length (cm)', 'div'=>'length'));?>
 	    <?=$form->input("Box.{$boxNo}.width", array('label'=>'Width (cm)', 'div'=>'width'));?>
 	    <?=$form->input("Box.{$boxNo}.height", array('label'=>'Height (cm)', 'div'=>'height'));?>
diff --git a/views/shipments/index.ctp b/views/shipments/index.ctp
index fa3aa635..d41a7573 100644
--- a/views/shipments/index.ctp
+++ b/views/shipments/index.ctp
@@ -91,12 +91,7 @@
 	    </td>
 
 	    <td  class="boxDimensions">
-		    <?php
-		    //This is nasty. Will fix this once its working.
-
-		    ?>
-
-
+		  
 		    <?php
 
 		    $totalWeight = 0;
diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css
index 61e9f058..ce1a3d79 100755
--- a/webroot/css/quotenik.css
+++ b/webroot/css/quotenik.css
@@ -392,13 +392,13 @@ th {
     text-align: center;
 }
 th a {
-  
+
     display: block;
     padding: 2px 4px;
     text-decoration: none;
 }
 th a:hover {
- 
+
     color: #333;
     text-decoration: none;
 }
@@ -1280,7 +1280,7 @@ table.jobsTable tbody {
 table.jobsTable tr th {
     border: 1px solid;
     font-size: 70%;
-  
+
 }
 
 /** Header Colors for Job table to replaced 'Book1'. */
@@ -1428,7 +1428,7 @@ span.year {
 }
 
 tr.cancelled td {
-   text-decoration: line-through;
+    text-decoration: line-through;
 }
 
 
@@ -1438,10 +1438,12 @@ tr.cancelled td {
 table.shipments tr td {
     font-size: 80%;
     border: 1px solid;
+    white-space: nowrap;
 }
 
 table.shipments tr td.boxDimensions {
     text-align: left;
+    white-space: nowrap;
 }
 
 
@@ -1486,7 +1488,7 @@ table.shipments {
 }
 
 span.totalWeight {
-    
+ 
     font-weight: bolder;
 }