--- a/busui/stopList.php
+++ b/busui/stopList.php
@@ -1,34 +1,59 @@
 <?php
 include('common.inc.php');
 include_header("Stops");
-echo '  <ul data-role="listview" data-filter="true">';
-$url = $APIurl."/json/stops";
-if ($_REQUEST['lat'] && $_REQUEST['lon']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15";
+echo'
+		<div data-role="navbar"> 
+			<ul> 
+				<li><a href="stopList.php">Timing Points</a></li>
+				<li><a href="stopList.php?suburbs=yes">By Suburb</a></li>
+				<li><a href="stopList.php?nearby=yes">Nearby Stops</a></li>
+				<li><a href="stopList.php?allstops=yes">All Stops</a></li> 
+			</ul>
+                </div>
+	';
+// By suburb
+if (isset($_REQUEST['suburbs'])) {
+   echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+   foreach ($suburbs as $suburb) {
+         echo  '<li><a href="stopList.php?suburb='.urlencode($suburb).'">'.$suburb.'</a></li>';
+   }
+echo '</ul>';
+} else {
+// Timing Points / All stops
+        echo '<div class="noscriptnav"> Go to letter: ';
+foreach(range('A','Z') as $letter) 
+{ 
+   echo "<a href=\"#$letter\">$letter</a>&nbsp;"; 
+}
+echo "</div>
+	<script>
+$('.noscriptnav').hide();
+        </script>";
+echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+$url = $APIurl."/json/timingpoints";
+if ($_REQUEST['allstops']) $url = $APIurl."/json/stops";
+if ($_REQUEST['nearby']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15";
+if ($_REQUEST['suburb']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['suburb']}";
 $contents = json_decode(getPage($url));
+debug(print_r($contents,true));
 foreach ($contents as $key => $row) {
     $stopName[$key]  = $row[1];
 }
 
-// Sort the data with volume descending, edition ascending
-// Add $data as the last parameter, to sort by the common key
+// Sort the stops by name
 array_multisort($stopName, SORT_ASC, $contents);
 
+$firstletter = "";
 foreach ($contents as $row)
 {
-
-      echo  '<li><a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>';
+    if (substr($row[1],0,1) != $firstletter){
+        echo "<a name=$firstletter></a>";
+        $firstletter = substr($row[1],0,1);
+    }
+      echo  '<li><a href="stop.php?stopid='.$row[0].'">'.bracketsMeanNewLine($row[1]).'</a></li>';
         }
 echo '</ul>';
-/*
- <div data-role="footer" data-id="foo1" data-position="fixed"> 
-		<div data-role="navbar"> 
-			<ul> 
-				<li><a href="footer-persist-a.html" class="ui-btn-active">Friends</a></li> 
-				<li><a href="footer-persist-b.html">Albums</a></li> 
-				<li><a href="footer-persist-c.html">Emails</a></li> 
-			</ul> 
-		</div><!-- /navbar -->
-*/
+}
 include_footer();
 ?>