--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -1,44 +1,100 @@
 <?php
+
 include_once ("./lib/common.inc.php");
 if ($_REQUEST['supplier']) {
+
+    $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
+    include_header(str_replace("%","",$supplierName));
+echo '<center><h1>'.str_replace("%","",$supplierName).'</h1></center>';
+
+   // MethodCountGraph($supplierS);
+  //  CnCGraph($supplierS);
+   // MethodValueGraph($supplierS);
+    /* lobbyist ties
+
+      links to ABR/ASIC/Google News/ASX/Court records
+
+      total value to various agencies (bar graph)
+
+      spread procurement methods + percent consultancies + percent confidential (bar graph)
+
+      spread of contract values
+
+      spread of industries (textual?) */
+    $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
+    "contractStart", "supplierName"
+    FROM contractnotice WHERE ' .
+            $supplierQ . ' ' . $standardQ
+            . ' ORDER BY value DESC';
     
-include_header("Supplier");
-  $supplier = htmlentities(strip_tags($_REQUEST['supplier']));
-  echo '<img src="graphs/displayMethodCountGraph.php?supplier=' . stripslashes($supplier) . '">';
-   echo '<img src="graphs/displayCnCGraph.php?supplier=' . stripslashes($supplier) . '">';
-   echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplier) . '">';
-  /*lobbyist ties
-  
-  links to ABR/ASIC/Google News/ASX/Court records
-  
-  total value to various agencies (bar graph)
-  
-  spread procurement methods + percent consultancies + percent confidential (bar graph)
-  
-  spread of contract values
-  
-  spread of industries (textual?)*/
+    $query = $conn->prepare($query);
+
+
+  if ($supplierParts[0] > 0) {
+    $query->bindParam(":supplierABN", $supplierABN);
+  } else {
+      $query->bindParam(":supplierName", $supplierName);
+  }
+    $query->execute();
+    databaseError($conn->errorInfo());
+   // echo '<img src="graphs/displayMethodCountGraph.php?month=' . stripslashes($supplier) . '">';
+   // echo '<img src="graphs/displayCnCGraph.php?month=' . stripslashes($supplier) . '">';
+
+    echo "<table>  <thead>
+    <tr>
+      <th>Contract Notice Number</th>
+      <th>Contract Description</th>
+      <th>Total Contract Value</th>
+      <th>Agency</th>
+      <th>Contract Start Date</th>
+      <th>Supplier</th>
+    </tr>
+  </thead>";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+        echo ("<tr>
+    <td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td>
+    <td><b>{$row['description']}</b></a></td>
+    <td>\$$value</td><td>{$row['agencyName']}</td>
+    <td>{$row['contractStart']}</td>
+    <td>{$row['supplierName']}</td>
+    </tr>");
+    }
+    echo "</table>";
 } else {
     /*
-     histograph of supplier size/value
-    */
-include_header("Suppliers");
-  $query = "SELECT SUM(value) as val, supplierName, supplierABN
-FROM `contractnotice`
-WHERE childCN = 0
-GROUP BY supplierName
+      histograph of supplier size/value
+     */
+    include_header("Suppliers");
+    suppliersGraph();
+    $query = 'SELECT SUM("value") as val, MAX("supplierName") as supplierName, "supplierABN",(
+ case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID 
+FROM contractnotice
+WHERE "childCN" is null
+GROUP BY supplierID,"supplierABN"
 ORDER BY val DESC
-LIMIT 100";
-  $result = mysql_query($query);
-  echo "<table>";
-  while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-    setlocale(LC_MONETARY, 'en_US');
-    $value = number_format(doubleval($row['val']) , 2);
-    $supplier = stripslashes($row['supplierABN'].'-'.$row['supplierName']);
-    echo ("<tr><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">".ucsmart($row['supplierName'])."</a></b></td><td>\$$value</td></tr>\n");
-  }
-  echo "</table>";
-  mysql_free_result($result);
+LIMIT 100';
+    $query = $conn->prepare($query);
+    $query->execute();
+        databaseError($conn->errorInfo());
+    echo "<table>  <thead>
+    <tr>
+       <th>Position</th>
+       <th>Supplier</th>
+      <th>Total Contract Value</th>
+    </tr>
+  </thead>";
+    $i = 1;
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['val']), 2);
+        $supplier = stripslashes($row['supplierABN'] . '-' . $row['suppliername']);
+        echo ("<tr><td>$i</td><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">" . ucsmart($row['suppliername']) . "</a></b></td><td>\$$value</td></tr>\n");
+        $i++;
+    }
+    echo "</table>";
 }
 include_footer();
 ?>
+