Between points integrated and estimated times
Between points integrated and estimated times

file:a/.gitignore -> file:b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-maxious-canberra-transit-feed/output/
+maxious-canberra-transit-feed/source-html
+origin-src
 

--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,65 @@
 
 function init()
 {
-		// create the ol map object
-		var map = new OpenLayers.Map('map');
+    // create the ol map object
+    var map = new OpenLayers.Map('map');
     
-	var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+  var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
 // use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
-            markers = new OpenLayers.Layer.Markers("Between Stop Markers");
+    markers = new OpenLayers.Layer.Markers("Between Stop Markers");
  
 
 <?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
-  echo "An error occured.\n";
-  exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");                                     
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+  $conn = pg_connect("dbname=bus user=postgres password=snmc");
+  if (!$conn) {
+      echo "An error occured.\n";
+      exit;
+  }
+  $result_stops = pg_query($conn, "Select * FROM stops");
+  
+  while ($stop = pg_fetch_assoc($result_stops)) {
+      echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
             .transform(
             new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
             new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
             ));';
-
-echo '
-            marker.id="'.$stop['geohash'].'";
+      
+      echo '
+            marker.id="' . $stop['geohash'] . '";
             markers.addMarker(marker);
 marker.events.register("mousedown", marker, function() {
 document.getElementById("between_points").innerHTML += this.id+";";
 });
 ';
-}
+  }
 ?>
 var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
 var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
 
             map.addLayers([osmtiles, markers,timepoints]);
             map.addControl(new OpenLayers.Control.LayerSwitcher());
-	    map.zoomToExtent(markers.getDataExtent());
+      map.zoomToExtent(markers.getDataExtent());
  }
+    </script>
+        <script type="text/javascript">
+function submitBetween () {
+        $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+        $("#response").html(html);
+        //clearForms();
+	return false;
+      });
+};
 
-	function submit(){
-		$.ajax({
-			type: "POST",
-			url: "betweenpoint.submit.php",
-			data: 	"reverse=" + document.getElementById("reverse").value + 
-					"&from=" + document.getElementById("from").value + 
-					"&to=" + document.getElementById("to").value +
-					"&routes=" + document.getElementById("routes").value +
-					"&between_points=" + document.getElementById("between_points").value,
-			success: function(html){
-				$("#response").html(html);
-				clearForms();
-			}
-		});
-		
-		}
-<!--
 function OnChange(dropdown)
 {
     var myindex  = dropdown.selectedIndex
-    var selValue = dropdown.options[myindex].value
-alert(selValue);    
+    var selValue = dropdown.options[myindex].value;
+  $("#routes").val(selValue.split(":",2)[0]);
+  fromto = selValue.split(":",2)[1];
+  $("#from").val(fromto.split("->",2)[0]);
+  $("#to").val(fromto.split("->",2)[1]);
     return true;
 }
-//--> 
 
 // function will clear input elements on each form
 function clearForms(){
@@ -96,7 +90,7 @@
           break;
         case "radio":
         case "checkbox":
-          document.forms[x].elements[y].checked = "";
+          document.forms[x].elements[y].checked = true;
           break;
         case "select-one":
           document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +112,69 @@
 <select name=selectPair onchange='OnChange(this.form.selectPair);'>
 <option>Select a from/to pair...</option>
 <?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
+  include('spyc/spyc.php');
+  //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+  $path = "maxious-canberra-transit-feed/output/";
+  $dhandle = opendir("maxious-canberra-transit-feed/output/");
+  // define an array to hold the files
+  $files = array();
+  $paths = array();
+  
+  if ($dhandle) {
+      // loop through all of the files
+      while (false !== ($fname = readdir($dhandle))) {
+          if (($fname != '.') && ($fname != '..')) {
+              $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+		// Strip off individual platforms because it usually doesn't matter for routes
+		$timetable["time_points"] = preg_replace("/(Platform.*/","",$timetable["time_points"]);
+              for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+                  @$paths[trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1])] .= $timetable["short_name"] . ";";
+              }
+          }
+      }
+  }
+  ksort($paths);
+  
+  $completedPaths = array();
+  $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
+  while ($path = pg_fetch_assoc($result_betweenstops)) {
+      $completedPaths[trim($path['fromlocation']) . "->" . trim($path['tolocation'])] .= trim($path['routes']);
+  }
+  
+  foreach ($paths as $path => $routes) {
+      if (!in_array($path, array_keys($completedPaths))) {
+          echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
+      } else {
+	$completedRoutes = explode(";", $completedPaths[$path]);
+	 $incompleteRoutes = "";
+	foreach (explode(";", $routes) as $route) {
 
-if ($dhandle) {
-   // loop through all of the files
-   while (false !== ($fname = readdir($dhandle))) {
-      if (($fname != '.') && ($fname != '..')) {
-		$timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
-		for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
-		{
-			@$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
-		}
+	  if (!in_array($route,$completedRoutes)) {
+	  $incompleteRoutes .= $route.';';
+	  }
+	  
 	}
-   }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4", 
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo  "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+	if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+      }
+      
+  }
 ?>
 </select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
 <br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/> 
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/> 
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
 <input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
 <br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
 </form>
-<br><div id="response">
-		<!-- Our message will be echoed out here -->
-	</div>
+<div id="response">
+    <!-- Our message will be echoed out here -->
+  </div>
 </div>
    <div id="map" width="100%" height="100%"></div>
   </body>
 </html>
 
-

--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,29 @@
 <?php

-/*

- * GeoPo Encode in PHP

- * @author : Shintaro Inagaki

- * @param $location (Array)

- * @return $geopo (String)

- */

-function geopoEncode($lat, $lng) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-

-	$geopo = "";

-	$scale = 7;

-	

-	// Change a degree measure to a decimal number

-	$lat = ($lat + 90) / 180 * pow(8, 10);

-	$lng = ($lng + 180) / 360 * pow(8, 10);

-	// Compute a GeoPo code from head and concatenate

-	for($i = 0; $i < $scale; $i++) {

-		$geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);

-	}

-	return $geopo;

-}		

-

-/*

- * GeoPo Decode in PHP

- * @author : Shintaro Inagaki

- * @param $geopo (String)

- * @return $location (Array)

- */

-function geopoDecode($geopo) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-	// Array for geolocation

-	$location = array ();

-

-	for ($i = 0; $i < strlen($geopo); $i++) {

-		// What number of character that equal to a GeoPo code (0-63)

-		$order = strpos($chars, substr($geopo, $i, 1));

-		// Lat/Lng plus geolocation value of scale 

-		$location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);

-		$location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);

-	}

-

-	// Change a decimal number to a degree measure, and plus revised value that shift center of area

-	$location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;

-	$location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;

-	$location['scale'] = strlen($geopo);

-

-	return $location;

-}	

-

 $conn = pg_connect("dbname=bus user=postgres password=snmc");

 if (!$conn) {

   echo "An error occured.\n";

   exit;

 }

-$xml = simplexml_load_file("04-locatebetweenpoints.osm");

-

-/* Access the <rating> nodes of the first movie.

- * Output the rating scale, too. */

-foreach ($xml->node as $node) {

-	$geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);

-	$node['lat'] = (int) ((float)$node['lat']*10000000);

-	$node['lon'] = (int) ((float)$node['lon']*10000000);

-	echo($node['lat'].",".$node['lon']."=$geoPo<br>");

-   $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";

+print_r($_REQUEST);

+$reverse=$_REQUEST["reverse"];

+$from=$_REQUEST["from"];

+$to=$_REQUEST["to"];

+$routes=$_REQUEST["routes"] ;

+$points=$_REQUEST["between_points"];

+   $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";

      $result = pg_query($conn, $sql);

      if (!$result) {

          echo("Error in SQL query: " . pg_last_error() ."<br>\n");

      }

+     if ($reverse === "on") {

+	$points = implode(";",array_reverse(explode(";",$points)));

+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";

+$result = pg_query($conn, $sql);

+     if (!$result) {

+         echo("Error in SQL query: " . pg_last_error() ."<br>\n");

+     }

+     }

 flush();

     

-}

 ?>

 

--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -1,5 +1,43 @@
 <?php
 date_default_timezone_set('Australia/ACT');
+$APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
+
+function isDebug()
+{
+    return true;
+}
+
+function isFastDevice() {
+    return true;
+}
+
+function include_header($pageTitle) {
+    // if (isDebug()) // set php error level high
+    echo '
+<!DOCTYPE html> 
+<html> 
+	<head> 
+	<title>bus.lambdacomplex.org - '.$pageTitle.'</title> 
+	<link rel="stylesheet"  href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" /> 
+	<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript" 
+src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script> 
+	<script type="text/javascript" src="docs/docs.js"></script> 
+</head> 
+<body> 
+ 
+<div data-role="page"> 
+ 
+	<div data-role="header"> 
+		<h1>'.$pageTitle.'</h1> 
+	</div><!-- /header -->
+        <div data-role="content"> ';
+}
+
+function include_footer()
+{
+    echo '</div>';
+}
 
 function service_period()
 {
@@ -13,5 +51,35 @@
 	return 'weekday';
 }	
 }
+
+function midnight_seconds()
+{
+// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
+  $secs = (date("G") * 3600) + (date("i") * 60) + date("s");
+   return $secs;
+}
+
+function midnight_seconds_to_time($seconds)
+{
+	$midnight = mktime (0, 0, 0, date("n"), date("j"), date("Y"));
+	return date("h:ia",$midnight+$seconds);
+}
+function getPage($url)
+{
+    $ch = curl_init($url);
+curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+curl_setopt( $ch, CURLOPT_HEADER, 0 );
+$page = curl_exec($ch);
+curl_close($ch);
+return $page;
+}
+function array_flatten($a,$f=array()){
+  if(!$a||!is_array($a))return '';
+  foreach($a as $k=>$v){
+    if(is_array($v))$f=array_flatten($v,$f);
+    else $f[$k]=$v;
+  }
+  return $f;
+}
 ?>
-
+  

--- a/busui/index.php
+++ b/busui/index.php
@@ -1,32 +1,20 @@
+<?php 
+include('common.inc.php'); 
+?>
 <!doctype html>
 <html>
     <head>
         <meta charset="UTF-8" />
-        <title>jQTouch &beta;</title>
-        <style type="text/css" media="screen">@import "jqtouch/jqtouch.min.css";</style>
-        <style type="text/css" media="screen">@import "themes/jqt/theme.min.css";</style>
-        <script src="jqtouch/jquery.1.3.2.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="jqtouch/jqtouch.min.js" type="application/x-javascript" charset="utf-8"></script>
-       <script src="extensions/jqt.location.js" type="application/x-javascript" charset="utf-8"></script> 
+        <title>bus.lambdacomplex.org</title>
+	<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" />
+	<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script>
+	<script src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script>
+        <!-- <script src="jqtouch/extensions/jqt.location.js" type="application/x-javascript" charset="utf-8"></script>  -->
  
-        <script type="text/javascript" charset="utf-8">
-            var jQT = new $.jQTouch({
-                icon: 'jqtouch.png',
-                addGlossToIcon: false,
-                startupScreen: 'jqt_startup.png',
-                statusBar: 'black',
-                preloadImages: [
-                    'themes/jqt/img/back_button.png',
-                    'themes/jqt/img/back_button_clicked.png',
-                    'themes/jqt/img/button_clicked.png',
-                    'themes/jqt/img/grayButton.png',
-                    'themes/jqt/img/whiteButton.png',
-                    'themes/jqt/img/loading.gif'
-                    ]
-            });
+<!--        <script type="text/javascript" charset="utf-8">
             $(function(){
                 function setDisplay(text) {
-                    $('.info').empty().append(text)
+                    $('.latlng').empty().append(text)
                 }
                 
                 // We pass "updateLocation" a callback function,
@@ -46,56 +34,33 @@
                     setDisplay('Looking up location&hellip;');
                 }
             });
-            // Some sample Javascript functions:
-            $(function(){
-                $('a[target="_blank"]').click(function() {
-                    if (confirm('This link opens in a new window.')) {
-                        return true;
-                    } else {
-                        $(this).removeClass('active');
-                        return false;
-                    }
-                });
-                // Page animation callback events
-                $('#pageevents').
-                    bind('pageAnimationStart', function(e, info){ 
-                        $(this).find('.info').append('Started animating ' + info.direction + '&hellip; ');
-                    }).
-                    bind('pageAnimationEnd', function(e, info){
-                        $(this).find('.info').append(' finished animating ' + info.direction + '.<br /><br />');
-                    });
-                // Page animations end with AJAX callback event, example 1 (load remote HTML only first time)
-                $('#callback').bind('pageAnimationEnd', function(e, info){
-                    if (!$(this).data('loaded')) {                      // Make sure the data hasn't already been loaded (we'll set 'loaded' to true a couple lines further down)
-                        $(this).append($('<div>Loading</div>').         // Append a placeholder in case the remote HTML takes its sweet time making it back
-                            load('ajax.html .info', function() {        // Overwrite the "Loading" placeholder text with the remote HTML
-                                $(this).parent().data('loaded', true);  // Set the 'loaded' var to true so we know not to re-load the HTML next time the #callback div animation ends
-                            }));
-                    }
-                });
-                // Orientation callback event
-                $('body').bind('turn', function(e, data){
-                    $('#orient').html('Orientation: ' + data.orientation);
-                });
-            });
-        </script>
+        </script> -->
     </head>
     <body>
-        <div id="home" class="current">
-            <div class="toolbar">
-                <h1>jQTouch</h1>
-                <a class="button slideup" id="infoButton" href="#about">About</a>
-            </div>
-            <ul class="rounded">
-                <li class="arrow"><a href="#ui">User Interface</a> <small class="counter">4</small></li>
-                <li class="arrow"><a href="list.php">All stops List</a></li>
-		<li class="arrow nearby">Nearby List</li>
-                <li class="arrow"><a href="list.php">Favourites List</a></li>
+<div data-role="page" data-theme="b" id="jqm-home"> 
+	<div id="jqm-homeheader"> 
+		<p>bus.lambdacomplex.org</p> 
+	</div> 
+	<div data-role="content"> 
+            <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
+                <li data-role="list-divider">Stops</li>
+                <li><a href="stopList.php">All stops List</a></li>
+		<li class="nearby"><a href="">Nearby List</a></li>
+                <li><a href="stopList.php">Favourites List</a></li>
+            </ul>
+	    <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
+                <li data-role="list-divider">Routes</li>
+                <li><a href="routeList.php">All Routes List</a></li>
+		<li class="nearby"><a href="">Nearby List</a></li>
+                <li><a href="routeList.php">Favourites List</a></li>
             </ul>
             <div class="info">
-                <p>Add this page to your home screen to view the custom icon, startup screen, and full screen mode.</p>
+		<p class="latlng"></p>
+		Time: <?php echo date("H:m"); ?> <br>
+		Service Period: <?php echo ucwords(service_period()); ?> 
             </div>
         </div>
-    </body>
+   </div>
+ </body>
 </html>
 

file:a/busui/list.php (deleted)
--- a/busui/list.php
+++ /dev/null
@@ -1,22 +1,1 @@
-<div id="get">
-    <div class="toolbar">
-        <h1>GET Example</h1>
-        <a class="back" href="#">AJAX</a>
-    </div>
-    <div class="info">
-        This page was loaded via AJAX.
-    </div>
-    <ul class="rounded">
-        <li><a href="#livetest">Test live events</a></li>
-    </ul>
-</div>
-<div id="livetest">
-    <div class="toolbar">
-        <h1>Events test</h1>
-        <a class="back" href="#">AJAX</a>
-        <a class="button goback" href="#home">Home</a>
-    </div>
-    <div class="info">
-        This is a test of live events.
-    </div>
-</div>
+

--- a/busui/readme.txt
+++ b/busui/readme.txt
@@ -1,2 +1,23 @@
+# input location (via GPS or favourites or search) and destination (via searchable list, optional)
+# http://10.0.1.153:8765/json/boundboxstops?n=-35.27568499917103&e=149.1346514225006&s=-35.279495003493516
+&w=149.12622928619385&limit=50
+# http://10.0.1.153:8765/json/stoptrips?stop=43&time=64440 # recursively call to show all services nearby, sort by distance, need to filter by service period
+# Hey, can pick destination again from a list filtered to places these stops go if you're curious!
+# http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
+# http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
+
+have to do
+/usr/sbin/setsebool -P httpd_can_network_connect=1
+on fedora
+
+might need http://forum.jquery.com/topic/google-maps-inside-jquery-mobile
+
+some extras
+/json/routes = all routes
+/json/neareststops?lat/lng/number
 TODO
+Destinations
+Favourites
+OOP stops/routes
+Stop sorting/search-filter
 

--- a/busui/routeList.php
+++ b/busui/routeList.php
@@ -1,1 +1,34 @@
+<?php
+include('common.inc.php');
+include_header("Routes");
+/* data-filter="true">';
+echo "<script> $('#routeList').listnav({prefixes: ['to'] }); </script>";*/
+echo '  <ul data-role="listview">';
+$url = $APIurl."/json/routes";
 
+$contents = json_decode(getPage($url));
+foreach ($contents as $key => $row) {
+    $routeDestinations[$row[2]][]  = $row;
+}
+foreach ($routeDestinations as $destination => $routes)
+{
+	echo '<li>'.$destination."... <ul>\n";
+		foreach($routes as $row) {
+      			echo  '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+		}
+	echo "</ul></li>\n";
+}
+echo "</ul>\n";
+/*
+ <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();
+?>
+

--- /dev/null
+++ b/busui/schedule_viewer.py
@@ -1,1 +1,536 @@
-
+#!/usr/bin/python2.5
+
+# Copyright (C) 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+An example application that uses the transitfeed module.
+
+You must provide a Google Maps API key.
+"""
+
+
+import BaseHTTPServer, sys, urlparse
+import bisect
+from gtfsscheduleviewer.marey_graph import MareyGraph
+import gtfsscheduleviewer
+import mimetypes
+import os.path
+import re
+import signal
+import simplejson
+import socket
+import time
+import transitfeed
+from transitfeed import util
+import urllib
+
+
+# By default Windows kills Python with Ctrl+Break. Instead make Ctrl+Break
+# raise a KeyboardInterrupt.
+if hasattr(signal, 'SIGBREAK'):
+  signal.signal(signal.SIGBREAK, signal.default_int_handler)
+
+
+mimetypes.add_type('text/plain', '.vbs')
+
+
+class ResultEncoder(simplejson.JSONEncoder):
+  def default(self, obj):
+    try:
+      iterable = iter(obj)
+    except TypeError:
+      pass
+    else:
+      return list(iterable)
+    return simplejson.JSONEncoder.default(self, obj)
+
+# Code taken from
+# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/425210/index_txt
+# An alternate approach is shown at
+# http://mail.python.org/pipermail/python-list/2003-July/212751.html
+# but it requires multiple threads. A sqlite object can only be used from one
+# thread.
+class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
+  def server_bind(self):
+    BaseHTTPServer.HTTPServer.server_bind(self)
+    self.socket.settimeout(1)
+    self._run = True
+
+  def get_request(self):
+    while self._run:
+      try:
+        sock, addr = self.socket.accept()
+        sock.settimeout(None)
+        return (sock, addr)
+      except socket.timeout:
+        pass
+
+  def stop(self):
+    self._run = False
+
+  def serve(self):
+    while self._run:
+      self.handle_request()
+
+
+def StopToTuple(stop):
+  """Return tuple as expected by javascript function addStopMarkerFromList"""
+  return (stop.stop_id, stop.stop_name, float(stop.stop_lat),
+          float(stop.stop_lon), stop.location_type)
+
+
+class ScheduleRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+  def do_GET(self):
+    scheme, host, path, x, params, fragment = urlparse.urlparse(self.path)
+    parsed_params = {}
+    for k in params.split('&'):
+      k = urllib.unquote(k)
+      if '=' in k:
+        k, v = k.split('=', 1)
+        parsed_params[k] = unicode(v, 'utf8')
+      else:
+        parsed_params[k] = ''
+
+    if path == '/':
+      return self.handle_GET_home()
+
+    m = re.match(r'/json/([a-z]{1,64})', path)
+    if m:
+      handler_name = 'handle_json_GET_%s' % m.group(1)
+      handler = getattr(self, handler_name, None)
+      if callable(handler):
+        return self.handle_json_wrapper_GET(handler, parsed_params)
+
+    # Restrict allowable file names to prevent relative path attacks etc
+    m = re.match(r'/file/([a-z0-9_-]{1,64}\.?[a-z0-9_-]{1,64})$', path)
+    if m and m.group(1):
+      try:
+        f, mime_type = self.OpenFile(m.group(1))
+        return self.handle_static_file_GET(f, mime_type)
+      except IOError, e:
+        print "Error: unable to open %s" % m.group(1)
+        # Ignore and treat as 404
+
+    m = re.match(r'/([a-z]{1,64})', path)
+    if m:
+      handler_name = 'handle_GET_%s' % m.group(1)
+      handler = getattr(self, handler_name, None)
+      if callable(handler):
+        return handler(parsed_params)
+
+    return self.handle_GET_default(parsed_params, path)
+
+  def OpenFile(self, filename):
+    """Try to open filename in the static files directory of this server.
+    Return a tuple (file object, string mime_type) or raise an exception."""
+    (mime_type, encoding) = mimetypes.guess_type(filename)
+    assert mime_type
+    # A crude guess of when we should use binary mode. Without it non-unix
+    # platforms may corrupt binary files.
+    if mime_type.startswith('text/'):
+      mode = 'r'
+    else:
+      mode = 'rb'
+    return open(os.path.join(self.server.file_dir, filename), mode), mime_type
+
+  def handle_GET_default(self, parsed_params, path):
+    self.send_error(404)
+
+  def handle_static_file_GET(self, fh, mime_type):
+    content = fh.read()
+    self.send_response(200)
+    self.send_header('Content-Type', mime_type)
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def AllowEditMode(self):
+    return False
+
+  def handle_GET_home(self):
+    schedule = self.server.schedule
+    (min_lat, min_lon, max_lat, max_lon) = schedule.GetStopBoundingBox()
+    forbid_editing = ('true', 'false')[self.AllowEditMode()]
+
+    agency = ', '.join(a.agency_name for a in schedule.GetAgencyList()).encode('utf-8')
+
+    key = self.server.key
+    host = self.server.host
+
+    # A very simple template system. For a fixed set of values replace [xxx]
+    # with the value of local variable xxx
+    f, _ = self.OpenFile('index.html')
+    content = f.read()
+    for v in ('agency', 'min_lat', 'min_lon', 'max_lat', 'max_lon', 'key',
+              'host', 'forbid_editing'):
+      content = content.replace('[%s]' % v, str(locals()[v]))
+
+    self.send_response(200)
+    self.send_header('Content-Type', 'text/html')
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def handle_json_GET_routepatterns(self, params):
+    """Given a route_id generate a list of patterns of the route. For each
+    pattern include some basic information and a few sample trips."""
+    schedule = self.server.schedule
+    route = schedule.GetRoute(params.get('route', None))
+    if not route:
+      self.send_error(404)
+      return
+    time = int(params.get('time', 0))
+    sample_size = 10  # For each pattern return the start time for this many trips
+
+    pattern_id_trip_dict = route.GetPatternIdTripDict()
+    patterns = []
+
+    for pattern_id, trips in pattern_id_trip_dict.items():
+      time_stops = trips[0].GetTimeStops()
+      if not time_stops:
+        continue
+      has_non_zero_trip_type = False;
+      for trip in trips:
+        if trip['trip_type'] and trip['trip_type'] != '0':
+          has_non_zero_trip_type = True
+      name = u'%s to %s, %d stops' % (time_stops[0][2].stop_name, time_stops[-1][2].stop_name, len(time_stops))
+      transitfeed.SortListOfTripByTime(trips)
+
+      num_trips = len(trips)
+      if num_trips <= sample_size:
+        start_sample_index = 0
+        num_after_sample = 0
+      else:
+        # Will return sample_size trips that start after the 'time' param.
+
+        # Linear search because I couldn't find a built-in way to do a binary
+        # search with a custom key.
+        start_sample_index = len(trips)
+        for i, trip in enumerate(trips):
+          if trip.GetStartTime() >= time:
+            start_sample_index = i
+            break
+
+        num_after_sample = num_trips - (start_sample_index + sample_size)
+        if num_after_sample < 0:
+          # Less than sample_size trips start after 'time' so return all the
+          # last sample_size trips.
+          num_after_sample = 0
+          start_sample_index = num_trips - sample_size
+
+      sample = []
+      for t in trips[start_sample_index:start_sample_index + sample_size]:
+        sample.append( (t.GetStartTime(), t.trip_id) )
+
+      patterns.append((name, pattern_id, start_sample_index, sample,
+                       num_after_sample, (0,1)[has_non_zero_trip_type]))
+
+    patterns.sort()
+    return patterns
+
+  def handle_json_wrapper_GET(self, handler, parsed_params):
+    """Call handler and output the return value in JSON."""
+    schedule = self.server.schedule
+    result = handler(parsed_params)
+    content = ResultEncoder().encode(result)
+    self.send_response(200)
+    self.send_header('Content-Type', 'text/plain')
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def handle_json_GET_routes(self, params):
+    """Return a list of all routes."""
+    schedule = self.server.schedule
+    result = []
+    for r in schedule.GetRouteList():
+      result.append( (r.route_id, r.route_short_name, r.route_long_name) )
+    result.sort(key = lambda x: x[1:3])
+    return result
+
+  def handle_json_GET_routerow(self, params):
+    schedule = self.server.schedule
+    route = schedule.GetRoute(params.get('route', None))
+    return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()]
+
+  def handle_json_GET_triprows(self, params):
+    """Return a list of rows from the feed file that are related to this
+    trip."""
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip', None))
+    except KeyError:
+      # if a non-existent trip is searched for, the return nothing
+      return
+    route = schedule.GetRoute(trip.route_id)
+    trip_row = dict(trip.iteritems())
+    route_row = dict(route.iteritems())
+    return [['trips.txt', trip_row], ['routes.txt', route_row]]
+
+  def handle_json_GET_tripstoptimes(self, params):
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip'))
+    except KeyError:
+       # if a non-existent trip is searched for, the return nothing
+      return
+    time_stops = trip.GetTimeStops()
+    stops = []
+    times = []
+    for arr,dep,stop in time_stops:
+      stops.append(StopToTuple(stop))
+      times.append(arr)
+    return [stops, times]
+
+  def handle_json_GET_tripshape(self, params):
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip'))
+    except KeyError:
+       # if a non-existent trip is searched for, the return nothing
+      return
+    points = []
+    if trip.shape_id:
+      shape = schedule.GetShape(trip.shape_id)
+      for (lat, lon, dist) in shape.points:
+        points.append((lat, lon))
+    else:
+      time_stops = trip.GetTimeStops()
+      for arr,dep,stop in time_stops:
+        points.append((stop.stop_lat, stop.stop_lon))
+    return points
+
+  def handle_json_GET_neareststops(self, params):
+    """Return a list of the nearest 'limit' stops to 'lat', 'lon'"""
+    schedule = self.server.schedule
+    lat = float(params.get('lat'))
+    lon = float(params.get('lon'))
+    limit = int(params.get('limit'))
+    stops = schedule.GetNearestStops(lat=lat, lon=lon, n=limit)
+    return [StopToTuple(s) for s in stops]
+
+  def handle_json_GET_boundboxstops(self, params):
+    """Return a list of up to 'limit' stops within bounding box with 'n','e'
+    and 's','w' in the NE and SW corners. Does not handle boxes crossing
+    longitude line 180."""
+    schedule = self.server.schedule
+    n = float(params.get('n'))
+    e = float(params.get('e'))
+    s = float(params.get('s'))
+    w = float(params.get('w'))
+    limit = int(params.get('limit'))
+    stops = schedule.GetStopsInBoundingBox(north=n, east=e, south=s, west=w, n=limit)
+    return [StopToTuple(s) for s in stops]
+
+  def handle_json_GET_stops(self, params):
+    schedule = self.server.schedule
+    return [StopToTuple(s) for s in schedule.GetStopList()]
+
+  def handle_json_GET_stopsearch(self, params):
+    schedule = self.server.schedule
+    query = params.get('q', None).lower()
+    matches = []
+    for s in schedule.GetStopList():
+      if s.stop_id.lower().find(query) != -1 or s.stop_name.lower().find(query) != -1:
+        matches.append(StopToTuple(s))
+    return matches
+
+  def handle_json_GET_stop(self, params):
+    schedule = self.server.schedule
+    query = params.get('stop_id', None).lower()
+    for s in schedule.GetStopList():
+      if s.stop_id.lower() == query:
+        return StopToTuple(s)
+    return []
+
+  def handle_json_GET_stoptrips(self, params):
+    """Given a stop_id and time in seconds since midnight return the next
+    trips to visit the stop."""
+    schedule = self.server.schedule
+    stop = schedule.GetStop(params.get('stop', None))
+    time = int(params.get('time', 0))
+    time_trips = stop.GetStopTimeTrips(schedule)
+    time_trips.sort()  # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N)
+    # Keep the first 15 after param 'time'.
+    # Need make a tuple to find correct bisect point
+    time_trips = time_trips[bisect.bisect_left(time_trips, (time, 0)):]
+    time_trips = time_trips[:15]
+    # TODO: combine times for a route to show next 2 departure times
+    result = []
+    for time, (trip, index), tp in time_trips:
+      headsign = None
+      # Find the most recent headsign from the StopTime objects
+      for stoptime in trip.GetStopTimes()[index::-1]:
+        if stoptime.stop_headsign:
+          headsign = stoptime.stop_headsign
+          break
+      # If stop_headsign isn't found, look for a trip_headsign
+      if not headsign:
+        headsign = trip.trip_headsign
+      route = schedule.GetRoute(trip.route_id)
+      trip_name = ''
+      if route.route_short_name:
+        trip_name += route.route_short_name
+      if route.route_long_name:
+        if len(trip_name):
+          trip_name += " - "
+        trip_name += route.route_long_name
+      if headsign:
+        trip_name += " (Direction: %s)" % headsign
+
+      result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
+    return result
+
+  def handle_GET_ttablegraph(self,params):
+    """Draw a Marey graph in SVG for a pattern (collection of trips in a route
+    that visit the same sequence of stops)."""
+    schedule = self.server.schedule
+    marey = MareyGraph()
+    trip = schedule.GetTrip(params.get('trip', None))
+    route = schedule.GetRoute(trip.route_id)
+    height = int(params.get('height', 300))
+
+    if not route:
+      print 'no such route'
+      self.send_error(404)
+      return
+
+    pattern_id_trip_dict = route.GetPatternIdTripDict()
+    pattern_id = trip.pattern_id
+    if pattern_id not in pattern_id_trip_dict:
+      print 'no pattern %s found in %s' % (pattern_id, pattern_id_trip_dict.keys())
+      self.send_error(404)
+      return
+    triplist = pattern_id_trip_dict[pattern_id]
+
+    pattern_start_time = min((t.GetStartTime() for t in triplist))
+    pattern_end_time = max((t.GetEndTime() for t in triplist))
+
+    marey.SetSpan(pattern_start_time,pattern_end_time)
+    marey.Draw(triplist[0].GetPattern(), triplist, height)
+
+    content = marey.Draw()
+
+    self.send_response(200)
+    self.send_header('Content-Type', 'image/svg+xml')
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+
+def FindPy2ExeBase():
+  """If this is running in py2exe return the install directory else return
+  None"""
+  # py2exe puts gtfsscheduleviewer in library.zip. For py2exe setup.py is
+  # configured to put the data next to library.zip.
+  windows_ending = gtfsscheduleviewer.__file__.find('\\library.zip\\')
+  if windows_ending != -1:
+    return transitfeed.__file__[:windows_ending]
+  else:
+    return None
+
+
+def FindDefaultFileDir():
+  """Return the path of the directory containing the static files. By default
+  the directory is called 'files'. The location depends on where setup.py put
+  it."""
+  base = FindPy2ExeBase()
+  if base:
+    return os.path.join(base, 'schedule_viewer_files')
+  else:
+    # For all other distributions 'files' is in the gtfsscheduleviewer
+    # directory.
+    base = os.path.dirname(gtfsscheduleviewer.__file__)  # Strip __init__.py
+    return os.path.join(base, 'files')
+
+
+def GetDefaultKeyFilePath():
+  """In py2exe return absolute path of file in the base directory and in all
+  other distributions return relative path 'key.txt'"""
+  windows_base = FindPy2ExeBase()
+  if windows_base:
+    return os.path.join(windows_base, 'key.txt')
+  else:
+    return 'key.txt'
+
+
+def main(RequestHandlerClass = ScheduleRequestHandler):
+  usage = \
+'''%prog [options] [<input GTFS.zip>]
+
+Runs a webserver that lets you explore a <input GTFS.zip> in your browser.
+
+If <input GTFS.zip> is omited the filename is read from the console. Dragging
+a file into the console may enter the filename.
+'''
+  parser = util.OptionParserLongError(
+      usage=usage, version='%prog '+transitfeed.__version__)
+  parser.add_option('--feed_filename', '--feed', dest='feed_filename',
+                    help='file name of feed to load')
+  parser.add_option('--key', dest='key',
+                    help='Google Maps API key or the name '
+                    'of a text file that contains an API key')
+  parser.add_option('--host', dest='host', help='Host name of Google Maps')
+  parser.add_option('--port', dest='port', type='int',
+                    help='port on which to listen')
+  parser.add_option('--file_dir', dest='file_dir',
+                    help='directory containing static files')
+  parser.add_option('-n', '--noprompt', action='store_false',
+                    dest='manual_entry',
+                    help='disable interactive prompts')
+  parser.set_defaults(port=8765,
+                      host='maps.google.com',
+                      file_dir=FindDefaultFileDir(),
+                      manual_entry=True)
+  (options, args) = parser.parse_args()
+
+  if not os.path.isfile(os.path.join(options.file_dir, 'index.html')):
+    print "Can't find index.html with --file_dir=%s" % options.file_dir
+    exit(1)
+
+  if not options.feed_filename and len(args) == 1:
+    options.feed_filename = args[0]
+
+  if not options.feed_filename and options.manual_entry:
+    options.feed_filename = raw_input('Enter Feed Location: ').strip('"')
+
+  default_key_file = GetDefaultKeyFilePath()
+  if not options.key and os.path.isfile(default_key_file):
+    options.key = open(default_key_file).read().strip()
+
+  if options.key and os.path.isfile(options.key):
+    options.key = open(options.key).read().strip()
+
+  schedule = transitfeed.Schedule(problem_reporter=transitfeed.ProblemReporter())
+  print 'Loading data from feed "%s"...' % options.feed_filename
+  print '(this may take a few minutes for larger cities)'
+  schedule.Load(options.feed_filename)
+
+  server = StoppableHTTPServer(server_address=('', options.port),
+                               RequestHandlerClass=RequestHandlerClass)
+  server.key = options.key
+  server.schedule = schedule
+  server.file_dir = options.file_dir
+  server.host = options.host
+  server.feed_path = options.feed_filename
+
+  print ("To view, point your browser at http://localhost:%d/" %
+         (server.server_port))
+  server.serve_forever()
+
+
+if __name__ == '__main__':
+  main()
+

--- a/busui/stop.php
+++ b/busui/stop.php
@@ -1,1 +1,17 @@
+<?php
+include('common.inc.php');
+$url = $APIurl."/json/stop?stop_id=".$_REQUEST['stopid'];
+$stop = json_decode(getPage($url));
 
+include_header("Trips passing ".$stop[1]);
+echo '  <ul data-role="listview" >';
+$url = $APIurl."/json/stoptrips?stop=".$_REQUEST['stopid']."&time=".midnight_seconds();
+$page = getPage($url);
+foreach (json_decode($page) as $row)
+{
+if ($row[1][2] === service_period()) echo  '<li>'.midnight_seconds_to_time($row[0]).' <a href="trip.php?stopid='.$_REQUEST['stopid'].'&tripid='.$row[1][0].'">'.$row[1][1].'</a></li>';        
+}
+echo '</ul>';
+include_footer();
+?>
+

--- a/busui/stopList.php
+++ b/busui/stopList.php
@@ -1,23 +1,35 @@
-<div id="get">
-    <div class="toolbar">
-        <h1>GET Example</h1>
-        <a class="back" href="#">AJAX</a>
-    </div>
-    <div class="info">
-        This page was loaded via AJAX.
-    </div>
-    <ul class="rounded">
-        <li><a href="#livetest">Test live events</a></li>
-    </ul>
-</div>
-<div id="livetest">
-    <div class="toolbar">
-        <h1>Events test</h1>
-        <a class="back" href="#">AJAX</a>
-        <a class="button goback" href="#home">Home</a>
-    </div>
-    <div class="info">
-        This is a test of live events.
-    </div>
-</div>
+<?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";
+$contents = json_decode(getPage($url));
+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
+array_multisort($stopName, SORT_ASC, $contents);
+
+foreach ($contents as $row)
+{
+
+      echo  '<li><a href="stop.php?stopid='.$row[0].'">'.$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();
+?>
+
+

file:b/busui/trip.php (new)
--- /dev/null
+++ b/busui/trip.php
@@ -1,1 +1,25 @@
+<?php
+include('common.inc.php');
+$url = $APIurl."/json/triprows?trip=".$_REQUEST['tripid'];
+$trips = array_flatten(json_decode(getPage($url)));
+print_r($trips);
 
+include_header("Stops on ". $trips[1]->route_short_name . ' '. $trips[1]->route_long_name);
+echo '  <ul data-role="listview" >';
+
+
+
+
+$url = $APIurl."/json/tripstoptimes?trip=".$_REQUEST['tripid'];
+
+$json = json_decode(getPage($url));
+$stops = $json[0];
+$times = $json[1];
+foreach ($stops as $key => $row)
+{
+echo  '<li>'.midnight_seconds_to_time($times[$key]).' <a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>';        
+}
+echo '</ul>';
+include_footer();
+?>
+

file:b/busui/view.sh (new)
--- /dev/null
+++ b/busui/view.sh
@@ -1,1 +1,8 @@
+# input location (via GPS or favourites or search) and destination (via searchable list, optional)
+# http://10.0.1.153:8765/json/boundboxstops?n=-35.27568499917103&e=149.1346514225006&s=-35.279495003493516&w=149.12622928619385&limit=50
+# http://10.0.1.153:8765/json/stoptrips?stop=43&time=64440 # recursively call to show all services nearby, sort by distance, need to filter by service period
+# Hey, can pick destination again from a list filtered to places these stops go if you're curious!
+# http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
+# http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
+python schedule_viewer.py --feed=../maxious-canberra-transit-feed/cbrfeed.zip --key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q
 

--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -14,7 +14,11 @@
 	timetable = {"between_stops" => [], "short_name" => short_name}
 	time_points = table.xpath('tr[1]//th').map do |tp|
 		if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"
-			timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub("  - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").strip
+			timing_point = tp.content.squeeze(" ").gsub(" Platform"," (Platform").gsub("  - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").squeeze(" ").strip
+			if (tp.content.match('Platform'))
+			  timing_point.concat(")")
+			end;
+			timing_point
 		end
 	end
 	time_points.delete(nil)
@@ -42,7 +46,7 @@
 	timetable[period] = periodtimes.to_a
 	# pp timetable
 	filename = timetable["short_name"] + "-" + timetable["long_name"]+ "." + period + ".yml"
-	filename = filename.downcase.gsub(" ","-").gsub("/","-")
+	filename = filename.downcase.gsub(" ","-").gsub("/","-").gsub("(","").gsub(")","")
 	puts "Saving " + filename
 	File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do |f|
 		f.write timetable.to_yaml

--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -2,9 +2,9 @@
 require 'pp'
 require 'yaml'
 class Array
-  def to_yaml_style
-    :inline
-  end
+ def to_yaml_style
+  :inline
+ end
 end
 Dir.chdir("output")
 
@@ -25,59 +25,60 @@
 #pp $time_points_sources.sort
 
 time_point_corrections = {"North Lynehamham" => "North Lyneham",
-			  "Lathlain St Platform 2" => "Lathlain St Bus Station - Platform 2",
-			  "Lathlain St Sation - Platform 5" => "Lathlain St Bus Station - Platform 5",
-	 		  "Lathlain Steet Station" => "Lathlain St Bus Station",
-			  "Lathlain St - Platform 3"  => "Lathlain St Bus Station - Platform 3",
-			  "Lathlain Steet Station - Platform 3"	  => "Lathlain St Bus Station - Platform 3",
-			  "Lathlain St Station" => "Lathlain St Bus Station",
-			  "Lathlain St Station - Platform 1" => "Lathlain St Bus Station - Platform 1",
-			  "Lathlain St Station - Platform 2" => "Lathlain St Bus Station - Platform 2",
-			  "Lathlain St Station - Platform 3" => "Lathlain St Bus Station - Platform 3",
-			  "Lathlain St Station - Platform 4" => "Lathlain St Bus Station - Platform 4",
-			  "Lathlain St Station - Platform 5" => "Lathlain St Bus Station - Platform 5",
-			  "Lathlain St Station - Platform 6" => "Lathlain St Bus Station - Platform 6",
-			  "Flemington Rd, Sandford St" => "Flemington Rd/Sandford St",
-			  "Erindale Centre / - Sternberg Crescent" => "Erindale Drive/Sternberg",
-			  "Canberra Hospita" => "Canberra Hospital",
-			  "Cohen Str Station - Platform 1" => "Cohen St Bus Station - Platform 1",
-			  "Cohen Street Station" => "Cohen St Bus Station",
-			  "Cohen Street Station - Platform 2" => "Cohen St Bus Station - Platform 2",
-			  "Cohn St Station - Platform 3" => "Cohen St Bus Station - Platform 3",
-			  "Cohen St Station" => "Cohen St Bus Station",
-			  "Cohen St Station - Platform 1" => "Cohen St Bus Station - Platform 1",
-			  "Cohen St Station - Platform 2" => "Cohen St Bus Station - Platform 2",
-			  "Cohen St Station - Platform 3" => "Cohen St Bus Station - Platform 3",
-			  "Cohen St Station - Platform 4" => "Cohen St Bus Station - Platform 4",
-			  "Cohen St Station - Platform 5" => "Cohen St Bus Station - Platform 5",
-			  "Cohen St Station - Platform 6" => "Cohen St Bus Station - Platform 6",
-			  "City - Platform 7" => "City Interchange - Platform 7",
-			  "Cameron Avenue Station" => "Cameron Ave Bus Station",
-			  "Cameron Avenue Station - Platform 1" => "Cameron Ave Bus Station - Platform 1",
-			  "Cameron Avenue Station - Platform 2" => "Cameron Ave Bus Station - Platform 2",
-			  "Cameron Avenue Station - Platform 3" => "Cameron Ave Bus Station - Platform 3",
-			  "Cameron Avenue Station - Platform 4" => "Cameron Ave Bus Station - Platform 4",
-			  "Cameron Avenue Station - Platform 5" => "Cameron Ave Bus Station - Platform 5",
-			  "Cameron Ave Station" => "Cameron Ave Bus Station",
-			  "Cameron Ave Station - Platform 1" => "Cameron Ave Bus Station - Platform 1",
-			  "Cameron Ave Station - Platform 2" => "Cameron Ave Bus Station - Platform 2",
-			  "Cameron Ave Station - Platform 3" => "Cameron Ave Bus Station - Platform 3",
-			  "Cameron Ave Station - Platform 4" => "Cameron Ave Bus Station - Platform 4",
-			  "Cameron Ave Station - Platform 5" => "Cameron Ave Bus Station - Platform 5",
-			  "Burton & Garranan Hall, Daley Road ANU" => "Burton & Garran Hall/Daley Road ANU",
-			  "Burton & Garranan Hall,Daley Road ANU" => "Burton & Garran Hall/Daley Road ANU",
-			  "Garran/Daley Rd" => "Burton & Garran Hall/Daley Road ANU",
-			  "Kingstons Ave/National Crt" => "Kings Ave/National Crt",
-			  "Newcastle Street after Isa St" => "Newcastle / Isa Street Fyshwick",
-			  "National Circ/Canberra Ave" => "National Circuit / Canberra Ave",
-			  "St Clare of Conder" => "St Clare of Assisi Primary",
-			  "McKillop College Isabella Campus" => "MacKillop College Isabella Campus",
-			  "Outrim / Duggan" => "Outtrim / Duggan",
-			  "Manuka Captain Cook" => "Manuka/Captain Cook",
-			  "Manuka, Captain Cook" => "Manuka/Captain Cook",
-			  "Hospice, Menindee Drive" => "Hospice",
-			  "Tharwa/Pocket" => "Tharwa/Pockett",
-			  "Paul-Co / Mirrabei" => "Paul Coe / Mirrabei"
+			 "Lathlain St (Platform 2)" => "Lathlain St Bus Station (Platform 2)",
+			 "Lathlain St Sation (Platform 5)" => "Lathlain St Bus Station (Platform 5)",
+	 		 "Lathlain Steet Station" => "Lathlain St Bus Station",
+			 "Lathlain St (Platform 3)" => "Lathlain St Bus Station (Platform 3)",
+			 "Lathlain Steet Station (Platform 3)"	 => "Lathlain St Bus Station (Platform 3)",
+			 "Lathlain St Station" => "Lathlain St Bus Station",
+			 "Lathlain St Station (Platform 1)" => "Lathlain St Bus Station (Platform 1)",
+			 "Lathlain St Station (Platform 2)" => "Lathlain St Bus Station (Platform 2)",
+			 "Lathlain St Station (Platform 3)" => "Lathlain St Bus Station (Platform 3)",
+			 "Lathlain St Station (Platform 4)" => "Lathlain St Bus Station (Platform 4)",
+			 "Lathlain St Station (Platform 5)" => "Lathlain St Bus Station (Platform 5)",
+			 "Lathlain St Station (Platform 6)" => "Lathlain St Bus Station (Platform 6)",
+			 "Flemington Rd, Sandford St" => "Flemington Rd/Sandford St",
+			 "Erindale Centre /Sternberg Crescent" => "Erindale Drive/Sternberg",
+			 "Canberra Hospita" => "Canberra Hospital",
+			 "Cohen Str Station (Platform 1)" => "Cohen St Bus Station (Platform 1)",
+			 "Cohen Street Station" => "Cohen St Bus Station",
+			 "Cohen Street Station (Platform 2)" => "Cohen St Bus Station (Platform 2)",
+			 "Cohn St Station (Platform 3)" => "Cohen St Bus Station (Platform 3)",
+			 "Cohen St Station" => "Cohen St Bus Station",
+			 "Cohen St Station (Platform 1)" => "Cohen St Bus Station (Platform 1)",
+			 "Cohen St Station (Platform 2)" => "Cohen St Bus Station (Platform 2)",
+			 "Cohen St Station (Platform 3)" => "Cohen St Bus Station (Platform 3)",
+			 "Cohen St Station (Platform 4)" => "Cohen St Bus Station (Platform 4)",
+			 "Cohen St Station (Platform 5)" => "Cohen St Bus Station (Platform 5)",
+			 "Cohen St Station (Platform 6)" => "Cohen St Bus Station (Platform 6)",
+			 "City (Platform 7)" => "City Interchange (Platform 7)",
+			 "Cameron Avenue Station" => "Cameron Ave Bus Station",
+			 "Cameron Avenue Station (Platform 1)" => "Cameron Ave Bus Station (Platform 1)",
+			 "Cameron Avenue Station (Platform 2)" => "Cameron Ave Bus Station (Platform 2)",
+			 "Cameron Avenue Station (Platform 3)" => "Cameron Ave Bus Station (Platform 3)",
+			 "Cameron Avenue Station (Platform 4)" => "Cameron Ave Bus Station (Platform 4)",
+			 "Cameron Avenue Station (Platform 5)" => "Cameron Ave Bus Station (Platform 5)",
+			 "Cameron Ave Station" => "Cameron Ave Bus Station",
+			 "Cameron Ave Station (Platform 1)" => "Cameron Ave Bus Station (Platform 1)",
+			 "Cameron Ave Station (Platform 2)" => "Cameron Ave Bus Station (Platform 2)",
+			 "Cameron Ave Station (Platform 3)" => "Cameron Ave Bus Station (Platform 3)",
+			 "Cameron Ave Station (Platform 4)" => "Cameron Ave Bus Station (Platform 4)",
+			 "Cameron Ave Station (Platform 5)" => "Cameron Ave Bus Station (Platform 5)",
+			 "Burton & Garranan Hall, Daley Road ANU" => "Burton & Garran Hall/Daley Road ANU",
+			 "Burton & Garranan Hall,Daley Road ANU" => "Burton & Garran Hall/Daley Road ANU",
+			 "Garran/Daley Rd" => "Burton & Garran Hall/Daley Road ANU",
+			 "Kingstons Ave/National Crt" => "Kings Ave/National Crt",
+			 "Newcastle Street after Isa St" => "Newcastle / Isa Street Fyshwick",
+			 "National Circ/Canberra Ave" => "National Circuit / Canberra Ave",
+			 "St Clare of Conder" => "St Clare of Assisi Primary",
+			 "McKillop College Isabella Campus" => "MacKillop College Isabella Campus",
+			 "Outrim / Duggan" => "Outtrim / Duggan",
+			 "Manuka Captain Cook" => "Manuka/Captain Cook",
+			 "Manuka, Captain Cook" => "Manuka/Captain Cook",
+			 "Menindee Drive - Hospice" => "Hospice",
+			 "Hospice, Menindee Drive" => "Hospice",
+			 "Tharwa/Pocket" => "Tharwa/Pockett",
+			 "Paul-Co / Mirrabei" => "Paul Coe / Mirrabei"
 			}
 time_point_corrections.each do |wrong, right|
 	$time_points_sources[wrong].each do |wrongfile|
@@ -86,7 +87,7 @@
 		badtimetable["time_points"][badentrynumber] = right
 		puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
 		File.open(wrongfile, "w") do |f|
-	  		f.write badtimetable.to_yaml
+	 		f.write badtimetable.to_yaml
 		end
 	end
 end

--- a/maxious-canberra-transit-feed/04-generateymlinclude.rb
+++ b/maxious-canberra-transit-feed/04-generateymlinclude.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/ruby
-require 'postgres'
 
 require 'highline.rb'
 include HighLine
 
 require 'rubygems'
+require 'postgres'
 require 'json'
 require 'yaml'
 require 'pp'
@@ -19,7 +19,7 @@
 	f2.puts header
 	f2.puts "stops:\n";
 	begin
-		time_points = connbus.exec("SELECT * from timing_point")
+		time_points = connbus.exec("SELECT * from timing_point ORDER BY name")
 	rescue PGError => e
 		puts "Error reading from DB #{e}"
 		#conn.close() if conn
@@ -30,7 +30,22 @@
 
 		# 1 = lat*100000
 		# 2 = lng*100000
+		#pp time_point[0]
 		f2.puts "  - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
+	end
+	begin
+		stops = connbus.exec("SELECT * from stops")
+	rescue PGError => e
+		puts "Error reading from DB #{e}"
+		#conn.close() if conn
+	end
+	stops.each do |stop|
+		#pp stop
+		# 0 = geoPo
+		# 1 = lat*100000
+		# 2 = lng*100000
+		#pp time_point[0]
+		f2.puts "  - { name: #{stop[0]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}}"
 	end
 	f2.puts "routes:\n";
 end

--- /dev/null
+++ b/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb
@@ -1,1 +1,53 @@
+require 'rubygems'
+require 'postgres'
+require 'pp'
+require 'yaml'
+class String
+  def escape_single_quotes
+    self.gsub(/'/, "''")
+  end
+end
+class Array
+  def to_yaml_style
+    :inline
+  end
+end
+Dir.chdir("output")
 
+connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")
+
+Dir.glob("*.yml") { |file|
+  timetable = YAML::load_file(file)
+  if timetable
+    route_name = timetable["short_name"]
+    timetable["between_stops"] = {}
+    for i in 0..timetable["time_points"].length-2
+	begin
+	  searchFrom = timetable["time_points"][i].escape_single_quotes.split("(")[0].strip
+	  searchTo = timetable["time_points"][i+1].escape_single_quotes.split("(")[0].strip
+	#  print "SELECT * from between_stops
+	#	  WHERE fromlocation = '#{searchFrom}'
+	#  AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'"
+	  between_points = connbus.exec("SELECT * from between_stops
+		  WHERE fromlocation = '#{searchFrom}'
+	  AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'")
+	rescue PGError => e
+		puts "Error selecting matching between points from DB #{e}"
+		#conn.close() if conn
+	end
+	between_points.each do |between_point_row|
+		points = between_point_row['points'].split(";")
+		points.delete("")
+		timetable["between_stops"][timetable["time_points"][i] + '-' +timetable["time_points"][i+1]] = points;
+	end
+    end
+    #pp timetable["between_stops"]
+    File.open(file, "w") do |f|
+      f.write timetable.to_yaml
+    end
+  
+  else
+    print "error, #{file} empty\n"
+  end
+}
+

--- a/maxious-canberra-transit-feed/05-cleanupyaml.sh
+++ /dev/null
@@ -1,3 +1,1 @@
-#!/bin/bash
-sed -i "s/- ---/- /g" cbrtable.yml
 

--- a/maxious-canberra-transit-feed/05-generateymlinclude.rb
+++ /dev/null
@@ -1,53 +1,1 @@
-#!/usr/bin/ruby
-require 'postgres'
 
-require 'highline.rb'
-include HighLine
-
-require 'rubygems'
-require 'json'
-require 'yaml'
-require 'pp'
-# make - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
-connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")
-
-f = File.open('cbrtable.yml.in.in')
-header = f.readlines
-f.close
-
-File.open('cbrtable.yml.in', 'w') do |f2|  
-	f2.puts header
-	f2.puts "stops:\n";
-	begin
-		time_points = connbus.exec("SELECT * from timing_point ORDER BY name")
-	rescue PGError => e
-		puts "Error reading from DB #{e}"
-		#conn.close() if conn
-	end
-	time_points.each do |time_point|
-		#pp time_point
-		# 0 = name
-
-		# 1 = lat*100000
-		# 2 = lng*100000
-		#pp time_point[0]
-		f2.puts "  - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
-	end
-	begin
-		stops = connbus.exec("SELECT * from stops")
-	rescue PGError => e
-		puts "Error reading from DB #{e}"
-		#conn.close() if conn
-	end
-	stops.each do |stop|
-		#pp stop
-		# 0 = geoPo
-		# 1 = lat*100000
-		# 2 = lng*100000
-		#pp time_point[0]
-		f2.puts "  - { name: #{stop[0]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}}"
-	end
-	f2.puts "routes:\n";
-end
-
-

--- a/maxious-canberra-transit-feed/900-intertown.yml
+++ b/maxious-canberra-transit-feed/900-intertown.yml
@@ -1,7 +1,9 @@
 short_name: 900
 long_name: Intertown
 time_points: [ civic_platform_6, 3042, 4531, 4929, civic_platform_1, civic_platform_5 ]
-between_stops: [ ]
+between_stops: [
+civic_platform_6-3042: [ADFA]
+]
 stop_times: [
   [ 632a, 642a, 657a, 708a, 715a, 727a],
   [ 702a, 712a, 727a, 738a, 745a, 757a],

--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -1,19 +1,21 @@
 default: cbrfeed.zip
 
 cbrfeed.zip: cbrtable.yml createfeed.py
+	sh 06-cleanupyaml.sh
 	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
 
 cbrtable.yml: cbrtable.yml.in indent-route.pl
 	cp cbrtable.yml.in cbrtable.yml
 	@$(foreach ROUTE_FILE, $(wildcard output/*),  \
 		echo "Parsing $(ROUTE_FILE)"; \
-		echo "TODO: replace friendly timing spot names with OSM node IDs or geohash in $(ROUTE_FILE)"; \
-		echo "TODO: add inbetween stops in $(ROUTE_FILE)"; \
-	./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
+		./indent-route.pl < "$(ROUTE_FILE)" >> cbrtable.yml;)
 
 cbrtable.yml.in: cbrtable.yml.in.in
-	ruby 04-generateymlinclude.rb	
+	ruby 01-extracttimes.rb	
+	ruby 02-tidytimepoints.rb 
+	ruby 04-generateymlinclude.rb 
+	ruby 05-addbetweenpointstotimetables.rb 
 
 clean:
-	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~
+	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~ output/*
 

--- a/maxious-canberra-transit-feed/README
+++ b/maxious-canberra-transit-feed/README
@@ -1,10 +1,9 @@
 === Introduction === 
 
 This distribution contains everything required to build a basic google transit 
-feed for Halifax Metro Transit, Nova Scotia, Canada. Note that it is woefully 
-incomplete at the moment. 
+feed for Canberra, Australia. Note that it is woefully incomplete at the moment. 
 
-Requirements: GNU Make, Perl, Python 2.5.
+Requirements: GNU Make, Perl, Python 2.5, PHP, Ruby, libpq (postgres-devel package on Fedora), postgres,json gem for Ruby, libyaml and pyyaml for Python
 
 === Usage ===
 
@@ -21,7 +20,7 @@
 Then just type "make" to build the feed. The output at the end is "feed.zip".
 For fun, you can view this feed using the snazzy transit feed view application:
 
-$HOME/src/transitfeed-1.1.7/python/schedule_viewer.py --feed=hfxfeed.zip
+$HOME/src/transitfeed-1.1.7/python/schedule_viewer.py --feed=cbrfeed.zip
 
 === Copyright ===
 
@@ -29,7 +28,7 @@
 License, please consider all software tools in distribution to be in the public 
 domain. Use them for what you will.
 
-I believe the Metro Transit route data is considered factual information
-which can not be copyrighted. Note, however, that Metro Transit and/or
-the city of Halifax may have claim over its own name and other trademarks.
+I believe the ACTION busses route data is considered factual information
+which can not be copyrighted. Note, however, that ACTION busses and/or
+the ACT Government may have claim over its own name and other trademarks.
 

--- a/maxious-canberra-transit-feed/add-between-times.pl
+++ /dev/null
@@ -1,104 +1,1 @@
-#!/usr/bin/perl
 
-use strict;
-
-sub parse_time {
-    my ($time) = @_;
-
-    my ($hour, $minute);
-
-    if ($time =~ /a\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])a/;
-	($hour, $minute) = ($1, $2);
-    } elsif ($time =~ /p\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])p/;
-	($hour, $minute) = ($1, $2);
-	if ($hour < 12) {
-	    $hour += 12;
-	}
-    } elsif ($time =~ /x\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])x/;
-	($hour, $minute) = ($1, $2);
-	if ($hour == 12) {
-	    $hour += 12;
-	} else {
-	    $hour += 24;
-	}
-    } elsif ($time =~ /^\ *-\Z/) {
-	($hour, $minute) = (0, 0);
-	# no stop at this time
-    } else {
-	print "Should not happen! Time ('$time') misformed.\n";
-	exit;
-    }
-
-    return ($hour, $minute);
-}
-
-my $num_intervals = $ARGV[0] or die "No num intervals given!";
-my $interval = $ARGV[1] or die "No interval given!";
-
-my @times;
-
-$_ = <STDIN>;
-print $_;
-
-if ($_ !~ /^\#/) {
-    my @timestrs;
-    if ($_ =~ m/\[(.*)\]/) {
-	my $inner = $1;
-	@timestrs = split (/\,/, $inner);
-
-    } else {
-	@timestrs = split /\ /;
-    }
-
-    foreach (@timestrs) {
-	my ($hour, $minute) = parse_time($_);
-	push @times, [ $hour, $minute ];
-    }
-}
-
-for (my $i=1; $i<($num_intervals+1); $i++) {
-    my $first = 1;
-    foreach (@times) {
-	my $mytime = $_;
-	my ($hour, $minute) = (@$mytime[0], @$mytime[1]);
-	if ($hour > 0 || $minute > 0) {
-	    $minute += $interval * $i;
-	    if ($minute > 59) {
-		$hour += int($minute / 60);
-		$minute = $minute % 60;
-		if ($minute < 10) {
-		    $minute = "0" . $minute;
-		}
-	    }
-	}
-	
-	sub print_time {
-	    my ($hour, $minute) = @_;
-	    if ($hour == 0 && $minute == 0) {
-		print "-";
-	    } else {
-		if ($hour < 12) {
-		    print "$hour$minute" . "a";
-		} else {
-		    if ($hour > 12) {
-			$hour -= 12;
-		    }
-		    print "$hour$minute" . "p";
-		}
-	    }
-	}
-
-	if (!$first) {
-	    print " ";
-	    print_time($hour, $minute);
-	} else {
-	    $first = 0;
-	    print_time($hour, $minute);
-	}
-    }
-print "\n";
-}
-

--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -238,20777 +238,3401 @@
   - { name: Woden Interchange - Platform 9,stop_code: Woden Interchange - Platform 9, lat: -35.3442083, lng: 149.0877771}
   - { name: Woodcock/Clare Dennis,stop_code: Woodcock/Clare Dennis, lat: -35.4422566, lng: 149.0854375}
   - { name: Yarralumla Shops,stop_code: Yarralumla Shops, lat: -35.30725, lng: 149.0972}
+  - { name: Wjz2mTK,stop_code: Wjz2mTK, lat: -35.3815863, lng: 149.0936139}
+  - { name: Wjz6kCT,stop_code: Wjz6kCT, lat: -35.217402, lng: 149.0910262}
+  - { name: Wjz6keB,stop_code: Wjz6keB, lat: -35.2175697, lng: 149.0866478}
+  - { name: Wjr-TRM,stop_code: Wjr-TRM, lat: -35.2021703, lng: 149.0498418}
+  - { name: Wjr_MMi,stop_code: Wjr_MMi, lat: -35.200018, lng: 149.0491234}
+  - { name: Wjr_Mxy,stop_code: Wjr_Mxy, lat: -35.1992913, lng: 149.0468658}
+  - { name: Wjr-IeY,stop_code: Wjr-IeY, lat: -35.2176259, lng: 149.032238}
+  - { name: Wjr-J8t,stop_code: Wjr-J8t, lat: -35.2161747, lng: 149.0315719}
+  - { name: Wjr-InZ,stop_code: Wjr-InZ, lat: -35.2169003, lng: 149.0335258}
+  - { name: Wjr-Jm9,stop_code: Wjr-Jm9, lat: -35.2124379, lng: 149.0325045}
+  - { name: Wjr-J44,stop_code: Wjr-J44, lat: -35.2135626, lng: 149.0296181}
+  - { name: Wjr-BB3,stop_code: Wjr-BB3, lat: -35.2129096, lng: 149.0241561}
+  - { name: Wjr-Alc,stop_code: Wjr-Alc, lat: -35.2183514, lng: 149.021625}
+  - { name: Wjr-AY4,stop_code: Wjr-AY4, lat: -35.2190044, lng: 149.0282415}
+  - { name: Wjr-I4P,stop_code: Wjr-I4P, lat: -35.2191133, lng: 149.0306838}
+  - { name: Wjr-IcO,stop_code: Wjr-IcO, lat: -35.2191858, lng: 149.0319716}
+  - { name: Wjr-IqS,stop_code: Wjr-IqS, lat: -35.2202741, lng: 149.034858}
+  - { name: Wjr-IGJ,stop_code: Wjr-IGJ, lat: -35.2203467, lng: 149.0373003}
+  - { name: Wjr-IMR,stop_code: Wjr-IMR, lat: -35.2216889, lng: 149.0389433}
+  - { name: Wjr-H-a,stop_code: Wjr-H-a, lat: -35.2232851, lng: 149.039343}
+  - { name: Wjr-Q4G,stop_code: Wjr-Q4G, lat: -35.2192221, lng: 149.0415189}
+  - { name: Wjz6zth,stop_code: Wjz6zth, lat: -35.2241129, lng: 149.1109391}
+  - { name: Wjz6zon,stop_code: Wjz6zon, lat: -35.2269858, lng: 149.1109391}
+  - { name: Wjz6ytu,stop_code: Wjz6ytu, lat: -35.2291622, lng: 149.1110812}
+  - { name: Wjz6yir,stop_code: Wjz6yir, lat: -35.2314837, lng: 149.1098378}
+  - { name: Wjz5mpm,stop_code: Wjz5mpm, lat: -35.2538531, lng: 149.0889493}
+  - { name: Wjz5mxf,stop_code: Wjz5mxf, lat: -35.2538241, lng: 149.0902637}
+  - { name: Wjzd0oD,stop_code: Wjzd0oD, lat: -35.2874406, lng: 149.1552177}
+  - { name: Wjr-MNh,stop_code: Wjr-MNh, lat: -35.2433401, lng: 149.0492618}
+  - { name: Wjr-Mqd,stop_code: Wjr-Mqd, lat: -35.2422956, lng: 149.0448568}
+  - { name: Wjr-N9a,stop_code: Wjr-N9a, lat: -35.2377693, lng: 149.0421213}
+  - { name: Wjr-EYe,stop_code: Wjr-EYe, lat: -35.2408449, lng: 149.0394925}
+  - { name: Wjr-EA_,stop_code: Wjr-EA_, lat: -35.2407288, lng: 149.0362953}
+  - { name: Wjr-EuB,stop_code: Wjr-EuB, lat: -35.2395683, lng: 149.034448}
+  - { name: Wjr-Fw4,stop_code: Wjr-Fw4, lat: -35.2382916, lng: 149.035194}
+  - { name: Wjr-VdI,stop_code: Wjr-VdI, lat: -35.2348097, lng: 149.0539156}
+  - { name: Wjr-Vnf,stop_code: Wjr-Vnf, lat: -35.2331848, lng: 149.054555}
+  - { name: Wjr-Ws2,stop_code: Wjr-Ws2, lat: -35.230167, lng: 149.0557628}
+  - { name: Wjr-PWf,stop_code: Wjr-PWf, lat: -35.225611, lng: 149.0504341}
+  - { name: Wjr-PyX,stop_code: Wjr-PyX, lat: -35.2259882, lng: 149.0472724}
+  - { name: WjrZKZn,stop_code: WjrZKZn, lat: -35.2510294, lng: 149.0396391}
+  - { name: WjrZKnY,stop_code: WjrZKnY, lat: -35.2498968, lng: 149.0336595}
+  - { name: Wjz4S1U,stop_code: Wjz4S1U, lat: -35.2983385, lng: 149.1296979}
+  - { name: Wjz4RbQ,stop_code: Wjz4RbQ, lat: -35.3021238, lng: 149.1308574}
+  - { name: Wjz4IrL,stop_code: Wjz4IrL, lat: -35.307326, lng: 149.1225503}
+  - { name: Wjz4INj,stop_code: Wjz4INj, lat: -35.3091118, lng: 149.1261312}
+  - { name: Wjz3fO2,stop_code: Wjz3fO2, lat: -35.3359729, lng: 149.0817737}
+  - { name: Wjz3fCx,stop_code: Wjz3fCx, lat: -35.333256, lng: 149.0798309}
+  - { name: Wjz4peM,stop_code: Wjz4peM, lat: -35.322342, lng: 149.0979263}
+  - { name: Wjz4qgy,stop_code: Wjz4qgy, lat: -35.3208475, lng: 149.098981}
+  - { name: Wjz4qTw,stop_code: Wjz4qTw, lat: -35.3162151, lng: 149.1045086}
+  - { name: Wjz4qtY,stop_code: Wjz4qtY, lat: -35.3172423, lng: 149.100878}
+  - { name: Wjz4qs0,stop_code: Wjz4qs0, lat: -35.3182278, lng: 149.09964}
+  - { name: Wjz4y7z,stop_code: Wjz4y7z, lat: -35.3159129, lng: 149.1072689}
+  - { name: Wjz4yng,stop_code: Wjz4yng, lat: -35.316172, lng: 149.1095953}
+  - { name: Wjz4yzk,stop_code: Wjz4yzk, lat: -35.3186155, lng: 149.1123352}
+  - { name: Wjz4yGG,stop_code: Wjz4yGG, lat: -35.3194308, lng: 149.1142224}
+  - { name: Wjz4yQ-,stop_code: Wjz4yQ-, lat: -35.3177825, lng: 149.1159796}
+  - { name: Wjz4H0P,stop_code: Wjz4H0P, lat: -35.3152936, lng: 149.1185178}
+  - { name: Wjz4Hbx,stop_code: Wjz4Hbx, lat: -35.3133913, lng: 149.1195724}
+  - { name: Wjz4A7o,stop_code: Wjz4A7o, lat: -35.3052441, lng: 149.107042}
+  - { name: Wjz4z67,stop_code: Wjz4z67, lat: -35.3107704, lng: 149.1065979}
+  - { name: Wjz4A2c,stop_code: Wjz4A2c, lat: -35.3082791, lng: 149.1066534}
+  - { name: Wjz4tUp,stop_code: Wjz4tUp, lat: -35.3044055, lng: 149.1056974}
+  - { name: Wjz4tpE,stop_code: Wjz4tpE, lat: -35.3038329, lng: 149.1005569}
+  - { name: Wjz1HTi,stop_code: Wjz1HTi, lat: -35.4423392, lng: 149.1260397}
+  - { name: Wjz1HOf,stop_code: Wjz1HOf, lat: -35.4453654, lng: 149.1258946}
+  - { name: Wjz1HEb,stop_code: Wjz1HEb, lat: -35.4471149, lng: 149.1245306}
+  - { name: Wjz1GsO,stop_code: Wjz1GsO, lat: -35.4499519, lng: 149.1226442}
+  - { name: Wjz1Gjj,stop_code: Wjz1Gjj, lat: -35.4504956, lng: 149.1205257}
+  - { name: Wjz1rQ6,stop_code: Wjz1rQ6, lat: -35.4440887, lng: 149.1038388}
+  - { name: Wjz1zWz,stop_code: Wjz1zWz, lat: -35.4457437, lng: 149.1168111}
+  - { name: Wjz1zN3,stop_code: Wjz1zN3, lat: -35.4464057, lng: 149.1147796}
+  - { name: Wjz1ySn,stop_code: Wjz1ySn, lat: -35.4481315, lng: 149.1151569}
+  - { name: Wjz1G32,stop_code: Wjz1G32, lat: -35.4506139, lng: 149.1174495}
+  - { name: Wjz1xRC,stop_code: Wjz1xRC, lat: -35.4544199, lng: 149.1154761}
+  - { name: Wjz1xWZ,stop_code: Wjz1xWZ, lat: -35.4565002, lng: 149.1174205}
+  - { name: Wjz1F5W,stop_code: Wjz1F5W, lat: -35.4547272, lng: 149.1186974}
+  - { name: Wjz1G89,stop_code: Wjz1G89, lat: -35.4527651, lng: 149.1190457}
+  - { name: Wjz1CdY,stop_code: Wjz1CdY, lat: -35.4270927, lng: 149.1090734}
+  - { name: Wjz1CD8,stop_code: Wjz1CD8, lat: -35.4260286, lng: 149.1122294}
+  - { name: Wjz1CRl,stop_code: Wjz1CRl, lat: -35.4269745, lng: 149.1151677}
+  - { name: Wjz1K49,stop_code: Wjz1K49, lat: -35.428009, lng: 149.1176708}
+  - { name: Wjz1J4T,stop_code: Wjz1J4T, lat: -35.4330044, lng: 149.1185777}
+  - { name: Wjz1K89,stop_code: Wjz1K89, lat: -35.4308171, lng: 149.1191218}
+  - { name: Wjz1Kiu,stop_code: Wjz1Kiu, lat: -35.4289549, lng: 149.1207905}
+  - { name: Wjz1JD7,stop_code: Wjz1JD7, lat: -35.4309354, lng: 149.1230759}
+  - { name: Wjz1JTP,stop_code: Wjz1JTP, lat: -35.4312901, lng: 149.126776}
+  - { name: Wjz1S2v,stop_code: Wjz1S2v, lat: -35.4289254, lng: 149.1290251}
+  - { name: Wjz1S5I,stop_code: Wjz1S5I, lat: -35.4271223, lng: 149.1292791}
+  - { name: Wjz1SfM,stop_code: Wjz1SfM, lat: -35.4260286, lng: 149.1309478}
+  - { name: Wjz1TgM,stop_code: Wjz1TgM, lat: -35.4253782, lng: 149.1323625}
+  - { name: Wjz1TLL,stop_code: Wjz1TLL, lat: -35.4199685, lng: 149.1361715}
+  - { name: Wjz1LBV,stop_code: Wjz1LBV, lat: -35.4218605, lng: 149.1241279}
+  - { name: Wjz1Lxu,stop_code: Wjz1Lxu, lat: -35.4241367, lng: 149.1234749}
+  - { name: Wjz1Liw,stop_code: Wjz1Liw, lat: -35.4239889, lng: 149.1208993}
+  - { name: Wjz1DWq,stop_code: Wjz1DWq, lat: -35.4238411, lng: 149.1166188}
+  - { name: Wjz1DLm,stop_code: Wjz1DLm, lat: -35.4200572, lng: 149.1136804}
+  - { name: Wjz2wGU,stop_code: Wjz2wGU, lat: -35.4184904, lng: 149.1145873}
+  - { name: Wjz2wY-,stop_code: Wjz2wY-, lat: -35.4166279, lng: 149.1173443}
+  - { name: Wjz2EdX,stop_code: Wjz2EdX, lat: -35.416214, lng: 149.120065}
+  - { name: Wjz2EL2,stop_code: Wjz2EL2, lat: -35.4149132, lng: 149.1244544}
+  - { name: Wjz2EXs,stop_code: Wjz2EXs, lat: -35.4174557, lng: 149.1275741}
+  - { name: Wjz2M5R,stop_code: Wjz2M5R, lat: -35.4160071, lng: 149.129533}
+  - { name: Wjz2MYC,stop_code: Wjz2MYC, lat: -35.4166279, lng: 149.1388559}
+  - { name: Wjz2V0k,stop_code: Wjz2V0k, lat: -35.4140263, lng: 149.1397991}
+  - { name: Wjz2NPZ,stop_code: Wjz2NPZ, lat: -35.4118681, lng: 149.1378765}
+  - { name: Wjz2NH0,stop_code: Wjz2NH0, lat: -35.4123115, lng: 149.1353734}
+  - { name: Wjz2Npv,stop_code: Wjz2Npv, lat: -35.4131394, lng: 149.1331606}
+  - { name: WjrXZz3,stop_code: WjrXZz3, lat: -35.3461161, lng: 149.0570563}
+  - { name: WjrXZiM,stop_code: WjrXZiM, lat: -35.3470777, lng: 149.0553331}
+  - { name: WjrXRW0,stop_code: WjrXRW0, lat: -35.3471147, lng: 149.0502999}
+  - { name: Wjz3nLq,stop_code: Wjz3nLq, lat: -35.3325054, lng: 149.0919265}
+  - { name: Wjz4shf,stop_code: Wjz4shf, lat: -35.3086912, lng: 149.0984092}
+  - { name: Wjz4rk2,stop_code: Wjz4rk2, lat: -35.3126013, lng: 149.0982349}
+  - { name: Wjz4hPC,stop_code: Wjz4hPC, lat: -35.323921, lng: 149.0935136}
+  - { name: Wjz4gou,stop_code: Wjz4gou, lat: -35.3314972, lng: 149.0892541}
+  - { name: Wjz4hMe,stop_code: Wjz4hMe, lat: -35.3259558, lng: 149.0929241}
+  - { name: Wjz4gt5,stop_code: Wjz4gt5, lat: -35.3281248, lng: 149.0887511}
+  - { name: Wjz4h1X,stop_code: Wjz4h1X, lat: -35.3255489, lng: 149.0857143}
+  - { name: Wjz48Q1,stop_code: Wjz48Q1, lat: -35.3291744, lng: 149.0818599}
+  - { name: Wjz49Ui,stop_code: Wjz49Ui, lat: -35.3262888, lng: 149.0835377}
+  - { name: Wjz49Wd,stop_code: Wjz49Wd, lat: -35.324698, lng: 149.0833563}
+  - { name: Wjz49Y5,stop_code: Wjz49Y5, lat: -35.3233291, lng: 149.0831296}
+  - { name: Wjz4aMo,stop_code: Wjz4aMo, lat: -35.3209613, lng: 149.082268}
+  - { name: Wjz4aH6,stop_code: Wjz4aH6, lat: -35.3184453, lng: 149.0804542}
+  - { name: Wjz4arc,stop_code: Wjz4arc, lat: -35.3185933, lng: 149.0779149}
+  - { name: Wjz4a9o,stop_code: Wjz4a9o, lat: -35.3203323, lng: 149.0754663}
+  - { name: Wjz49dp,stop_code: Wjz49dp, lat: -35.3229961, lng: 149.075421}
+  - { name: Wjz499S,stop_code: Wjz499S, lat: -35.3252899, lng: 149.0759651}
+  - { name: Wjz48dZ,stop_code: Wjz48dZ, lat: -35.3281016, lng: 149.0761465}
+  - { name: Wjz48qI,stop_code: Wjz48qI, lat: -35.3302472, lng: 149.0785498}
+  - { name: WjrYUj0,stop_code: WjrYUj0, lat: -35.3299526, lng: 149.0543559}
+  - { name: WjrYUG8,stop_code: WjrYUG8, lat: -35.3306155, lng: 149.058622}
+  - { name: WjrX_SL,stop_code: WjrX_SL, lat: -35.3327937, lng: 149.0607695}
+  - { name: Wjz37Lm,stop_code: Wjz37Lm, lat: -35.3321544, lng: 149.0697369}
+  - { name: Wjz3d3K,stop_code: Wjz3d3K, lat: -35.3459087, lng: 149.0743512}
+  - { name: Wjz3e8l,stop_code: Wjz3e8l, lat: -35.3425473, lng: 149.0752509}
+  - { name: Wjz3ee-,stop_code: Wjz3ee-, lat: -35.3383098, lng: 149.0761505}
+  - { name: Wjz37Zc,stop_code: Wjz37Zc, lat: -35.3337407, lng: 149.0723488}
+  - { name: Wjz3fa8,stop_code: Wjz3fa8, lat: -35.3360845, lng: 149.0750477}
+  - { name: WjrX-Lw,stop_code: WjrX-Lw, lat: -35.3381915, lng: 149.0592024}
+  - { name: WjrX_xY,stop_code: WjrX_xY, lat: -35.3364869, lng: 149.0583028}
+  - { name: WjrX_bF,stop_code: WjrX_bF, lat: -35.3353506, lng: 149.0538045}
+  - { name: WjrX_iU,stop_code: WjrX_iU, lat: -35.3361318, lng: 149.0556038}
+  - { name: WjrX-m2,stop_code: WjrX-m2, lat: -35.3386886, lng: 149.0543559}
+  - { name: WjrX-oT,stop_code: WjrX-oT, lat: -35.3424053, lng: 149.0567937}
+  - { name: WjrX-sE,stop_code: WjrX-sE, lat: -35.3402511, lng: 149.0565615}
+  - { name: WjrX-zT,stop_code: WjrX-zT, lat: -35.3402984, lng: 149.0581286}
+  - { name: Wjz354b,stop_code: Wjz354b, lat: -35.345459, lng: 149.062772}
+  - { name: Wjz1edz,stop_code: Wjz1edz, lat: -35.4271482, lng: 149.0757082}
+  - { name: Wjz1et6,stop_code: Wjz1et6, lat: -35.4269117, lng: 149.0777759}
+  - { name: Wjz1nxQ,stop_code: Wjz1nxQ, lat: -35.4243695, lng: 149.0911255}
+  - { name: Wjz1nzY,stop_code: Wjz1nzY, lat: -35.4229506, lng: 149.0912343}
+  - { name: Wjz1f8Y,stop_code: Wjz1f8Y, lat: -35.4250198, lng: 149.076216}
+  - { name: Wjz1f2H,stop_code: Wjz1f2H, lat: -35.4237487, lng: 149.0744748}
+  - { name: Wjz20Eo,stop_code: Wjz20Eo, lat: -35.4198466, lng: 149.0699766}
+  - { name: Wjz1f7q,stop_code: Wjz1f7q, lat: -35.4203787, lng: 149.0740032}
+  - { name: Wjz20Vv,stop_code: Wjz20Vv, lat: -35.4185754, lng: 149.072661}
+  - { name: Wjz2bHS,stop_code: Wjz2bHS, lat: -35.400824, lng: 149.0814035}
+  - { name: Wjz2aLs,stop_code: Wjz2aLs, lat: -35.4037395, lng: 149.081019}
+  - { name: Wjz2b8J,stop_code: Wjz2b8J, lat: -35.4029944, lng: 149.0757807}
+  - { name: Wjz2a26,stop_code: Wjz2a26, lat: -35.4069683, lng: 149.0736259}
+  - { name: Wjz29Ya,stop_code: Wjz29Ya, lat: -35.4114741, lng: 149.0833189}
+  - { name: Wjz29-5,stop_code: Wjz29-5, lat: -35.4098244, lng: 149.083123}
+  - { name: Wjz2i3o,stop_code: Wjz2i3o, lat: -35.4068322, lng: 149.0850166}
+  - { name: Wjz2aVu,stop_code: Wjz2aVu, lat: -35.4076897, lng: 149.0836236}
+  - { name: Wjz2aGG,stop_code: Wjz2aGG, lat: -35.4073408, lng: 149.0812511}
+  - { name: Wjz2azE,stop_code: Wjz2azE, lat: -35.4068027, lng: 149.0799162}
+  - { name: Wjz2arg,stop_code: Wjz2arg, lat: -35.4068086, lng: 149.0779936}
+  - { name: Wjz2aaw,stop_code: Wjz2aaw, lat: -35.4075241, lng: 149.0756429}
+  - { name: Wjz29ea,stop_code: Wjz29ea, lat: -35.4101319, lng: 149.0751278}
+  - { name: Wjz29yh,stop_code: Wjz29yh, lat: -35.4129642, lng: 149.0794301}
+  - { name: Wjz28DH,stop_code: Wjz28DH, lat: -35.4148504, lng: 149.0799887}
+  - { name: Wjz28Yv,stop_code: Wjz28Yv, lat: -35.4165651, lng: 149.0836163}
+  - { name: Wjz2g6U,stop_code: Wjz2g6U, lat: -35.4157965, lng: 149.0857566}
+  - { name: Wjz2gvd,stop_code: Wjz2gvd, lat: -35.4146612, lng: 149.0888256}
+  - { name: Wjz2haF,stop_code: Wjz2haF, lat: -35.4129406, lng: 149.0867361}
+  - { name: Wjz2hlp,stop_code: Wjz2hlp, lat: -35.4109006, lng: 149.0878896}
+  - { name: Wjz2hBQ,stop_code: Wjz2hBQ, lat: -35.4106404, lng: 149.0911182}
+  - { name: Wjz2iEO,stop_code: Wjz2iEO, lat: -35.40876, lng: 149.0925039}
+  - { name: Wjz2iPv,stop_code: Wjz2iPv, lat: -35.4062172, lng: 149.093302}
+  - { name: Wjz2izK,stop_code: Wjz2izK, lat: -35.4062764, lng: 149.0909078}
+  - { name: Wjz34Gq,stop_code: Wjz34Gq, lat: -35.352423, lng: 149.0699271}
+  - { name: Wjz33LB,stop_code: Wjz33LB, lat: -35.3542352, lng: 149.0701992}
+  - { name: Wjz33CI,stop_code: Wjz33CI, lat: -35.3549749, lng: 149.0689295}
+  - { name: Wjz33KX,stop_code: Wjz33KX, lat: -35.3550858, lng: 149.070698}
+  - { name: Wjz33GY,stop_code: Wjz33GY, lat: -35.3577485, lng: 149.0706526}
+  - { name: Wjz33EK,stop_code: Wjz33EK, lat: -35.3589689, lng: 149.0702445}
+  - { name: WjrXXFn,stop_code: WjrXXFn, lat: -35.3581997, lng: 149.0587995}
+  - { name: WjrXXMe,stop_code: WjrXXMe, lat: -35.3589023, lng: 149.0599784}
+  - { name: WjrXWQ8,stop_code: WjrXWQ8, lat: -35.3621767, lng: 149.0600261}
+  - { name: WjrXWsn,stop_code: WjrXWsn, lat: -35.3616093, lng: 149.055979}
+  - { name: WjrXW7A,stop_code: WjrXW7A, lat: -35.3597972, lng: 149.0523061}
+  - { name: WjrXGDF,stop_code: WjrXGDF, lat: -35.3600413, lng: 149.0360091}
+  - { name: WjrXXb4,stop_code: WjrXXb4, lat: -35.3570754, lng: 149.0530316}
+  - { name: WjrX-FV,stop_code: WjrX-FV, lat: -35.3422149, lng: 149.0596338}
+  - { name: Wjz356k,stop_code: Wjz356k, lat: -35.3440169, lng: 149.0629513}
+  - { name: Wjz35av,stop_code: Wjz35av, lat: -35.3464684, lng: 149.064395}
+  - { name: Wjz358l,stop_code: Wjz358l, lat: -35.3480588, lng: 149.0643043}
+  - { name: Wjz34c4,stop_code: Wjz34c4, lat: -35.3508697, lng: 149.0639869}
+  - { name: Wjz348u,stop_code: Wjz348u, lat: -35.3534586, lng: 149.0644857}
+  - { name: Wjz33nk,stop_code: Wjz33nk, lat: -35.3543462, lng: 149.0657554}
+  - { name: Wjz337w,stop_code: Wjz337w, lat: -35.354642, lng: 149.0633068}
+  - { name: WjrXXK9,stop_code: WjrXXK9, lat: -35.355219, lng: 149.0585637}
+  - { name: WjrXXI2,stop_code: WjrXXI2, lat: -35.3565059, lng: 149.058473}
+  - { name: WjrXXyQ,stop_code: WjrXXyQ, lat: -35.3576967, lng: 149.0580467}
+  - { name: WjrXXq3,stop_code: WjrXXq3, lat: -35.3578077, lng: 149.0557251}
+  - { name: WjrXXd0,stop_code: WjrXXd0, lat: -35.3559956, lng: 149.0529772}
+  - { name: WjrXYL4,stop_code: WjrXYL4, lat: -35.3488355, lng: 149.0584095}
+  - { name: WjrXYtm,stop_code: WjrXYtm, lat: -35.3499821, lng: 149.0560969}
+  - { name: WjrXQZX,stop_code: WjrXQZX, lat: -35.3502779, lng: 149.0514717}
+  - { name: WjrXRks,stop_code: WjrXRks, lat: -35.3453958, lng: 149.0438991}
+  - { name: WjrXR3f,stop_code: WjrXR3f, lat: -35.3458397, lng: 149.040861}
+  - { name: WjrXIDX,stop_code: WjrXIDX, lat: -35.348916, lng: 149.0363428}
+  - { name: WjrXIKK,stop_code: WjrXIKK, lat: -35.3493279, lng: 149.0374035}
+  - { name: WjrXQ65,stop_code: WjrXQ65, lat: -35.349419, lng: 149.040696}
+  - { name: WjrXJfw,stop_code: WjrXJfw, lat: -35.3436463, lng: 149.031771}
+  - { name: WjrXKoe,stop_code: WjrXKoe, lat: -35.3424911, lng: 149.0339533}
+  - { name: WjrXLR-,stop_code: WjrXLR-, lat: -35.3335487, lng: 149.0390846}
+  - { name: WjrXLtK,stop_code: WjrXLtK, lat: -35.3335671, lng: 149.0346289}
+  - { name: WjrXLaD,stop_code: WjrXLaD, lat: -35.3355436, lng: 149.0316183}
+  - { name: WjrYEg0,stop_code: WjrYEg0, lat: -35.3320285, lng: 149.0323493}
+  - { name: WjrYEpn,stop_code: WjrYEpn, lat: -35.3306598, lng: 149.0341649}
+  - { name: WjrYEWc,stop_code: WjrYEWc, lat: -35.3302839, lng: 149.0394086}
+  - { name: WjrYMbF,stop_code: WjrYMbF, lat: -35.3298385, lng: 149.0428712}
+  - { name: WjrYMrj,stop_code: WjrYMrj, lat: -35.3296313, lng: 149.0450622}
+  - { name: WjrYMHm,stop_code: WjrYMHm, lat: -35.3294538, lng: 149.0477466}
+  - { name: WjrYMGB,stop_code: WjrYMGB, lat: -35.3301626, lng: 149.0481758}
+  - { name: WjrXTSe,stop_code: WjrXTSe, lat: -35.3328347, lng: 149.0489873}
+  - { name: WjrX_1g,stop_code: WjrX_1g, lat: -35.336799, lng: 149.0519909}
+  - { name: WjrXTIp,stop_code: WjrXTIp, lat: -35.3346742, lng: 149.0480789}
+  - { name: WjrXTqY,stop_code: WjrXTqY, lat: -35.3357893, lng: 149.0460156}
+  - { name: WjrXTgl,stop_code: WjrXTgl, lat: -35.3370298, lng: 149.0436997}
+  - { name: WjrXKBE,stop_code: WjrXKBE, lat: -35.3395611, lng: 149.0360582}
+  - { name: WjrXLY1,stop_code: WjrXLY1, lat: -35.3346674, lng: 149.0391656}
+  - { name: WjrXLEL,stop_code: WjrXLEL, lat: -35.3369076, lng: 149.0374236}
+  - { name: WjrXLgs,stop_code: WjrXLgs, lat: -35.3371612, lng: 149.0328459}
+  - { name: WjrXKfG,stop_code: WjrXKfG, lat: -35.338018, lng: 149.0318393}
+  - { name: Wjz2ve3,stop_code: Wjz2ve3, lat: -35.3770117, lng: 149.0968721}
+  - { name: Wjz3aaB,stop_code: Wjz3aaB, lat: -35.3631322, lng: 149.0756066}
+  - { name: Wjz39sA,stop_code: Wjz39sA, lat: -35.3673329, lng: 149.0783636}
+  - { name: Wjz39GV,stop_code: Wjz39GV, lat: -35.369019, lng: 149.0816284}
+  - { name: Wjz39PE,stop_code: Wjz39PE, lat: -35.3683683, lng: 149.0827167}
+  - { name: Wjz3h5c,stop_code: Wjz3h5c, lat: -35.3666525, lng: 149.0847118}
+  - { name: Wjz3hu6,stop_code: Wjz3hu6, lat: -35.3658261, lng: 149.0887408}
+  - { name: Wjz3j2F,stop_code: Wjz3j2F, lat: -35.3580142, lng: 149.0853648}
+  - { name: Wjz3it1,stop_code: Wjz3it1, lat: -35.3614164, lng: 149.0886297}
+  - { name: Wjz3iuk,stop_code: Wjz3iuk, lat: -35.3604697, lng: 149.0889561}
+  - { name: Wjzcrp_,stop_code: Wjzcrp_, lat: -35.3142011, lng: 149.1887666}
+  - { name: WjzcrK3,stop_code: WjzcrK3, lat: -35.3111478, lng: 149.190364}
+  - { name: Wjzcuop,stop_code: Wjzcuop, lat: -35.2989647, lng: 149.1881172}
+  - { name: Wjzcuw1,stop_code: Wjzcuw1, lat: -35.2989793, lng: 149.188937}
+  - { name: WjzcBHZ,stop_code: WjzcBHZ, lat: -35.3020154, lng: 149.2024041}
+  - { name: WjzcJ38,stop_code: WjzcJ38, lat: -35.3024713, lng: 149.2056109}
+  - { name: WjzcJ0K,stop_code: WjzcJ0K, lat: -35.3040486, lng: 149.2062653}
+  - { name: Wjzf3oM,stop_code: Wjzf3oM, lat: -35.1836894, lng: 149.1556666}
+  - { name: Wjz7smv,stop_code: Wjz7smv, lat: -35.1734671, lng: 149.0988597}
+  - { name: Wjr_Gxf,stop_code: Wjr_Gxf, lat: -35.1878657, lng: 149.0352296}
+  - { name: Wjr_Es4,stop_code: Wjr_Es4, lat: -35.1970405, lng: 149.0338265}
+  - { name: Wjr_xY9,stop_code: Wjr_xY9, lat: -35.1918291, lng: 149.028508}
+  - { name: Wjr_FTN,stop_code: Wjr_FTN, lat: -35.1897508, lng: 149.038952}
+  - { name: Wjr_xLL,stop_code: Wjr_xLL, lat: -35.1892698, lng: 149.0264062}
+  - { name: Wjr_Ej0,stop_code: Wjr_Ej0, lat: -35.1981116, lng: 149.0323079}
+  - { name: Wjr_xnT,stop_code: Wjr_xnT, lat: -35.1892671, lng: 149.0223682}
+  - { name: Wjr_FXR,stop_code: Wjr_FXR, lat: -35.1922038, lng: 149.0402464}
+  - { name: Wjr_GVA,stop_code: Wjr_GVA, lat: -35.188117, lng: 149.0399446}
+  - { name: Wjr_E1y,stop_code: Wjr_E1y, lat: -35.1992571, lng: 149.0303603}
+  - { name: Wjr_NDY,stop_code: Wjr_NDY, lat: -35.1895167, lng: 149.04724}
+  - { name: Wjr_N-q,stop_code: Wjr_N-q, lat: -35.1903433, lng: 149.0507803}
+  - { name: Wjr_V6V,stop_code: Wjr_V6V, lat: -35.1904467, lng: 149.0528033}
+  - { name: Wjr_Vt9,stop_code: Wjr_Vt9, lat: -35.191134, lng: 149.055871}
+  - { name: Wjr_Vbj,stop_code: Wjr_Vbj, lat: -35.1923583, lng: 149.0533723}
+  - { name: Wjr_V2c,stop_code: Wjr_V2c, lat: -35.192985, lng: 149.0517177}
+  - { name: Wjr_NFt,stop_code: Wjr_NFt, lat: -35.1935465, lng: 149.0479464}
+  - { name: Wjr_NpJ,stop_code: Wjr_NpJ, lat: -35.1935127, lng: 149.0455536}
+  - { name: Wjr_McO,stop_code: Wjr_McO, lat: -35.1972013, lng: 149.0429389}
+  - { name: Wjr_MjV,stop_code: Wjr_MjV, lat: -35.1979805, lng: 149.0445264}
+  - { name: Wjr_MhY,stop_code: Wjr_MhY, lat: -35.1991196, lng: 149.0445095}
+  - { name: Wjr-Tf_,stop_code: Wjr-Tf_, lat: -35.2002734, lng: 149.0432168}
+  - { name: Wjr-Lzm,stop_code: Wjr-Lzm, lat: -35.2030997, lng: 149.0354829}
+  - { name: Wjr-L1H,stop_code: Wjr-L1H, lat: -35.2046871, lng: 149.0304447}
+  - { name: Wjr-DNK,stop_code: Wjr-DNK, lat: -35.2044788, lng: 149.0277602}
+  - { name: Wjr-DQE,stop_code: Wjr-DQE, lat: -35.2029293, lng: 149.0277662}
+  - { name: Wjr-DTC,stop_code: Wjr-DTC, lat: -35.2002855, lng: 149.0276101}
+  - { name: Wjr_wf4,stop_code: Wjr_wf4, lat: -35.1950004, lng: 149.0199737}
+  - { name: Wjr_wm3,stop_code: Wjr_wm3, lat: -35.195762, lng: 149.0214528}
+  - { name: Wjr_wjn,stop_code: Wjr_wjn, lat: -35.1975263, lng: 149.0216638}
+  - { name: Wjr_pVW,stop_code: Wjr_pVW, lat: -35.1938099, lng: 149.0184155}
+  - { name: Wjr_o_j,stop_code: Wjr_o_j, lat: -35.1950629, lng: 149.0175978}
+  - { name: Wjr_oJA,stop_code: Wjr_oJA, lat: -35.1964177, lng: 149.0152805}
+  - { name: Wjr_oP1,stop_code: Wjr_oP1, lat: -35.1980445, lng: 149.0158736}
+  - { name: Wjr-CS2,stop_code: Wjr-CS2, lat: -35.2068071, lng: 149.0268212}
+  - { name: Wjr-vNL,stop_code: Wjr-vNL, lat: -35.2043835, lng: 149.0167621}
+  - { name: Wjr-Df8,stop_code: Wjr-Df8, lat: -35.2008175, lng: 149.0201835}
+  - { name: Wjr-vJY,stop_code: Wjr-vJY, lat: -35.2019113, lng: 149.0157184}
+  - { name: Wjr-uUL,stop_code: Wjr-uUL, lat: -35.210513, lng: 149.0180445}
+  - { name: Wjr-te3,stop_code: Wjr-te3, lat: -35.2122382, lng: 149.0090273}
+  - { name: Wjr-tbm,stop_code: Wjr-tbm, lat: -35.2140927, lng: 149.0093105}
+  - { name: Wjr-thp,stop_code: Wjr-thp, lat: -35.2158247, lng: 149.0109263}
+  - { name: Wjr-smi,stop_code: Wjr-smi, lat: -35.2178617, lng: 149.0106876}
+  - { name: Wjr-sKW,stop_code: Wjr-sKW, lat: -35.2178207, lng: 149.0156953}
+  - { name: Wjr-s_F,stop_code: Wjr-s_F, lat: -35.2172009, lng: 149.0180976}
+  - { name: Wjr-CsO,stop_code: Wjr-CsO, lat: -35.2082115, lng: 149.0237453}
+  - { name: Wjr-BL8,stop_code: Wjr-BL8, lat: -35.2118565, lng: 149.025622}
+  - { name: Wjr-KJQ,stop_code: Wjr-KJQ, lat: -35.2073355, lng: 149.037506}
+  - { name: Wjr-S6B,stop_code: Wjr-S6B, lat: -35.2066123, lng: 149.0412991}
+  - { name: Wjr-S9y,stop_code: Wjr-S9y, lat: -35.2102797, lng: 149.0426899}
+  - { name: Wjr-RnT,stop_code: Wjr-RnT, lat: -35.2112095, lng: 149.0444601}
+  - { name: Wjr-Rs8,stop_code: Wjr-Rs8, lat: -35.2139046, lng: 149.0449606}
+  - { name: Wjr-Q8c,stop_code: Wjr-Q8c, lat: -35.2217975, lng: 149.042121}
+  - { name: Wjr-Pk6,stop_code: Wjr-Pk6, lat: -35.2243699, lng: 149.0432872}
+  - { name: Wjr-AHx,stop_code: Wjr-AHx, lat: -35.2199899, lng: 149.0262529}
+  - { name: Wjr-z_L,stop_code: Wjr-z_L, lat: -35.222191, lng: 149.0291286}
+  - { name: Wjr-zOn,stop_code: Wjr-zOn, lat: -35.2256125, lng: 149.0272189}
+  - { name: Wjr-HbC,stop_code: Wjr-HbC, lat: -35.2250302, lng: 149.0316399}
+  - { name: Wjr-sV3,stop_code: Wjr-sV3, lat: -35.2212162, lng: 149.0172455}
+  - { name: Wjr-sQ8,stop_code: Wjr-sQ8, lat: -35.2193706, lng: 149.0159919}
+  - { name: Wjr-st9,stop_code: Wjr-st9, lat: -35.2186471, lng: 149.0119654}
+  - { name: Wjr-rv7,stop_code: Wjr-rv7, lat: -35.2221818, lng: 149.0117611}
+  - { name: Wjr-kVk,stop_code: Wjr-kVk, lat: -35.2210905, lng: 149.0066193}
+  - { name: Wjr-jRn,stop_code: Wjr-jRn, lat: -35.2235756, lng: 149.0053113}
+  - { name: Wjr-rjD,stop_code: Wjr-rjD, lat: -35.2249706, lng: 149.0111289}
+  - { name: Wjr-rQJ,stop_code: Wjr-rQJ, lat: -35.2244007, lng: 149.0167658}
+  - { name: Wjr-syd,stop_code: Wjr-syd, lat: -35.2203046, lng: 149.0133355}
+  - { name: Wjr-rxG,stop_code: Wjr-rxG, lat: -35.2267918, lng: 149.0140227}
+  - { name: Wjr-jNB,stop_code: Wjr-jNB, lat: -35.2265208, lng: 149.0056756}
+  - { name: Wjr-qcc,stop_code: Wjr-qcc, lat: -35.230013, lng: 149.0092125}
+  - { name: Wjr-qyr,stop_code: Wjr-qyr, lat: -35.2315106, lng: 149.0137011}
+  - { name: Wjr-qZg,stop_code: Wjr-qZg, lat: -35.2296561, lng: 149.0176617}
+  - { name: Wjr-rUs,stop_code: Wjr-rUs, lat: -35.2272548, lng: 149.0178319}
+  - { name: Wjr-rNr,stop_code: Wjr-rNr, lat: -35.226697, lng: 149.016389}
+  - { name: Wjr-zom,stop_code: Wjr-zom, lat: -35.2270626, lng: 149.0231771}
+  - { name: Wjr-zcC,stop_code: Wjr-zcC, lat: -35.2243517, lng: 149.0207165}
+  - { name: Wjr-yni,stop_code: Wjr-yni, lat: -35.2281496, lng: 149.0217011}
+  - { name: Wjr-yrh,stop_code: Wjr-yrh, lat: -35.2309899, lng: 149.0230231}
+  - { name: Wjr-ywh,stop_code: Wjr-ywh, lat: -35.2330631, lng: 149.0245222}
+  - { name: Wjr-yJZ,stop_code: Wjr-yJZ, lat: -35.2292857, lng: 149.0266955}
+  - { name: Wjr-ySy,stop_code: Wjr-ySy, lat: -35.228821, lng: 149.0276438}
+  - { name: Wjr-zWb,stop_code: Wjr-zWb, lat: -35.2259772, lng: 149.0283569}
+  - { name: Wjr-zC9,stop_code: Wjr-zC9, lat: -35.2234474, lng: 149.0242983}
+  - { name: Wjr-G5f,stop_code: Wjr-G5f, lat: -35.2290792, lng: 149.0298564}
+  - { name: Wjr-GeX,stop_code: Wjr-GeX, lat: -35.2287693, lng: 149.0321955}
+  - { name: Wjr-xLK,stop_code: Wjr-xLK, lat: -35.2332476, lng: 149.0263679}
+  - { name: Wjr-xRd,stop_code: Wjr-xRd, lat: -35.2347078, lng: 149.0270748}
+  - { name: Wjr-xxu,stop_code: Wjr-xxu, lat: -35.2373929, lng: 149.0246092}
+  - { name: Wjr-wDP,stop_code: Wjr-wDP, lat: -35.2389936, lng: 149.0252414}
+  - { name: Wjr-Ekp,stop_code: Wjr-Ekp, lat: -35.2412759, lng: 149.032879}
+  - { name: Wjr-Gsq,stop_code: Wjr-Gsq, lat: -35.2301636, lng: 149.0342818}
+  - { name: Wjr-GyJ,stop_code: Wjr-GyJ, lat: -35.2312775, lng: 149.0359574}
+  - { name: Wjr-GFM,stop_code: Wjr-GFM, lat: -35.2324613, lng: 149.03753}
+  - { name: Wjr-F_m,stop_code: Wjr-F_m, lat: -35.233261, lng: 149.039515}
+  - { name: Wjr-FCU,stop_code: Wjr-FCU, lat: -35.2344506, lng: 149.0363984}
+  - { name: Wjr-Fzd,stop_code: Wjr-Fzd, lat: -35.2360739, lng: 149.0353153}
+  - { name: Wjr-E8A,stop_code: Wjr-E8A, lat: -35.2437543, lng: 149.031741}
+  - { name: WjrZLdA,stop_code: WjrZLdA, lat: -35.245805, lng: 149.0316615}
+  - { name: WjrZSKp,stop_code: WjrZSKp, lat: -35.2509203, lng: 149.0480636}
+  - { name: WjrZSWs,stop_code: WjrZSWs, lat: -35.2533983, lng: 149.050782}
+  - { name: Wjr-MCk,stop_code: Wjr-MCk, lat: -35.2396029, lng: 149.0464162}
+  - { name: Wjr-M-x,stop_code: Wjr-M-x, lat: -35.2399127, lng: 149.0508416}
+  - { name: WjrZ-aT,stop_code: WjrZ-aT, lat: -35.2531402, lng: 149.053943}
+  - { name: WjrZZeD,stop_code: WjrZZeD, lat: -35.2558247, lng: 149.0536901}
+  - { name: WjrZZlR,stop_code: WjrZZlR, lat: -35.2567539, lng: 149.055397}
+  - { name: WjrZZH3,stop_code: WjrZZH3, lat: -35.2583026, lng: 149.0584315}
+  - { name: Wjz54mj,stop_code: Wjz54mj, lat: -35.2617096, lng: 149.0656385}
+  - { name: Wjz55vN,stop_code: Wjz55vN, lat: -35.2557214, lng: 149.0677248}
+  - { name: Wjz557P,stop_code: Wjz557P, lat: -35.2555149, lng: 149.0636155}
+  - { name: WjrZ-WW,stop_code: WjrZ-WW, lat: -35.2535016, lng: 149.0623511}
+  - { name: WjrZ-GZ,stop_code: WjrZ-GZ, lat: -35.2532951, lng: 149.0596327}
+  - { name: WjrZ-Jc,stop_code: WjrZ-Jc, lat: -35.2513107, lng: 149.058664}
+  - { name: WjrZ_Fk,stop_code: WjrZ_Fk, lat: -35.2485228, lng: 149.0588536}
+  - { name: Wjz57tg,stop_code: Wjz57tg, lat: -35.2461188, lng: 149.0669661}
+  - { name: Wjz57Q7,stop_code: Wjz57Q7, lat: -35.2462221, lng: 149.0708857}
+  - { name: Wjz57T_,stop_code: Wjz57T_, lat: -35.2441569, lng: 149.0719751}
+  - { name: Wjz5f2j,stop_code: Wjz5f2j, lat: -35.2479775, lng: 149.0739202}
+  - { name: Wjz5fm2,stop_code: Wjz5fm2, lat: -35.2452775, lng: 149.0763507}
+  - { name: Wjz688N,stop_code: Wjz688N, lat: -35.2439868, lng: 149.0759082}
+  - { name: Wjz68g-,stop_code: Wjz68g-, lat: -35.2436119, lng: 149.0775571}
+  - { name: Wjz5nUz,stop_code: Wjz5nUz, lat: -35.2493715, lng: 149.094909}
+  - { name: Wjz5vjd,stop_code: Wjz5vjd, lat: -35.2470998, lng: 149.0983861}
+  - { name: Wjz5v68,stop_code: Wjz5v68, lat: -35.2454993, lng: 149.0956677}
+  - { name: Wjz6gUM,stop_code: Wjz6gUM, lat: -35.2441052, lng: 149.0951619}
+  - { name: Wjz6gQ0,stop_code: Wjz6gQ0, lat: -35.2413491, lng: 149.0928379}
+  - { name: Wjz6gJc,stop_code: Wjz6gJc, lat: -35.2402968, lng: 149.0916132}
+  - { name: Wjz5vrT,stop_code: Wjz5vrT, lat: -35.2469189, lng: 149.1007523}
+  - { name: Wjz6oEz,stop_code: Wjz6oEz, lat: -35.243821, lng: 149.1030282}
+  - { name: Wjz6oJz,stop_code: Wjz6oJz, lat: -35.2403705, lng: 149.1030403}
+  - { name: Wjz7pfP,stop_code: Wjz7pfP, lat: -35.189616, lng: 149.0978803}
+  - { name: Wjz7p2n,stop_code: Wjz7p2n, lat: -35.1926501, lng: 149.0958323}
+  - { name: Wjz7hZW,stop_code: Wjz7hZW, lat: -35.1910485, lng: 149.0953265}
+  - { name: Wjz7iV0,stop_code: Wjz7iV0, lat: -35.1885169, lng: 149.0941253}
+  - { name: Wjz7iG_,stop_code: Wjz7iG_, lat: -35.1872252, lng: 149.0926713}
+  - { name: Wjz7iKx,stop_code: Wjz7iKx, lat: -35.1849518, lng: 149.0920391}
+  - { name: Wjz7ilp,stop_code: Wjz7ilp, lat: -35.1856235, lng: 149.0877402}
+  - { name: Wjz7i7r,stop_code: Wjz7i7r, lat: -35.1841251, lng: 149.0850218}
+  - { name: Wjz7jaJ,stop_code: Wjz7jaJ, lat: -35.1819033, lng: 149.0868551}
+  - { name: Wjz7jsi,stop_code: Wjz7jsi, lat: -35.1807665, lng: 149.0890046}
+  - { name: Wjz7jW4,stop_code: Wjz7jW4, lat: -35.181955, lng: 149.0941886}
+  - { name: Wjz7qfu,stop_code: Wjz7qfu, lat: -35.1838151, lng: 149.0974127}
+  - { name: Wjz7qvq,stop_code: Wjz7qvq, lat: -35.1841768, lng: 149.1001944}
+  - { name: Wjz7rzg,stop_code: Wjz7rzg, lat: -35.1815933, lng: 149.1014588}
+  - { name: Wjz7qkM,stop_code: Wjz7qkM, lat: -35.1864502, lng: 149.0992461}
+  - { name: Wjz7qwq,stop_code: Wjz7qwq, lat: -35.1890336, lng: 149.101522}
+  - { name: Wjz7pkV,stop_code: Wjz7pkV, lat: -35.1918235, lng: 149.0995622}
+  - { name: Wjz7rOj,stop_code: Wjz7rOj, lat: -35.1820066, lng: 149.104114}
+  - { name: Wjz7rMm,stop_code: Wjz7rMm, lat: -35.1831434, lng: 149.104114}
+  - { name: Wjz7qSX,stop_code: Wjz7qSX, lat: -35.1847968, lng: 149.1050623}
+  - { name: Wjz7q-_,stop_code: Wjz7q-_, lat: -35.1844351, lng: 149.1063899}
+  - { name: Wjz7yfG,stop_code: Wjz7yfG, lat: -35.1841768, lng: 149.108729}
+  - { name: Wjz7r-a,stop_code: Wjz7r-a, lat: -35.1793714, lng: 149.1053784}
+  - { name: Wjz7rRa,stop_code: Wjz7rRa, lat: -35.1800948, lng: 149.1039243}
+  - { name: Wjz7Add,stop_code: Wjz7Add, lat: -35.1743073, lng: 149.10816}
+  - { name: Wjz7B0w,stop_code: Wjz7B0w, lat: -35.1727054, lng: 149.107275}
+  - { name: Wjz7tOr,stop_code: Wjz7tOr, lat: -35.1710517, lng: 149.1042404}
+  - { name: Wjz7txI,stop_code: Wjz7txI, lat: -35.1716718, lng: 149.1018381}
+  - { name: Wjz7thn,stop_code: Wjz7thn, lat: -35.1713618, lng: 149.0985507}
+  - { name: Wjz7tug,stop_code: Wjz7tug, lat: -35.1685711, lng: 149.0999415}
+  - { name: Wjz7tvK,stop_code: Wjz7tvK, lat: -35.1673308, lng: 149.1005105}
+  - { name: Wjz7uxi,stop_code: Wjz7uxi, lat: -35.1663489, lng: 149.1013956}
+  - { name: Wjz7tLG,stop_code: Wjz7tLG, lat: -35.1677443, lng: 149.1032921}
+  - { name: Wjz7tIt,stop_code: Wjz7tIt, lat: -35.169553, lng: 149.1029128}
+  - { name: Wjz7Bg7,stop_code: Wjz7Bg7, lat: -35.1720853, lng: 149.109298}
+  - { name: Wjz7BqG,stop_code: Wjz7BqG, lat: -35.1711551, lng: 149.1115106}
+  - { name: Wjz7BsE,stop_code: Wjz7BsE, lat: -35.1699148, lng: 149.1115106}
+  - { name: Wjz7BC3,stop_code: Wjz7BC3, lat: -35.1683127, lng: 149.1120164}
+  - { name: Wjz7BJK,stop_code: Wjz7BJK, lat: -35.1687262, lng: 149.1142923}
+  - { name: Wjz7BST,stop_code: Wjz7BST, lat: -35.167951, lng: 149.1157463}
+  - { name: Wjz7BED,stop_code: Wjz7BED, lat: -35.1720853, lng: 149.1141026}
+  - { name: Wjz7BWN,stop_code: Wjz7BWN, lat: -35.1712067, lng: 149.1171372}
+  - { name: Wjz7AJS,stop_code: Wjz7AJS, lat: -35.174204, lng: 149.1143555}
+  - { name: Wjz7AGv,stop_code: Wjz7AGv, lat: -35.1762193, lng: 149.113913}
+  - { name: Wjz7AEw,stop_code: Wjz7AEw, lat: -35.1781829, lng: 149.1141659}
+  - { name: Wjz7zzB,stop_code: Wjz7zzB, lat: -35.1811799, lng: 149.1126486}
+  - { name: Wjz7CqJ,stop_code: Wjz7CqJ, lat: -35.1654186, lng: 149.1114474}
+  - { name: Wjz7CA3,stop_code: Wjz7CA3, lat: -35.16423, lng: 149.1119532}
+  - { name: Wjz7CD7,stop_code: Wjz7CD7, lat: -35.1617492, lng: 149.1119532}
+  - { name: Wjz7CKg,stop_code: Wjz7CKg, lat: -35.1630413, lng: 149.1137233}
+  - { name: Wjz7IDY,stop_code: Wjz7IDY, lat: -35.1730154, lng: 149.1242809}
+  - { name: Wjz7If2,stop_code: Wjz7If2, lat: -35.1732221, lng: 149.1188441}
+  - { name: Wjz7Ikc,stop_code: Wjz7Ikc, lat: -35.1750825, lng: 149.1204878}
+  - { name: Wjz7Iax,stop_code: Wjz7Iax, lat: -35.1766844, lng: 149.1196027}
+  - { name: Wjz7HfF,stop_code: Wjz7HfF, lat: -35.178803, lng: 149.1197924}
+  - { name: Wjz7IoZ,stop_code: Wjz7IoZ, lat: -35.1777695, lng: 149.1227637}
+  - { name: Wjz7IFg,stop_code: Wjz7IFg, lat: -35.1774595, lng: 149.1246602}
+  - { name: Wjz7IuJ,stop_code: Wjz7IuJ, lat: -35.1736356, lng: 149.1225108}
+  - { name: Wjz7JP1,stop_code: Wjz7JP1, lat: -35.1705349, lng: 149.1257982}
+  - { name: Wjz7J-7,stop_code: Wjz7J-7, lat: -35.167951, lng: 149.1270626}
+  - { name: Wjz7R6d,stop_code: Wjz7R6d, lat: -35.1681577, lng: 149.1286431}
+  - { name: Wjz7R5z,stop_code: Wjz7R5z, lat: -35.1690363, lng: 149.1291488}
+  - { name: Wjz7RdE,stop_code: Wjz7RdE, lat: -35.169243, lng: 149.1307293}
+  - { name: Wjz7RHe,stop_code: Wjz7RHe, lat: -35.1700698, lng: 149.135534}
+  - { name: Wjz7SN-,stop_code: Wjz7SN-, lat: -35.1660013, lng: 149.1378981}
+  - { name: Wjz7Y0J,stop_code: Wjz7Y0J, lat: -35.177732, lng: 149.1403005}
+  - { name: Wjz7PIc,stop_code: Wjz7PIc, lat: -35.1805599, lng: 149.135534}
+  - { name: Wjz7Pjj,stop_code: Wjz7Pjj, lat: -35.1813349, lng: 149.1316144}
+  - { name: Wjz7GSc,stop_code: Wjz7GSc, lat: -35.1847451, lng: 149.1258614}
+  - { name: Wjz7yNW,stop_code: Wjz7yNW, lat: -35.1883262, lng: 149.1159763}
+  - { name: Wjz7Ppw,stop_code: Wjz7Ppw, lat: -35.1829884, lng: 149.1332581}
+  - { name: Wjz7OBc,stop_code: Wjz7OBc, lat: -35.1853732, lng: 149.1341431}
+  - { name: Wjz7PNV,stop_code: Wjz7PNV, lat: -35.1828992, lng: 149.1380246}
+  - { name: Wjz7X2n,stop_code: Wjz7X2n, lat: -35.1817108, lng: 149.1398579}
+  - { name: Wjz7X3O,stop_code: Wjz7X3O, lat: -35.1814007, lng: 149.1404901}
+  - { name: Wjz7Xiv,stop_code: Wjz7Xiv, lat: -35.1817108, lng: 149.1427028}
+  - { name: Wjz7XxD,stop_code: Wjz7XxD, lat: -35.1823825, lng: 149.1457373}
+  - { name: Wjzf31y,stop_code: Wjzf31y, lat: -35.1828475, lng: 149.151111}
+  - { name: Wjzf2hJ,stop_code: Wjzf2hJ, lat: -35.1880144, lng: 149.154019}
+  - { name: Wjzf2rm,stop_code: Wjzf2rm, lat: -35.1865677, lng: 149.1549041}
+  - { name: Wjzf1X3,stop_code: Wjzf1X3, lat: -35.1923543, lng: 149.1600249}
+  - { name: Wjzf91m,stop_code: Wjzf91m, lat: -35.1934909, lng: 149.1618582}
+  - { name: Wjzf0ZL,stop_code: Wjzf0ZL, lat: -35.1961257, lng: 149.1609099}
+  - { name: Wjzf0EJ,stop_code: Wjzf0EJ, lat: -35.1997419, lng: 149.1581283}
+  - { name: Wjze7Cp,stop_code: Wjze7Cp, lat: -35.2014466, lng: 149.1565478}
+  - { name: Wjz6_vY,stop_code: Wjz6_vY, lat: -35.2004651, lng: 149.1448522}
+  - { name: Wjz6_7M,stop_code: Wjz6_7M, lat: -35.2008784, lng: 149.1404901}
+  - { name: Wjz6TZN,stop_code: Wjz6TZN, lat: -35.2021182, lng: 149.1392257}
+  - { name: Wjz7Oal,stop_code: Wjz7Oal, lat: -35.1873286, lng: 149.1301603}
+  - { name: Wjz7GPB,stop_code: Wjz7GPB, lat: -35.1867085, lng: 149.1264936}
+  - { name: Wjz7Gxm,stop_code: Wjz7Gxm, lat: -35.188002, lng: 149.1234035}
+  - { name: Wjz7Fmf,stop_code: Wjz7Fmf, lat: -35.1899217, lng: 149.1203537}
+  - { name: Wjz7F5C,stop_code: Wjz7F5C, lat: -35.1906966, lng: 149.118141}
+  - { name: Wjz7xO6,stop_code: Wjz7xO6, lat: -35.1928051, lng: 149.1147348}
+  - { name: Wjz7xJz,stop_code: Wjz7xJz, lat: -35.191011, lng: 149.1141277}
+  - { name: Wjz7wZg,stop_code: Wjz7wZg, lat: -35.1967555, lng: 149.1165529}
+  - { name: Wjz7E3Z,stop_code: Wjz7E3Z, lat: -35.1976337, lng: 149.1187656}
+  - { name: Wjz7EjH,stop_code: Wjz7EjH, lat: -35.1978404, lng: 149.1211679}
+  - { name: Wjz7Ezf,stop_code: Wjz7Ezf, lat: -35.1975304, lng: 149.1231277}
+  - { name: Wjz7EJ7,stop_code: Wjz7EJ7, lat: -35.1960839, lng: 149.1244553}
+  - { name: Wjz7FNw,stop_code: Wjz7FNw, lat: -35.193955, lng: 149.126474}
+  - { name: Wjz6-16,stop_code: Wjz6-16, lat: -35.20994, lng: 149.1394383}
+  - { name: Wjz6RQW,stop_code: Wjz6RQW, lat: -35.2136848, lng: 149.1379368}
+  - { name: Wjz6Zb2,stop_code: Wjz6Zb2, lat: -35.214395, lng: 149.1408607}
+  - { name: Wjz6Z8D,stop_code: Wjz6Z8D, lat: -35.216009, lng: 149.1414929}
+  - { name: Wjz6QTd,stop_code: Wjz6QTd, lat: -35.2168483, lng: 149.1369095}
+  - { name: Wjz6QPM,stop_code: Wjz6QPM, lat: -35.2200763, lng: 149.1377788}
+  - { name: Wjz6Yc1,stop_code: Wjz6Yc1, lat: -35.2193016, lng: 149.1407817}
+  - { name: Wjz6Yaq,stop_code: Wjz6Yaq, lat: -35.2205928, lng: 149.1414139}
+  - { name: Wjz6YiM,stop_code: Wjz6YiM, lat: -35.2207864, lng: 149.1433105}
+  - { name: Wjz6XiO,stop_code: Wjz6XiO, lat: -35.226071, lng: 149.143256}
+  - { name: Wjz6Wse,stop_code: Wjz6Wse, lat: -35.2298796, lng: 149.1438091}
+  - { name: Wjze2eG,stop_code: Wjze2eG, lat: -35.2288072, lng: 149.1527323}
+  - { name: Wjze3gN,stop_code: Wjze3gN, lat: -35.2275265, lng: 149.154199}
+  - { name: Wjze3Fa,stop_code: Wjze3Fa, lat: -35.2267416, lng: 149.1575876}
+  - { name: Wjze3Vq,stop_code: Wjze3Vq, lat: -35.2267416, lng: 149.1606727}
+  - { name: Wjzebjj,stop_code: Wjzebjj, lat: -35.2253369, lng: 149.1645164}
+  - { name: Wjzeaq_,stop_code: Wjzeaq_, lat: -35.2311306, lng: 149.1668636}
+  - { name: Wjze8v0,stop_code: Wjze8v0, lat: -35.2393099, lng: 149.1654981}
+  - { name: Wjze8bf,stop_code: Wjze8bf, lat: -35.2414165, lng: 149.1630705}
+  - { name: Wjze0VY,stop_code: Wjze0VY, lat: -35.2430274, lng: 149.1613003}
+  - { name: Wjze0Pi,stop_code: Wjze0Pi, lat: -35.2418709, lng: 149.1591256}
+  - { name: Wjze0vR,stop_code: Wjze0vR, lat: -35.2388968, lng: 149.1555853}
+  - { name: Wjze1hB,stop_code: Wjze1hB, lat: -35.2374923, lng: 149.1539669}
+  - { name: Wjze1c2,stop_code: Wjze1c2, lat: -35.2356747, lng: 149.1518427}
+  - { name: Wjze17N,stop_code: Wjze17N, lat: -35.2336919, lng: 149.1515898}
+  - { name: Wjze1gi,stop_code: Wjze1gi, lat: -35.2384424, lng: 149.1535117}
+  - { name: Wjz6UYK,stop_code: Wjz6UYK, lat: -35.2407969, lng: 149.1499714}
+  - { name: Wjz6UQw,stop_code: Wjz6UQw, lat: -35.2413339, lng: 149.1484036}
+  - { name: Wjz6Upu,stop_code: Wjz6Upu, lat: -35.2429035, lng: 149.1442058}
+  - { name: Wjz6Ugw,stop_code: Wjz6Ugw, lat: -35.2441014, lng: 149.142992}
+  - { name: Wjz5_mg,stop_code: Wjz5_mg, lat: -35.2454644, lng: 149.1425874}
+  - { name: Wjz5_ie,stop_code: Wjz5_ie, lat: -35.2476948, lng: 149.1423851}
+  - { name: Wjz5_y0,stop_code: Wjz5_y0, lat: -35.2482318, lng: 149.1449139}
+  - { name: Wjz5_O4,stop_code: Wjz5_O4, lat: -35.24786, lng: 149.147645}
+  - { name: Wjzd73N,stop_code: Wjzd73N, lat: -35.2474057, lng: 149.1515393}
+  - { name: Wjzd7sL,stop_code: Wjzd7sL, lat: -35.2462079, lng: 149.1554841}
+  - { name: Wjzd7LX,stop_code: Wjzd7LX, lat: -35.2445144, lng: 149.1586198}
+  - { name: Wjzd7_6,stop_code: Wjzd7_6, lat: -35.2443079, lng: 149.1601371}
+  - { name: Wjzdfaz,stop_code: Wjzdfaz, lat: -35.2479426, lng: 149.1635256}
+  - { name: WjzdeeQ,stop_code: WjzdeeQ, lat: -35.2506237, lng: 149.1639253}
+  - { name: Wjzd6XP,stop_code: Wjzd6XP, lat: -35.2527713, lng: 149.1610527}
+  - { name: Wjzd6Pn,stop_code: Wjzd6Pn, lat: -35.2524079, lng: 149.1590701}
+  - { name: Wjzd6Cq,stop_code: Wjzd6Cq, lat: -35.2507889, lng: 149.1563997}
+  - { name: Wjzd6lW,stop_code: Wjzd6lW, lat: -35.2515158, lng: 149.1544172}
+  - { name: Wjzd6iW,stop_code: Wjzd6iW, lat: -35.2535643, lng: 149.1544576}
+  - { name: Wjzd68O,stop_code: Wjzd68O, lat: -35.254952, lng: 149.1528797}
+  - { name: Wjz5ZZQ,stop_code: Wjz5ZZQ, lat: -35.2567691, lng: 149.1500474}
+  - { name: Wjz5ZO1,stop_code: Wjz5ZO1, lat: -35.2591479, lng: 149.1477412}
+  - { name: Wjz5-5y,stop_code: Wjz5-5y, lat: -35.2514497, lng: 149.1400942}
+  - { name: Wjz5SWN,stop_code: Wjz5SWN, lat: -35.2535974, lng: 149.1390827}
+  - { name: Wjz5Z5c,stop_code: Wjz5Z5c, lat: -35.2568022, lng: 149.1396491}
+  - { name: Wjz5Za5,stop_code: Wjz5Za5, lat: -35.2588175, lng: 149.1409439}
+  - { name: Wjz5YfD,stop_code: Wjz5YfD, lat: -35.2606676, lng: 149.1416317}
+  - { name: Wjz5YKO,stop_code: Wjz5YKO, lat: -35.2618095, lng: 149.1473796}
+  - { name: Wjz5YAK,stop_code: Wjz5YAK, lat: -35.2627902, lng: 149.1458623}
+  - { name: Wjz5Yq4,stop_code: Wjz5Yq4, lat: -35.2643388, lng: 149.1435864}
+  - { name: Wjz5XnQ,stop_code: Wjz5XnQ, lat: -35.2664452, lng: 149.1432384}
+  - { name: Wjz5XrS,stop_code: Wjz5XrS, lat: -35.2689744, lng: 149.1446925}
+  - { name: Wjz5XwW,stop_code: Wjz5XwW, lat: -35.2714003, lng: 149.1461465}
+  - { name: Wjz5W3H,stop_code: Wjz5W3H, lat: -35.2747063, lng: 149.1403907}
+  - { name: Wjz5W8l,stop_code: Wjz5W8l, lat: -35.276623, lng: 149.1411209}
+  - { name: Wjz5Ycz,stop_code: Wjz5Ycz, lat: -35.2631, lng: 149.1415634}
+  - { name: Wjz5Y1_,stop_code: Wjz5Y1_, lat: -35.2648034, lng: 149.1406151}
+  - { name: Wjz5QUd,stop_code: Wjz5QUd, lat: -35.2656089, lng: 149.1383392}
+  - { name: Wjz5PLJ,stop_code: Wjz5PLJ, lat: -35.2663315, lng: 149.136253}
+  - { name: Wjz5PBC,stop_code: Wjz5PBC, lat: -35.2675907, lng: 149.1347357}
+  - { name: Wjz5Pwn,stop_code: Wjz5Pwn, lat: -35.2709457, lng: 149.1344196}
+  - { name: Wjz5OLh,stop_code: Wjz5OLh, lat: -35.2721844, lng: 149.135684}
+  - { name: Wjz5OIf,stop_code: Wjz5OIf, lat: -35.2737328, lng: 149.1354944}
+  - { name: Wjz5OOo,stop_code: Wjz5OOo, lat: -35.2757106, lng: 149.1372297}
+  - { name: Wjz5V64,stop_code: Wjz5V64, lat: -35.2780918, lng: 149.1394963}
+  - { name: Wjz5NRJ,stop_code: Wjz5NRJ, lat: -35.2787111, lng: 149.1375365}
+  - { name: Wjz5NHD,stop_code: Wjz5NHD, lat: -35.2798744, lng: 149.1361266}
+  - { name: Wjz5Vls,stop_code: Wjz5Vls, lat: -35.2787911, lng: 149.1427895}
+  - { name: Wjz5VAq,stop_code: Wjz5VAq, lat: -35.2796604, lng: 149.14553}
+  - { name: Wjz5VFA,stop_code: Wjz5VFA, lat: -35.2815441, lng: 149.146984}
+  - { name: Wjz5VUU,stop_code: Wjz5VUU, lat: -35.2825429, lng: 149.15037}
+  - { name: Wjzd0CK,stop_code: Wjzd0CK, lat: -35.283446, lng: 149.156771}
+  - { name: Wjzd8br,stop_code: Wjzd8br, lat: -35.2857037, lng: 149.16333}
+  - { name: Wjzd0yM,stop_code: Wjzd0yM, lat: -35.2866868, lng: 149.1570161}
+  - { name: Wjzc7nq,stop_code: Wjzc7nq, lat: -35.2885152, lng: 149.1537353}
+  - { name: Wjzd02s,stop_code: Wjzd02s, lat: -35.286331, lng: 149.1509776}
+  - { name: Wjz5UHK,stop_code: Wjz5UHK, lat: -35.2854924, lng: 149.1472635}
+  - { name: Wjz5Urj,stop_code: Wjz5Urj, lat: -35.285706, lng: 149.144029}
+  - { name: Wjz5Vg4,stop_code: Wjz5Vg4, lat: -35.2821666, lng: 149.1422877}
+  - { name: Wjzd0EU,stop_code: Wjzd0EU, lat: -35.2880133, lng: 149.158501}
+  - { name: Wjzc7Ay,stop_code: Wjzc7Ay, lat: -35.2905765, lng: 149.1566757}
+  - { name: Wjzc7si,stop_code: Wjzc7si, lat: -35.2905765, lng: 149.1549056}
+  - { name: Wjzc7bs,stop_code: Wjzc7bs, lat: -35.2911202, lng: 149.1523397}
+  - { name: Wjz4_Oj,stop_code: Wjz4_Oj, lat: -35.2918933, lng: 149.1481428}
+  - { name: Wjz4_wS,stop_code: Wjz4_wS, lat: -35.2930129, lng: 149.145973}
+  - { name: Wjz4_jm,stop_code: Wjz4_jm, lat: -35.2909901, lng: 149.1425844}
+  - { name: Wjz4T-X,stop_code: Wjz4T-X, lat: -35.2891325, lng: 149.1393476}
+  - { name: Wjz5MEL,stop_code: Wjz5MEL, lat: -35.2874399, lng: 149.1362625}
+  - { name: Wjzce4H,stop_code: Wjzce4H, lat: -35.2960675, lng: 149.1623594}
+  - { name: WjzceHt,stop_code: WjzceHt, lat: -35.2965216, lng: 149.168833}
+  - { name: WjzceFT,stop_code: WjzceFT, lat: -35.2977187, lng: 149.1693894}
+  - { name: WjzcdDs,stop_code: WjzcdDs, lat: -35.299411, lng: 149.1675181}
+  - { name: Wjzcdsn,stop_code: Wjzcdsn, lat: -35.3011446, lng: 149.1659502}
+  - { name: Wjzcdi7,stop_code: Wjzcdi7, lat: -35.3025893, lng: 149.1642813}
+  - { name: Wjzcd8D,stop_code: Wjzcd8D, lat: -35.3039101, lng: 149.1635732}
+  - { name: Wjzcd2U,stop_code: Wjzcd2U, lat: -35.3031671, lng: 149.1626628}
+  - { name: Wjzc59p,stop_code: Wjzc59p, lat: -35.3037863, lng: 149.1523455}
+  - { name: Wjzc45R,stop_code: Wjzc45R, lat: -35.3061389, lng: 149.1514351}
+  - { name: Wjz4WnH,stop_code: Wjz4WnH, lat: -35.3159201, lng: 149.1430396}
+  - { name: Wjz4VKr,stop_code: Wjz4VKr, lat: -35.3221513, lng: 149.1468833}
+  - { name: Wjz4VRQ,stop_code: Wjz4VRQ, lat: -35.3226878, lng: 149.148704}
+  - { name: Wjz4Ofi,stop_code: Wjz4Ofi, lat: -35.3160439, lng: 149.1301934}
+  - { name: Wjz4FEJ,stop_code: Wjz4FEJ, lat: -35.3260887, lng: 149.125286}
+  - { name: Wjz4ECF,stop_code: Wjz4ECF, lat: -35.3278218, lng: 149.1238193}
+  - { name: Wjz4EG2,stop_code: Wjz4EG2, lat: -35.3304213, lng: 149.1244262}
+  - { name: Wjz3LP9,stop_code: Wjz3LP9, lat: -35.3353724, lng: 149.1259941}
+  - { name: Wjz3LN9,stop_code: Wjz3LN9, lat: -35.3367339, lng: 149.1259435}
+  - { name: Wjz3KLn,stop_code: Wjz3KLn, lat: -35.3376003, lng: 149.1247297}
+  - { name: Wjz4MAz,stop_code: Wjz4MAz, lat: -35.3290192, lng: 149.1346333}
+  - { name: Wjz4NWF,stop_code: Wjz4NWF, lat: -35.3250038, lng: 149.138898}
+  - { name: Wjz4Ue5,stop_code: Wjz4Ue5, lat: -35.327397, lng: 149.140921}
+  - { name: Wjz4Ujk,stop_code: Wjz4Ujk, lat: -35.3295839, lng: 149.1425394}
+  - { name: Wjz3_sf,stop_code: Wjz3_sf, lat: -35.3341586, lng: 149.1437982}
+  - { name: Wjz3_Ji,stop_code: Wjz3_Ji, lat: -35.3339111, lng: 149.146681}
+  - { name: Wjz4UwD,stop_code: Wjz4UwD, lat: -35.3313913, lng: 149.1456952}
+  - { name: Wjz4UIv,stop_code: Wjz4UIv, lat: -35.328635, lng: 149.1467867}
+  - { name: Wjz4VEF,stop_code: Wjz4VEF, lat: -35.3264205, lng: 149.1472235}
+  - { name: Wjzc1n0,stop_code: Wjzc1n0, lat: -35.3216636, lng: 149.1532292}
+  - { name: Wjz4UYU,stop_code: Wjz4UYU, lat: -35.3292631, lng: 149.1503427}
+  - { name: Wjzc090,stop_code: Wjzc090, lat: -35.3312849, lng: 149.15186}
+  - { name: Wjzb7nW,stop_code: Wjzb7nW, lat: -35.3324815, lng: 149.1544899}
+  - { name: Wjz3KB0,stop_code: Wjz3KB0, lat: -35.3395291, lng: 149.1229469}
+  - { name: Wjz3Kxb,stop_code: Wjz3Kxb, lat: -35.342056, lng: 149.1231366}
+  - { name: Wjz3JDp,stop_code: Wjz3JDp, lat: -35.3435515, lng: 149.1235159}
+  - { name: Wjz3JJs,stop_code: Wjz3JJs, lat: -35.344686, lng: 149.1248435}
+  - { name: Wjz3JQO,stop_code: Wjz3JQO, lat: -35.3455626, lng: 149.1268033}
+  - { name: Wjz3Rdo,stop_code: Wjz3Rdo, lat: -35.3450469, lng: 149.1304068}
+  - { name: Wjz3ShE,stop_code: Wjz3ShE, lat: -35.3422498, lng: 149.1321257}
+  - { name: Wjz3Slx,stop_code: Wjz3Slx, lat: -35.3394651, lng: 149.131936}
+  - { name: Wjz3T8Z,stop_code: Wjz3T8Z, lat: -35.337043, lng: 149.1311337}
+  - { name: Wjz4MpW,stop_code: Wjz4MpW, lat: -35.3311406, lng: 149.1338209}
+  - { name: Wjz3TJe,stop_code: Wjz3TJe, lat: -35.3335378, lng: 149.135468}
+  - { name: Wjz3-Jb,stop_code: Wjz3-Jb, lat: -35.3392754, lng: 149.1466095}
+  - { name: Wjzb6cp,stop_code: Wjzb6cp, lat: -35.3401203, lng: 149.1523581}
+  - { name: Wjzb79X,stop_code: Wjzb79X, lat: -35.3365565, lng: 149.1529783}
+  - { name: Wjzb7wf,stop_code: Wjzb7wf, lat: -35.3368722, lng: 149.1561338}
+  - { name: Wjzb6EM,stop_code: Wjzb6EM, lat: -35.342941, lng: 149.1583643}
+  - { name: Wjzb7HN,stop_code: Wjzb7HN, lat: -35.335349, lng: 149.1583716}
+  - { name: Wjzb7S4,stop_code: Wjzb7S4, lat: -35.3330282, lng: 149.1586877}
+  - { name: Wjzb7Cp,stop_code: Wjzb7Cp, lat: -35.333286, lng: 149.156475}
+  - { name: Wjz3SUA,stop_code: Wjz3SUA, lat: -35.3426508, lng: 149.1388551}
+  - { name: Wjzb4vx,stop_code: Wjzb4vx, lat: -35.3490259, lng: 149.1553622}
+  - { name: Wjz3YW3,stop_code: Wjz3YW3, lat: -35.3523419, lng: 149.1490844}
+  - { name: Wjzc1tq,stop_code: Wjzc1tq, lat: -35.3228774, lng: 149.1550358}
+  - { name: Wjzbfnr,stop_code: Wjzbfnr, lat: -35.332383, lng: 149.1647873}
+  - { name: Wjzc9PB,stop_code: Wjzc9PB, lat: -35.3239975, lng: 149.1704393}
+  - { name: Wjzc9WV,stop_code: Wjzc9WV, lat: -35.3250576, lng: 149.1722805}
+  - { name: WjzchQP,stop_code: WjzchQP, lat: -35.3235189, lng: 149.1817987}
+  - { name: Wjzcp0F,stop_code: Wjzcp0F, lat: -35.3263698, lng: 149.1843675}
+  - { name: Wjzcod5,stop_code: Wjzcod5, lat: -35.3281204, lng: 149.1848684}
+  - { name: Wjzcoab,stop_code: Wjzcoab, lat: -35.3303968, lng: 149.1849583}
+  - { name: Wjzcg-_,stop_code: Wjzcg-_, lat: -35.3272591, lng: 149.1832438}
+  - { name: WjzcgX_,stop_code: WjzcgX_, lat: -35.3293219, lng: 149.1833416}
+  - { name: WjzcgSm,stop_code: WjzcgSm, lat: -35.3273624, lng: 149.1809901}
+  - { name: Wjz3r_u,stop_code: Wjz3r_u, lat: -35.3540946, lng: 149.1057023}
+  - { name: Wjz3rQi,stop_code: Wjz3rQi, lat: -35.3565695, lng: 149.104185}
+  - { name: Wjz3rML,stop_code: Wjz3rML, lat: -35.3588381, lng: 149.1045644}
+  - { name: Wjz3z0c,stop_code: Wjz3z0c, lat: -35.3591474, lng: 149.106777}
+  - { name: Wjz3y4z,stop_code: Wjz3y4z, lat: -35.3619315, lng: 149.1072828}
+  - { name: Wjz3y9z,stop_code: Wjz3y9z, lat: -35.3640453, lng: 149.1086104}
+  - { name: Wjz3pZQ,stop_code: Wjz3pZQ, lat: -35.366623, lng: 149.1062713}
+  - { name: Wjz3x3A,stop_code: Wjz3x3A, lat: -35.3680664, lng: 149.1072196}
+  - { name: Wjz3xi3,stop_code: Wjz3xi3, lat: -35.3688397, lng: 149.1093058}
+  - { name: Wjz3xwa,stop_code: Wjz3xwa, lat: -35.3702316, lng: 149.1122771}
+  - { name: Wjz3wrK,stop_code: Wjz3wrK, lat: -35.3733761, lng: 149.1115817}
+  - { name: Wjz3woC,stop_code: Wjz3woC, lat: -35.3754381, lng: 149.1112656}
+  - { name: Wjz2DK6,stop_code: Wjz2DK6, lat: -35.3767783, lng: 149.1134151}
+  - { name: Wjz2DPD,stop_code: Wjz2DPD, lat: -35.378737, lng: 149.1155013}
+  - { name: Wjz2DEs,stop_code: Wjz2DEs, lat: -35.3811081, lng: 149.1139208}
+  - { name: Wjz2Dgb,stop_code: Wjz2Dgb, lat: -35.381175, lng: 149.10938}
+  - { name: Wjz2C5I,stop_code: Wjz2C5I, lat: -35.3831852, lng: 149.1074202}
+  - { name: Wjz2uSZ,stop_code: Wjz2uSZ, lat: -35.3823742, lng: 149.1050643}
+  - { name: Wjz2vzR,stop_code: Wjz2vzR, lat: -35.3789646, lng: 149.1019944}
+  - { name: Wjz2vL4,stop_code: Wjz2vL4, lat: -35.3762782, lng: 149.1023627}
+  - { name: Wjz3ops,stop_code: Wjz3ops, lat: -35.3749061, lng: 149.1001427}
+  - { name: Wjz3oih,stop_code: Wjz3oih, lat: -35.3744422, lng: 149.0986886}
+  - { name: Wjz3oeM,stop_code: Wjz3oeM, lat: -35.3718451, lng: 149.0980006}
+  - { name: Wjz3hUs,stop_code: Wjz3hUs, lat: -35.370077, lng: 149.0946389}
+  - { name: Wjz3hXO,stop_code: Wjz3hXO, lat: -35.3681696, lng: 149.0952079}
+  - { name: Wjz3peD,stop_code: Wjz3peD, lat: -35.3657466, lng: 149.0976102}
+  - { name: Wjz3oge,stop_code: Wjz3oge, lat: -35.3754535, lng: 149.0983799}
+  - { name: Wjz3gUQ,stop_code: Wjz3gUQ, lat: -35.3755566, lng: 149.0951557}
+  - { name: Wjz2nLE,stop_code: Wjz2nLE, lat: -35.3766237, lng: 149.0922366}
+  - { name: Wjz2nug,stop_code: Wjz2nug, lat: -35.3773453, lng: 149.0890124}
+  - { name: Wjz2f_R,stop_code: Wjz2f_R, lat: -35.3761632, lng: 149.0842481}
+  - { name: Wjz3gcu,stop_code: Wjz3gcu, lat: -35.3726637, lng: 149.0864364}
+  - { name: Wjz3g7D,stop_code: Wjz3g7D, lat: -35.3705636, lng: 149.085208}
+  - { name: Wjz3gB5,stop_code: Wjz3gB5, lat: -35.3720623, lng: 149.0900243}
+  - { name: Wjz2k5E,stop_code: Wjz2k5E, lat: -35.3945084, lng: 149.0853457}
+  - { name: Wjz2c-r,stop_code: Wjz2c-r, lat: -35.3935292, lng: 149.0837652}
+  - { name: Wjz2cKo,stop_code: Wjz2cKo, lat: -35.3937869, lng: 149.0809204}
+  - { name: Wjz2crQ,stop_code: Wjz2crQ, lat: -35.3954875, lng: 149.0787077}
+  - { name: Wjz2civ,stop_code: Wjz2civ, lat: -35.3959622, lng: 149.0767882}
+  - { name: Wjz2kbO,stop_code: Wjz2kbO, lat: -35.3956421, lng: 149.0869894}
+  - { name: Wjz2lDC,stop_code: Wjz2lDC, lat: -35.3870716, lng: 149.090679}
+  - { name: Wjz2mGO,stop_code: Wjz2mGO, lat: -35.3853996, lng: 149.0925014}
+  - { name: Wjz2u2j,stop_code: Wjz2u2j, lat: -35.3853192, lng: 149.095863}
+  - { name: Wjz2ugd,stop_code: Wjz2ugd, lat: -35.3865047, lng: 149.0985182}
+  - { name: Wjz2ttB,stop_code: Wjz2ttB, lat: -35.3885662, lng: 149.1004148}
+  - { name: Wjz2tyn,stop_code: Wjz2tyn, lat: -35.3904732, lng: 149.1013631}
+  - { name: Wjz2sLr,stop_code: Wjz2sLr, lat: -35.3928439, lng: 149.1028803}
+  - { name: Wjz2rN0,stop_code: Wjz2rN0, lat: -35.4027536, lng: 149.1038057}
+  - { name: Wjz2qJ7,stop_code: Wjz2qJ7, lat: -35.4048663, lng: 149.1024781}
+  - { name: Wjz2r9X,stop_code: Wjz2r9X, lat: -35.4024569, lng: 149.098142}
+  - { name: Wjz2jPU,stop_code: Wjz2jPU, lat: -35.401368, lng: 149.0939538}
+  - { name: Wjz2jFF,stop_code: Wjz2jFF, lat: -35.4026479, lng: 149.0922959}
+  - { name: Wjz2isR,stop_code: Wjz2isR, lat: -35.4057431, lng: 149.0896883}
+  - { name: Wjz2iwA,stop_code: Wjz2iwA, lat: -35.4085873, lng: 149.0906768}
+  - { name: Wjz2iVd,stop_code: Wjz2iVd, lat: -35.4077519, lng: 149.0942596}
+  - { name: Wjz2q9z,stop_code: Wjz2q9z, lat: -35.4079064, lng: 149.0976735}
+  - { name: Wjz2pmy,stop_code: Wjz2pmy, lat: -35.4100705, lng: 149.0990011}
+  - { name: Wjz2F6d,stop_code: Wjz2F6d, lat: -35.4098598, lng: 149.1177053}
+  - { name: Wjz2xyM,stop_code: Wjz2xyM, lat: -35.4130074, lng: 149.113099}
+  - { name: Wjz2xq1,stop_code: Wjz2xq1, lat: -35.4129044, lng: 149.1106334}
+  - { name: Wjz2pVO,stop_code: Wjz2pVO, lat: -35.4135227, lng: 149.1062081}
+  - { name: Wjz2oQE,stop_code: Wjz2oQE, lat: -35.4171292, lng: 149.1046908}
+  - { name: Wjz2yQZ,stop_code: Wjz2yQZ, lat: -35.4057423, lng: 149.116007}
+  - { name: Wjz2Gff,stop_code: Wjz2Gff, lat: -35.403475, lng: 149.1191048}
+  - { name: Wjz2Gu5,stop_code: Wjz2Gu5, lat: -35.404351, lng: 149.1216336}
+  - { name: Wjz2G9R,stop_code: Wjz2G9R, lat: -35.4077654, lng: 149.1199409}
+  - { name: Wjz2FDo,stop_code: Wjz2FDo, lat: -35.4095553, lng: 149.1235301}
+  - { name: Wjz2F_q,stop_code: Wjz2F_q, lat: -35.4093651, lng: 149.1276548}
+  - { name: Wjz2N0r,stop_code: Wjz2N0r, lat: -35.4141264, lng: 149.128949}
+  - { name: Wjz2EB6,stop_code: Wjz2EB6, lat: -35.4159442, lng: 149.1230876}
+  - { name: Wjz1BFG,stop_code: Wjz1BFG, lat: -35.4354872, lng: 149.1142337}
+  - { name: Wjz1CS7,stop_code: Wjz1CS7, lat: -35.4261448, lng: 149.1147427}
+  - { name: Wjz1Dap,stop_code: Wjz1Dap, lat: -35.4239297, lng: 149.1084839}
+  - { name: Wjz1Dlj,stop_code: Wjz1Dlj, lat: -35.4217144, lng: 149.1096219}
+  - { name: Wjz1C75,stop_code: Wjz1C75, lat: -35.4256297, lng: 149.1065242}
+  - { name: Wjz1vMs,stop_code: Wjz1vMs, lat: -35.4250115, lng: 149.1042483}
+  - { name: Wjz1vJN,stop_code: Wjz1vJN, lat: -35.4218175, lng: 149.1034264}
+  - { name: Wjz2w0e,stop_code: Wjz2w0e, lat: -35.4193446, lng: 149.106777}
+  - { name: Wjz2osQ,stop_code: Wjz2osQ, lat: -35.4167685, lng: 149.1006448}
+  - { name: Wjz2o8V,stop_code: Wjz2o8V, lat: -35.4197567, lng: 149.0980528}
+  - { name: Wjz1v6h,stop_code: Wjz1v6h, lat: -35.4211477, lng: 149.0958401}
+  - { name: Wjz1v2R,stop_code: Wjz1v2R, lat: -35.423569, lng: 149.0965355}
+  - { name: Wjz1viP,stop_code: Wjz1viP, lat: -35.4237236, lng: 149.0993804}
+  - { name: Wjz1BrK,stop_code: Wjz1BrK, lat: -35.4337687, lng: 149.1114553}
+  - { name: Wjz1B9T,stop_code: Wjz1B9T, lat: -35.4350564, lng: 149.1089897}
+  - { name: Wjz1tYG,stop_code: Wjz1tYG, lat: -35.4334596, lng: 149.1060816}
+  - { name: Wjz1tR7,stop_code: Wjz1tR7, lat: -35.4323264, lng: 149.1038057}
+  - { name: Wjz1tE0,stop_code: Wjz1tE0, lat: -35.4363442, lng: 149.1024781}
+  - { name: Wjz1tok,stop_code: Wjz1tok, lat: -35.4359836, lng: 149.0999494}
+  - { name: Wjz1tbe,stop_code: Wjz1tbe, lat: -35.4337687, lng: 149.0971677}
+  - { name: Wjz1lQS,stop_code: Wjz1lQS, lat: -35.4330991, lng: 149.0938171}
+  - { name: Wjz1lyA,stop_code: Wjz1lyA, lat: -35.4346444, lng: 149.0907826}
+  - { name: Wjz1lB8,stop_code: Wjz1lB8, lat: -35.4329445, lng: 149.0902136}
+  - { name: Wjz1gBy,stop_code: Wjz1gBy, lat: -35.4601891, lng: 149.0907826}
+  - { name: Wjz0nS3,stop_code: Wjz0nS3, lat: -35.4649778, lng: 149.0928056}
+  - { name: Wjz0v3X,stop_code: Wjz0v3X, lat: -35.4670374, lng: 149.0967252}
+  - { name: Wjz0unz,stop_code: Wjz0unz, lat: -35.4697663, lng: 149.0990011}
+  - { name: Wjz0uuZ,stop_code: Wjz0uuZ, lat: -35.4702296, lng: 149.1008976}
+  - { name: Wjz0uQv,stop_code: Wjz0uQv, lat: -35.4714653, lng: 149.1043747}
+  - { name: Wjz0C4B,stop_code: Wjz0C4B, lat: -35.4716198, lng: 149.1071563}
+  - { name: Wjz0CcV,stop_code: Wjz0CcV, lat: -35.4719802, lng: 149.1091794}
+  - { name: Wjz0Cpn,stop_code: Wjz0Cpn, lat: -35.4735247, lng: 149.1110759}
+  - { name: Wjz0Bv9,stop_code: Wjz0Bv9, lat: -35.4753782, lng: 149.1107598}
+  - { name: Wjz0B6Y,stop_code: Wjz0B6Y, lat: -35.4758415, lng: 149.1077253}
+  - { name: Wjz0t_T,stop_code: Wjz0t_T, lat: -35.4749148, lng: 149.1061448}
+  - { name: Wjz0tB4,stop_code: Wjz0tB4, lat: -35.4765623, lng: 149.1010241}
+  - { name: Wjz0tno,stop_code: Wjz0tno, lat: -35.4754811, lng: 149.0988746}
+  - { name: Wjz0u92,stop_code: Wjz0u92, lat: -35.4739881, lng: 149.0969148}
+  - { name: Wjz0mMT,stop_code: Wjz0mMT, lat: -35.474194, lng: 149.0937539}
+  - { name: Wjz0lYC,stop_code: Wjz0lYC, lat: -35.4770256, lng: 149.0948286}
+  - { name: Wjz0t9g,stop_code: Wjz0t9g, lat: -35.4795997, lng: 149.0972309}
+  - { name: Wjz0kYJ,stop_code: Wjz0kYJ, lat: -35.482637, lng: 149.0950815}
+  - { name: Wjz0kHU,stop_code: Wjz0kHU, lat: -35.4837695, lng: 149.0925527}
+  - { name: Wjz0klX,stop_code: Wjz0klX, lat: -35.4821222, lng: 149.0884434}
+  - { name: Wjz0lhu,stop_code: Wjz0lhu, lat: -35.4790849, lng: 149.0878745}
+  - { name: Wjz0lcW,stop_code: Wjz0lcW, lat: -35.477386, lng: 149.0870526}
+  - { name: Wjz0eVg,stop_code: Wjz0eVg, lat: -35.4740911, lng: 149.0835756}
+  - { name: Wjz0eRx,stop_code: Wjz0eRx, lat: -35.4713109, lng: 149.0824376}
+  - { name: Wjz0m65,stop_code: Wjz0m65, lat: -35.4702811, lng: 149.0845871}
+  - { name: Wjz0n3A,stop_code: Wjz0n3A, lat: -35.4669344, lng: 149.0852193}
+  - { name: Wjz1gaC,stop_code: Wjz1gaC, lat: -35.4619398, lng: 149.0865469}
+  - { name: Wjz1gnx,stop_code: Wjz1gnx, lat: -35.4589532, lng: 149.0880641}
+  - { name: Wjz1h9y,stop_code: Wjz1h9y, lat: -35.4574599, lng: 149.0866733}
+  - { name: Wjz19V7,stop_code: Wjz19V7, lat: -35.4570479, lng: 149.0831962}
+  - { name: Wjz1h4G,stop_code: Wjz1h4G, lat: -35.4554516, lng: 149.0853457}
+  - { name: Wjz1heN,stop_code: Wjz1heN, lat: -35.4541126, lng: 149.0869262}
+  - { name: Wjz1i2p,stop_code: Wjz1i2p, lat: -35.4513833, lng: 149.0850928}
+  - { name: Wjz1ic5,stop_code: Wjz1ic5, lat: -35.4496838, lng: 149.0858515}
+  - { name: Wjz1jf0,stop_code: Wjz1jf0, lat: -35.442525, lng: 149.0859147}
+  - { name: Wjz1bTA,stop_code: Wjz1bTA, lat: -35.4422159, lng: 149.0824376}
+  - { name: Wjz1cI3,stop_code: Wjz1cI3, lat: -35.438868, lng: 149.0804778}
+  - { name: Wjz1cz3,stop_code: Wjz1cz3, lat: -35.4395376, lng: 149.079087}
+  - { name: Wjz1ceG,stop_code: Wjz1ceG, lat: -35.4375289, lng: 149.0757996}
+  - { name: Wjz1d0X,stop_code: Wjz1d0X, lat: -35.4360866, lng: 149.0748513}
+  - { name: Wjz15Xb,stop_code: Wjz15Xb, lat: -35.4340778, lng: 149.0723858}
+  - { name: Wjz1kvl,stop_code: Wjz1kvl, lat: -35.4366017, lng: 149.0890756}
+  - { name: Wjz1klr,stop_code: Wjz1klr, lat: -35.4381985, lng: 149.087748}
+  - { name: Wjz1kyn,stop_code: Wjz1kyn, lat: -35.4398982, lng: 149.0904032}
+  - { name: Wjz16U7,stop_code: Wjz16U7, lat: -35.4302659, lng: 149.0722593}
+  - { name: Wjz16Q9,stop_code: Wjz16Q9, lat: -35.4280509, lng: 149.0709317}
+  - { name: WjrWXL8,stop_code: WjrWXL8, lat: -35.3985958, lng: 149.0586576}
+  - { name: WjrWXIP,stop_code: WjrWXIP, lat: -35.4004264, lng: 149.0594265}
+  - { name: WjrWY3_,stop_code: WjrWY3_, lat: -35.3952466, lng: 149.0527528}
+  - { name: WjrWQRL,stop_code: WjrWQRL, lat: -35.3938608, lng: 149.049706}
+  - { name: WjrWRWi,stop_code: WjrWRWi, lat: -35.3908805, lng: 149.0506492}
+  - { name: WjrWSUa,stop_code: WjrWSUa, lat: -35.3867455, lng: 149.0504459}
+  - { name: WjrWSX9,stop_code: WjrWSX9, lat: -35.3847561, lng: 149.0504459}
+  - { name: WjrWSBZ,stop_code: WjrWSBZ, lat: -35.383041, lng: 149.0472484}
+  - { name: Wjz5LYB,stop_code: Wjz5LYB, lat: -35.2464052, lng: 149.1278592}
+  - { name: Wjz5LLF,stop_code: Wjz5LLF, lat: -35.2446872, lng: 149.1252507}
+  - { name: Wjz5LDv,stop_code: Wjz5LDv, lat: -35.2442061, lng: 149.1235678}
+  - { name: Wjz5LsC,stop_code: Wjz5LsC, lat: -35.2463364, lng: 149.1223897}
+  - { name: Wjz5Lh-,stop_code: Wjz5Lh-, lat: -35.248398, lng: 149.12138}
+  - { name: Wjz5Kve,stop_code: Wjz5Kve, lat: -35.2497723, lng: 149.1218849}
+  - { name: Wjz5Krx,stop_code: Wjz5Krx, lat: -35.2529666, lng: 149.1223781}
+  - { name: Wjz5CW3,stop_code: Wjz5CW3, lat: -35.2534813, lng: 149.1160707}
+  - { name: Wjz5BPB,stop_code: Wjz5BPB, lat: -35.2580866, lng: 149.1154899}
+  - { name: Wjz5BWh,stop_code: Wjz5BWh, lat: -35.2591172, lng: 149.1164155}
+  - { name: Wjz5BaH,stop_code: Wjz5BaH, lat: -35.2589798, lng: 149.1087583}
+  - { name: Wjz5ASf,stop_code: Wjz5ASf, lat: -35.2613846, lng: 149.1149009}
+  - { name: Wjz5AGB,stop_code: Wjz5AGB, lat: -35.2642702, lng: 149.1141435}
+  - { name: Wjz5zJi,stop_code: Wjz5zJi, lat: -35.2679801, lng: 149.113807}
+  - { name: Wjz5zOq,stop_code: Wjz5zOq, lat: -35.2700411, lng: 149.1153216}
+  - { name: Wjz5H0p,stop_code: Wjz5H0p, lat: -35.2714838, lng: 149.1180142}
+  - { name: Wjz5GeU,stop_code: Wjz5GeU, lat: -35.2729264, lng: 149.1200337}
+  - { name: Wjz6EBY,stop_code: Wjz6EBY, lat: -35.2403577, lng: 149.1242409}
+  - { name: Wjz6ElH,stop_code: Wjz6ElH, lat: -35.2404264, lng: 149.1210434}
+  - { name: Wjz6Myj,stop_code: Wjz6Myj, lat: -35.2424881, lng: 149.1344225}
+  - { name: Wjz6Vj2,stop_code: Wjz6Vj2, lat: -35.2363715, lng: 149.1421638}
+  - { name: Wjz6FEI,stop_code: Wjz6FEI, lat: -35.2382959, lng: 149.1252507}
+  - { name: Wjz6Fze,stop_code: Wjz6Fze, lat: -35.2360279, lng: 149.123147}
+  - { name: Wjz6cz2,stop_code: Wjz6cz2, lat: -35.2199304, lng: 149.0791416}
+  - { name: Wjz6cjg,stop_code: Wjz6cjg, lat: -35.2200412, lng: 149.0766172}
+  - { name: Wjz6c8c,stop_code: Wjz6c8c, lat: -35.2217598, lng: 149.0751026}
+  - { name: Wjz64OE,stop_code: Wjz64OE, lat: -35.2207286, lng: 149.0717368}
+  - { name: Wjz64Yc,stop_code: Wjz64Yc, lat: -35.2190101, lng: 149.0723258}
+  - { name: Wjz6c7A,stop_code: Wjz6c7A, lat: -35.2169478, lng: 149.074177}
+  - { name: Wjz6eWi,stop_code: Wjz6eWi, lat: -35.2096321, lng: 149.0835148}
+  - { name: Wjz6eGq,stop_code: Wjz6eGq, lat: -35.2096321, lng: 149.0809063}
+  - { name: Wjz6eoG,stop_code: Wjz6eoG, lat: -35.2110071, lng: 149.0784661}
+  - { name: Wjz6e8G,stop_code: Wjz6e8G, lat: -35.2110071, lng: 149.0758577}
+  - { name: Wjz65_2,stop_code: Wjz65_2, lat: -35.2116258, lng: 149.0722394}
+  - { name: Wjz64CB,stop_code: Wjz64CB, lat: -35.2176067, lng: 149.0687895}
+  - { name: Wjr_w0L,stop_code: Wjr_w0L, lat: -35.1995769, lng: 149.0194714}
+  - { name: Wjr_F9a,stop_code: Wjr_F9a, lat: -35.1938253, lng: 149.031231}
+  - { name: Wjr_NaX,stop_code: Wjr_NaX, lat: -35.1930428, lng: 149.043112}
+  - { name: Wjr_Ow3,stop_code: Wjr_Ow3, lat: -35.1889085, lng: 149.0461463}
+  - { name: Wjr_M6A,stop_code: Wjr_M6A, lat: -35.1956738, lng: 149.0413435}
+  - { name: Wjr_FV4,stop_code: Wjr_FV4, lat: -35.1935916, lng: 149.039268}
+  - { name: Wjr_GGq,stop_code: Wjr_GGq, lat: -35.1875953, lng: 149.0370811}
+  - { name: Wjr-CnE,stop_code: Wjr-CnE, lat: -35.206318, lng: 149.0223041}
+  - { name: Wjr-D1B,stop_code: Wjr-D1B, lat: -35.2045158, lng: 149.0193788}
+  - { name: Wjr-uUb,stop_code: Wjr-uUb, lat: -35.2108896, lng: 149.0174054}
+  - { name: Wjr-ux-,stop_code: Wjr-ux-, lat: -35.2099601, lng: 149.0143872}
+  - { name: Wjr-s5D,stop_code: Wjr-s5D, lat: -35.2180783, lng: 149.0083939}
+  - { name: Wjr-kZV,stop_code: Wjr-kZV, lat: -35.2186221, lng: 149.0075381}
+  - { name: Wjr-yDR,stop_code: Wjr-yDR, lat: -35.2278849, lng: 149.0252438}
+  - { name: Wjr-yOB,stop_code: Wjr-yOB, lat: -35.2313222, lng: 149.0276235}
+  - { name: Wjr-G49,stop_code: Wjr-G49, lat: -35.2302721, lng: 149.0298424}
+  - { name: Wjr-GcG,stop_code: Wjr-GcG, lat: -35.2301944, lng: 149.0319226}
+  - { name: Wjr-Hoi,stop_code: Wjr-Hoi, lat: -35.2274077, lng: 149.0341216}
+  - { name: Wjr-Hi1,stop_code: Wjr-Hi1, lat: -35.2261454, lng: 149.032398}
+  - { name: WjzcgLt,stop_code: WjzcgLt, lat: -35.3267279, lng: 149.1797667}
+  - { name: WjzcgD0,stop_code: WjzcgD0, lat: -35.3271927, lng: 149.1779495}
+  - { name: Wjzcgzn,stop_code: Wjzcgzn, lat: -35.3293028, lng: 149.178368}
+  - { name: WjzbfzE,stop_code: WjzbfzE, lat: -35.3354178, lng: 149.1678599}
+  - { name: Wjzbfpl,stop_code: Wjzbfpl, lat: -35.3363832, lng: 149.1658515}
+  - { name: Wjzbfr6,stop_code: Wjzbfr6, lat: -35.3349204, lng: 149.1655287}
+  - { name: Wjzc8im,stop_code: Wjzc8im, lat: -35.3300635, lng: 149.1644887}
+  - { name: Wjzc8l0,stop_code: Wjzc8l0, lat: -35.3285713, lng: 149.1642018}
+  - { name: Wjzc8c1,stop_code: Wjzc8c1, lat: -35.3291272, lng: 149.1628031}
+  - { name: Wjzbn5y,stop_code: Wjzbn5y, lat: -35.3338671, lng: 149.1730601}
+  - { name: Wjzbnmb,stop_code: Wjzbnmb, lat: -35.3331064, lng: 149.1753196}
+  - { name: Wjz3TZj,stop_code: Wjz3TZj, lat: -35.3338162, lng: 149.1384399}
+  - { name: Wjz3_3L,stop_code: Wjz3_3L, lat: -35.3347817, lng: 149.1404124}
+  - { name: Wjz3_o2,stop_code: Wjz3_o2, lat: -35.3372978, lng: 149.1435685}
+  - { name: Wjz3-r-,stop_code: Wjz3-r-, lat: -35.3403989, lng: 149.1448954}
+  - { name: Wjz3-aW,stop_code: Wjz3-aW, lat: -35.3414521, lng: 149.1420263}
+  - { name: Wjzb5vw,stop_code: Wjzb5vw, lat: -35.3436462, lng: 149.155296}
+  - { name: Wjz5N7c,stop_code: Wjz5N7c, lat: -35.2774279, lng: 149.1287001}
+  - { name: Wjza_-f,stop_code: Wjza_-f, lat: -35.3767042, lng: 149.237157}
+  - { name: WjzbYnD,stop_code: WjzbYnD, lat: -35.3485475, lng: 149.2307657}
+  - { name: WjzbZ3m,stop_code: WjzbZ3m, lat: -35.3459335, lng: 149.227726}
+  - { name: WjzbXms,stop_code: WjzbXms, lat: -35.3550134, lng: 149.2306199}
+  - { name: WjzbXmQ,stop_code: WjzbXmQ, lat: -35.3550126, lng: 149.2311068}
+  - { name: WjzbYzg,stop_code: WjzbYzg, lat: -35.3519226, lng: 149.2332104}
+  - { name: WjzbYue,stop_code: WjzbYue, lat: -35.3493054, lng: 149.2316145}
+  - { name: Wjzj5BH,stop_code: Wjzj5BH, lat: -35.3447463, lng: 149.2446946}
+  - { name: Wjzj6z9,stop_code: Wjzj6z9, lat: -35.3407864, lng: 149.2440483}
+  - { name: WjzbYD0,stop_code: WjzbYD0, lat: -35.3491814, lng: 149.232803}
+  - { name: WjzbZqS,stop_code: WjzbZqS, lat: -35.3465484, lng: 149.2325494}
+  - { name: Wjz5F-1,stop_code: Wjz5F-1, lat: -35.2783161, lng: 149.1271286}
+  - { name: Wjz5FSY,stop_code: Wjz5FSY, lat: -35.2780524, lng: 149.1269928}
+  - { name: WjzbZ77,stop_code: WjzbZ77, lat: -35.3430401, lng: 149.2274615}
+  - { name: Wjz5N6V,stop_code: Wjz5N6V, lat: -35.2783725, lng: 149.1297843}
+  - { name: WjzbRdA,stop_code: WjzbRdA, lat: -35.3446934, lng: 149.2184308}
+  - { name: WjzbRdl,stop_code: WjzbRdl, lat: -35.3446304, lng: 149.2181472}
+  - { name: WjzbJSj,stop_code: WjzbJSj, lat: -35.3441148, lng: 149.2140644}
+  - { name: Wjzj5cC,stop_code: Wjzj5cC, lat: -35.3451754, lng: 149.2404108}
+  - { name: WjzbZ3n,stop_code: WjzbZ3n, lat: -35.3458022, lng: 149.2277877}
+  - { name: WjzbRBs,stop_code: WjzbRBs, lat: -35.344722, lng: 149.2224303}
+  - { name: WjzbRBx,stop_code: WjzbRBx, lat: -35.3449879, lng: 149.2226535}
+  - { name: Wjz5N5_,stop_code: Wjz5N5_, lat: -35.2785242, lng: 149.1297348}
+  - { name: Wjz5Ndm,stop_code: Wjz5Ndm, lat: -35.2785658, lng: 149.1301727}
+  - { name: Wjz5Neo,stop_code: Wjz5Neo, lat: -35.27843, lng: 149.130345}
+  - { name: WjzaArS,stop_code: WjzaArS, lat: -35.3953167, lng: 149.1995002}
+  - { name: WjzaAXA,stop_code: WjzaAXA, lat: -35.3954806, lng: 149.2047447}
+  - { name: WjzaJ9a,stop_code: WjzaJ9a, lat: -35.391582, lng: 149.2069701}
+  - { name: WjzaAdv,stop_code: WjzaAdv, lat: -35.3938794, lng: 149.1962366}
+  - { name: WjzbBu_,stop_code: WjzbBu_, lat: -35.3437537, lng: 149.1997253}
+  - { name: WjzbPQW,stop_code: WjzbPQW, lat: -35.3565184, lng: 149.2259167}
+  - { name: WjzbPXf,stop_code: WjzbPXf, lat: -35.3567667, lng: 149.2261434}
+  - { name: WjzbPpi,stop_code: WjzbPpi, lat: -35.3586252, lng: 149.2208441}
+  - { name: WjzbVBj,stop_code: WjzbVBj, lat: -35.3667378, lng: 149.233235}
+  - { name: WjzbWDe,stop_code: WjzbWDe, lat: -35.3596366, lng: 149.2330229}
+  - { name: WjzbXwk,stop_code: WjzbXwk, lat: -35.3591416, lng: 149.2331706}
+  - { name: WjzbVCw,stop_code: WjzbVCw, lat: -35.3663608, lng: 149.2335824}
+  - { name: WjzbVxf,stop_code: WjzbVxf, lat: -35.369131, lng: 149.233084}
+  - { name: WjzbVy2,stop_code: WjzbVy2, lat: -35.3689098, lng: 149.232863}
+  - { name: Wjz9JIL,stop_code: Wjz9JIL, lat: -35.4330525, lng: 149.2131844}
+  - { name: Wjz9JdV,stop_code: Wjz9JdV, lat: -35.4328562, lng: 149.2080577}
+  - { name: WjzbXAb,stop_code: WjzbXAb, lat: -35.3564366, lng: 149.2330826}
+  - { name: WjzaK0g,stop_code: WjzaK0g, lat: -35.3868815, lng: 149.2056751}
+  - { name: WjzbwuF,stop_code: WjzbwuF, lat: -35.3717405, lng: 149.1994726}
+  - { name: WjzbwDR,stop_code: WjzbwDR, lat: -35.37069, lng: 149.2008683}
+  - { name: WjzaDIK,stop_code: WjzaDIK, lat: -35.3781802, lng: 149.2021825}
+  - { name: WjzbwMd,stop_code: WjzbwMd, lat: -35.3755316, lng: 149.2028602}
+  - { name: WjzbG5c,stop_code: WjzbG5c, lat: -35.3611934, lng: 149.2054955}
+  - { name: WjzbXBT,stop_code: WjzbXBT, lat: -35.3553953, lng: 149.2338714}
+  - { name: WjzbJRl,stop_code: WjzbJRl, lat: -35.3445935, lng: 149.2139248}
+  - { name: WjzbfPy,stop_code: WjzbfPy, lat: -35.3352335, lng: 149.1703836}
+  - { name: WjzcrrQ,stop_code: WjzcrrQ, lat: -35.3131274, lng: 149.188611}
+  - { name: Wjz4OqF,stop_code: Wjz4OqF, lat: -35.3195494, lng: 149.1335622}
+  - { name: Wjz4Pk_,stop_code: Wjz4Pk_, lat: -35.3121631, lng: 149.1324213}
+  - { name: Wjz4Pt5,stop_code: Wjz4Pt5, lat: -35.3116531, lng: 149.1326324}
+  - { name: Wjzc1qE,stop_code: Wjzc1qE, lat: -35.3251161, lng: 149.1555115}
+  - { name: Wjz5NeC,stop_code: Wjz5NeC, lat: -35.2778798, lng: 149.1305995}
+  - { name: Wjz5NeF,stop_code: Wjz5NeF, lat: -35.2783224, lng: 149.130726}
+  - { name: Wjz5Ndz,stop_code: Wjz5Ndz, lat: -35.2788601, lng: 149.130649}
+  - { name: Wjz5NcA,stop_code: Wjz5NcA, lat: -35.2794346, lng: 149.1305879}
+  - { name: Wjz5Nds,stop_code: Wjz5Nds, lat: -35.2787886, lng: 149.1304779}
+  - { name: Wjz3mWn,stop_code: Wjz3mWn, lat: -35.3409621, lng: 149.0945298}
+  - { name: Wjz3mPO,stop_code: Wjz3mPO, lat: -35.3407241, lng: 149.0937831}
+  - { name: Wjz3mI_,stop_code: Wjz3mI_, lat: -35.3396179, lng: 149.0925471}
+  - { name: Wjz3mQ4,stop_code: Wjz3mQ4, lat: -35.3398419, lng: 149.0928819}
+  - { name: Wjz3vrf,stop_code: Wjz3vrf, lat: -35.3348497, lng: 149.099817}
+  - { name: Wjz3vqN,stop_code: Wjz3vqN, lat: -35.3360119, lng: 149.1006409}
+  - { name: Wjz3C9Q,stop_code: Wjz3C9Q, lat: -35.3419855, lng: 149.108934}
+  - { name: Wjz3C4O,stop_code: Wjz3C4O, lat: -35.3400601, lng: 149.1074834}
+  - { name: Wjz3uQf,stop_code: Wjz3uQf, lat: -35.339661, lng: 149.1040329}
+  - { name: Wjz3uJV,stop_code: Wjz3uJV, lat: -35.339486, lng: 149.1035524}
+  - { name: Wjz3C4q,stop_code: Wjz3C4q, lat: -35.3400391, lng: 149.106977}
+  - { name: Wjz3C9J,stop_code: Wjz3C9J, lat: -35.3418945, lng: 149.1087966}
+  - { name: Wjz3B5o,stop_code: Wjz3B5o, lat: -35.344996, lng: 149.1070285}
+  - { name: Wjz3lVM,stop_code: Wjz3lVM, lat: -35.3477625, lng: 149.0952366}
+  - { name: Wjz3lVG,stop_code: Wjz3lVG, lat: -35.3476365, lng: 149.095065}
+  - { name: Wjz3n-4,stop_code: Wjz3n-4, lat: -35.3330183, lng: 149.0941258}
+  - { name: Wjz3n-H,stop_code: Wjz3n-H, lat: -35.3331304, lng: 149.0950356}
+  - { name: Wjz3mAg,stop_code: Wjz3mAg, lat: -35.3402021, lng: 149.0903851}
+  - { name: Wjz4qia,stop_code: Wjz4qia, lat: -35.3194535, lng: 149.0984183}
+  - { name: Wjz4q8_,stop_code: Wjz4q8_, lat: -35.3203709, lng: 149.0981179}
+  - { name: Wjz4p1K,stop_code: Wjz4p1K, lat: -35.325336, lng: 149.0963669}
+  - { name: Wjz4p2R,stop_code: Wjz4p2R, lat: -35.3247128, lng: 149.0966244}
+  - { name: Wjz4gXk,stop_code: Wjz4gXk, lat: -35.3296011, lng: 149.0945736}
+  - { name: Wjz4gYg,stop_code: Wjz4gYg, lat: -35.329258, lng: 149.0944878}
+  - { name: Wjz5G6U,stop_code: Wjz5G6U, lat: -35.2729086, lng: 149.1187429}
+  - { name: Wjz5Guy,stop_code: Wjz5Guy, lat: -35.2727878, lng: 149.1223747}
+  - { name: Wjz5Hw8,stop_code: Wjz5Hw8, lat: -35.2715996, lng: 149.1231371}
+  - { name: Wjz5HDd,stop_code: Wjz5HDd, lat: -35.2662951, lng: 149.1231711}
+  - { name: Wjz5Iw8,stop_code: Wjz5Iw8, lat: -35.2660466, lng: 149.1231132}
+  - { name: Wjz5Iqp,stop_code: Wjz5Iqp, lat: -35.2646152, lng: 149.1221727}
+  - { name: Wjz5IjX,stop_code: Wjz5IjX, lat: -35.2637604, lng: 149.1215219}
+  - { name: Wjz5Imu,stop_code: Wjz5Imu, lat: -35.2614148, lng: 149.1208459}
+  - { name: Wjz5Jpp,stop_code: Wjz5Jpp, lat: -35.2597672, lng: 149.1221194}
+  - { name: Wjz5Jpu,stop_code: Wjz5Jpu, lat: -35.2594072, lng: 149.1221624}
+  - { name: Wjz5Jyz,stop_code: Wjz5Jyz, lat: -35.258945, lng: 149.123718}
+  - { name: Wjz5JzP,stop_code: Wjz5JzP, lat: -35.2582197, lng: 149.123961}
+  - { name: Wjz5JuJ,stop_code: Wjz5JuJ, lat: -35.2560391, lng: 149.1225279}
+  - { name: Wjz5Juf,stop_code: Wjz5Juf, lat: -35.2558204, lng: 149.1217923}
+  - { name: Wjz5KgQ,stop_code: Wjz5KgQ, lat: -35.2547172, lng: 149.1212395}
+  - { name: Wjz5KgT,stop_code: Wjz5KgT, lat: -35.2544701, lng: 149.1213129}
+  - { name: Wjz5N5k,stop_code: Wjz5N5k, lat: -35.2787905, lng: 149.1288627}
+  - { name: Wjz5N4J,stop_code: Wjz5N4J, lat: -35.2793571, lng: 149.1293659}
+  - { name: Wjz5Nht,stop_code: Wjz5Nht, lat: -35.281465, lng: 149.131837}
+  - { name: Wjr-LNq,stop_code: Wjr-LNq, lat: -35.2048275, lng: 149.0383141}
+  - { name: Wjz68W5,stop_code: Wjz68W5, lat: -35.2423221, lng: 149.0831522}
+  - { name: Wjz6giR,stop_code: Wjz6giR, lat: -35.2422899, lng: 149.0883846}
+  - { name: Wjz6gia,stop_code: Wjz6gia, lat: -35.2425616, lng: 149.0874888}
+  - { name: Wjz5maK,stop_code: Wjz5maK, lat: -35.2532079, lng: 149.0867657}
+  - { name: Wjz5G6B,stop_code: Wjz5G6B, lat: -35.2724804, lng: 149.1181797}
+  - { name: Wjz5GMT,stop_code: Wjz5GMT, lat: -35.2764151, lng: 149.1267199}
+  - { name: Wjz4KO9,stop_code: Wjz4KO9, lat: -35.2975962, lng: 149.1259252}
+  - { name: Wjz4KNu,stop_code: Wjz4KNu, lat: -35.2978611, lng: 149.1263289}
+  - { name: WjzbnGh,stop_code: WjzbnGh, lat: -35.3359862, lng: 149.1796321}
+  - { name: Wjz5_0v,stop_code: Wjz5_0v, lat: -35.2490065, lng: 149.1400861}
+  - { name: Wjz4Ox0,stop_code: Wjz4Ox0, lat: -35.3203301, lng: 149.1339648}
+  - { name: Wjz4OpP,stop_code: Wjz4OpP, lat: -35.320064, lng: 149.1335699}
+  - { name: Wjz4NDo,stop_code: Wjz4NDo, lat: -35.3217168, lng: 149.1344712}
+  - { name: Wjz4NDP,stop_code: Wjz4NDP, lat: -35.3214366, lng: 149.1350462}
+  - { name: Wjz4Pa9,stop_code: Wjz4Pa9, lat: -35.314076, lng: 149.1301281}
+  - { name: Wjz5FIS,stop_code: Wjz5FIS, lat: -35.279312, lng: 149.1254166}
+  - { name: Wjz5qbi,stop_code: Wjz5qbi, lat: -35.2748058, lng: 149.0972461}
+  - { name: Wjr-_Ua,stop_code: Wjr-_Ua, lat: -35.2054509, lng: 149.0613315}
+  - { name: Wjz66kG,stop_code: Wjz66kG, lat: -35.2081931, lng: 149.0662542}
+  - { name: Wjz66kP,stop_code: Wjz66kP, lat: -35.2081588, lng: 149.066382}
+  - { name: Wjz66lY,stop_code: Wjz66lY, lat: -35.2073806, lng: 149.0665685}
+  - { name: Wjz66t3,stop_code: Wjz66t3, lat: -35.2074684, lng: 149.0667796}
+  - { name: Wjz664q,stop_code: Wjz664q, lat: -35.2082119, lng: 149.0631086}
+  - { name: Wjz664g,stop_code: Wjz664g, lat: -35.2083936, lng: 149.0629132}
+  - { name: Wjr-Xhh,stop_code: Wjr-Xhh, lat: -35.2268712, lng: 149.0546156}
+  - { name: Wjz4Rs-,stop_code: Wjz4Rs-, lat: -35.3012441, lng: 149.1338254}
+  - { name: Wjr-_Uj,stop_code: Wjr-_Uj, lat: -35.2054305, lng: 149.0615985}
+  - { name: Wjr--r_,stop_code: Wjr--r_, lat: -35.2084885, lng: 149.0569758}
+  - { name: Wjz4Lh5,stop_code: Wjz4Lh5, lat: -35.2924038, lng: 149.1201999}
+  - { name: Wjzc54R,stop_code: Wjzc54R, lat: -35.3013866, lng: 149.1515283}
+  - { name: Wjzc55s,stop_code: Wjzc55s, lat: -35.3007195, lng: 149.1509863}
+  - { name: Wjzc60A,stop_code: Wjzc60A, lat: -35.2986953, lng: 149.151155}
+  - { name: Wjz4-WZ,stop_code: Wjz4-WZ, lat: -35.2972194, lng: 149.1503113}
+  - { name: Wjz4-YV,stop_code: Wjz4-YV, lat: -35.2961803, lng: 149.1503194}
+  - { name: Wjz56Hh,stop_code: Wjz56Hh, lat: -35.25291, lng: 149.0697814}
+  - { name: Wjz4-WL,stop_code: Wjz4-WL, lat: -35.2970826, lng: 149.149927}
+  - { name: Wjzc60i,stop_code: Wjzc60i, lat: -35.2988201, lng: 149.1508684}
+  - { name: Wjz4RFJ,stop_code: Wjz4RFJ, lat: -35.3034224, lng: 149.1361467}
+  - { name: Wjz4RwH,stop_code: Wjz4RwH, lat: -35.3042846, lng: 149.1348585}
+  - { name: Wjz4Quk,stop_code: Wjz4Quk, lat: -35.3055692, lng: 149.1330442}
+  - { name: Wjz4PuC,stop_code: Wjz4PuC, lat: -35.3109115, lng: 149.1332413}
+  - { name: Wjz4P6x,stop_code: Wjz4P6x, lat: -35.3112617, lng: 149.1291119}
+  - { name: Wjz3eZ4,stop_code: Wjz3eZ4, lat: -35.3392098, lng: 149.0831308}
+  - { name: Wjz3bdj,stop_code: Wjz3bdj, lat: -35.3557447, lng: 149.0753424}
+  - { name: Wjz4-Rc,stop_code: Wjz4-Rc, lat: -35.2952651, lng: 149.1479687}
+  - { name: Wjz4-KO,stop_code: Wjz4-KO, lat: -35.2946955, lng: 149.147399}
+  - { name: Wjr--W0,stop_code: Wjr--W0, lat: -35.2097244, lng: 149.0611869}
+  - { name: Wjr--W9,stop_code: Wjr--W9, lat: -35.2096897, lng: 149.061394}
+  - { name: Wjz3caw,stop_code: Wjz3caw, lat: -35.3525528, lng: 149.0755688}
+  - { name: Wjz3cal,stop_code: Wjz3cal, lat: -35.3521568, lng: 149.0752845}
+  - { name: Wjz3bdl,stop_code: Wjz3bdl, lat: -35.3556201, lng: 149.075221}
+  - { name: Wjz3ceY,stop_code: Wjz3ceY, lat: -35.3495185, lng: 149.0761236}
+  - { name: Wjz3b9v,stop_code: Wjz3b9v, lat: -35.3581498, lng: 149.0754026}
+  - { name: Wjz3b9L,stop_code: Wjz3b9L, lat: -35.3581358, lng: 149.0757975}
+  - { name: Wjz39RI,stop_code: Wjz39RI, lat: -35.3666487, lng: 149.0827357}
+  - { name: Wjz3ceV,stop_code: Wjz3ceV, lat: -35.3497899, lng: 149.0761589}
+  - { name: Wjr-SHc,stop_code: Wjr-SHc, lat: -35.2086969, lng: 149.0476925}
+  - { name: Wjr-RKi,stop_code: Wjr-RKi, lat: -35.2123821, lng: 149.0478391}
+  - { name: Wjr-RZx,stop_code: Wjr-RZx, lat: -35.213153, lng: 149.050965}
+  - { name: Wjr-RZE,stop_code: Wjr-RZE, lat: -35.2132014, lng: 149.0511677}
+  - { name: Wjr-RT-,stop_code: Wjr-RT-, lat: -35.2113153, lng: 149.0500244}
+  - { name: Wjr-R_3,stop_code: Wjr-R_3, lat: -35.2115401, lng: 149.0502887}
+  - { name: Wjr-Zk3,stop_code: Wjr-Zk3, lat: -35.2136037, lng: 149.0543575}
+  - { name: Wjr-Zk5,stop_code: Wjr-Zk5, lat: -35.2134943, lng: 149.0543506}
+  - { name: Wjr-ZBY,stop_code: Wjr-ZBY, lat: -35.2128526, lng: 149.0583185}
+  - { name: Wjr-ZJc,stop_code: Wjr-ZJc, lat: -35.2128875, lng: 149.0586429}
+  - { name: Wjr-ZRJ,stop_code: Wjr-ZRJ, lat: -35.2127453, lng: 149.0607491}
+  - { name: Wjr-ZSE,stop_code: Wjr-ZSE, lat: -35.2124829, lng: 149.0606716}
+  - { name: Wjz66fw,stop_code: Wjz66fw, lat: -35.2063185, lng: 149.0646037}
+  - { name: Wjz66fx,stop_code: Wjz66fx, lat: -35.2062629, lng: 149.0647145}
+  - { name: Wjr--sV,stop_code: Wjr--sV, lat: -35.2083253, lng: 149.0568878}
+  - { name: Wjr--Lw,stop_code: Wjr--Lw, lat: -35.2063011, lng: 149.059093}
+  - { name: Wjr--Ki,stop_code: Wjr--Ki, lat: -35.2068427, lng: 149.0588291}
+  - { name: Wjr--m3,stop_code: Wjr--m3, lat: -35.2067416, lng: 149.0543264}
+  - { name: Wjr--md,stop_code: Wjr--md, lat: -35.2066211, lng: 149.0544526}
+  - { name: Wjr--6t,stop_code: Wjr--6t, lat: -35.2065912, lng: 149.0521439}
+  - { name: Wjr--6k,stop_code: Wjr--6k, lat: -35.2066759, lng: 149.0519744}
+  - { name: Wjr-SS5,stop_code: Wjr-SS5, lat: -35.2065999, lng: 149.0489353}
+  - { name: Wjz605N,stop_code: Wjz605N, lat: -35.2405467, lng: 149.0636668}
+  - { name: Wjz60d1,stop_code: Wjz60d1, lat: -35.2406019, lng: 149.0638958}
+  - { name: Wjz60c5,stop_code: Wjz60c5, lat: -35.2408972, lng: 149.0639885}
+  - { name: Wjz604Y,stop_code: Wjz604Y, lat: -35.2410486, lng: 149.0638326}
+  - { name: Wjz605_,stop_code: Wjz605_, lat: -35.2400517, lng: 149.0637152}
+  - { name: Wjz606I,stop_code: Wjz606I, lat: -35.2396656, lng: 149.0633992}
+  - { name: Wjz5xHC,stop_code: Wjz5xHC, lat: -35.2799871, lng: 149.1141335}
+  - { name: Wjz5yXo,stop_code: Wjz5yXo, lat: -35.2749982, lng: 149.1166312}
+  - { name: Wjz5Jaa,stop_code: Wjz5Jaa, lat: -35.2590481, lng: 149.1191164}
+  - { name: Wjz5J9d,stop_code: Wjz5J9d, lat: -35.2594616, lng: 149.1190821}
+  - { name: Wjz68Yy,stop_code: Wjz68Yy, lat: -35.2411603, lng: 149.0838439}
+  - { name: Wjr-_3A,stop_code: Wjr-_3A, lat: -35.2032823, lng: 149.0522538}
+  - { name: Wjr-_kG,stop_code: Wjr-_kG, lat: -35.2027328, lng: 149.0551853}
+  - { name: Wjr-_Hp,stop_code: Wjr-_Hp, lat: -35.2034703, lng: 149.0589653}
+  - { name: Wjr-_Nn,stop_code: Wjr-_Nn, lat: -35.2043934, lng: 149.0601598}
+  - { name: Wjr-_Og,stop_code: Wjr-_Og, lat: -35.2042571, lng: 149.0602273}
+  - { name: Wjz670_,stop_code: Wjz670_, lat: -35.205061, lng: 149.0637667}
+  - { name: Wjz671V,stop_code: Wjz671V, lat: -35.204864, lng: 149.0637204}
+  - { name: Wjz67k1,stop_code: Wjz67k1, lat: -35.2028461, lng: 149.0653269}
+  - { name: Wjz67kk,stop_code: Wjz67kk, lat: -35.2025967, lng: 149.0657125}
+  - { name: Wjr-_zv,stop_code: Wjr-_zv, lat: -35.2030129, lng: 149.0575605}
+  - { name: Wjr-YdU,stop_code: Wjr-YdU, lat: -35.2186771, lng: 149.0542242}
+  - { name: Wjr-YcT,stop_code: Wjr-YcT, lat: -35.2187393, lng: 149.0539932}
+  - { name: Wjr-Yg7,stop_code: Wjr-Yg7, lat: -35.2215188, lng: 149.0543538}
+  - { name: Wjr-Xno,stop_code: Wjr-Xno, lat: -35.2227935, lng: 149.0548844}
+  - { name: Wjr-Xky,stop_code: Wjr-Xky, lat: -35.2247107, lng: 149.0549856}
+  - { name: Wjr-XyN,stop_code: Wjr-XyN, lat: -35.226202, lng: 149.0581637}
+  - { name: WjrZ_tn,stop_code: WjrZ_tn, lat: -35.2455787, lng: 149.0560808}
+  - { name: WjrZ_so,stop_code: WjrZ_so, lat: -35.2468109, lng: 149.0562979}
+  - { name: Wjz56Xu,stop_code: Wjz56Xu, lat: -35.2524925, lng: 149.0726439}
+  - { name: Wjz56XB,stop_code: Wjz56XB, lat: -35.2526099, lng: 149.0728793}
+  - { name: Wjz5711,stop_code: Wjz5711, lat: -35.2488233, lng: 149.0625779}
+  - { name: Wjz571j,stop_code: Wjz571j, lat: -35.2486364, lng: 149.0628845}
+  - { name: Wjz3eRR,stop_code: Wjz3eRR, lat: -35.3390911, lng: 149.082759}
+  - { name: Wjz3m31,stop_code: Wjz3m31, lat: -35.3408061, lng: 149.0844784}
+  - { name: Wjz3m3b,stop_code: Wjz3m3b, lat: -35.3406241, lng: 149.0847703}
+  - { name: Wjz79-a,stop_code: Wjz79-a, lat: -35.1903384, lng: 149.0833628}
+  - { name: Wjz79ZQ,stop_code: Wjz79ZQ, lat: -35.190906, lng: 149.0842116}
+  - { name: Wjz7hb5,stop_code: Wjz7hb5, lat: -35.1921368, lng: 149.0859491}
+  - { name: Wjz7hbe,stop_code: Wjz7hbe, lat: -35.1921183, lng: 149.0860955}
+  - { name: Wjz5dCr,stop_code: Wjz5dCr, lat: -35.2561978, lng: 149.0795805}
+  - { name: Wjz54_B,stop_code: Wjz54_B, lat: -35.2608235, lng: 149.0728514}
+  - { name: Wjz54_n,stop_code: Wjz54_n, lat: -35.2606623, lng: 149.072551}
+  - { name: Wjz54CS,stop_code: Wjz54CS, lat: -35.2614333, lng: 149.0690577}
+  - { name: Wjz551Q,stop_code: Wjz551Q, lat: -35.2595831, lng: 149.0636761}
+  - { name: Wjz5592,stop_code: Wjz5592, lat: -35.2596812, lng: 149.0639679}
+  - { name: WjrZZB7,stop_code: WjrZZB7, lat: -35.2565133, lng: 149.0570071}
+  - { name: WjrZ_o2,stop_code: WjrZ_o2, lat: -35.2493991, lng: 149.055711}
+  - { name: WjrZ_o4,stop_code: WjrZ_o4, lat: -35.2492379, lng: 149.0556338}
+  - { name: WjrZTMv,stop_code: WjrZTMv, lat: -35.2489575, lng: 149.0493939}
+  - { name: WjrZTua,stop_code: WjrZTua, lat: -35.2452775, lng: 149.0448362}
+  - { name: WjrZTu1,stop_code: WjrZTu1, lat: -35.2453967, lng: 149.044759}
+  - { name: Wjr-Mg6,stop_code: Wjr-Mg6, lat: -35.2436162, lng: 149.0432913}
+  - { name: Wjr-Mgt,stop_code: Wjr-Mgt, lat: -35.2436863, lng: 149.0438835}
+  - { name: WjrZT5e,stop_code: WjrZT5e, lat: -35.245649, lng: 149.0408365}
+  - { name: WjrZLXY,stop_code: WjrZLXY, lat: -35.2471491, lng: 149.0403988}
+  - { name: WjrZT6b,stop_code: WjrZT6b, lat: -35.2452004, lng: 149.0407936}
+  - { name: Wjz3mI-,stop_code: Wjz3mI-, lat: -35.3396854, lng: 149.092654}
+  - { name: Wjz3mQ5,stop_code: Wjz3mQ5, lat: -35.339761, lng: 149.0927558}
+  - { name: Wjr-z7J,stop_code: Wjr-z7J, lat: -35.2223574, lng: 149.0195037}
+  - { name: Wjr-ZXo,stop_code: Wjr-ZXo, lat: -35.214551, lng: 149.0617978}
+  - { name: Wjz652H,stop_code: Wjz652H, lat: -35.2150139, lng: 149.0634241}
+  - { name: Wjz65aB,stop_code: Wjz65aB, lat: -35.2148653, lng: 149.0646456}
+  - { name: Wjz65ik,stop_code: Wjz65ik, lat: -35.2149321, lng: 149.0656677}
+  - { name: Wjz65rA,stop_code: Wjz65rA, lat: -35.2142446, lng: 149.0673143}
+  - { name: Wjz65rQ,stop_code: Wjz65rQ, lat: -35.2142653, lng: 149.0676927}
+  - { name: Wjz65Hy,stop_code: Wjz65Hy, lat: -35.2143691, lng: 149.0701627}
+  - { name: Wjz65GS,stop_code: Wjz65GS, lat: -35.2147682, lng: 149.0705542}
+  - { name: Wjz66oJ,stop_code: Wjz66oJ, lat: -35.2107077, lng: 149.0674989}
+  - { name: Wjz66oO,stop_code: Wjz66oO, lat: -35.2109547, lng: 149.067737}
+  - { name: Wjz66Fg,stop_code: Wjz66Fg, lat: -35.2104421, lng: 149.0698018}
+  - { name: Wjz66WS,stop_code: Wjz66WS, lat: -35.2092634, lng: 149.0731992}
+  - { name: Wjz66XM,stop_code: Wjz66XM, lat: -35.2090851, lng: 149.0732672}
+  - { name: Wjz6ec7,stop_code: Wjz6ec7, lat: -35.2077712, lng: 149.0749969}
+  - { name: WjrW_zu,stop_code: WjrW_zu, lat: -35.3788924, lng: 149.0576496}
+  - { name: WjrW_zy,stop_code: WjrW_zy, lat: -35.3792073, lng: 149.0577944}
+  - { name: WjrW_Qk,stop_code: WjrW_Qk, lat: -35.3783254, lng: 149.0600973}
+  - { name: WjrW_RH,stop_code: WjrW_RH, lat: -35.3777568, lng: 149.0607135}
+  - { name: Wjz27d3,stop_code: Wjz27d3, lat: -35.3777767, lng: 149.064033}
+  - { name: Wjz27dd,stop_code: Wjz27dd, lat: -35.3775909, lng: 149.0640777}
+  - { name: Wjz27k0,stop_code: Wjz27k0, lat: -35.3786939, lng: 149.0653235}
+  - { name: Wjz27k8,stop_code: Wjz27k8, lat: -35.3787048, lng: 149.065524}
+  - { name: Wjz27gg,stop_code: Wjz27gg, lat: -35.3814094, lng: 149.0656219}
+  - { name: Wjz26n5,stop_code: Wjz26n5, lat: -35.3816653, lng: 149.0653041}
+  - { name: Wjz26tG,stop_code: Wjz26tG, lat: -35.3833338, lng: 149.0674908}
+  - { name: Wjz26tw,stop_code: Wjz26tw, lat: -35.38347, lng: 149.0674733}
+  - { name: Wjz26P8,stop_code: Wjz26P8, lat: -35.3848854, lng: 149.0709314}
+  - { name: Wjz26Om,stop_code: Wjz26Om, lat: -35.385045, lng: 149.0711386}
+  - { name: Wjz26WW,stop_code: Wjz26WW, lat: -35.3853577, lng: 149.0733293}
+  - { name: Wjz26WN,stop_code: Wjz26WN, lat: -35.3854988, lng: 149.073226}
+  - { name: Wjz2df1,stop_code: Wjz2df1, lat: -35.3875049, lng: 149.0748933}
+  - { name: Wjz2def,stop_code: Wjz2def, lat: -35.3876959, lng: 149.0750942}
+  - { name: Wjz2d34,stop_code: Wjz2d34, lat: -35.3900029, lng: 149.0734943}
+  - { name: Wjz2d32,stop_code: Wjz2d32, lat: -35.3901917, lng: 149.0734943}
+  - { name: Wjz25Ox,stop_code: Wjz25Ox, lat: -35.3909341, lng: 149.0714764}
+  - { name: Wjz25NL,stop_code: Wjz25NL, lat: -35.3911118, lng: 149.0716052}
+  - { name: Wjz24uT,stop_code: Wjz24uT, lat: -35.3931517, lng: 149.0676751}
+  - { name: Wjz24vP,stop_code: Wjz24vP, lat: -35.3928088, lng: 149.0677265}
+  - { name: Wjz24lA,stop_code: Wjz24lA, lat: -35.3941231, lng: 149.0659575}
+  - { name: Wjz24lu,stop_code: Wjz24lu, lat: -35.3939542, lng: 149.0657865}
+  - { name: Wjz24cK,stop_code: Wjz24cK, lat: -35.3946419, lng: 149.0647484}
+  - { name: Wjz2498,stop_code: Wjz2498, lat: -35.3972167, lng: 149.0640703}
+  - { name: Wjz248n,stop_code: Wjz248n, lat: -35.3972727, lng: 149.064345}
+  - { name: Wjz2347,stop_code: Wjz2347, lat: -35.4000362, lng: 149.0625}
+  - { name: Wjz234e,stop_code: Wjz234e, lat: -35.4001412, lng: 149.0627055}
+  - { name: WjrWXON,stop_code: WjrWXON, lat: -35.4019182, lng: 149.060886}
+  - { name: WjrWXNL,stop_code: WjrWXNL, lat: -35.4020721, lng: 149.0607315}
+  - { name: Wjz230Q,stop_code: Wjz230Q, lat: -35.4030936, lng: 149.0635466}
+  - { name: Wjz230G,stop_code: Wjz230G, lat: -35.4032475, lng: 149.0634951}
+  - { name: Wjz66Cd,stop_code: Wjz66Cd, lat: -35.2065831, lng: 149.0682105}
+  - { name: Wjz66C2,stop_code: Wjz66C2, lat: -35.2068343, lng: 149.0681005}
+  - { name: Wjz67xQ,stop_code: Wjz67xQ, lat: -35.2046532, lng: 149.0691406}
+  - { name: Wjz66KO,stop_code: Wjz66KO, lat: -35.2068138, lng: 149.0704302}
+  - { name: Wjz66Lx,stop_code: Wjz66Lx, lat: -35.2062279, lng: 149.0700922}
+  - { name: Wjz67yW,stop_code: Wjz67yW, lat: -35.2040813, lng: 149.0692143}
+  - { name: Wjz67nz,stop_code: Wjz67nz, lat: -35.2006201, lng: 149.0659965}
+  - { name: Wjz70go,stop_code: Wjz70go, lat: -35.2001419, lng: 149.0658463}
+  - { name: Wjz701y,stop_code: Wjz701y, lat: -35.1992909, lng: 149.0633518}
+  - { name: Wjz701a,stop_code: Wjz701a, lat: -35.1992794, lng: 149.0628172}
+  - { name: Wjr_UUM,stop_code: Wjr_UUM, lat: -35.2001188, lng: 149.062303}
+  - { name: Wjr_UUU,stop_code: Wjr_UUU, lat: -35.2001327, lng: 149.0624944}
+  - { name: Wjz3_z-,stop_code: Wjz3_z-, lat: -35.3349223, lng: 149.1461306}
+  - { name: Wjzb705,stop_code: Wjzb705, lat: -35.3370433, lng: 149.1505109}
+  - { name: Wjr_UPA,stop_code: Wjr_UPA, lat: -35.1977713, lng: 149.0605874}
+  - { name: Wjr_UPL,stop_code: Wjr_UPL, lat: -35.1975228, lng: 149.0606273}
+  - { name: Wjr_UTL,stop_code: Wjr_UTL, lat: -35.1947749, lng: 149.060646}
+  - { name: Wjr_UTJ,stop_code: Wjr_UTJ, lat: -35.1949558, lng: 149.0607434}
+  - { name: Wjz707-,stop_code: Wjz707-, lat: -35.1947883, lng: 149.0637942}
+  - { name: Wjz707Z,stop_code: Wjz707Z, lat: -35.1948745, lng: 149.0637273}
+  - { name: Wjz70lp,stop_code: Wjz70lp, lat: -35.1966753, lng: 149.0658519}
+  - { name: Wjz70kD,stop_code: Wjz70kD, lat: -35.196836, lng: 149.0659887}
+  - { name: Wjz70zB,stop_code: Wjz70zB, lat: -35.1976784, lng: 149.0688026}
+  - { name: Wjz70zz,stop_code: Wjz70zz, lat: -35.1978567, lng: 149.0687555}
+  - { name: Wjz70IW,stop_code: Wjz70IW, lat: -35.197242, lng: 149.0706277}
+  - { name: Wjz70IY,stop_code: Wjz70IY, lat: -35.1970964, lng: 149.0706179}
+  - { name: Wjz70Wi,stop_code: Wjz70Wi, lat: -35.1986355, lng: 149.0725952}
+  - { name: Wjz70Wx,stop_code: Wjz70Wx, lat: -35.1986717, lng: 149.0728065}
+  - { name: Wjz67_t,stop_code: Wjz67_t, lat: -35.200411, lng: 149.0727116}
+  - { name: Wjz67_v,stop_code: Wjz67_v, lat: -35.2002563, lng: 149.0727607}
+  - { name: Wjz67BD,stop_code: Wjz67BD, lat: -35.2015929, lng: 149.0686908}
+  - { name: Wjz67Dq,stop_code: Wjz67Dq, lat: -35.2006561, lng: 149.0686086}
+  - { name: Wjzcend,stop_code: Wjzcend, lat: -35.2937972, lng: 149.1643403}
+  - { name: Wjzce7O,stop_code: Wjzce7O, lat: -35.2940494, lng: 149.162512}
+  - { name: Wjz68Y0,stop_code: Wjz68Y0, lat: -35.2413091, lng: 149.0832098}
+  - { name: Wjz68W3,stop_code: Wjz68W3, lat: -35.2425008, lng: 149.0831669}
+  - { name: Wjz68IH,stop_code: Wjz68IH, lat: -35.2411129, lng: 149.0812786}
+  - { name: Wjz68Ip,stop_code: Wjz68Ip, lat: -35.2412881, lng: 149.0809439}
+  - { name: WjrW_uo,stop_code: WjrW_uo, lat: -35.3773291, lng: 149.056161}
+  - { name: WjrXUoV,stop_code: WjrXUoV, lat: -35.3758661, lng: 149.0568376}
+  - { name: WjrXUAm,stop_code: WjrXUAm, lat: -35.3726375, lng: 149.0574471}
+  - { name: WjrXUsW,stop_code: WjrXUsW, lat: -35.3730527, lng: 149.0568719}
+  - { name: Wjz5dQt,stop_code: Wjz5dQt, lat: -35.2573605, lng: 149.0822652}
+  - { name: Wjz5l2U,stop_code: Wjz5l2U, lat: -35.2592266, lng: 149.0857332}
+  - { name: Wjz5dcJ,stop_code: Wjz5dcJ, lat: -35.2573868, lng: 149.075852}
+  - { name: Wjz5d81,stop_code: Wjz5d81, lat: -35.2605056, lng: 149.0749293}
+  - { name: Wjz5e8Y,stop_code: Wjz5e8Y, lat: -35.2547235, lng: 149.0761202}
+  - { name: Wjz5NAQ,stop_code: Wjz5NAQ, lat: -35.2794375, lng: 149.1349942}
+  - { name: WjrXMN9,stop_code: WjrXMN9, lat: -35.3751239, lng: 149.0489789}
+  - { name: WjrXMFM,stop_code: WjrXMFM, lat: -35.3752866, lng: 149.0485475}
+  - { name: WjrX-3w,stop_code: WjrX-3w, lat: -35.340876, lng: 149.0522964}
+  - { name: Wjzj4ju,stop_code: Wjzj4ju, lat: -35.351369, lng: 149.2416919}
+  - { name: WjrXJZ6,stop_code: WjrXJZ6, lat: -35.3445279, lng: 149.0392999}
+  - { name: WjrXJ-g,stop_code: WjrXJ-g, lat: -35.3443528, lng: 149.0396647}
+  - { name: Wjz2qnG,stop_code: Wjz2qnG, lat: -35.4038881, lng: 149.0992283}
+  - { name: Wjz3jaF,stop_code: Wjz3jaF, lat: -35.3579826, lng: 149.0867102}
+  - { name: Wjz3i6e,stop_code: Wjz3i6e, lat: -35.3603188, lng: 149.084779}
+  - { name: Wjz3jei,stop_code: Wjz3jei, lat: -35.3551755, lng: 149.0862349}
+  - { name: Wjz3k1J,stop_code: Wjz3k1J, lat: -35.3528521, lng: 149.0854118}
+  - { name: Wjz3kcA,stop_code: Wjz3kcA, lat: -35.3508773, lng: 149.0866243}
+  - { name: Wjz69uI,stop_code: Wjz69uI, lat: -35.2341477, lng: 149.0784965}
+  - { name: Wjz7ZaH,stop_code: Wjz7ZaH, lat: -35.171087, lng: 149.1418054}
+  - { name: Wjz7ZaP,stop_code: Wjz7ZaP, lat: -35.1710474, lng: 149.141884}
+  - { name: Wjz7-oI,stop_code: Wjz7-oI, lat: -35.1668191, lng: 149.1443901}
+  - { name: Wjz7-xb,stop_code: Wjz7-xb, lat: -35.1662448, lng: 149.1450965}
+  - { name: WjzcrEu,stop_code: WjzcrEu, lat: -35.3150059, lng: 149.190788}
+  - { name: WjzbUGB,stop_code: WjzbUGB, lat: -35.3740947, lng: 149.2349556}
+  - { name: WjzbUQX,stop_code: WjzbUQX, lat: -35.3729581, lng: 149.2368028}
+  - { name: Wjzi7mf,stop_code: Wjzi7mf, lat: -35.3766831, lng: 149.2412565}
+  - { name: Wjzj0yX,stop_code: Wjzj0yX, lat: -35.3742978, lng: 149.2450265}
+  - { name: WjzbUCp,stop_code: WjzbUCp, lat: -35.3717241, lng: 149.2334526}
+  - { name: WjzbWBs,stop_code: WjzbWBs, lat: -35.3611492, lng: 149.2334303}
+  - { name: Wjz5FOn,stop_code: Wjz5FOn, lat: -35.2806054, lng: 149.1260452}
+  - { name: WjzbWzE,stop_code: WjzbWzE, lat: -35.3628765, lng: 149.2337473}
+  - { name: WjzbWyW,stop_code: WjzbWyW, lat: -35.363411, lng: 149.2340547}
+  - { name: Wjz7oYv,stop_code: Wjz7oYv, lat: -35.196789, lng: 149.1057064}
+  - { name: Wjz7oZp,stop_code: Wjz7oZp, lat: -35.1966204, lng: 149.1057315}
+  - { name: Wjz7xp9,stop_code: Wjz7xp9, lat: -35.193896, lng: 149.1108506}
+  - { name: Wjz7xpa,stop_code: Wjz7xpa, lat: -35.1938349, lng: 149.1107761}
+  - { name: Wjz5-6R,stop_code: Wjz5-6R, lat: -35.2505265, lng: 149.1404751}
+  - { name: Wjz7YIc,stop_code: Wjz7YIc, lat: -35.1751298, lng: 149.1466086}
+  - { name: WjrW_1f,stop_code: WjrW_1f, lat: -35.3801683, lng: 149.051853}
+  - { name: WjrWTWO,stop_code: WjrWTWO, lat: -35.3798917, lng: 149.0512179}
+  - { name: WjrWTJo,stop_code: WjrWTJo, lat: -35.3779591, lng: 149.0479511}
+  - { name: WjrWTJq,stop_code: WjrWTJq, lat: -35.3778081, lng: 149.0480034}
+  - { name: Wjz5MsT,stop_code: Wjz5MsT, lat: -35.2846782, lng: 149.133671}
+  - { name: Wjz5MsD,stop_code: Wjz5MsD, lat: -35.2847121, lng: 149.1333531}
+  - { name: WjrXBSS,stop_code: WjrXBSS, lat: -35.3438051, lng: 149.0278253}
+  - { name: WjrXBSJ,stop_code: WjrXBSJ, lat: -35.3439387, lng: 149.0276931}
+  - { name: Wjz5Oj2,stop_code: Wjz5Oj2, lat: -35.2748472, lng: 149.131256}
+  - { name: Wjz5Ok1,stop_code: Wjz5Ok1, lat: -35.2742265, lng: 149.1312268}
+  - { name: Wjz5P8K,stop_code: Wjz5P8K, lat: -35.2710632, lng: 149.1307122}
+  - { name: Wjz5SDc,stop_code: Wjz5SDc, lat: -35.2499285, lng: 149.1341368}
+  - { name: Wjz5SrO,stop_code: Wjz5SrO, lat: -35.2528485, lng: 149.1336705}
+  - { name: Wjz5RvC,stop_code: Wjz5RvC, lat: -35.2552151, lng: 149.1332875}
+  - { name: Wjz5Rsi,stop_code: Wjz5Rsi, lat: -35.2576771, lng: 149.132889}
+  - { name: Wjz5QmR,stop_code: Wjz5QmR, lat: -35.2615172, lng: 149.1322602}
+  - { name: Wjz5Qgn,stop_code: Wjz5Qgn, lat: -35.2655006, lng: 149.1316277}
+  - { name: Wjz5Pl0,stop_code: Wjz5Pl0, lat: -35.2681201, lng: 149.1312}
+  - { name: Wjz5Oci,stop_code: Wjz5Oci, lat: -35.2741724, lng: 149.1302168}
+  - { name: Wjz5N4m,stop_code: Wjz5N4m, lat: -35.279266, lng: 149.1287817}
+  - { name: Wjz5N5h,stop_code: Wjz5N5h, lat: -35.2790396, lng: 149.1288222}
+  - { name: Wjz5O3Q,stop_code: Wjz5O3Q, lat: -35.274617, lng: 149.1295599}
+  - { name: Wjz5P8n,stop_code: Wjz5P8n, lat: -35.2710038, lng: 149.1301486}
+  - { name: Wjz5PdJ,stop_code: Wjz5PdJ, lat: -35.2676612, lng: 149.1306865}
+  - { name: Wjz5Qi2,stop_code: Wjz5Qi2, lat: -35.2645608, lng: 149.1311834}
+  - { name: Wjz5Qmu,stop_code: Wjz5Qmu, lat: -35.2613932, lng: 149.1316889}
+  - { name: Wjz5RkN,stop_code: Wjz5RkN, lat: -35.2577065, lng: 149.1322899}
+  - { name: Wjz5Sqk,stop_code: Wjz5Sqk, lat: -35.2533948, lng: 149.1329835}
+  - { name: Wjz5Sux,stop_code: Wjz5Sux, lat: -35.2509191, lng: 149.1333899}
+  - { name: Wjz5MI3,stop_code: Wjz5MI3, lat: -35.2850249, lng: 149.1353935}
+  - { name: WjzbYAM,stop_code: WjzbYAM, lat: -35.3512052, lng: 149.2339748}
+  - { name: Wjz3uDU,stop_code: Wjz3uDU, lat: -35.338154, lng: 149.1022456}
+  - { name: Wjz3uK7,stop_code: Wjz3uK7, lat: -35.3382669, lng: 149.1024969}
+  - { name: Wjz5xl6,stop_code: Wjz5xl6, lat: -35.278643, lng: 149.1093237}
+  - { name: Wjz3eje,stop_code: Wjz3eje, lat: -35.3403963, lng: 149.0765097}
+  - { name: WjrXQ2W,stop_code: WjrXQ2W, lat: -35.3523853, lng: 149.0417814}
+  - { name: WjrXQeH,stop_code: WjrXQeH, lat: -35.3495777, lng: 149.0428125}
+  - { name: WjrXHZU,stop_code: WjrXHZU, lat: -35.3560382, lng: 149.0404158}
+  - { name: Wjz60QI,stop_code: Wjz60QI, lat: -35.2410106, lng: 149.0717141}
+  - { name: Wjz60Y4,stop_code: Wjz60Y4, lat: -35.2410195, lng: 149.0722506}
+  - { name: Wjz60QW,stop_code: Wjz60QW, lat: -35.241186, lng: 149.0720789}
+  - { name: Wjz60Qa,stop_code: Wjz60Qa, lat: -35.2411772, lng: 149.0709792}
+  - { name: Wjz60Qc,stop_code: Wjz60Qc, lat: -35.2410063, lng: 149.0710758}
+  - { name: Wjz6u3h,stop_code: Wjz6u3h, lat: -35.2089622, lng: 149.095889}
+  - { name: Wjz6u32,stop_code: Wjz6u32, lat: -35.2088899, lng: 149.09552}
+  - { name: Wjz6mOx,stop_code: Wjz6mOx, lat: -35.20966, lng: 149.0935299}
+  - { name: Wjz6sHv,stop_code: Wjz6sHv, lat: -35.21947, lng: 149.10295}
+  - { name: Wjz6sZ1,stop_code: Wjz6sZ1, lat: -35.21859, lng: 149.10511}
+  - { name: Wjz6uhX,stop_code: Wjz6uhX, lat: -35.2101981, lng: 149.0994957}
+  - { name: Wjz6uwF,stop_code: Wjz6uwF, lat: -35.2110747, lng: 149.1018989}
+  - { name: WjrWYHH,stop_code: WjrWYHH, lat: -35.3956133, lng: 149.0592665}
+  - { name: WjrWYDE,stop_code: WjrWYDE, lat: -35.3931009, lng: 149.0580053}
+  - { name: WjrWYDO,stop_code: WjrWYDO, lat: -35.3929049, lng: 149.058196}
+  - { name: WjrWYHE,stop_code: WjrWYHE, lat: -35.3958129, lng: 149.0592983}
+  - { name: Wjz6sdP,stop_code: Wjz6sdP, lat: -35.21844, lng: 149.0979199}
+  - { name: Wjz6sdJ,stop_code: Wjz6sdJ, lat: -35.21822, lng: 149.09782}
+  - { name: Wjz6t8_,stop_code: Wjz6t8_, lat: -35.21601, lng: 149.09817}
+  - { name: Wjz6t9w,stop_code: Wjz6t9w, lat: -35.21597, lng: 149.09763}
+  - { name: Wjz6t3F,stop_code: Wjz6t3F, lat: -35.21451, lng: 149.09646}
+  - { name: Wjz6t4U,stop_code: Wjz6t4U, lat: -35.21388, lng: 149.09676}
+  - { name: Wjz5nw6,stop_code: Wjz5nw6, lat: -35.2491082, lng: 149.0900504}
+  - { name: Wjz5nwb,stop_code: Wjz5nwb, lat: -35.2493711, lng: 149.0901523}
+  - { name: Wjz6hxB,stop_code: Wjz6hxB, lat: -35.2374959, lng: 149.0907853}
+  - { name: Wjz6rsL,stop_code: Wjz6rsL, lat: -35.2242562, lng: 149.1005043}
+  - { name: Wjz6rrI,stop_code: Wjz6rrI, lat: -35.2252509, lng: 149.1005016}
+  - { name: Wjz5mbS,stop_code: Wjz5mbS, lat: -35.2525252, lng: 149.0869819}
+  - { name: Wjz5eb2,stop_code: Wjz5eb2, lat: -35.252833, lng: 149.0749872}
+  - { name: Wjz5ec7,stop_code: Wjz5ec7, lat: -35.2517641, lng: 149.0750194}
+  - { name: Wjz5e0m,stop_code: Wjz5e0m, lat: -35.2546115, lng: 149.0739747}
+  - { name: Wjz5d57,stop_code: Wjz5d57, lat: -35.256585, lng: 149.0734919}
+  - { name: Wjz55V-,stop_code: Wjz55V-, lat: -35.2594169, lng: 149.0733684}
+  - { name: Wjz681S,stop_code: Wjz681S, lat: -35.2428905, lng: 149.0745728}
+  - { name: Wjz689c,stop_code: Wjz689c, lat: -35.2430767, lng: 149.0750449}
+  - { name: Wjz6pLi,stop_code: Wjz6pLi, lat: -35.2336222, lng: 149.1026958}
+  - { name: Wjz6pLk,stop_code: Wjz6pLk, lat: -35.2334807, lng: 149.1028323}
+  - { name: Wjz6y90,stop_code: Wjz6y90, lat: -35.2324006, lng: 149.1079069}
+  - { name: Wjz6mip,stop_code: Wjz6mip, lat: -35.2096535, lng: 149.0878294}
+  - { name: Wjz6Apq,stop_code: Wjz6Apq, lat: -35.2212504, lng: 149.1111434}
+  - { name: Wjz6yzQ,stop_code: Wjz6yzQ, lat: -35.2307289, lng: 149.1130906}
+  - { name: Wjz6yzH,stop_code: Wjz6yzH, lat: -35.2308034, lng: 149.1129136}
+  - { name: Wjz5L_c,stop_code: Wjz5L_c, lat: -35.2444385, lng: 149.1272473}
+  - { name: Wjz5Ti2,stop_code: Wjz5Ti2, lat: -35.2480353, lng: 149.1313351}
+  - { name: Wjz6Apy,stop_code: Wjz6Apy, lat: -35.2213073, lng: 149.1113204}
+  - { name: Wjz69ht,stop_code: Wjz69ht, lat: -35.2375061, lng: 149.0768646}
+  - { name: Wjz69gA,stop_code: Wjz69gA, lat: -35.2382334, lng: 149.0769344}
+  - { name: Wjz69vO,stop_code: Wjz69vO, lat: -35.2336108, lng: 149.0786617}
+  - { name: WjrWZsS,stop_code: WjrWZsS, lat: -35.3891768, lng: 149.0567055}
+  - { name: WjrWZA3,stop_code: WjrWZA3, lat: -35.3893963, lng: 149.0571767}
+  - { name: Wjz6iN7,stop_code: Wjz6iN7, lat: -35.2318153, lng: 149.0928498}
+  - { name: Wjz6iNm,stop_code: Wjz6iNm, lat: -35.2318811, lng: 149.0930643}
+  - { name: Wjz6iYm,stop_code: Wjz6iYm, lat: -35.2298806, lng: 149.0944438}
+  - { name: Wjz6iYk,stop_code: Wjz6iYk, lat: -35.2300583, lng: 149.0945448}
+  - { name: Wjz239F,stop_code: Wjz239F, lat: -35.4026063, lng: 149.0647649}
+  - { name: Wjz213w,stop_code: Wjz213w, lat: -35.4123171, lng: 149.0633299}
+  - { name: Wjz213q,stop_code: Wjz213q, lat: -35.4121336, lng: 149.063177}
+  - { name: Wjz20ut,stop_code: Wjz20ut, lat: -35.415325, lng: 149.0672593}
+  - { name: Wjz3hL_,stop_code: Wjz3hL_, lat: -35.3650156, lng: 149.0926464}
+  - { name: Wjz3gK-,stop_code: Wjz3gK-, lat: -35.3712753, lng: 149.0926679}
+  - { name: Wjz3gQn,stop_code: Wjz3gQn, lat: -35.3725942, lng: 149.0931105}
+  - { name: Wjz3gMq,stop_code: Wjz3gMq, lat: -35.3757982, lng: 149.0932419}
+  - { name: Wjz238T,stop_code: Wjz238T, lat: -35.4027681, lng: 149.0650277}
+  - { name: Wjz3kAx,stop_code: Wjz3kAx, lat: -35.3511369, lng: 149.0906806}
+  - { name: Wjz3kwU,stop_code: Wjz3kwU, lat: -35.3539843, lng: 149.0913052}
+  - { name: Wjz3iFK,stop_code: Wjz3iFK, lat: -35.3637163, lng: 149.0922629}
+  - { name: Wjz6rp1,stop_code: Wjz6rp1, lat: -35.2268254, lng: 149.0996755}
+  - { name: Wjz6rhW,stop_code: Wjz6rhW, lat: -35.2267553, lng: 149.0994502}
+  - { name: Wjz6qe4,stop_code: Wjz6qe4, lat: -35.2286658, lng: 149.0969557}
+  - { name: Wjz6qea,stop_code: Wjz6qea, lat: -35.2288148, lng: 149.0970523}
+  - { name: Wjz6zAP,stop_code: Wjz6zAP, lat: -35.2246234, lng: 149.113116}
+  - { name: Wjz5GNG,stop_code: Wjz5GNG, lat: -35.2762093, lng: 149.1265723}
+  - { name: Wjz5E4O,stop_code: Wjz5E4O, lat: -35.2851023, lng: 149.1186022}
+  - { name: Wjz5w_S,stop_code: Wjz5w_S, lat: -35.2827048, lng: 149.117182}
+  - { name: Wjz5yYV,stop_code: Wjz5yYV, lat: -35.2742188, lng: 149.1173067}
+  - { name: Wjz3leq,stop_code: Wjz3leq, lat: -35.344135, lng: 149.0864401}
+  - { name: Wjz3ldS,stop_code: Wjz3ldS, lat: -35.3445222, lng: 149.0870435}
+  - { name: Wjz3ldj,stop_code: Wjz3ldj, lat: -35.3447574, lng: 149.0862912}
+  - { name: Wjz3ldh,stop_code: Wjz3ldh, lat: -35.3449697, lng: 149.0863328}
+  - { name: Wjz3ldC,stop_code: Wjz3ldC, lat: -35.344484, lng: 149.0866144}
+  - { name: Wjz3ldT,stop_code: Wjz3ldT, lat: -35.3444271, lng: 149.0869631}
+  - { name: Wjz3lm0,stop_code: Wjz3lm0, lat: -35.34438, lng: 149.0872661}
+  - { name: Wjz3ldJ,stop_code: Wjz3ldJ, lat: -35.344566, lng: 149.086774}
+  - { name: Wjz3ll7,stop_code: Wjz3ll7, lat: -35.3444741, lng: 149.0873533}
+  - { name: Wjz3lmt,stop_code: Wjz3lmt, lat: -35.3439501, lng: 149.0877369}
+  - { name: Wjz3lml,stop_code: Wjz3lml, lat: -35.3439129, lng: 149.0876216}
+  - { name: Wjz3lmi,stop_code: Wjz3lmi, lat: -35.3442093, lng: 149.0876443}
+  - { name: Wjz3llf,stop_code: Wjz3llf, lat: -35.34445, lng: 149.0875371}
+  - { name: Wjz3leo,stop_code: Wjz3leo, lat: -35.344368, lng: 149.0864991}
+  - { name: Wjz3kyX,stop_code: Wjz3kyX, lat: -35.3523555, lng: 149.0913002}
+  - { name: Wjz3lmq,stop_code: Wjz3lmq, lat: -35.3442083, lng: 149.0877771}
+  - { name: Wjz20nf,stop_code: Wjz20nf, lat: -35.4144924, lng: 149.0655423}
+  - { name: Wjz21g2,stop_code: Wjz21g2, lat: -35.414217, lng: 149.0653492}
+  - { name: Wjz218U,stop_code: Wjz218U, lat: -35.4143897, lng: 149.0652364}
+  - { name: Wjz20nd,stop_code: Wjz20nd, lat: -35.4146761, lng: 149.0654565}
+  - { name: Wjz20ni,stop_code: Wjz20ni, lat: -35.4149428, lng: 149.0656523}
+  - { name: Wjz20nk,stop_code: Wjz20nk, lat: -35.4147569, lng: 149.0657435}
+  - { name: Wjr-UJ-,stop_code: Wjr-UJ-, lat: -35.240121, lng: 149.0597101}
+  - { name: Wjr-USo,stop_code: Wjr-USo, lat: -35.2400027, lng: 149.0603149}
+  - { name: Wjr-USy,stop_code: Wjr-USy, lat: -35.2397639, lng: 149.0604531}
+  - { name: Wjr-USa,stop_code: Wjr-USa, lat: -35.2398454, lng: 149.0600442}
+  - { name: Wjz7YzW,stop_code: Wjz7YzW, lat: -35.1759253, lng: 149.1462691}
+  - { name: Wjr-SAW,stop_code: Wjr-SAW, lat: -35.2081966, lng: 149.0473834}
+  - { name: Wjzc24u,stop_code: Wjzc24u, lat: -35.317722, lng: 149.1510115}
+  - { name: Wjz4WZo,stop_code: Wjz4WZo, lat: -35.3175809, lng: 149.1496027}
+  - { name: Wjz4WY7,stop_code: Wjz4WY7, lat: -35.3176372, lng: 149.1491419}
+  - { name: WjrXPbu,stop_code: WjrXPbu, lat: -35.3568919, lng: 149.0424224}
+  - { name: WjrXPbD,stop_code: WjrXPbD, lat: -35.356823, lng: 149.0426424}
+  - { name: WjrXBWn,stop_code: WjrXBWn, lat: -35.3465295, lng: 149.0286032}
+  - { name: WjrXBWu,stop_code: WjrXBWu, lat: -35.3466197, lng: 149.0287455}
+  - { name: WjrXI5u,stop_code: WjrXI5u, lat: -35.3499839, lng: 149.0301495}
+  - { name: WjrXI5s,stop_code: WjrXI5s, lat: -35.3501807, lng: 149.0301549}
+  - { name: WjrXIbK,stop_code: WjrXIbK, lat: -35.3514081, lng: 149.0319332}
+  - { name: WjrXIbT,stop_code: WjrXIbT, lat: -35.351342, lng: 149.0321099}
+  - { name: WjrXIqk,stop_code: WjrXIqk, lat: -35.3522608, lng: 149.0341457}
+  - { name: WjrXIqp,stop_code: WjrXIqp, lat: -35.352473, lng: 149.0342718}
+  - { name: WjrXHvw,stop_code: WjrXHvw, lat: -35.3546272, lng: 149.0344542}
+  - { name: WjrXHuL,stop_code: WjrXHuL, lat: -35.3547054, lng: 149.0346008}
+  - { name: WjrXHH7,stop_code: WjrXHH7, lat: -35.3568349, lng: 149.0364585}
+  - { name: WjrXHHk,stop_code: WjrXHHk, lat: -35.3570187, lng: 149.0369096}
+  - { name: WjrXHYJ,stop_code: WjrXHYJ, lat: -35.356246, lng: 149.0401055}
+  - { name: WjrXPgO,stop_code: WjrXPgO, lat: -35.3592839, lng: 149.0444246}
+  - { name: WjrXOn_,stop_code: WjrXOn_, lat: -35.359526, lng: 149.0445552}
+  - { name: WjrXPFr,stop_code: WjrXPFr, lat: -35.3585046, lng: 149.0479415}
+  - { name: WjrXPFn,stop_code: WjrXPFn, lat: -35.358206, lng: 149.0478792}
+  - { name: WjrXPR4,stop_code: WjrXPR4, lat: -35.3556673, lng: 149.048857}
+  - { name: WjrXPJX,stop_code: WjrXPJX, lat: -35.3557253, lng: 149.0486263}
+  - { name: WjrXQO9,stop_code: WjrXQO9, lat: -35.352521, lng: 149.0490119}
+  - { name: WjrXQOh,stop_code: WjrXQOh, lat: -35.3524926, lng: 149.049231}
+  - { name: WjrXQTq,stop_code: WjrXQTq, lat: -35.348941, lng: 149.0494159}
+  - { name: WjrXQTy,stop_code: WjrXQTy, lat: -35.3489683, lng: 149.0495709}
+  - { name: WjrXRMq,stop_code: WjrXRMq, lat: -35.3483271, lng: 149.0492963}
+  - { name: WjrXRFB,stop_code: WjrXRFB, lat: -35.3473864, lng: 149.048202}
+  - { name: WjrXRyK,stop_code: WjrXRyK, lat: -35.3465911, lng: 149.0470392}
+  - { name: WjrXRzE,stop_code: WjrXRzE, lat: -35.3464066, lng: 149.0469632}
+  - { name: WjrXRBQ,stop_code: WjrXRBQ, lat: -35.3446963, lng: 149.0471083}
+  - { name: WjrXRBJ,stop_code: WjrXRBJ, lat: -35.344588, lng: 149.0469995}
+  - { name: WjrX-0-,stop_code: WjrX-0-, lat: -35.3424839, lng: 149.052828}
+  - { name: WjrX-90,stop_code: WjrX-90, lat: -35.3423165, lng: 149.0529937}
+  - { name: WjrXZv3,stop_code: WjrXZv3, lat: -35.3434037, lng: 149.0557375}
+  - { name: WjrXZv5,stop_code: WjrXZv5, lat: -35.3432647, lng: 149.0558034}
+  - { name: Wjz3dXS,stop_code: Wjz3dXS, lat: -35.3459117, lng: 149.0842511}
+  - { name: Wjr-uhM,stop_code: Wjr-uhM, lat: -35.2104818, lng: 149.0114129}
+  - { name: Wjz3BfO,stop_code: Wjz3BfO, lat: -35.3434784, lng: 149.1088951}
+  - { name: Wjz3Bea,stop_code: Wjz3Bea, lat: -35.3442178, lng: 149.1080098}
 routes:
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "10"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 632a
-      - 642a
-      - 644a
-      - 649a
-      - 659a
-      - 706a
-      - 708a
-      - 712a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 702a
-      - 712a
-      - 714a
-      - 719a
-      - 729a
-      - 736a
-      - 738a
-      - 742a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 732a
-      - 742a
-      - 744a
-      - 749a
-      - 759a
-      - 806a
-      - 808a
-      - 812a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 802a
-      - 812a
-      - 814a
-      - 819a
-      - 829a
-      - 836a
-      - 838a
-      - 842a
-    - - "-"
-      - "-"
-      - "-"
-      - 800a
-      - 803a
-      - 808a
-      - 820a
-      - 830a
-      - 832a
-      - 837a
-      - 847a
-      - 854a
-      - 856a
-      - 900a
-    - - "-"
-      - "-"
-      - "-"
-      - 830a
-      - 833a
-      - 838a
-      - 850a
-      - 900a
-      - 902a
-      - 907a
-      - 917a
-      - 924a
-      - 926a
-      - 930a
-    - - "-"
-      - "-"
-      - "-"
-      - 900a
-      - 903a
-      - 908a
-      - 920a
-      - 930a
-      - 932a
-      - 937a
-      - 947a
-      - 954a
-      - 956a
-      - 1000a
-    - - 918a
-      - 929a
-      - 934a
-      - 941a
-      - 944a
-      - 949a
-      - 1001a
-      - 1011a
-      - 1013a
-      - 1018a
-      - 1028a
-      - 1035a
-      - 1037a
-      - 1041a
-    - - 948a
-      - 959a
-      - 1004a
-      - 1011a
-      - 1014a
-      - 1019a
-      - 1031a
-      - 1041a
-      - 1043a
-      - 1048a
-      - 1058a
-      - 1105a
-      - 1107a
-      - 1111a
-    - - 1018a
-      - 1029a
-      - 1034a
-      - 1041a
-      - 1044a
-      - 1049a
-      - 1101a
-      - 1111a
-      - 1113a
-      - 1118a
-      - 1128a
-      - 1135a
-      - 1137a
-      - 1141a
-    - - 1048a
-      - 1059a
-      - 1104a
-      - 1111a
-      - 1114a
-      - 1119a
-      - 1131a
-      - 1141a
-      - 1143a
-      - 1148a
-      - 1158a
-      - 1205p
-      - 1207p
-      - 1211p
-    - - 1118a
-      - 1129a
-      - 1134a
-      - 1141a
-      - 1144a
-      - 1149a
-      - 1201p
-      - 1211p
-      - 1213p
-      - 1218p
-      - 1228p
-      - 1235p
-      - 1237p
-      - 1241p
-    - - 1148a
-      - 1159a
-      - 1204p
-      - 1211p
-      - 1214p
-      - 1219p
-      - 1231p
-      - 1241p
-      - 1243p
-      - 1248p
-      - 1258p
-      - 105p
-      - 107p
-      - 111p
-    - - 1218p
-      - 1229p
-      - 1234p
-      - 1241p
-      - 1244p
-      - 1249p
-      - 101p
-      - 111p
-      - 113p
-      - 118p
-      - 128p
-      - 135p
-      - 137p
-      - 141p
-    - - 1248p
-      - 1259p
-      - 104p
-      - 111p
-      - 114p
-      - 119p
-      - 131p
-      - 141p
-      - 143p
-      - 148p
-      - 158p
-      - 205p
-      - 207p
-      - 211p
-    - - 118p
-      - 129p
-      - 134p
-      - 141p
-      - 144p
-      - 149p
-      - 201p
-      - 211p
-      - 213p
-      - 218p
-      - 228p
-      - 235p
-      - 237p
-      - 241p
-    - - 148p
-      - 159p
-      - 204p
-      - 211p
-      - 214p
-      - 219p
-      - 231p
-      - 241p
-      - 243p
-      - 248p
-      - 258p
-      - 305p
-      - 307p
-      - 311p
-    - - 218p
-      - 229p
-      - 234p
-      - 241p
-      - 244p
-      - 249p
-      - 301p
-      - 311p
-      - 314p
-      - 319p
-      - 329p
-      - 336p
-      - 338p
-      - 342p
-    - - 248p
-      - 259p
-      - 304p
-      - 311p
-      - 315p
-      - 320p
-      - 332p
-      - 342p
-      - 345p
-      - 350p
-      - 400p
-      - 407p
-      - 409p
-      - 413p
-    - - 318p
-      - 329p
-      - 334p
-      - 341p
-      - 345p
-      - 350p
-      - 402p
-      - 412p
-      - 415p
-      - 420p
-      - 430p
-      - 437p
-      - 439p
-      - 443p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 416p
-      - 426p
-      - 429p
-      - 434p
-      - 444p
-      - 451p
-      - 453p
-      - 457p
-    - - 348p
-      - 359p
-      - 404p
-      - 411p
-      - 415p
-      - 420p
-      - 432p
-      - 442p
-      - 445p
-      - 450p
-      - 500p
-      - 507p
-      - 509p
-      - 513p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 446p
-      - 456p
-      - 459p
-      - 504p
-      - 514p
-      - 521p
-      - 523p
-      - 527p
-    - - "-"
-      - "-"
-      - 431p
-      - 441p
-      - 445p
-      - 450p
-      - 502p
-      - 512p
-      - 515p
-      - 520p
-      - 530p
-      - 537p
-      - 539p
-      - 543p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 516p
-      - 526p
-      - 529p
-      - 534p
-      - 544p
-      - 551p
-      - 553p
-      - 557p
-    - - "-"
-      - "-"
-      - 458p
-      - 511p
-      - 515p
-      - 520p
-      - 532p
-      - 542p
-      - 545p
-      - 550p
-      - 600p
-      - 607p
-      - 609p
-      - 613p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 546p
-      - 556p
-      - 559p
-      - 604p
-      - 614p
-      - 621p
-      - 623p
-      - 627p
-    - - "-"
-      - "-"
-      - "-"
-      - 540p
-      - 544p
-      - 549p
-      - 601p
-      - 611p
-      - 614p
-      - 619p
-      - 629p
-      - 636p
-      - 638p
-      - 641p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 616p
-      - 626p
-      - 629p
-      - 634p
-      - 644p
-      - 651p
-      - 653p
-      - 656p
-    - - "-"
-      - "-"
-      - "-"
-      - 611p
-      - 615p
-      - 620p
-      - 632p
-      - 642p
-      - 644p
-      - 649p
-      - 659p
-      - 706p
-      - 708p
-      - 711p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 736p
-      - 746p
-      - 748p
-      - 753p
-      - 803p
-      - 810p
-      - 812p
-      - 815p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 836p
-      - 846p
-      - 848p
-      - 853p
-      - 903p
-      - 910p
-      - 912p
-      - 915p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 936p
-      - 946p
-      - 948p
-      - 953p
-      - 1003p
-      - 1010p
-      - 1012p
-      - 1015p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1036p
-      - 1046p
-      - 1048p
-      - 1053p
-      - 1103p
-      - 1110p
-      - 1112p
-      - 1115p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1136p
-      - 1146p
-      - 1148p
-      - 1153p
-      - 1203a
-      - 1210a
-      - 1212a
-      - 1215a
-    time_points: 
-    - Fairbairn Park
-    - Brindabella Business Park
-    - Majura Business Park
-    - Campbell Park Offices
-    - ADFA
-    - War Memorial
-    - City Interchange - Platform 4
-    - Caswell Drive
-    - Aranda
-    - Cook
-    - Jamison Centre
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    stop_times: [["-", "-", "-", "-", "-", "-", 632a, 642a, 644a, 649a, 659a, 706a, 708a, 712a], ["-", "-", "-", "-", "-", "-", 702a, 712a, 714a, 719a, 729a, 736a, 738a, 742a], ["-", "-", "-", "-", "-", "-", 732a, 742a, 744a, 749a, 759a, 806a, 808a, 812a], ["-", "-", "-", "-", "-", "-", 802a, 812a, 814a, 819a, 829a, 836a, 838a, 842a], ["-", "-", "-", 800a, 803a, 808a, 820a, 830a, 832a, 837a, 847a, 854a, 856a, 900a], ["-", "-", "-", 830a, 833a, 838a, 850a, 900a, 902a, 907a, 917a, 924a, 926a, 930a], ["-", "-", "-", 900a, 903a, 908a, 920a, 930a, 932a, 937a, 947a, 954a, 956a, 1000a], [918a, 929a, 934a, 941a, 944a, 949a, 1001a, 1011a, 1013a, 1018a, 1028a, 1035a, 1037a, 1041a], [948a, 959a, 1004a, 1011a, 1014a, 1019a, 1031a, 1041a, 1043a, 1048a, 1058a, 1105a, 1107a, 1111a], [1018a, 1029a, 1034a, 1041a, 1044a, 1049a, 1101a, 1111a, 1113a, 1118a, 1128a, 1135a, 1137a, 1141a], [1048a, 1059a, 1104a, 1111a, 1114a, 1119a, 1131a, 1141a, 1143a, 1148a, 1158a, 1205p, 1207p, 1211p], [1118a, 1129a, 1134a, 1141a, 1144a, 1149a, 1201p, 1211p, 1213p, 1218p, 1228p, 1235p, 1237p, 1241p], [1148a, 1159a, 1204p, 1211p, 1214p, 1219p, 1231p, 1241p, 1243p, 1248p, 1258p, 105p, 107p, 111p], [1218p, 1229p, 1234p, 1241p, 1244p, 1249p, 101p, 111p, 113p, 118p, 128p, 135p, 137p, 141p], [1248p, 1259p, 104p, 111p, 114p, 119p, 131p, 141p, 143p, 148p, 158p, 205p, 207p, 211p], [118p, 129p, 134p, 141p, 144p, 149p, 201p, 211p, 213p, 218p, 228p, 235p, 237p, 241p], [148p, 159p, 204p, 211p, 214p, 219p, 231p, 241p, 243p, 248p, 258p, 305p, 307p, 311p], [218p, 229p, 234p, 241p, 244p, 249p, 301p, 311p, 314p, 319p, 329p, 336p, 338p, 342p], [248p, 259p, 304p, 311p, 315p, 320p, 332p, 342p, 345p, 350p, 400p, 407p, 409p, 413p], [318p, 329p, 334p, 341p, 345p, 350p, 402p, 412p, 415p, 420p, 430p, 437p, 439p, 443p], ["-", "-", "-", "-", "-", "-", 416p, 426p, 429p, 434p, 444p, 451p, 453p, 457p], [348p, 359p, 404p, 411p, 415p, 420p, 432p, 442p, 445p, 450p, 500p, 507p, 509p, 513p], ["-", "-", "-", "-", "-", "-", 446p, 456p, 459p, 504p, 514p, 521p, 523p, 527p], ["-", "-", 431p, 441p, 445p, 450p, 502p, 512p, 515p, 520p, 530p, 537p, 539p, 543p], ["-", "-", "-", "-", "-", "-", 516p, 526p, 529p, 534p, 544p, 551p, 553p, 557p], ["-", "-", 458p, 511p, 515p, 520p, 532p, 542p, 545p, 550p, 600p, 607p, 609p, 613p], ["-", "-", "-", "-", "-", "-", 546p, 556p, 559p, 604p, 614p, 621p, 623p, 627p], ["-", "-", "-", 540p, 544p, 549p, 601p, 611p, 614p, 619p, 629p, 636p, 638p, 641p], ["-", "-", "-", "-", "-", "-", 616p, 626p, 629p, 634p, 644p, 651p, 653p, 656p], ["-", "-", "-", 611p, 615p, 620p, 632p, 642p, 644p, 649p, 659p, 706p, 708p, 711p], ["-", "-", "-", "-", "-", "-", 736p, 746p, 748p, 753p, 803p, 810p, 812p, 815p], ["-", "-", "-", "-", "-", "-", 836p, 846p, 848p, 853p, 903p, 910p, 912p, 915p], ["-", "-", "-", "-", "-", "-", 936p, 946p, 948p, 953p, 1003p, 1010p, 1012p, 1015p], ["-", "-", "-", "-", "-", "-", 1036p, 1046p, 1048p, 1053p, 1103p, 1110p, 1112p, 1115p], ["-", "-", "-", "-", "-", "-", 1136p, 1146p, 1148p, 1153p, 1203a, 1210a, 1212a, 1215a]]
+    time_points: [Fairbairn Park, Brindabella Business Park, Majura Business Park, Campbell Park Offices, ADFA, War Memorial, City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Fairbairn Park
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "10"
-    stop_times: 
-    - - 553a
-      - 555a
-      - 559a
-      - 606a
-      - 616a
-      - 621a
-      - 624a
-      - 634a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 624a
-      - 626a
-      - 630a
-      - 637a
-      - 647a
-      - 652a
-      - 655a
-      - 705a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 654a
-      - 656a
-      - 700a
-      - 707a
-      - 717a
-      - 722a
-      - 725a
-      - 736a
-      - 746a
-      - 752a
-      - 756a
-      - 803a
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 724a
-      - 729a
-      - 732a
-      - 742a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 709a
-      - 711a
-      - 715a
-      - 722a
-      - 732a
-      - 737a
-      - 740a
-      - 750a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 724a
-      - 726a
-      - 730a
-      - 737a
-      - 747a
-      - 752a
-      - 755a
-      - 806a
-      - 816a
-      - 822a
-      - 826a
-      - 835a
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 754a
-      - 759a
-      - 802a
-      - 812a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 739a
-      - 741a
-      - 745a
-      - 752a
-      - 802a
-      - 807a
-      - 810a
-      - 820a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 754a
-      - 756a
-      - 800a
-      - 807a
-      - 817a
-      - 822a
-      - 825a
-      - 836a
-      - 846a
-      - 852a
-      - 856a
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - 812a
-      - 822a
-      - 827a
-      - 830a
-      - 840a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 809a
-      - 811a
-      - 815a
-      - 822a
-      - 832a
-      - 837a
-      - 840a
-      - 851a
-      - 901a
-      - 907a
-      - 911a
-      - 918a
-      - 927a
-      - 935a
-    - - 824a
-      - 826a
-      - 830a
-      - 837a
-      - 847a
-      - 852a
-      - 855a
-      - 905a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 839a
-      - 841a
-      - 845a
-      - 852a
-      - 902a
-      - 907a
-      - 910a
-      - 921a
-      - 931a
-      - 937a
-      - 940a
-      - 947a
-      - 956a
-      - 1004a
-    - - 854a
-      - 856a
-      - 900a
-      - 907a
-      - 917a
-      - 922a
-      - 925a
-      - 935a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 955a
-      - 1005a
-      - 1011a
-      - 1014a
-      - 1021a
-      - 1030a
-      - 1038a
-    - - 925a
-      - 927a
-      - 931a
-      - 938a
-      - 948a
-      - 953a
-      - 955a
-      - 1005a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1025a
-      - 1035a
-      - 1041a
-      - 1044a
-      - 1051a
-      - 1100a
-      - 1108a
-    - - 957a
-      - 959a
-      - 1003a
-      - 1010a
-      - 1020a
-      - 1025a
-      - 1027a
-      - 1037a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1055a
-      - 1105a
-      - 1111a
-      - 1114a
-      - 1121a
-      - 1130a
-      - 1138a
-    - - 1026a
-      - 1028a
-      - 1032a
-      - 1039a
-      - 1049a
-      - 1054a
-      - 1056a
-      - 1106a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1125a
-      - 1135a
-      - 1141a
-      - 1144a
-      - 1151a
-      - 1200p
-      - 1208p
-    - - 1056a
-      - 1058a
-      - 1102a
-      - 1109a
-      - 1119a
-      - 1124a
-      - 1126a
-      - 1136a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1155a
-      - 1205p
-      - 1211p
-      - 1214p
-      - 1221p
-      - 1230p
-      - 1238p
-    - - 1126a
-      - 1128a
-      - 1132a
-      - 1139a
-      - 1149a
-      - 1154a
-      - 1156a
-      - 1206p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1225p
-      - 1235p
-      - 1241p
-      - 1244p
-      - 1251p
-      - 100p
-      - 108p
-    - - 1156a
-      - 1158a
-      - 1202p
-      - 1209p
-      - 1219p
-      - 1224p
-      - 1226p
-      - 1236p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1255p
-      - 105p
-      - 111p
-      - 114p
-      - 121p
-      - 130p
-      - 138p
-    - - 1226p
-      - 1228p
-      - 1232p
-      - 1239p
-      - 1249p
-      - 1254p
-      - 1256p
-      - 106p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 125p
-      - 135p
-      - 141p
-      - 144p
-      - 151p
-      - 200p
-      - 208p
-    - - 1256p
-      - 1258p
-      - 102p
-      - 109p
-      - 119p
-      - 124p
-      - 126p
-      - 136p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 155p
-      - 205p
-      - 211p
-      - 214p
-      - 221p
-      - 230p
-      - 238p
-    - - 126p
-      - 128p
-      - 132p
-      - 139p
-      - 149p
-      - 154p
-      - 156p
-      - 206p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 225p
-      - 235p
-      - 241p
-      - 244p
-      - 251p
-      - 300p
-      - 308p
-    - - 156p
-      - 158p
-      - 202p
-      - 209p
-      - 219p
-      - 224p
-      - 226p
-      - 236p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 255p
-      - 305p
-      - 311p
-      - 315p
-      - 322p
-      - 331p
-      - 339p
-    - - 226p
-      - 228p
-      - 232p
-      - 239p
-      - 249p
-      - 254p
-      - 256p
-      - 306p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 329p
-      - 339p
-      - 345p
-      - 349p
-      - 356p
-      - 405p
-      - 413p
-    - - 256p
-      - 258p
-      - 302p
-      - 309p
-      - 319p
-      - 324p
-      - 326p
-      - 336p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 359p
-      - 409p
-      - 415p
-      - 419p
-      - 426p
-      - 435p
-      - 443p
-    - - 326p
-      - 328p
-      - 332p
-      - 339p
-      - 349p
-      - 354p
-      - 356p
-      - 406p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 341p
-      - 343p
-      - 347p
-      - 354p
-      - 404p
-      - 409p
-      - 411p
-      - 421p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 356p
-      - 358p
-      - 402p
-      - 409p
-      - 419p
-      - 424p
-      - 426p
-      - 436p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 447p
-      - 457p
-      - 503p
-      - 507p
-      - "-"
-      - "-"
-      - "-"
-    - - 411p
-      - 413p
-      - 417p
-      - 424p
-      - 434p
-      - 439p
-      - 441p
-      - 451p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 426p
-      - 428p
-      - 432p
-      - 439p
-      - 449p
-      - 454p
-      - 456p
-      - 506p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 441p
-      - 443p
-      - 447p
-      - 454p
-      - 504p
-      - 509p
-      - 511p
-      - 521p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 456p
-      - 458p
-      - 502p
-      - 509p
-      - 519p
-      - 524p
-      - 526p
-      - 536p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 511p
-      - 513p
-      - 517p
-      - 524p
-      - 534p
-      - 539p
-      - 541p
-      - 551p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 526p
-      - 528p
-      - 532p
-      - 539p
-      - 549p
-      - 554p
-      - 556p
-      - 606p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 541p
-      - 543p
-      - 547p
-      - 554p
-      - 604p
-      - 609p
-      - 611p
-      - 621p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 620p
-      - 622p
-      - 626p
-      - 633p
-      - 643p
-      - 648p
-      - 650p
-      - 700p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 720p
-      - 722p
-      - 725p
-      - 732p
-      - 742p
-      - 747p
-      - 749p
-      - 759p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 820p
-      - 822p
-      - 825p
-      - 832p
-      - 842p
-      - 847p
-      - 849p
-      - 859p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 920p
-      - 922p
-      - 925p
-      - 932p
-      - 942p
-      - 947p
-      - 949p
-      - 959p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1020p
-      - 1022p
-      - 1025p
-      - 1032p
-      - 1042p
-      - 1047p
-      - 1049p
-      - 1059p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1120p
-      - 1122p
-      - 1125p
-      - 1132p
-      - 1142p
-      - 1147p
-      - 1149p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Jamison Centre
-    - Cook
-    - Aranda
-    - Caswell Drive
-    - City Interchange - Platform 7
-    - War Memorial
-    - ADFA
-    - Campbell Park Offices
-    - Majura Business Park
-    - Brindabella Business Park
-    - Fairbairn Park
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [[553a, 555a, 559a, 606a, 616a, 621a, 624a, 634a, "-", "-", "-", "-", "-", "-"], [624a, 626a, 630a, 637a, 647a, 652a, 655a, 705a, "-", "-", "-", "-", "-", "-"], [654a, 656a, 700a, 707a, 717a, 722a, 725a, 736a, 746a, 752a, 756a, 803a, "-", "-"], ["-", "-", "-", "-", 724a, 729a, 732a, 742a, "-", "-", "-", "-", "-", "-"], [709a, 711a, 715a, 722a, 732a, 737a, 740a, 750a, "-", "-", "-", "-", "-", "-"], [724a, 726a, 730a, 737a, 747a, 752a, 755a, 806a, 816a, 822a, 826a, 835a, "-", "-"], ["-", "-", "-", "-", 754a, 759a, 802a, 812a, "-", "-", "-", "-", "-", "-"], [739a, 741a, 745a, 752a, 802a, 807a, 810a, 820a, "-", "-", "-", "-", "-", "-"], [754a, 756a, 800a, 807a, 817a, 822a, 825a, 836a, 846a, 852a, 856a, "-", "-", "-"], ["-", "-", "-", 812a, 822a, 827a, 830a, 840a, "-", "-", "-", "-", "-", "-"], [809a, 811a, 815a, 822a, 832a, 837a, 840a, 851a, 901a, 907a, 911a, 918a, 927a, 935a], [824a, 826a, 830a, 837a, 847a, 852a, 855a, 905a, "-", "-", "-", "-", "-", "-"], [839a, 841a, 845a, 852a, 902a, 907a, 910a, 921a, 931a, 937a, 940a, 947a, 956a, 1004a], [854a, 856a, 900a, 907a, 917a, 922a, 925a, 935a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 955a, 1005a, 1011a, 1014a, 1021a, 1030a, 1038a], [925a, 927a, 931a, 938a, 948a, 953a, 955a, 1005a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1025a, 1035a, 1041a, 1044a, 1051a, 1100a, 1108a], [957a, 959a, 1003a, 1010a, 1020a, 1025a, 1027a, 1037a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1055a, 1105a, 1111a, 1114a, 1121a, 1130a, 1138a], [1026a, 1028a, 1032a, 1039a, 1049a, 1054a, 1056a, 1106a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1125a, 1135a, 1141a, 1144a, 1151a, 1200p, 1208p], [1056a, 1058a, 1102a, 1109a, 1119a, 1124a, 1126a, 1136a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1155a, 1205p, 1211p, 1214p, 1221p, 1230p, 1238p], [1126a, 1128a, 1132a, 1139a, 1149a, 1154a, 1156a, 1206p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1225p, 1235p, 1241p, 1244p, 1251p, 100p, 108p], [1156a, 1158a, 1202p, 1209p, 1219p, 1224p, 1226p, 1236p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1255p, 105p, 111p, 114p, 121p, 130p, 138p], [1226p, 1228p, 1232p, 1239p, 1249p, 1254p, 1256p, 106p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 125p, 135p, 141p, 144p, 151p, 200p, 208p], [1256p, 1258p, 102p, 109p, 119p, 124p, 126p, 136p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 155p, 205p, 211p, 214p, 221p, 230p, 238p], [126p, 128p, 132p, 139p, 149p, 154p, 156p, 206p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 225p, 235p, 241p, 244p, 251p, 300p, 308p], [156p, 158p, 202p, 209p, 219p, 224p, 226p, 236p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 255p, 305p, 311p, 315p, 322p, 331p, 339p], [226p, 228p, 232p, 239p, 249p, 254p, 256p, 306p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 329p, 339p, 345p, 349p, 356p, 405p, 413p], [256p, 258p, 302p, 309p, 319p, 324p, 326p, 336p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 359p, 409p, 415p, 419p, 426p, 435p, 443p], [326p, 328p, 332p, 339p, 349p, 354p, 356p, 406p, "-", "-", "-", "-", "-", "-"], [341p, 343p, 347p, 354p, 404p, 409p, 411p, 421p, "-", "-", "-", "-", "-", "-"], [356p, 358p, 402p, 409p, 419p, 424p, 426p, 436p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 447p, 457p, 503p, 507p, "-", "-", "-"], [411p, 413p, 417p, 424p, 434p, 439p, 441p, 451p, "-", "-", "-", "-", "-", "-"], [426p, 428p, 432p, 439p, 449p, 454p, 456p, 506p, "-", "-", "-", "-", "-", "-"], [441p, 443p, 447p, 454p, 504p, 509p, 511p, 521p, "-", "-", "-", "-", "-", "-"], [456p, 458p, 502p, 509p, 519p, 524p, 526p, 536p, "-", "-", "-", "-", "-", "-"], [511p, 513p, 517p, 524p, 534p, 539p, 541p, 551p, "-", "-", "-", "-", "-", "-"], [526p, 528p, 532p, 539p, 549p, 554p, 556p, 606p, "-", "-", "-", "-", "-", "-"], [541p, 543p, 547p, 554p, 604p, 609p, 611p, 621p, "-", "-", "-", "-", "-", "-"], [620p, 622p, 626p, 633p, 643p, 648p, 650p, 700p, "-", "-", "-", "-", "-", "-"], [720p, 722p, 725p, 732p, 742p, 747p, 749p, 759p, "-", "-", "-", "-", "-", "-"], [820p, 822p, 825p, 832p, 842p, 847p, 849p, 859p, "-", "-", "-", "-", "-", "-"], [920p, 922p, 925p, 932p, 942p, 947p, 949p, 959p, "-", "-", "-", "-", "-", "-"], [1020p, 1022p, 1025p, 1032p, 1042p, 1047p, 1049p, 1059p, "-", "-", "-", "-", "-", "-"], [1120p, 1122p, 1125p, 1132p, 1142p, 1147p, 1149p, "-", "-", "-", "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange - Platform 7, War Memorial, ADFA, Campbell Park Offices, Majura Business Park, Brindabella Business Park, Fairbairn Park]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
     short_name: 11/111
-    stop_times: 
-    - - 621a
-      - 627a
-      - 641a
-      - 651a
-      - 657a
-      - 713a
-      - 729a
-    - - 641a
-      - 647a
-      - 701a
-      - 711a
-      - 717a
-      - 733a
-      - 751a
-    - - 701a
-      - 707a
-      - 721a
-      - 731a
-      - 737a
-      - 754a
-      - 812a
-    - - 721a
-      - 727a
-      - 742a
-      - 752a
-      - 758a
-      - 815a
-      - 833a
-    - - 741a
-      - 748a
-      - 803a
-      - 813a
-      - 819a
-      - 836a
-      - 854a
-    - - 801a
-      - 808a
-      - 823a
-      - 833a
-      - 839a
-      - 856a
-      - 914a
-    - - 821a
-      - 828a
-      - 843a
-      - 853a
-      - 859a
-      - 914a
-      - "-"
-    - - 841a
-      - 848a
-      - 903a
-      - 913a
-      - 919a
-      - 933a
-      - "-"
-    - - 921a
-      - 927a
-      - 940a
-      - 949a
-      - 955a
-      - 1007a
-      - "-"
-    - - 951a
-      - 957a
-      - 1010a
-      - 1019a
-      - 1025a
-      - 1037a
-      - "-"
-    - - 1021a
-      - 1027a
-      - 1040a
-      - 1049a
-      - 1055a
-      - 1107a
-      - "-"
-    - - 1051a
-      - 1057a
-      - 1110a
-      - 1119a
-      - 1125a
-      - 1137a
-      - "-"
-    - - 1121a
-      - 1127a
-      - 1140a
-      - 1149a
-      - 1155a
-      - 1207p
-      - "-"
-    - - 1151a
-      - 1157a
-      - 1210p
-      - 1219p
-      - 1225p
-      - 1237p
-      - "-"
-    - - 1221p
-      - 1227p
-      - 1240p
-      - 1249p
-      - 1255p
-      - 107p
-      - "-"
-    - - 1251p
-      - 1257p
-      - 110p
-      - 119p
-      - 125p
-      - 137p
-      - "-"
-    - - 121p
-      - 127p
-      - 140p
-      - 149p
-      - 155p
-      - 207p
-      - "-"
-    - - 151p
-      - 157p
-      - 210p
-      - 219p
-      - 225p
-      - 237p
-      - "-"
-    - - 221p
-      - 227p
-      - 240p
-      - 249p
-      - 255p
-      - 307p
-      - "-"
-    - - 251p
-      - 257p
-      - 310p
-      - 319p
-      - 325p
-      - 339p
-      - "-"
-    - - 323p
-      - 330p
-      - 345p
-      - 355p
-      - 401p
-      - 416p
-      - "-"
-    - - 340p
-      - 347p
-      - 402p
-      - 412p
-      - 418p
-      - 433p
-      - "-"
-    - - 400p
-      - 407p
-      - 422p
-      - 432p
-      - 438p
-      - 453p
-      - "-"
-    - - 418p
-      - 425p
-      - 440p
-      - 450p
-      - 456p
-      - 511p
-      - "-"
-    - - 441p
-      - 448p
-      - 503p
-      - 513p
-      - 519p
-      - "-"
-      - "-"
-    - - 501p
-      - 508p
-      - 523p
-      - 533p
-      - 539p
-      - "-"
-      - "-"
-    - - 521p
-      - 528p
-      - 543p
-      - 553p
-      - 559p
-      - 614p
-      - "-"
-    - - 541p
-      - 548p
-      - 603p
-      - 613p
-      - 619p
-      - "-"
-      - "-"
-    - - 601p
-      - 608p
-      - 623p
-      - 633p
-      - 639p
-      - "-"
-      - "-"
-    - - 625p
-      - 632p
-      - 645p
-      - 654p
-      - 700p
-      - 712p
-      - "-"
-    - - 725p
-      - 731p
-      - 744p
-      - 753p
-      - 759p
-      - 811p
-      - "-"
-    - - 825p
-      - 831p
-      - 844p
-      - 853p
-      - 859p
-      - 911p
-      - "-"
-    - - 925p
-      - 931p
-      - 944p
-      - 953p
-      - 959p
-      - 1011p
-      - "-"
-    - - 1025p
-      - 1031p
-      - 1044p
-      - 1053p
-      - 1059p
-      - 1111p
-      - "-"
-    - - 1125p
-      - 1131p
-      - 1144p
-      - 1153p
-      - 1159p
-      - "-"
-      - "-"
-    time_points: 
-    - Tuggeranong Interchange - Platform 3
-    - MacKillop College Isabella Campus
-    - Theodore
-    - Calwell Shops
-    - Erindale Centre
-    - Woden Interchange - Platform 9
-    - City Interchange
+    stop_times: [[621a, 627a, 641a, 651a, 657a, 713a, 729a], [641a, 647a, 701a, 711a, 717a, 733a, 751a], [701a, 707a, 721a, 731a, 737a, 754a, 812a], [721a, 727a, 742a, 752a, 758a, 815a, 833a], [741a, 748a, 803a, 813a, 819a, 836a, 854a], [801a, 808a, 823a, 833a, 839a, 856a, 914a], [821a, 828a, 843a, 853a, 859a, 914a, "-"], [841a, 848a, 903a, 913a, 919a, 933a, "-"], [921a, 927a, 940a, 949a, 955a, 1007a, "-"], [951a, 957a, 1010a, 1019a, 1025a, 1037a, "-"], [1021a, 1027a, 1040a, 1049a, 1055a, 1107a, "-"], [1051a, 1057a, 1110a, 1119a, 1125a, 1137a, "-"], [1121a, 1127a, 1140a, 1149a, 1155a, 1207p, "-"], [1151a, 1157a, 1210p, 1219p, 1225p, 1237p, "-"], [1221p, 1227p, 1240p, 1249p, 1255p, 107p, "-"], [1251p, 1257p, 110p, 119p, 125p, 137p, "-"], [121p, 127p, 140p, 149p, 155p, 207p, "-"], [151p, 157p, 210p, 219p, 225p, 237p, "-"], [221p, 227p, 240p, 249p, 255p, 307p, "-"], [251p, 257p, 310p, 319p, 325p, 339p, "-"], [323p, 330p, 345p, 355p, 401p, 416p, "-"], [340p, 347p, 402p, 412p, 418p, 433p, "-"], [400p, 407p, 422p, 432p, 438p, 453p, "-"], [418p, 425p, 440p, 450p, 456p, 511p, "-"], [441p, 448p, 503p, 513p, 519p, "-", "-"], [501p, 508p, 523p, 533p, 539p, "-", "-"], [521p, 528p, 543p, 553p, 559p, 614p, "-"], [541p, 548p, 603p, 613p, 619p, "-", "-"], [601p, 608p, 623p, 633p, 639p, "-", "-"], [625p, 632p, 645p, 654p, 700p, 712p, "-"], [725p, 731p, 744p, 753p, 759p, 811p, "-"], [825p, 831p, 844p, 853p, 859p, 911p, "-"], [925p, 931p, 944p, 953p, 959p, 1011p, "-"], [1025p, 1031p, 1044p, 1053p, 1059p, 1111p, "-"], [1125p, 1131p, 1144p, 1153p, 1159p, "-", "-"]]
+    time_points: [Tuggeranong Interchange - Platform 3, MacKillop College Isabella Campus, Theodore, Calwell Shops, Erindale Centre, Woden Interchange - Platform 9, City Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
+    between_stops: 
+      City Interchange - Platform 1-Woden Interchange - Platform 11: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 11/111
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 546a
-      - 556a
-      - 609a
-      - 616a
-    - - "-"
-      - "-"
-      - "-"
-      - 606a
-      - 616a
-      - 629a
-      - 636a
-    - - "-"
-      - "-"
-      - "-"
-      - 626a
-      - 636a
-      - 649a
-      - 656a
-    - - "-"
-      - "-"
-      - "-"
-      - 646a
-      - 656a
-      - 709a
-      - 716a
-    - - "-"
-      - "-"
-      - "-"
-      - 706a
-      - 716a
-      - 729a
-      - 736a
-    - - "-"
-      - "-"
-      - "-"
-      - 725a
-      - 735a
-      - 749a
-      - 756a
-    - - "-"
-      - "-"
-      - "-"
-      - 745a
-      - 755a
-      - 809a
-      - 816a
-    - - "-"
-      - "-"
-      - "-"
-      - 805a
-      - 815a
-      - 829a
-      - 836a
-    - - "-"
-      - "-"
-      - "-"
-      - 825a
-      - 835a
-      - 849a
-      - 856a
-    - - "-"
-      - "-"
-      - "-"
-      - 845a
-      - 855a
-      - 909a
-      - 916a
-    - - "-"
-      - "-"
-      - "-"
-      - 917a
-      - 927a
-      - 940a
-      - 946a
-    - - "-"
-      - 930a
-      - 942a
-      - 948a
-      - 957a
-      - 1010a
-      - 1016a
-    - - "-"
-      - 1000a
-      - 1012a
-      - 1018a
-      - 1027a
-      - 1040a
-      - 1046a
-    - - "-"
-      - 1030a
-      - 1042a
-      - 1048a
-      - 1057a
-      - 1110a
-      - 1116a
-    - - "-"
-      - 1100a
-      - 1112a
-      - 1118a
-      - 1127a
-      - 1140a
-      - 1146a
-    - - "-"
-      - 1130a
-      - 1142a
-      - 1148a
-      - 1157a
-      - 1210p
-      - 1216p
-    - - "-"
-      - 1200p
-      - 1212p
-      - 1218p
-      - 1227p
-      - 1240p
-      - 1246p
-    - - "-"
-      - 1230p
-      - 1242p
-      - 1248p
-      - 1257p
-      - 110p
-      - 116p
-    - - "-"
-      - 100p
-      - 112p
-      - 118p
-      - 127p
-      - 140p
-      - 146p
-    - - "-"
-      - 130p
-      - 142p
-      - 148p
-      - 157p
-      - 210p
-      - 216p
-    - - "-"
-      - 200p
-      - 212p
-      - 218p
-      - 227p
-      - 240p
-      - 246p
-    - - "-"
-      - 230p
-      - 242p
-      - 248p
-      - 257p
-      - 311p
-      - 318p
-    - - "-"
-      - 300p
-      - 314p
-      - 321p
-      - 331p
-      - 345p
-      - 352p
-    - - "-"
-      - 320p
-      - 334p
-      - 341p
-      - 351p
-      - 405p
-      - 412p
-    - - "-"
-      - 340p
-      - 354p
-      - 401p
-      - 411p
-      - 425p
-      - 432p
-    - - "-"
-      - 400p
-      - 414p
-      - 421p
-      - 431p
-      - 445p
-      - 452p
-    - - "-"
-      - 425p
-      - 439p
-      - 446p
-      - 456p
-      - 510p
-      - 517p
-    - - "-"
-      - 440p
-      - 454p
-      - 501p
-      - 511p
-      - 525p
-      - 532p
-    - - "-"
-      - 500p
-      - 514p
-      - 521p
-      - 531p
-      - 545p
-      - 552p
-    - - 456p
-      - 513p
-      - 527p
-      - 534p
-      - 544p
-      - 558p
-      - 605p
-    - - 516p
-      - 533p
-      - 547p
-      - 554p
-      - 604p
-      - 618p
-      - 625p
-    - - 534p
-      - 551p
-      - 605p
-      - 612p
-      - 622p
-      - 636p
-      - 641p
-    - - 556p
-      - 613p
-      - 627p
-      - 633p
-      - 642p
-      - 655p
-      - 701p
-    - - 616p
-      - 633p
-      - 645p
-      - 651p
-      - 700p
-      - 713p
-      - 719p
-    - - "-"
-      - 733p
-      - 745p
-      - 751p
-      - 800p
-      - 813p
-      - 819p
-    - - "-"
-      - 833p
-      - 845p
-      - 851p
-      - 900p
-      - 913p
-      - 919p
-    - - "-"
-      - 933p
-      - 945p
-      - 951p
-      - 1000p
-      - 1013p
-      - 1019p
-    - - "-"
-      - 1033p
-      - 1045p
-      - 1051p
-      - 1100p
-      - 1113p
-      - 1119p
-    time_points: 
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 11
-    - Erindale Centre
-    - Calwell Shops
-    - Theodore
-    - MacKillop College Isabella Campus
-    - Tuggeranong Interchange
+    stop_times: [["-", "-", "-", 546a, 556a, 609a, 616a], ["-", "-", "-", 606a, 616a, 629a, 636a], ["-", "-", "-", 626a, 636a, 649a, 656a], ["-", "-", "-", 646a, 656a, 709a, 716a], ["-", "-", "-", 706a, 716a, 729a, 736a], ["-", "-", "-", 725a, 735a, 749a, 756a], ["-", "-", "-", 745a, 755a, 809a, 816a], ["-", "-", "-", 805a, 815a, 829a, 836a], ["-", "-", "-", 825a, 835a, 849a, 856a], ["-", "-", "-", 845a, 855a, 909a, 916a], ["-", "-", "-", 917a, 927a, 940a, 946a], ["-", 930a, 942a, 948a, 957a, 1010a, 1016a], ["-", 1000a, 1012a, 1018a, 1027a, 1040a, 1046a], ["-", 1030a, 1042a, 1048a, 1057a, 1110a, 1116a], ["-", 1100a, 1112a, 1118a, 1127a, 1140a, 1146a], ["-", 1130a, 1142a, 1148a, 1157a, 1210p, 1216p], ["-", 1200p, 1212p, 1218p, 1227p, 1240p, 1246p], ["-", 1230p, 1242p, 1248p, 1257p, 110p, 116p], ["-", 100p, 112p, 118p, 127p, 140p, 146p], ["-", 130p, 142p, 148p, 157p, 210p, 216p], ["-", 200p, 212p, 218p, 227p, 240p, 246p], ["-", 230p, 242p, 248p, 257p, 311p, 318p], ["-", 300p, 314p, 321p, 331p, 345p, 352p], ["-", 320p, 334p, 341p, 351p, 405p, 412p], ["-", 340p, 354p, 401p, 411p, 425p, 432p], ["-", 400p, 414p, 421p, 431p, 445p, 452p], ["-", 425p, 439p, 446p, 456p, 510p, 517p], ["-", 440p, 454p, 501p, 511p, 525p, 532p], ["-", 500p, 514p, 521p, 531p, 545p, 552p], [456p, 513p, 527p, 534p, 544p, 558p, 605p], [516p, 533p, 547p, 554p, 604p, 618p, 625p], [534p, 551p, 605p, 612p, 622p, 636p, 641p], [556p, 613p, 627p, 633p, 642p, 655p, 701p], [616p, 633p, 645p, 651p, 700p, 713p, 719p], ["-", 733p, 745p, 751p, 800p, 813p, 819p], ["-", 833p, 845p, 851p, 900p, 913p, 919p], ["-", 933p, 945p, 951p, 1000p, 1013p, 1019p], ["-", 1033p, 1045p, 1051p, 1100p, 1113p, 1119p]]
+    time_points: [City Interchange - Platform 1, Woden Interchange - Platform 11, Erindale Centre, Calwell Shops, Theodore, MacKillop College Isabella Campus, Tuggeranong Interchange]
   -  
     long_name: To Spence Terminus
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
+      City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 12/312
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 723a
-      - 725a
-      - 729a
-      - 737a
-      - 741a
-      - 746a
-      - 752a
-    - - "-"
-      - "-"
-      - "-"
-      - 802a
-      - 804a
-      - 808a
-      - 816a
-      - 820a
-      - 825a
-      - 831a
-    - - 726a
-      - 745a
-      - 803a
-      - 821a
-      - 823a
-      - 827a
-      - 835a
-      - 839a
-      - 844a
-      - 850a
-    - - 826a
-      - 845a
-      - 903a
-      - 921a
-      - 923a
-      - 927a
-      - 934a
-      - 938a
-      - 942a
-      - 948a
-    - - 901a
-      - 920a
-      - 937a
-      - 954a
-      - 956a
-      - 1000a
-      - 1007a
-      - 1011a
-      - 1015a
-      - 1021a
-    - - 931a
-      - 949a
-      - 1005a
-      - 1022a
-      - 1024a
-      - 1028a
-      - 1035a
-      - 1039a
-      - 1043a
-      - 1049a
-    - - 1001a
-      - 1019a
-      - 1035a
-      - 1052a
-      - 1054a
-      - 1058a
-      - 1105a
-      - 1109a
-      - 1113a
-      - 1119a
-    - - 1031a
-      - 1049a
-      - 1105a
-      - 1122a
-      - 1124a
-      - 1128a
-      - 1135a
-      - 1139a
-      - 1143a
-      - 1149a
-    - - 1101a
-      - 1119a
-      - 1135a
-      - 1152a
-      - 1154a
-      - 1158a
-      - 1205p
-      - 1209p
-      - 1213p
-      - 1219p
-    - - 1131a
-      - 1149a
-      - 1205p
-      - 1222p
-      - 1224p
-      - 1228p
-      - 1235p
-      - 1239p
-      - 1243p
-      - 1249p
-    - - 1201p
-      - 1219p
-      - 1235p
-      - 1252p
-      - 1254p
-      - 1258p
-      - 105p
-      - 109p
-      - 113p
-      - 119p
-    - - 1231p
-      - 1249p
-      - 105p
-      - 122p
-      - 124p
-      - 128p
-      - 135p
-      - 139p
-      - 143p
-      - 149p
-    - - 101p
-      - 119p
-      - 135p
-      - 152p
-      - 154p
-      - 158p
-      - 205p
-      - 209p
-      - 213p
-      - 219p
-    - - 131p
-      - 149p
-      - 205p
-      - 222p
-      - 224p
-      - 228p
-      - 235p
-      - 239p
-      - 243p
-      - 249p
-    - - 201p
-      - 219p
-      - 235p
-      - 252p
-      - 254p
-      - 258p
-      - 306p
-      - 310p
-      - 315p
-      - 321p
-    - - 231p
-      - 249p
-      - 305p
-      - 323p
-      - 325p
-      - 329p
-      - 337p
-      - 341p
-      - 346p
-      - 352p
-    - - 301p
-      - 320p
-      - 338p
-      - 356p
-      - 358p
-      - 402p
-      - 410p
-      - 414p
-      - 419p
-      - 425p
-    - - 331p
-      - 350p
-      - 408p
-      - 426p
-      - 428p
-      - 432p
-      - 440p
-      - 444p
-      - 449p
-      - 455p
-    - - 356p
-      - 415p
-      - 433p
-      - 451p
-      - 453p
-      - 457p
-      - 505p
-      - 509p
-      - 514p
-      - 520p
-    - - 416p
-      - 435p
-      - 453p
-      - 511p
-      - 513p
-      - 517p
-      - 525p
-      - 529p
-      - 534p
-      - 540p
-    - - 436p
-      - 455p
-      - 513p
-      - 531p
-      - 533p
-      - 537p
-      - 545p
-      - 549p
-      - 554p
-      - 600p
-    - - 456p
-      - 515p
-      - 533p
-      - 551p
-      - 553p
-      - 557p
-      - 605p
-      - 609p
-      - 614p
-      - 620p
-    - - 516p
-      - 535p
-      - 553p
-      - 611p
-      - 613p
-      - 617p
-      - 625p
-      - 629p
-      - 633p
-      - 639p
-    - - 536p
-      - 555p
-      - 613p
-      - 631p
-      - 633p
-      - 636p
-      - 643p
-      - 647p
-      - 651p
-      - 657p
-    - - 636p
-      - 653p
-      - 708p
-      - 725p
-      - 727p
-      - 730p
-      - 737p
-      - 741p
-      - 745p
-      - 751p
-    - - "-"
-      - "-"
-      - "-"
-      - 835p
-      - 837p
-      - 840p
-      - 847p
-      - 851p
-      - 855p
-      - 901p
-    - - "-"
-      - "-"
-      - "-"
-      - 935p
-      - 937p
-      - 940p
-      - 947p
-      - 951p
-      - 955p
-      - 1001p
-    - - "-"
-      - "-"
-      - "-"
-      - 1035p
-      - 1037p
-      - 1040p
-      - 1047p
-      - 1051p
-      - 1055p
-      - 1101p
-    - - "-"
-      - "-"
-      - "-"
-      - 1135p
-      - 1137p
-      - 1140p
-      - 1147p
-      - 1151p
-      - 1155p
-      - 1201a
-    time_points: 
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station - Platform 4
-    - Lathlain St Bus Station - Platform 4
-    - Cohen St Bus Station - Platform 6
-    - McKellar
-    - Copland College
-    - Evatt
-    - Spence Terminus
+    stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 752a], ["-", "-", "-", 802a, 804a, 808a, 816a, 820a, 825a, 831a], [726a, 745a, 803a, 821a, 823a, 827a, 835a, 839a, 844a, 850a], [826a, 845a, 903a, 921a, 923a, 927a, 934a, 938a, 942a, 948a], [901a, 920a, 937a, 954a, 956a, 1000a, 1007a, 1011a, 1015a, 1021a], [931a, 949a, 1005a, 1022a, 1024a, 1028a, 1035a, 1039a, 1043a, 1049a], [1001a, 1019a, 1035a, 1052a, 1054a, 1058a, 1105a, 1109a, 1113a, 1119a], [1031a, 1049a, 1105a, 1122a, 1124a, 1128a, 1135a, 1139a, 1143a, 1149a], [1101a, 1119a, 1135a, 1152a, 1154a, 1158a, 1205p, 1209p, 1213p, 1219p], [1131a, 1149a, 1205p, 1222p, 1224p, 1228p, 1235p, 1239p, 1243p, 1249p], [1201p, 1219p, 1235p, 1252p, 1254p, 1258p, 105p, 109p, 113p, 119p], [1231p, 1249p, 105p, 122p, 124p, 128p, 135p, 139p, 143p, 149p], [101p, 119p, 135p, 152p, 154p, 158p, 205p, 209p, 213p, 219p], [131p, 149p, 205p, 222p, 224p, 228p, 235p, 239p, 243p, 249p], [201p, 219p, 235p, 252p, 254p, 258p, 306p, 310p, 315p, 321p], [231p, 249p, 305p, 323p, 325p, 329p, 337p, 341p, 346p, 352p], [301p, 320p, 338p, 356p, 358p, 402p, 410p, 414p, 419p, 425p], [331p, 350p, 408p, 426p, 428p, 432p, 440p, 444p, 449p, 455p], [356p, 415p, 433p, 451p, 453p, 457p, 505p, 509p, 514p, 520p], [416p, 435p, 453p, 511p, 513p, 517p, 525p, 529p, 534p, 540p], [436p, 455p, 513p, 531p, 533p, 537p, 545p, 549p, 554p, 600p], [456p, 515p, 533p, 551p, 553p, 557p, 605p, 609p, 614p, 620p], [516p, 535p, 553p, 611p, 613p, 617p, 625p, 629p, 633p, 639p], [536p, 555p, 613p, 631p, 633p, 636p, 643p, 647p, 651p, 657p], [636p, 653p, 708p, 725p, 727p, 730p, 737p, 741p, 745p, 751p], ["-", "-", "-", 835p, 837p, 840p, 847p, 851p, 855p, 901p], ["-", "-", "-", 935p, 937p, 940p, 947p, 951p, 955p, 1001p], ["-", "-", "-", 1035p, 1037p, 1040p, 1047p, 1051p, 1055p, 1101p], ["-", "-", "-", 1135p, 1137p, 1140p, 1147p, 1151p, 1155p, 1201a]]
+    time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Copland College, Evatt, Spence Terminus]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 6-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Cohen St Bus Station - Platform 3-Lathlain St Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 12/312
-    stop_times: 
-    - - 628a
-      - 633a
-      - 636a
-      - 640a
-      - 650a
-      - 652a
-      - 656a
-      - "-"
-      - "-"
-      - "-"
-    - - 656a
-      - 701a
-      - 704a
-      - 708a
-      - 718a
-      - 720a
-      - 724a
-      - 742a
-      - 759a
-      - 816a
-    - - 725a
-      - 730a
-      - 734a
-      - 738a
-      - 748a
-      - 750a
-      - 754a
-      - 813a
-      - 830a
-      - 847a
-    - - 736a
-      - 741a
-      - 745a
-      - 749a
-      - 759a
-      - 801a
-      - 805a
-      - 824a
-      - 841a
-      - 858a
-    - - 750a
-      - 755a
-      - 759a
-      - 803a
-      - 813a
-      - 815a
-      - 819a
-      - 838a
-      - 855a
-      - 912a
-    - - 810a
-      - 815a
-      - 819a
-      - 823a
-      - 833a
-      - 835a
-      - 839a
-      - 858a
-      - 915a
-      - 932a
-    - - 830a
-      - 835a
-      - 839a
-      - 843a
-      - 853a
-      - 855a
-      - 859a
-      - 918a
-      - 935a
-      - 950a
-    - - 855a
-      - 900a
-      - 904a
-      - 908a
-      - 918a
-      - 920a
-      - 924a
-      - 942a
-      - 959a
-      - 1014a
-    - - 926a
-      - 931a
-      - 934a
-      - 938a
-      - 948a
-      - 950a
-      - 954a
-      - 1011a
-      - 1028a
-      - 1043a
-    - - 956a
-      - 1001a
-      - 1004a
-      - 1008a
-      - 1018a
-      - 1020a
-      - 1024a
-      - 1041a
-      - 1058a
-      - 1113a
-    - - 1026a
-      - 1031a
-      - 1034a
-      - 1038a
-      - 1048a
-      - 1050a
-      - 1054a
-      - 1111a
-      - 1128a
-      - 1143a
-    - - 1056a
-      - 1101a
-      - 1104a
-      - 1108a
-      - 1118a
-      - 1120a
-      - 1124a
-      - 1141a
-      - 1158a
-      - 1213p
-    - - 1126a
-      - 1131a
-      - 1134a
-      - 1138a
-      - 1148a
-      - 1150a
-      - 1154a
-      - 1211p
-      - 1228p
-      - 1243p
-    - - 1156a
-      - 1201p
-      - 1204p
-      - 1208p
-      - 1218p
-      - 1220p
-      - 1224p
-      - 1241p
-      - 1258p
-      - 113p
-    - - 1226p
-      - 1231p
-      - 1234p
-      - 1238p
-      - 1248p
-      - 1250p
-      - 1254p
-      - 111p
-      - 128p
-      - 143p
-    - - 1256p
-      - 101p
-      - 104p
-      - 108p
-      - 118p
-      - 120p
-      - 124p
-      - 141p
-      - 158p
-      - 213p
-    - - 126p
-      - 131p
-      - 134p
-      - 138p
-      - 148p
-      - 150p
-      - 154p
-      - 211p
-      - 228p
-      - 243p
-    - - 156p
-      - 201p
-      - 204p
-      - 208p
-      - 218p
-      - 220p
-      - 224p
-      - 241p
-      - 258p
-      - 316p
-    - - 226p
-      - 231p
-      - 234p
-      - 238p
-      - 248p
-      - 250p
-      - 254p
-      - 312p
-      - 329p
-      - 348p
-    - - 255p
-      - 300p
-      - 304p
-      - 308p
-      - 318p
-      - 320p
-      - 324p
-      - 343p
-      - 400p
-      - 419p
-    - - 325p
-      - 330p
-      - 334p
-      - 338p
-      - 348p
-      - 350p
-      - 354p
-      - 413p
-      - 430p
-      - 449p
-    - - 345p
-      - 350p
-      - 354p
-      - 358p
-      - 408p
-      - 410p
-      - 414p
-      - 433p
-      - 450p
-      - 509p
-    - - 415p
-      - 420p
-      - 424p
-      - 428p
-      - 438p
-      - 440p
-      - 444p
-      - 503p
-      - 520p
-      - 539p
-    - - 435p
-      - 440p
-      - 444p
-      - 448p
-      - 458p
-      - 500p
-      - 504p
-      - 523p
-      - 540p
-      - 559p
-    - - 500p
-      - 505p
-      - 509p
-      - 513p
-      - 523p
-      - 525p
-      - 529p
-      - 548p
-      - 605p
-      - 624p
-    - - 525p
-      - 530p
-      - 534p
-      - 538p
-      - 548p
-      - 550p
-      - 554p
-      - 613p
-      - 630p
-      - 645p
-    - - 555p
-      - 600p
-      - 604p
-      - 608p
-      - 618p
-      - 620p
-      - 624p
-      - 641p
-      - 655p
-      - 710p
-    - - 627p
-      - 632p
-      - 635p
-      - 639p
-      - 649p
-      - 651p
-      - 654p
-      - 710p
-      - 724p
-      - 739p
-    - - 707p
-      - 712p
-      - 715p
-      - 719p
-      - 728a
-      - 730a
-      - 734p
-      - "-"
-      - "-"
-      - "-"
-    - - 807p
-      - 812p
-      - 815p
-      - 819p
-      - 828a
-      - 830a
-      - 834p
-      - "-"
-      - "-"
-      - "-"
-    - - 907p
-      - 912p
-      - 915p
-      - 919p
-      - 928a
-      - 930a
-      - 934p
-      - "-"
-      - "-"
-      - "-"
-    - - 1007p
-      - 1012p
-      - 1015p
-      - 1019p
-      - 1028a
-      - 1030a
-      - 1034p
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Spence Terminus
-    - Evatt
-    - Copland College
-    - McKellar
-    - Cohen St Bus Station - Platform 3
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange
+    stop_times: [[628a, 633a, 636a, 640a, 650a, 652a, 656a, "-", "-", "-"], [656a, 701a, 704a, 708a, 718a, 720a, 724a, 742a, 759a, 816a], [725a, 730a, 734a, 738a, 748a, 750a, 754a, 813a, 830a, 847a], [736a, 741a, 745a, 749a, 759a, 801a, 805a, 824a, 841a, 858a], [750a, 755a, 759a, 803a, 813a, 815a, 819a, 838a, 855a, 912a], [810a, 815a, 819a, 823a, 833a, 835a, 839a, 858a, 915a, 932a], [830a, 835a, 839a, 843a, 853a, 855a, 859a, 918a, 935a, 950a], [855a, 900a, 904a, 908a, 918a, 920a, 924a, 942a, 959a, 1014a], [926a, 931a, 934a, 938a, 948a, 950a, 954a, 1011a, 1028a, 1043a], [956a, 1001a, 1004a, 1008a, 1018a, 1020a, 1024a, 1041a, 1058a, 1113a], [1026a, 1031a, 1034a, 1038a, 1048a, 1050a, 1054a, 1111a, 1128a, 1143a], [1056a, 1101a, 1104a, 1108a, 1118a, 1120a, 1124a, 1141a, 1158a, 1213p], [1126a, 1131a, 1134a, 1138a, 1148a, 1150a, 1154a, 1211p, 1228p, 1243p], [1156a, 1201p, 1204p, 1208p, 1218p, 1220p, 1224p, 1241p, 1258p, 113p], [1226p, 1231p, 1234p, 1238p, 1248p, 1250p, 1254p, 111p, 128p, 143p], [1256p, 101p, 104p, 108p, 118p, 120p, 124p, 141p, 158p, 213p], [126p, 131p, 134p, 138p, 148p, 150p, 154p, 211p, 228p, 243p], [156p, 201p, 204p, 208p, 218p, 220p, 224p, 241p, 258p, 316p], [226p, 231p, 234p, 238p, 248p, 250p, 254p, 312p, 329p, 348p], [255p, 300p, 304p, 308p, 318p, 320p, 324p, 343p, 400p, 419p], [325p, 330p, 334p, 338p, 348p, 350p, 354p, 413p, 430p, 449p], [345p, 350p, 354p, 358p, 408p, 410p, 414p, 433p, 450p, 509p], [415p, 420p, 424p, 428p, 438p, 440p, 444p, 503p, 520p, 539p], [435p, 440p, 444p, 448p, 458p, 500p, 504p, 523p, 540p, 559p], [500p, 505p, 509p, 513p, 523p, 525p, 529p, 548p, 605p, 624p], [525p, 530p, 534p, 538p, 548p, 550p, 554p, 613p, 630p, 645p], [555p, 600p, 604p, 608p, 618p, 620p, 624p, 641p, 655p, 710p], [627p, 632p, 635p, 639p, 649p, 651p, 654p, 710p, 724p, 739p], [707p, 712p, 715p, 719p, 728a, 730a, 734p, "-", "-", "-"], [807p, 812p, 815p, 819p, 828a, 830a, 834p, "-", "-", "-"], [907p, 912p, 915p, 919p, 928a, 930a, 934p, "-", "-", "-"], [1007p, 1012p, 1015p, 1019p, 1028a, 1030a, 1034p, "-", "-", "-"]]
+    time_points: [Spence Terminus, Evatt, Copland College, McKellar, Cohen St Bus Station - Platform 3, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange]
   -  
     long_name: To Fraser West Terminus
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
+      City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 13/313
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 728a
-      - 730a
-      - 734a
-      - 737a
-      - 741a
-      - 750a
-      - 757a
-    - - 711a
-      - 729a
-      - 747a
-      - 805a
-      - 807a
-      - 811a
-      - 814a
-      - 818a
-      - 827a
-      - 834a
-    - - 751a
-      - 810a
-      - 828a
-      - 846a
-      - 848a
-      - 852a
-      - 855a
-      - 859a
-      - 908a
-      - 915a
-    - - 811a
-      - 830a
-      - 848a
-      - 906a
-      - 908a
-      - 912a
-      - 915a
-      - 919a
-      - 928a
-      - 934a
-    - - 851a
-      - 910a
-      - 928a
-      - 945a
-      - 947a
-      - 951a
-      - 953a
-      - 957a
-      - 1005a
-      - 1011a
-    - - 921a
-      - 940a
-      - 956a
-      - 1013a
-      - 1015a
-      - 1019a
-      - 1021a
-      - 1025a
-      - 1033a
-      - 1039a
-    - - 951a
-      - 1009a
-      - 1025a
-      - 1042a
-      - 1044a
-      - 1048a
-      - 1050a
-      - 1054a
-      - 1102a
-      - 1108a
-    - - 1021a
-      - 1039a
-      - 1055a
-      - 1112a
-      - 1114a
-      - 1118a
-      - 1120a
-      - 1124a
-      - 1132a
-      - 1138a
-    - - 1051a
-      - 1109a
-      - 1125a
-      - 1142a
-      - 1144a
-      - 1148a
-      - 1150a
-      - 1154a
-      - 1202p
-      - 1208p
-    - - 1121a
-      - 1139a
-      - 1155a
-      - 1212p
-      - 1214p
-      - 1218p
-      - 1220p
-      - 1224p
-      - 1232p
-      - 1238p
-    - - 1151a
-      - 1209p
-      - 1225p
-      - 1242p
-      - 1244p
-      - 1248p
-      - 1250p
-      - 1254p
-      - 102p
-      - 108p
-    - - 1221p
-      - 1239p
-      - 1255p
-      - 112p
-      - 114p
-      - 118p
-      - 120p
-      - 124p
-      - 132p
-      - 138p
-    - - 1251p
-      - 109p
-      - 125p
-      - 142p
-      - 144p
-      - 148p
-      - 150p
-      - 154p
-      - 202p
-      - 208p
-    - - 121p
-      - 139p
-      - 155p
-      - 212p
-      - 214p
-      - 218p
-      - 220p
-      - 224p
-      - 232p
-      - 238p
-    - - 151p
-      - 209p
-      - 225p
-      - 242p
-      - 244p
-      - 248p
-      - 250p
-      - 254p
-      - 303p
-      - 309p
-    - - 221p
-      - 239p
-      - 255p
-      - 313p
-      - 315p
-      - 319p
-      - 322p
-      - 327p
-      - 337p
-      - 343p
-    - - 250p
-      - 308p
-      - 326p
-      - 344p
-      - 346p
-      - 350p
-      - 353p
-      - 358p
-      - 408p
-      - 414p
-    - - 316p
-      - 335p
-      - 353p
-      - 411p
-      - 413p
-      - 417p
-      - 420p
-      - 425p
-      - 435p
-      - 441p
-    - - 346p
-      - 405p
-      - 423p
-      - 441p
-      - 443p
-      - 447p
-      - 450p
-      - 455p
-      - 505p
-      - 511p
-    - - 406p
-      - 425p
-      - 443p
-      - 501p
-      - 503p
-      - 507p
-      - 510p
-      - 515p
-      - 525p
-      - 531p
-    - - 426p
-      - 445p
-      - 503p
-      - 521p
-      - 523p
-      - 527p
-      - 530p
-      - 535p
-      - 545p
-      - 551p
-    - - 446p
-      - 505p
-      - 523p
-      - 541p
-      - 543p
-      - 547p
-      - 550p
-      - 555p
-      - 605p
-      - 611p
-    - - 526p
-      - 545p
-      - 603p
-      - 621p
-      - 623p
-      - 627p
-      - 630p
-      - 634p
-      - 642p
-      - 648p
-    - - 556p
-      - 615p
-      - 632p
-      - 649p
-      - 651p
-      - 654p
-      - 656p
-      - 700p
-      - 708p
-      - 714p
-    - - 656p
-      - 713p
-      - 728p
-      - 745p
-      - 747p
-      - 750p
-      - 752p
-      - 756p
-      - 804p
-      - 810p
-    - - "-"
-      - "-"
-      - "-"
-      - 840p
-      - 842p
-      - 845p
-      - 847p
-      - 851p
-      - 859p
-      - 905p
-    - - "-"
-      - "-"
-      - "-"
-      - 940p
-      - 942p
-      - 945p
-      - 947p
-      - 951p
-      - 959p
-      - 1005p
-    - - "-"
-      - "-"
-      - "-"
-      - 1040p
-      - 1042p
-      - 1045p
-      - 1047p
-      - 1051p
-      - 1059p
-      - 1105p
-    time_points: 
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station - Platform 4
-    - Lathlain St Bus Station - Platform 4
-    - Cohen St Bus Station - Platform 6
-    - Page Shops
-    - Scullin Shops
-    - Charnwood
-    - Fraser West Terminus
+    stop_times: [["-", "-", "-", 728a, 730a, 734a, 737a, 741a, 750a, 757a], [711a, 729a, 747a, 805a, 807a, 811a, 814a, 818a, 827a, 834a], [751a, 810a, 828a, 846a, 848a, 852a, 855a, 859a, 908a, 915a], [811a, 830a, 848a, 906a, 908a, 912a, 915a, 919a, 928a, 934a], [851a, 910a, 928a, 945a, 947a, 951a, 953a, 957a, 1005a, 1011a], [921a, 940a, 956a, 1013a, 1015a, 1019a, 1021a, 1025a, 1033a, 1039a], [951a, 1009a, 1025a, 1042a, 1044a, 1048a, 1050a, 1054a, 1102a, 1108a], [1021a, 1039a, 1055a, 1112a, 1114a, 1118a, 1120a, 1124a, 1132a, 1138a], [1051a, 1109a, 1125a, 1142a, 1144a, 1148a, 1150a, 1154a, 1202p, 1208p], [1121a, 1139a, 1155a, 1212p, 1214p, 1218p, 1220p, 1224p, 1232p, 1238p], [1151a, 1209p, 1225p, 1242p, 1244p, 1248p, 1250p, 1254p, 102p, 108p], [1221p, 1239p, 1255p, 112p, 114p, 118p, 120p, 124p, 132p, 138p], [1251p, 109p, 125p, 142p, 144p, 148p, 150p, 154p, 202p, 208p], [121p, 139p, 155p, 212p, 214p, 218p, 220p, 224p, 232p, 238p], [151p, 209p, 225p, 242p, 244p, 248p, 250p, 254p, 303p, 309p], [221p, 239p, 255p, 313p, 315p, 319p, 322p, 327p, 337p, 343p], [250p, 308p, 326p, 344p, 346p, 350p, 353p, 358p, 408p, 414p], [316p, 335p, 353p, 411p, 413p, 417p, 420p, 425p, 435p, 441p], [346p, 405p, 423p, 441p, 443p, 447p, 450p, 455p, 505p, 511p], [406p, 425p, 443p, 501p, 503p, 507p, 510p, 515p, 525p, 531p], [426p, 445p, 503p, 521p, 523p, 527p, 530p, 535p, 545p, 551p], [446p, 505p, 523p, 541p, 543p, 547p, 550p, 555p, 605p, 611p], [526p, 545p, 603p, 621p, 623p, 627p, 630p, 634p, 642p, 648p], [556p, 615p, 632p, 649p, 651p, 654p, 656p, 700p, 708p, 714p], [656p, 713p, 728p, 745p, 747p, 750p, 752p, 756p, 804p, 810p], ["-", "-", "-", 840p, 842p, 845p, 847p, 851p, 859p, 905p], ["-", "-", "-", 940p, 942p, 945p, 947p, 951p, 959p, 1005p], ["-", "-", "-", 1040p, 1042p, 1045p, 1047p, 1051p, 1059p, 1105p]]
+    time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Page Shops, Scullin Shops, Charnwood, Fraser West Terminus]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 6-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Cohen St Bus Station - Platform 3-Lathlain St Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 13/313
-    stop_times: 
-    - - 549a
-      - 553a
-      - 602a
-      - 606a
-      - 613a
-      - 615a
-      - 619a
-      - 636a
-      - 653a
-      - 706a
-    - - 619a
-      - 623a
-      - 632a
-      - 636a
-      - 643a
-      - 645a
-      - 649a
-      - 706a
-      - 723a
-      - 738a
-    - - 649a
-      - 653a
-      - 702a
-      - 706a
-      - 713a
-      - 715a
-      - 719a
-      - 737a
-      - 754a
-      - 811a
-    - - 717a
-      - 721a
-      - 730a
-      - 735a
-      - 743a
-      - 745a
-      - 749a
-      - 808a
-      - 825a
-      - 842a
-    - - 740a
-      - 745a
-      - 755a
-      - 800a
-      - 808a
-      - 810a
-      - 814a
-      - 833a
-      - 850a
-      - 907a
-    - - 800a
-      - 805a
-      - 815a
-      - 820a
-      - 828a
-      - 830a
-      - 834a
-      - 853a
-      - 910a
-      - 927a
-    - - 820a
-      - 825a
-      - 835a
-      - 840a
-      - 848a
-      - 850a
-      - 854a
-      - 913a
-      - 930a
-      - 945a
-    - - 845a
-      - 850a
-      - 900a
-      - 905a
-      - 913a
-      - 915a
-      - 919a
-      - 937a
-      - 954a
-      - 1009a
-    - - 917a
-      - 922a
-      - 932a
-      - 936a
-      - 943a
-      - 945a
-      - 949a
-      - 1006a
-      - 1023a
-      - 1038a
-    - - 949a
-      - 953a
-      - 1002a
-      - 1006a
-      - 1013a
-      - 1015a
-      - 1019a
-      - 1036a
-      - 1053a
-      - 1108a
-    - - 1019a
-      - 1023a
-      - 1032a
-      - 1036a
-      - 1043a
-      - 1045a
-      - 1049a
-      - 1106a
-      - 1123a
-      - 1138a
-    - - 1049a
-      - 1053a
-      - 1102a
-      - 1106a
-      - 1113a
-      - 1115a
-      - 1119a
-      - 1136a
-      - 1153a
-      - 1208p
-    - - 1119a
-      - 1123a
-      - 1132a
-      - 1136a
-      - 1143a
-      - 1145a
-      - 1149a
-      - 1206p
-      - 1223p
-      - 1238p
-    - - 1149a
-      - 1153a
-      - 1202p
-      - 1206p
-      - 1213p
-      - 1215p
-      - 1219p
-      - 1236p
-      - 1253p
-      - 108p
-    - - 1219p
-      - 1223p
-      - 1232p
-      - 1236p
-      - 1243p
-      - 1245p
-      - 1249p
-      - 106p
-      - 123p
-      - 138p
-    - - 1249p
-      - 1253p
-      - 102p
-      - 106p
-      - 113p
-      - 115p
-      - 119p
-      - 136p
-      - 153p
-      - 208p
-    - - 119p
-      - 123p
-      - 132p
-      - 136p
-      - 143p
-      - 145p
-      - 149p
-      - 206p
-      - 223p
-      - 238p
-    - - 149p
-      - 153p
-      - 202p
-      - 206p
-      - 213p
-      - 215p
-      - 219p
-      - 236p
-      - 253p
-      - 310p
-    - - 219p
-      - 223p
-      - 232p
-      - 236p
-      - 243p
-      - 245p
-      - 249p
-      - 307p
-      - 324p
-      - 343p
-    - - 248p
-      - 252p
-      - 301p
-      - 305p
-      - 313p
-      - 315p
-      - 319p
-      - 338p
-      - 355p
-      - 414p
-    - - 316p
-      - 321p
-      - 331p
-      - 335p
-      - 343p
-      - 345p
-      - 349p
-      - 408p
-      - 425p
-      - 444p
-    - - 346p
-      - 351p
-      - 401p
-      - 405p
-      - 413p
-      - 415p
-      - 419p
-      - 438p
-      - 455p
-      - 514p
-    - - 421p
-      - 426p
-      - 436p
-      - 440p
-      - 448p
-      - 450p
-      - 454p
-      - "-"
-      - "-"
-      - "-"
-    - - 450p
-      - 455p
-      - 505p
-      - 509p
-      - 517p
-      - 519p
-      - 523p
-      - "-"
-      - "-"
-      - "-"
-    - - 516p
-      - 521p
-      - 531p
-      - 535p
-      - 543p
-      - 545p
-      - 549p
-      - 608p
-      - 625p
-      - 641p
-    - - 546p
-      - 551p
-      - 601p
-      - 605p
-      - 613p
-      - 615p
-      - 619p
-      - 636p
-      - 650p
-      - 705p
-    - - 619p
-      - 624p
-      - 634p
-      - 638p
-      - 644p
-      - 646p
-      - 649p
-      - 705p
-      - 719p
-      - 734p
-    - - 712p
-      - 716p
-      - 725p
-      - 729p
-      - 735p
-      - 737p
-      - 740p
-      - "-"
-      - "-"
-      - "-"
-    - - 812p
-      - 816p
-      - 825p
-      - 829p
-      - 835p
-      - 837p
-      - 840p
-      - "-"
-      - "-"
-      - "-"
-    - - 912p
-      - 916p
-      - 925p
-      - 929p
-      - 935p
-      - 937p
-      - 940p
-      - "-"
-      - "-"
-      - "-"
-    - - 1012p
-      - 1016p
-      - 1025p
-      - 1029p
-      - 1035p
-      - 1037p
-      - 1040p
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Fraser West Terminus
-    - Charnwood
-    - Scullin Shops
-    - Page Shops
-    - Cohen St Bus Station - Platform 3
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange
+    stop_times: [[549a, 553a, 602a, 606a, 613a, 615a, 619a, 636a, 653a, 706a], [619a, 623a, 632a, 636a, 643a, 645a, 649a, 706a, 723a, 738a], [649a, 653a, 702a, 706a, 713a, 715a, 719a, 737a, 754a, 811a], [717a, 721a, 730a, 735a, 743a, 745a, 749a, 808a, 825a, 842a], [740a, 745a, 755a, 800a, 808a, 810a, 814a, 833a, 850a, 907a], [800a, 805a, 815a, 820a, 828a, 830a, 834a, 853a, 910a, 927a], [820a, 825a, 835a, 840a, 848a, 850a, 854a, 913a, 930a, 945a], [845a, 850a, 900a, 905a, 913a, 915a, 919a, 937a, 954a, 1009a], [917a, 922a, 932a, 936a, 943a, 945a, 949a, 1006a, 1023a, 1038a], [949a, 953a, 1002a, 1006a, 1013a, 1015a, 1019a, 1036a, 1053a, 1108a], [1019a, 1023a, 1032a, 1036a, 1043a, 1045a, 1049a, 1106a, 1123a, 1138a], [1049a, 1053a, 1102a, 1106a, 1113a, 1115a, 1119a, 1136a, 1153a, 1208p], [1119a, 1123a, 1132a, 1136a, 1143a, 1145a, 1149a, 1206p, 1223p, 1238p], [1149a, 1153a, 1202p, 1206p, 1213p, 1215p, 1219p, 1236p, 1253p, 108p], [1219p, 1223p, 1232p, 1236p, 1243p, 1245p, 1249p, 106p, 123p, 138p], [1249p, 1253p, 102p, 106p, 113p, 115p, 119p, 136p, 153p, 208p], [119p, 123p, 132p, 136p, 143p, 145p, 149p, 206p, 223p, 238p], [149p, 153p, 202p, 206p, 213p, 215p, 219p, 236p, 253p, 310p], [219p, 223p, 232p, 236p, 243p, 245p, 249p, 307p, 324p, 343p], [248p, 252p, 301p, 305p, 313p, 315p, 319p, 338p, 355p, 414p], [316p, 321p, 331p, 335p, 343p, 345p, 349p, 408p, 425p, 444p], [346p, 351p, 401p, 405p, 413p, 415p, 419p, 438p, 455p, 514p], [421p, 426p, 436p, 440p, 448p, 450p, 454p, "-", "-", "-"], [450p, 455p, 505p, 509p, 517p, 519p, 523p, "-", "-", "-"], [516p, 521p, 531p, 535p, 543p, 545p, 549p, 608p, 625p, 641p], [546p, 551p, 601p, 605p, 613p, 615p, 619p, 636p, 650p, 705p], [619p, 624p, 634p, 638p, 644p, 646p, 649p, 705p, 719p, 734p], [712p, 716p, 725p, 729p, 735p, 737p, 740p, "-", "-", "-"], [812p, 816p, 825p, 829p, 835p, 837p, 840p, "-", "-", "-"], [912p, 916p, 925p, 929p, 935p, 937p, 940p, "-", "-", "-"], [1012p, 1016p, 1025p, 1029p, 1035p, 1037p, 1040p, "-", "-", "-"]]
+    time_points: [Fraser West Terminus, Charnwood, Scullin Shops, Page Shops, Cohen St Bus Station - Platform 3, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange]
   -  
     long_name: To Fraser West Terminus
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
+      City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 14/314
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 705a
-      - 707a
-      - 711a
-      - 716a
-      - 721a
-      - 725a
-      - 733a
-    - - "-"
-      - "-"
-      - "-"
-      - 723a
-      - 725a
-      - 729a
-      - 735a
-      - 740a
-      - 745a
-      - 753a
-    - - 706a
-      - 724a
-      - 741a
-      - 759a
-      - 801a
-      - 805a
-      - 811a
-      - 816a
-      - 821a
-      - 829a
-    - - 746a
-      - 805a
-      - 823a
-      - 841a
-      - 843a
-      - 847a
-      - 853a
-      - 858a
-      - 903a
-      - 911a
-    - - 806a
-      - 825a
-      - 843a
-      - 901a
-      - 903a
-      - 907a
-      - 913a
-      - 918a
-      - 923a
-      - 931a
-    - - 843a
-      - 902a
-      - 920a
-      - 938a
-      - 940a
-      - 944a
-      - 949a
-      - 954a
-      - 958a
-      - 1006a
-    - - 916a
-      - 935a
-      - 951a
-      - 1008a
-      - 1010a
-      - 1014a
-      - 1019a
-      - 1024a
-      - 1028a
-      - 1036a
-    - - 946a
-      - 1004a
-      - 1020a
-      - 1037a
-      - 1039a
-      - 1043a
-      - 1048a
-      - 1053a
-      - 1057a
-      - 1105a
-    - - 1016a
-      - 1034a
-      - 1050a
-      - 1107a
-      - 1109a
-      - 1113a
-      - 1118a
-      - 1123a
-      - 1127a
-      - 1135a
-    - - 1046a
-      - 1104a
-      - 1120a
-      - 1137a
-      - 1139a
-      - 1143a
-      - 1148a
-      - 1153a
-      - 1157a
-      - 1205p
-    - - 1116a
-      - 1134a
-      - 1150a
-      - 1207p
-      - 1209p
-      - 1213p
-      - 1218p
-      - 1223p
-      - 1227p
-      - 1235p
-    - - 1146a
-      - 1204p
-      - 1220p
-      - 1237p
-      - 1239p
-      - 1243p
-      - 1248p
-      - 1253p
-      - 1257p
-      - 105p
-    - - 1216p
-      - 1234p
-      - 1250p
-      - 107p
-      - 109p
-      - 113p
-      - 118p
-      - 123p
-      - 127p
-      - 135p
-    - - 1246p
-      - 104p
-      - 120p
-      - 137p
-      - 139p
-      - 143p
-      - 148p
-      - 153p
-      - 157p
-      - 205p
-    - - 116p
-      - 134p
-      - 150p
-      - 207p
-      - 209p
-      - 213p
-      - 218p
-      - 223p
-      - 227p
-      - 235p
-    - - 146p
-      - 204p
-      - 220p
-      - 237p
-      - 239p
-      - 243p
-      - 248p
-      - 253p
-      - 257p
-      - 306p
-    - - 216p
-      - 234p
-      - 250p
-      - 307p
-      - 309p
-      - 313p
-      - 319p
-      - 324p
-      - 329p
-      - 338p
-    - - 245p
-      - 303p
-      - 321p
-      - 339p
-      - 341p
-      - 345p
-      - 351p
-      - 356p
-      - 401p
-      - 410p
-    - - "-"
-      - "-"
-      - "-"
-      - 342p
-      - 344p
-      - 348p
-      - 354p
-      - 359p
-      - 404p
-      - 413p
-    - - 321p
-      - 340p
-      - 358p
-      - 416p
-      - 418p
-      - 422p
-      - 428p
-      - 433p
-      - 438p
-      - 447p
-    - - 351p
-      - 410p
-      - 428p
-      - 446p
-      - 448p
-      - 452p
-      - 458p
-      - 503p
-      - 508p
-      - 517p
-    - - 421p
-      - 440p
-      - 458p
-      - 516p
-      - 518p
-      - 522p
-      - 528p
-      - 533p
-      - 538p
-      - 547p
-    - - 451p
-      - 510p
-      - 528p
-      - 546p
-      - 548p
-      - 552p
-      - 558p
-      - 603p
-      - 608p
-      - 617p
-    - - 511p
-      - 530p
-      - 548p
-      - 606p
-      - 608p
-      - 612p
-      - 618p
-      - 623p
-      - 628p
-      - 636p
-    - - 531p
-      - 550p
-      - 608p
-      - 626p
-      - 628p
-      - 632p
-      - 637p
-      - 642p
-      - 646p
-      - 654p
-    - - 551p
-      - 610p
-      - 628p
-      - 645p
-      - 647p
-      - 650p
-      - 655p
-      - 700p
-      - 704p
-      - 712p
-    - - 621p
-      - 639p
-      - 654p
-      - 711p
-      - 713p
-      - 716p
-      - 721p
-      - 726p
-      - 730p
-      - 738p
-    - - "-"
-      - "-"
-      - "-"
-      - 746p
-      - 748p
-      - 751p
-      - 756p
-      - 801p
-      - 805p
-      - 813p
-    - - "-"
-      - "-"
-      - "-"
-      - 846p
-      - 848p
-      - 851p
-      - 856p
-      - 901p
-      - 905p
-      - 913p
-    - - "-"
-      - "-"
-      - "-"
-      - 946p
-      - 948p
-      - 951p
-      - 956p
-      - 1001p
-      - 1005p
-      - 1013p
-    - - "-"
-      - "-"
-      - "-"
-      - 1046p
-      - 1048p
-      - 1051p
-      - 1056p
-      - 1101p
-      - 1105p
-      - 1113p
-    time_points: 
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station - Platform 4
-    - Lathlain St Bus Station - Platform 4
-    - Cohen St Bus Station - Platform 6
-    - St Francis Xavier Florey
-    - Charnwood
-    - Fraser
-    - Fraser West Terminus
+    stop_times: [["-", "-", "-", 705a, 707a, 711a, 716a, 721a, 725a, 733a], ["-", "-", "-", 723a, 725a, 729a, 735a, 740a, 745a, 753a], [706a, 724a, 741a, 759a, 801a, 805a, 811a, 816a, 821a, 829a], [746a, 805a, 823a, 841a, 843a, 847a, 853a, 858a, 903a, 911a], [806a, 825a, 843a, 901a, 903a, 907a, 913a, 918a, 923a, 931a], [843a, 902a, 920a, 938a, 940a, 944a, 949a, 954a, 958a, 1006a], [916a, 935a, 951a, 1008a, 1010a, 1014a, 1019a, 1024a, 1028a, 1036a], [946a, 1004a, 1020a, 1037a, 1039a, 1043a, 1048a, 1053a, 1057a, 1105a], [1016a, 1034a, 1050a, 1107a, 1109a, 1113a, 1118a, 1123a, 1127a, 1135a], [1046a, 1104a, 1120a, 1137a, 1139a, 1143a, 1148a, 1153a, 1157a, 1205p], [1116a, 1134a, 1150a, 1207p, 1209p, 1213p, 1218p, 1223p, 1227p, 1235p], [1146a, 1204p, 1220p, 1237p, 1239p, 1243p, 1248p, 1253p, 1257p, 105p], [1216p, 1234p, 1250p, 107p, 109p, 113p, 118p, 123p, 127p, 135p], [1246p, 104p, 120p, 137p, 139p, 143p, 148p, 153p, 157p, 205p], [116p, 134p, 150p, 207p, 209p, 213p, 218p, 223p, 227p, 235p], [146p, 204p, 220p, 237p, 239p, 243p, 248p, 253p, 257p, 306p], [216p, 234p, 250p, 307p, 309p, 313p, 319p, 324p, 329p, 338p], [245p, 303p, 321p, 339p, 341p, 345p, 351p, 356p, 401p, 410p], ["-", "-", "-", 342p, 344p, 348p, 354p, 359p, 404p, 413p], [321p, 340p, 358p, 416p, 418p, 422p, 428p, 433p, 438p, 447p], [351p, 410p, 428p, 446p, 448p, 452p, 458p, 503p, 508p, 517p], [421p, 440p, 458p, 516p, 518p, 522p, 528p, 533p, 538p, 547p], [451p, 510p, 528p, 546p, 548p, 552p, 558p, 603p, 608p, 617p], [511p, 530p, 548p, 606p, 608p, 612p, 618p, 623p, 628p, 636p], [531p, 550p, 608p, 626p, 628p, 632p, 637p, 642p, 646p, 654p], [551p, 610p, 628p, 645p, 647p, 650p, 655p, 700p, 704p, 712p], [621p, 639p, 654p, 711p, 713p, 716p, 721p, 726p, 730p, 738p], ["-", "-", "-", 746p, 748p, 751p, 756p, 801p, 805p, 813p], ["-", "-", "-", 846p, 848p, 851p, 856p, 901p, 905p, 913p], ["-", "-", "-", 946p, 948p, 951p, 956p, 1001p, 1005p, 1013p], ["-", "-", "-", 1046p, 1048p, 1051p, 1056p, 1101p, 1105p, 1113p]]
+    time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, St Francis Xavier Florey, Charnwood, Fraser, Fraser West Terminus]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 6-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Cohen St Bus Station - Platform 3-Lathlain St Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 14/314
-    stop_times: 
-    - - 613a
-      - 620a
-      - 624a
-      - 629a
-      - 638a
-      - 640a
-      - 644a
-      - "-"
-      - "-"
-      - "-"
-    - - 643a
-      - 650a
-      - 654a
-      - 659a
-      - 708a
-      - 710a
-      - 714a
-      - 731a
-      - 748a
-      - 805a
-    - - 712a
-      - 719a
-      - 723a
-      - 728a
-      - 738a
-      - 740a
-      - 744a
-      - 803a
-      - 820a
-      - 837a
-    - - 735a
-      - 743a
-      - 748a
-      - 753a
-      - 803a
-      - 805a
-      - 809a
-      - 828a
-      - 845a
-      - 902a
-    - - 755a
-      - 803a
-      - 808a
-      - 813a
-      - 823a
-      - 825a
-      - 829a
-      - 848a
-      - 905a
-      - 922a
-    - - 815a
-      - 823a
-      - 828a
-      - 833a
-      - 843a
-      - 845a
-      - 849a
-      - 908a
-      - 925a
-      - 941a
-    - - 840a
-      - 848a
-      - 853a
-      - 858a
-      - 908a
-      - 910a
-      - 914a
-      - 933a
-      - 950a
-      - 1005a
-    - - 911a
-      - 919a
-      - 924a
-      - 929a
-      - 938a
-      - 940a
-      - 944a
-      - 1001a
-      - 1018a
-      - 1033a
-    - - 943a
-      - 950a
-      - 954a
-      - 959a
-      - 1008a
-      - 1010a
-      - 1014a
-      - 1031a
-      - 1048a
-      - 1103a
-    - - 1013a
-      - 1020a
-      - 1024a
-      - 1029a
-      - 1038a
-      - 1040a
-      - 1044a
-      - 1101a
-      - 1118a
-      - 1133a
-    - - 1043a
-      - 1050a
-      - 1054a
-      - 1059a
-      - 1108a
-      - 1110a
-      - 1114a
-      - 1131a
-      - 1148a
-      - 1203p
-    - - 1113a
-      - 1120a
-      - 1124a
-      - 1129a
-      - 1138a
-      - 1140a
-      - 1144a
-      - 1201p
-      - 1218p
-      - 1233p
-    - - 1143a
-      - 1150a
-      - 1154a
-      - 1159a
-      - 1208p
-      - 1210p
-      - 1214p
-      - 1231p
-      - 1248p
-      - 103p
-    - - 1213p
-      - 1220p
-      - 1224p
-      - 1229p
-      - 1238p
-      - 1240p
-      - 1244p
-      - 101p
-      - 118p
-      - 133p
-    - - 1243p
-      - 1250p
-      - 1254p
-      - 1259p
-      - 108p
-      - 110p
-      - 114p
-      - 131p
-      - 148p
-      - 203p
-    - - 113p
-      - 120p
-      - 124p
-      - 129p
-      - 138p
-      - 140p
-      - 144p
-      - 201p
-      - 218p
-      - 233p
-    - - 143p
-      - 150p
-      - 154p
-      - 159p
-      - 208p
-      - 210p
-      - 214p
-      - 231p
-      - 248p
-      - 304p
-    - - 213p
-      - 220p
-      - 224p
-      - 229p
-      - 238p
-      - 240p
-      - 244p
-      - 301p
-      - 318p
-      - 337p
-    - - 242p
-      - 249p
-      - 253p
-      - 258p
-      - 308p
-      - 310p
-      - 314p
-      - 333p
-      - 350p
-      - 409p
-    - - 311p
-      - 318p
-      - 323p
-      - 328p
-      - 338p
-      - 340p
-      - 344p
-      - 403p
-      - 420p
-      - 439p
-    - - 351p
-      - 358p
-      - 403p
-      - 408p
-      - 418p
-      - 420p
-      - 424p
-      - 443p
-      - 500p
-      - 519p
-    - - 421p
-      - 428p
-      - 433p
-      - 438p
-      - 448p
-      - 450p
-      - 454p
-      - 513p
-      - 530p
-      - 549p
-    - - 451p
-      - 458p
-      - 503p
-      - 508p
-      - 518a
-      - 520a
-      - 524p
-      - "-"
-      - "-"
-      - "-"
-    - - 541p
-      - 548p
-      - 553p
-      - 558p
-      - 608p
-      - 610p
-      - 614p
-      - 632p
-      - 646p
-      - 701p
-    - - 614p
-      - 621p
-      - 626p
-      - 631p
-      - 639p
-      - 641p
-      - 644p
-      - 700p
-      - 714p
-      - 729p
-    - - 639p
-      - 646p
-      - 650p
-      - 655p
-      - 702a
-      - 704a
-      - 708p
-      - "-"
-      - "-"
-      - "-"
-    - - 717p
-      - 724p
-      - 728p
-      - 733p
-      - 740a
-      - 742a
-      - 746p
-      - "-"
-      - "-"
-      - "-"
-    - - 817p
-      - 824p
-      - 828p
-      - 833p
-      - 840a
-      - 842a
-      - 846p
-      - "-"
-      - "-"
-      - "-"
-    - - 917p
-      - 924p
-      - 928p
-      - 933p
-      - 940a
-      - 942a
-      - 946p
-      - "-"
-      - "-"
-      - "-"
-    - - 1017p
-      - 1024p
-      - 1028p
-      - 1033p
-      - 1040a
-      - 1042a
-      - 1046p
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Fraser West Terminus
-    - Fraser
-    - Charnwood
-    - St Francis Xavier Florey
-    - Cohen St Bus Station - Platform 3
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange
+    stop_times: [[613a, 620a, 624a, 629a, 638a, 640a, 644a, "-", "-", "-"], [643a, 650a, 654a, 659a, 708a, 710a, 714a, 731a, 748a, 805a], [712a, 719a, 723a, 728a, 738a, 740a, 744a, 803a, 820a, 837a], [735a, 743a, 748a, 753a, 803a, 805a, 809a, 828a, 845a, 902a], [755a, 803a, 808a, 813a, 823a, 825a, 829a, 848a, 905a, 922a], [815a, 823a, 828a, 833a, 843a, 845a, 849a, 908a, 925a, 941a], [840a, 848a, 853a, 858a, 908a, 910a, 914a, 933a, 950a, 1005a], [911a, 919a, 924a, 929a, 938a, 940a, 944a, 1001a, 1018a, 1033a], [943a, 950a, 954a, 959a, 1008a, 1010a, 1014a, 1031a, 1048a, 1103a], [1013a, 1020a, 1024a, 1029a, 1038a, 1040a, 1044a, 1101a, 1118a, 1133a], [1043a, 1050a, 1054a, 1059a, 1108a, 1110a, 1114a, 1131a, 1148a, 1203p], [1113a, 1120a, 1124a, 1129a, 1138a, 1140a, 1144a, 1201p, 1218p, 1233p], [1143a, 1150a, 1154a, 1159a, 1208p, 1210p, 1214p, 1231p, 1248p, 103p], [1213p, 1220p, 1224p, 1229p, 1238p, 1240p, 1244p, 101p, 118p, 133p], [1243p, 1250p, 1254p, 1259p, 108p, 110p, 114p, 131p, 148p, 203p], [113p, 120p, 124p, 129p, 138p, 140p, 144p, 201p, 218p, 233p], [143p, 150p, 154p, 159p, 208p, 210p, 214p, 231p, 248p, 304p], [213p, 220p, 224p, 229p, 238p, 240p, 244p, 301p, 318p, 337p], [242p, 249p, 253p, 258p, 308p, 310p, 314p, 333p, 350p, 409p], [311p, 318p, 323p, 328p, 338p, 340p, 344p, 403p, 420p, 439p], [351p, 358p, 403p, 408p, 418p, 420p, 424p, 443p, 500p, 519p], [421p, 428p, 433p, 438p, 448p, 450p, 454p, 513p, 530p, 549p], [451p, 458p, 503p, 508p, 518a, 520a, 524p, "-", "-", "-"], [541p, 548p, 553p, 558p, 608p, 610p, 614p, 632p, 646p, 701p], [614p, 621p, 626p, 631p, 639p, 641p, 644p, 700p, 714p, 729p], [639p, 646p, 650p, 655p, 702a, 704a, 708p, "-", "-", "-"], [717p, 724p, 728p, 733p, 740a, 742a, 746p, "-", "-", "-"], [817p, 824p, 828p, 833p, 840a, 842a, 846p, "-", "-", "-"], [917p, 924p, 928p, 933p, 940a, 942a, 946p, "-", "-", "-"], [1017p, 1024p, 1028p, 1033p, 1040a, 1042a, 1046p, "-", "-", "-"]]
+    time_points: [Fraser West Terminus, Fraser, Charnwood, St Francis Xavier Florey, Cohen St Bus Station - Platform 3, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange]
   -  
     long_name: To Spence Terminus
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
+      City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 15/315
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 723a
-      - 725a
-      - 729a
-      - 737a
-      - 741a
-      - 749a
-      - 754a
-    - - "-"
-      - "-"
-      - "-"
-      - 803a
-      - 805a
-      - 809a
-      - 817a
-      - 821a
-      - 829a
-      - 834a
-    - - 731a
-      - 750a
-      - 808a
-      - 826a
-      - 828a
-      - 832a
-      - 840a
-      - 844a
-      - 852a
-      - 857a
-    - - 831a
-      - 850a
-      - 908a
-      - 926a
-      - 928a
-      - 932a
-      - 939a
-      - 942a
-      - 948a
-      - 953a
-    - - 911a
-      - 930a
-      - 946a
-      - 1003a
-      - 1005a
-      - 1009a
-      - 1016a
-      - 1019a
-      - 1025a
-      - 1030a
-    - - 941a
-      - 959a
-      - 1015a
-      - 1032a
-      - 1034a
-      - 1038a
-      - 1045a
-      - 1048a
-      - 1054a
-      - 1059a
-    - - 1011a
-      - 1029a
-      - 1045a
-      - 1102a
-      - 1104a
-      - 1108a
-      - 1115a
-      - 1118a
-      - 1124a
-      - 1129a
-    - - 1041a
-      - 1059a
-      - 1115a
-      - 1132a
-      - 1134a
-      - 1138a
-      - 1145a
-      - 1148a
-      - 1154a
-      - 1159a
-    - - 1111a
-      - 1129a
-      - 1145a
-      - 1202p
-      - 1204p
-      - 1208p
-      - 1215p
-      - 1218p
-      - 1224p
-      - 1229p
-    - - 1141a
-      - 1159a
-      - 1215p
-      - 1232p
-      - 1234p
-      - 1238p
-      - 1245p
-      - 1248p
-      - 1254p
-      - 1259p
-    - - 1211p
-      - 1229p
-      - 1245p
-      - 102p
-      - 104p
-      - 108p
-      - 115p
-      - 118p
-      - 124p
-      - 129p
-    - - 1241p
-      - 1259p
-      - 115p
-      - 132p
-      - 134p
-      - 138p
-      - 145p
-      - 148p
-      - 154p
-      - 159p
-    - - 111p
-      - 129p
-      - 145p
-      - 202p
-      - 204p
-      - 208p
-      - 215p
-      - 218p
-      - 224p
-      - 229p
-    - - 141p
-      - 159p
-      - 215p
-      - 232p
-      - 234p
-      - 238p
-      - 245p
-      - 248p
-      - 254p
-      - 259p
-    - - 211p
-      - 229p
-      - 245p
-      - 302p
-      - 304p
-      - 308p
-      - 316p
-      - 320p
-      - 328p
-      - 333p
-    - - 241p
-      - 259p
-      - 317p
-      - 335p
-      - 337p
-      - 341p
-      - 349p
-      - 353p
-      - 401p
-      - 406p
-    - - "-"
-      - "-"
-      - "-"
-      - 354p
-      - 356p
-      - 400p
-      - 408p
-      - 412p
-      - 420p
-      - 425p
-    - - 311p
-      - 330p
-      - 348p
-      - 406p
-      - 408p
-      - 412p
-      - 420p
-      - 424p
-      - 432p
-      - 437p
-    - - 341p
-      - 400p
-      - 418p
-      - 436p
-      - 438p
-      - 442p
-      - 450p
-      - 454p
-      - 502p
-      - 507p
-    - - 411p
-      - 430p
-      - 448p
-      - 506p
-      - 508p
-      - 512p
-      - 520p
-      - 524p
-      - 532p
-      - 537p
-    - - 441p
-      - 500p
-      - 518p
-      - 536p
-      - 538p
-      - 542p
-      - 550p
-      - 554p
-      - 602p
-      - 607p
-    - - 501p
-      - 520p
-      - 538p
-      - 556p
-      - 558p
-      - 602p
-      - 610p
-      - 614p
-      - 622p
-      - 627p
-    - - 521p
-      - 540p
-      - 558p
-      - 616p
-      - 618p
-      - 622p
-      - 630p
-      - 633p
-      - 639p
-      - 644p
-    - - 601p
-      - 620p
-      - 636p
-      - 653p
-      - 655p
-      - 658p
-      - 705p
-      - 708p
-      - 714p
-      - 719p
-    - - "-"
-      - "-"
-      - "-"
-      - 753p
-      - 755p
-      - 758p
-      - 805p
-      - 808p
-      - 814p
-      - 819p
-    - - "-"
-      - "-"
-      - "-"
-      - 853p
-      - 855p
-      - 858p
-      - 905p
-      - 908p
-      - 914p
-      - 919p
-    - - "-"
-      - "-"
-      - "-"
-      - 953p
-      - 955p
-      - 958p
-      - 1005p
-      - 1008p
-      - 1014p
-      - 1019p
-    - - "-"
-      - "-"
-      - "-"
-      - 1053p
-      - 1055p
-      - 1058p
-      - 1105p
-      - 1108p
-      - 1114p
-      - 1119p
-    time_points: 
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station - Platform 4
-    - Lathlain St Bus Station - Platform 4
-    - Cohen St Bus Station - Platform 6
-    - Copland College
-    - Melba
-    - Spence
-    - Spence Terminus
+    stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 749a, 754a], ["-", "-", "-", 803a, 805a, 809a, 817a, 821a, 829a, 834a], [731a, 750a, 808a, 826a, 828a, 832a, 840a, 844a, 852a, 857a], [831a, 850a, 908a, 926a, 928a, 932a, 939a, 942a, 948a, 953a], [911a, 930a, 946a, 1003a, 1005a, 1009a, 1016a, 1019a, 1025a, 1030a], [941a, 959a, 1015a, 1032a, 1034a, 1038a, 1045a, 1048a, 1054a, 1059a], [1011a, 1029a, 1045a, 1102a, 1104a, 1108a, 1115a, 1118a, 1124a, 1129a], [1041a, 1059a, 1115a, 1132a, 1134a, 1138a, 1145a, 1148a, 1154a, 1159a], [1111a, 1129a, 1145a, 1202p, 1204p, 1208p, 1215p, 1218p, 1224p, 1229p], [1141a, 1159a, 1215p, 1232p, 1234p, 1238p, 1245p, 1248p, 1254p, 1259p], [1211p, 1229p, 1245p, 102p, 104p, 108p, 115p, 118p, 124p, 129p], [1241p, 1259p, 115p, 132p, 134p, 138p, 145p, 148p, 154p, 159p], [111p, 129p, 145p, 202p, 204p, 208p, 215p, 218p, 224p, 229p], [141p, 159p, 215p, 232p, 234p, 238p, 245p, 248p, 254p, 259p], [211p, 229p, 245p, 302p, 304p, 308p, 316p, 320p, 328p, 333p], [241p, 259p, 317p, 335p, 337p, 341p, 349p, 353p, 401p, 406p], ["-", "-", "-", 354p, 356p, 400p, 408p, 412p, 420p, 425p], [311p, 330p, 348p, 406p, 408p, 412p, 420p, 424p, 432p, 437p], [341p, 400p, 418p, 436p, 438p, 442p, 450p, 454p, 502p, 507p], [411p, 430p, 448p, 506p, 508p, 512p, 520p, 524p, 532p, 537p], [441p, 500p, 518p, 536p, 538p, 542p, 550p, 554p, 602p, 607p], [501p, 520p, 538p, 556p, 558p, 602p, 610p, 614p, 622p, 627p], [521p, 540p, 558p, 616p, 618p, 622p, 630p, 633p, 639p, 644p], [601p, 620p, 636p, 653p, 655p, 658p, 705p, 708p, 714p, 719p], ["-", "-", "-", 753p, 755p, 758p, 805p, 808p, 814p, 819p], ["-", "-", "-", 853p, 855p, 858p, 905p, 908p, 914p, 919p], ["-", "-", "-", 953p, 955p, 958p, 1005p, 1008p, 1014p, 1019p], ["-", "-", "-", 1053p, 1055p, 1058p, 1105p, 1108p, 1114p, 1119p]]
+    time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Copland College, Melba, Spence, Spence Terminus]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 6-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Cohen St Bus Station - Platform 3-Lathlain St Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 15/315
-    stop_times: 
-    - - 535a
-      - 540a
-      - 543a
-      - 545a
-      - 548a
-      - 558a
-      - 600a
-      - 604a
-      - "-"
-      - "-"
-      - "-"
-    - - 605a
-      - 610a
-      - 613a
-      - 615a
-      - 618a
-      - 628a
-      - 630a
-      - 634a
-      - "-"
-      - "-"
-      - "-"
-    - - 635a
-      - 640a
-      - 643a
-      - 645a
-      - 648a
-      - 658a
-      - 700a
-      - 704a
-      - 721a
-      - 738a
-      - 755a
-    - - 705a
-      - 710a
-      - 713a
-      - 715a
-      - 718a
-      - 728a
-      - 730a
-      - 734a
-      - 753a
-      - 810a
-      - 827a
-    - - 733a
-      - 738a
-      - 741a
-      - 744a
-      - 748a
-      - 758a
-      - 800a
-      - 804a
-      - 823a
-      - 840a
-      - 857a
-    - - 753a
-      - 758a
-      - 801a
-      - 804a
-      - 808a
-      - 818a
-      - 820a
-      - 824a
-      - 843a
-      - 900a
-      - 917a
-    - - "-"
-      - "-"
-      - 821a
-      - 823a
-      - 827a
-      - 837a
-      - 839a
-      - 843a
-      - 900a
-      - "-"
-      - "-"
-    - - 813a
-      - 818a
-      - 821a
-      - 824a
-      - 828a
-      - 838a
-      - 840a
-      - 844a
-      - 903a
-      - 920a
-      - 936a
-    - - 833a
-      - 838a
-      - 841a
-      - 844a
-      - 848a
-      - 858a
-      - 900a
-      - 904a
-      - 923a
-      - 940a
-      - 955a
-    - - 903a
-      - 908a
-      - 911a
-      - 914a
-      - 918a
-      - 928a
-      - 930a
-      - 934a
-      - 951a
-      - 1008a
-      - 1023a
-    - - 935a
-      - 940a
-      - 943a
-      - 945a
-      - 948a
-      - 958a
-      - 1000a
-      - 1004a
-      - 1021a
-      - 1038a
-      - 1053a
-    - - 1005a
-      - 1010a
-      - 1013a
-      - 1015a
-      - 1018a
-      - 1028a
-      - 1030a
-      - 1034a
-      - 1051a
-      - 1108a
-      - 1123a
-    - - 1035a
-      - 1040a
-      - 1043a
-      - 1045a
-      - 1048a
-      - 1058a
-      - 1100a
-      - 1104a
-      - 1121a
-      - 1138a
-      - 1153a
-    - - 1105a
-      - 1110a
-      - 1113a
-      - 1115a
-      - 1118a
-      - 1128a
-      - 1130a
-      - 1134a
-      - 1151a
-      - 1208p
-      - 1223p
-    - - 1135a
-      - 1140a
-      - 1143a
-      - 1145a
-      - 1148a
-      - 1158a
-      - 1200p
-      - 1204p
-      - 1221p
-      - 1238p
-      - 1253p
-    - - 1205p
-      - 1210p
-      - 1213p
-      - 1215p
-      - 1218p
-      - 1228p
-      - 1230p
-      - 1234p
-      - 1251p
-      - 108p
-      - 123p
-    - - 1235p
-      - 1240p
-      - 1243p
-      - 1245p
-      - 1248p
-      - 1258p
-      - 100p
-      - 104p
-      - 121p
-      - 138p
-      - 153p
-    - - 105p
-      - 110p
-      - 113p
-      - 115p
-      - 118p
-      - 128p
-      - 130p
-      - 134p
-      - 151p
-      - 208p
-      - 223p
-    - - 135p
-      - 140p
-      - 143p
-      - 145p
-      - 148p
-      - 158p
-      - 200p
-      - 204p
-      - 221p
-      - 238p
-      - 253p
-    - - 205p
-      - 210p
-      - 213p
-      - 215p
-      - 218p
-      - 228p
-      - 230p
-      - 234p
-      - 251p
-      - 308p
-      - 327p
-    - - 235p
-      - 240p
-      - 243p
-      - 245p
-      - 248p
-      - 258p
-      - 300p
-      - 304p
-      - 323p
-      - 340p
-      - 359p
-    - - 303p
-      - 308p
-      - 311p
-      - 314p
-      - 318p
-      - 328p
-      - 330p
-      - 334p
-      - 353p
-      - 410p
-      - 429p
-    - - 333p
-      - 338p
-      - 341p
-      - 344p
-      - 348p
-      - 358p
-      - 400p
-      - 404p
-      - 423p
-      - 440p
-      - 459p
-    - - 403p
-      - 408p
-      - 411p
-      - 414p
-      - 418p
-      - 428p
-      - 430p
-      - 434p
-      - 453p
-      - 510p
-      - 529p
-    - - 443p
-      - 448p
-      - 451p
-      - 454p
-      - 458p
-      - 508p
-      - 510p
-      - 514p
-      - 533p
-      - 550p
-      - 609p
-    - - 533p
-      - 538p
-      - 541p
-      - 544p
-      - 548p
-      - 558p
-      - 600p
-      - 604p
-      - 623p
-      - 638p
-      - 653p
-    - - 604p
-      - 609p
-      - 612p
-      - 615p
-      - 619p
-      - 629p
-      - 631p
-      - 634p
-      - 650p
-      - 704p
-      - 719p
-    - - 623p
-      - 628p
-      - 631p
-      - 633p
-      - 636p
-      - 645p
-      - 647p
-      - 650p
-      - "-"
-      - "-"
-      - "-"
-    - - 723p
-      - 728p
-      - 731p
-      - 733p
-      - 736p
-      - 745p
-      - 747p
-      - 750p
-      - "-"
-      - "-"
-      - "-"
-    - - 823p
-      - 828p
-      - 831p
-      - 833p
-      - 836p
-      - 845p
-      - 847p
-      - 850p
-      - "-"
-      - "-"
-      - "-"
-    - - 923p
-      - 928p
-      - 931p
-      - 933p
-      - 936p
-      - 945p
-      - 947p
-      - 950p
-      - "-"
-      - "-"
-      - "-"
-    - - 1023p
-      - 1028p
-      - 1031p
-      - 1033p
-      - 1036p
-      - 1045p
-      - 1047p
-      - 1050p
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Spence Terminus
-    - Spence
-    - Alpen & Clifford St
-    - Melba
-    - Copland College
-    - Cohen St Bus Station - Platform 3
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange
+    stop_times: [[535a, 540a, 543a, 545a, 548a, 558a, 600a, 604a, "-", "-", "-"], [605a, 610a, 613a, 615a, 618a, 628a, 630a, 634a, "-", "-", "-"], [635a, 640a, 643a, 645a, 648a, 658a, 700a, 704a, 721a, 738a, 755a], [705a, 710a, 713a, 715a, 718a, 728a, 730a, 734a, 753a, 810a, 827a], [733a, 738a, 741a, 744a, 748a, 758a, 800a, 804a, 823a, 840a, 857a], [753a, 758a, 801a, 804a, 808a, 818a, 820a, 824a, 843a, 900a, 917a], ["-", "-", 821a, 823a, 827a, 837a, 839a, 843a, 900a, "-", "-"], [813a, 818a, 821a, 824a, 828a, 838a, 840a, 844a, 903a, 920a, 936a], [833a, 838a, 841a, 844a, 848a, 858a, 900a, 904a, 923a, 940a, 955a], [903a, 908a, 911a, 914a, 918a, 928a, 930a, 934a, 951a, 1008a, 1023a], [935a, 940a, 943a, 945a, 948a, 958a, 1000a, 1004a, 1021a, 1038a, 1053a], [1005a, 1010a, 1013a, 1015a, 1018a, 1028a, 1030a, 1034a, 1051a, 1108a, 1123a], [1035a, 1040a, 1043a, 1045a, 1048a, 1058a, 1100a, 1104a, 1121a, 1138a, 1153a], [1105a, 1110a, 1113a, 1115a, 1118a, 1128a, 1130a, 1134a, 1151a, 1208p, 1223p], [1135a, 1140a, 1143a, 1145a, 1148a, 1158a, 1200p, 1204p, 1221p, 1238p, 1253p], [1205p, 1210p, 1213p, 1215p, 1218p, 1228p, 1230p, 1234p, 1251p, 108p, 123p], [1235p, 1240p, 1243p, 1245p, 1248p, 1258p, 100p, 104p, 121p, 138p, 153p], [105p, 110p, 113p, 115p, 118p, 128p, 130p, 134p, 151p, 208p, 223p], [135p, 140p, 143p, 145p, 148p, 158p, 200p, 204p, 221p, 238p, 253p], [205p, 210p, 213p, 215p, 218p, 228p, 230p, 234p, 251p, 308p, 327p], [235p, 240p, 243p, 245p, 248p, 258p, 300p, 304p, 323p, 340p, 359p], [303p, 308p, 311p, 314p, 318p, 328p, 330p, 334p, 353p, 410p, 429p], [333p, 338p, 341p, 344p, 348p, 358p, 400p, 404p, 423p, 440p, 459p], [403p, 408p, 411p, 414p, 418p, 428p, 430p, 434p, 453p, 510p, 529p], [443p, 448p, 451p, 454p, 458p, 508p, 510p, 514p, 533p, 550p, 609p], [533p, 538p, 541p, 544p, 548p, 558p, 600p, 604p, 623p, 638p, 653p], [604p, 609p, 612p, 615p, 619p, 629p, 631p, 634p, 650p, 704p, 719p], [623p, 628p, 631p, 633p, 636p, 645p, 647p, 650p, "-", "-", "-"], [723p, 728p, 731p, 733p, 736p, 745p, 747p, 750p, "-", "-", "-"], [823p, 828p, 831p, 833p, 836p, 845p, 847p, 850p, "-", "-", "-"], [923p, 928p, 931p, 933p, 936p, 945p, 947p, 950p, "-", "-", "-"], [1023p, 1028p, 1031p, 1033p, 1036p, 1045p, 1047p, 1050p, "-", "-", "-"]]
+    time_points: [Spence Terminus, Spence, Alpen & Clifford St, Melba, Copland College, Cohen St Bus Station - Platform 3, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange]
   -  
     long_name: To Cameron Ave Station
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
     short_name: "16"
-    stop_times: 
-    - - 610a
-      - 619a
-      - 625a
-      - 630a
-      - 632a
-      - 636a
-    - - 640a
-      - 649a
-      - 655a
-      - 700a
-      - 702a
-      - 706a
-    - - 711a
-      - 720a
-      - 726a
-      - 731a
-      - 733a
-      - 737a
-    - - 730a
-      - 741a
-      - 747a
-      - 753a
-      - 755a
-      - 759a
-    - - 750a
-      - 801a
-      - 807a
-      - 813a
-      - 815a
-      - 819a
-    - - 810a
-      - 821a
-      - 827a
-      - 833a
-      - 835a
-      - 839a
-    - - 830a
-      - 841a
-      - 847a
-      - 853a
-      - 855a
-      - 859a
-    - - 851a
-      - 902a
-      - 908a
-      - 912a
-      - 914a
-      - 918a
-    - - 925a
-      - 935a
-      - 940a
-      - 944a
-      - 946a
-      - 950a
-    - - 954a
-      - 1003a
-      - 1009a
-      - 1014a
-      - 1016a
-      - 1020a
-    - - 1024a
-      - 1033a
-      - 1039a
-      - 1044a
-      - 1046a
-      - 1050a
-    - - 1054a
-      - 1103a
-      - 1109a
-      - 1114a
-      - 1116a
-      - 1120a
-    - - 1124a
-      - 1133a
-      - 1139a
-      - 1144a
-      - 1146a
-      - 1150a
-    - - 1154a
-      - 1203p
-      - 1209p
-      - 1214p
-      - 1216p
-      - 1220p
-    - - 1224p
-      - 1233p
-      - 1239p
-      - 1244p
-      - 1246p
-      - 1250p
-    - - 1254p
-      - 103p
-      - 109p
-      - 114p
-      - 116p
-      - 120p
-    - - 124p
-      - 133p
-      - 139p
-      - 144p
-      - 146p
-      - 150p
-    - - 154p
-      - 203p
-      - 209p
-      - 214p
-      - 216p
-      - 220p
-    - - 224p
-      - 233p
-      - 239p
-      - 244p
-      - 246p
-      - 250p
-    - - 255p
-      - 304p
-      - 310p
-      - 314p
-      - 316p
-      - 320p
-    - - 324p
-      - 335p
-      - 341p
-      - 347p
-      - 349p
-      - 353p
-    - - 354p
-      - 405p
-      - 411p
-      - 417p
-      - 419p
-      - 423p
-    - - 427p
-      - 438p
-      - 444p
-      - 450p
-      - 452p
-      - 456p
-    - - 456p
-      - 507p
-      - 513p
-      - 519p
-      - 521p
-      - 525p
-    - - 526p
-      - 537p
-      - 543p
-      - 549p
-      - 551p
-      - 555p
-    - - 549p
-      - 600p
-      - 606p
-      - 612p
-      - 614p
-      - 618p
-    - - 649p
-      - 658p
-      - 704p
-      - 708p
-      - 710p
-      - 713p
-    - - 749p
-      - 758p
-      - 804p
-      - 808p
-      - 810p
-      - 813p
-    - - 849p
-      - 858p
-      - 904p
-      - 908p
-      - 910p
-      - 913p
-    - - 949p
-      - 958p
-      - 1004p
-      - 1008p
-      - 1010p
-      - 1013p
-    - - 1049p
-      - 1058p
-      - 1104p
-      - 1108p
-      - 1110p
-      - 1113p
-    time_points: 
-    - Kippax
-    - Latham Shops
-    - Florey Shops
-    - Cohen St Bus Station
-    - Lathlain St Bus Station
-    - Cameron Ave Bus Station
+    stop_times: [[610a, 619a, 625a, 630a, 632a, 636a], [640a, 649a, 655a, 700a, 702a, 706a], [711a, 720a, 726a, 731a, 733a, 737a], [730a, 741a, 747a, 753a, 755a, 759a], [750a, 801a, 807a, 813a, 815a, 819a], [810a, 821a, 827a, 833a, 835a, 839a], [830a, 841a, 847a, 853a, 855a, 859a], [851a, 902a, 908a, 912a, 914a, 918a], [925a, 935a, 940a, 944a, 946a, 950a], [954a, 1003a, 1009a, 1014a, 1016a, 1020a], [1024a, 1033a, 1039a, 1044a, 1046a, 1050a], [1054a, 1103a, 1109a, 1114a, 1116a, 1120a], [1124a, 1133a, 1139a, 1144a, 1146a, 1150a], [1154a, 1203p, 1209p, 1214p, 1216p, 1220p], [1224p, 1233p, 1239p, 1244p, 1246p, 1250p], [1254p, 103p, 109p, 114p, 116p, 120p], [124p, 133p, 139p, 144p, 146p, 150p], [154p, 203p, 209p, 214p, 216p, 220p], [224p, 233p, 239p, 244p, 246p, 250p], [255p, 304p, 310p, 314p, 316p, 320p], [324p, 335p, 341p, 347p, 349p, 353p], [354p, 405p, 411p, 417p, 419p, 423p], [427p, 438p, 444p, 450p, 452p, 456p], [456p, 507p, 513p, 519p, 521p, 525p], [526p, 537p, 543p, 549p, 551p, 555p], [549p, 600p, 606p, 612p, 614p, 618p], [649p, 658p, 704p, 708p, 710p, 713p], [749p, 758p, 804p, 808p, 810p, 813p], [849p, 858p, 904p, 908p, 910p, 913p], [949p, 958p, 1004p, 1008p, 1010p, 1013p], [1049p, 1058p, 1104p, 1108p, 1110p, 1113p]]
+    time_points: [Kippax, Latham Shops, Florey Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Kippax
-    between_stops: []
-    
+    between_stops: 
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     short_name: "16"
-    stop_times: 
-    - - 701a
-      - 703a
-      - 707a
-      - 712a
-      - 718a
-      - 727a
-    - - 801a
-      - 803a
-      - 807a
-      - 813a
-      - 819a
-      - 830a
-    - - 857a
-      - 859a
-      - 903a
-      - 909a
-      - 915a
-      - 926a
-    - - 927a
-      - 929a
-      - 933a
-      - 938a
-      - 944a
-      - 953a
-    - - 957a
-      - 959a
-      - 1003a
-      - 1008a
-      - 1014a
-      - 1023a
-    - - 1027a
-      - 1029a
-      - 1033a
-      - 1038a
-      - 1044a
-      - 1053a
-    - - 1057a
-      - 1059a
-      - 1103a
-      - 1108a
-      - 1114a
-      - 1123a
-    - - 1127a
-      - 1129a
-      - 1133a
-      - 1138a
-      - 1144a
-      - 1153a
-    - - 1157a
-      - 1159a
-      - 1203p
-      - 1208p
-      - 1214p
-      - 1223p
-    - - 1227p
-      - 1229p
-      - 1233p
-      - 1238p
-      - 1244p
-      - 1253p
-    - - 1257p
-      - 1259p
-      - 103p
-      - 108p
-      - 114p
-      - 123p
-    - - 127p
-      - 129p
-      - 133p
-      - 138p
-      - 144p
-      - 153p
-    - - 157p
-      - 159p
-      - 203p
-      - 208p
-      - 214p
-      - 223p
-    - - 227p
-      - 229p
-      - 233p
-      - 238p
-      - 244p
-      - 253p
-    - - 257p
-      - 259p
-      - 303p
-      - 309p
-      - 315p
-      - 326p
-    - - 327p
-      - 329p
-      - 333p
-      - 339p
-      - 345p
-      - 356p
-    - - 357p
-      - 359p
-      - 403p
-      - 409p
-      - 415p
-      - 426p
-    - - 427p
-      - 429p
-      - 433p
-      - 439p
-      - 445p
-      - 456p
-    - - 447p
-      - 449p
-      - 453p
-      - 459p
-      - 505p
-      - 516p
-    - - 507p
-      - 509p
-      - 513p
-      - 519p
-      - 525p
-      - 536p
-    - - 527p
-      - 529p
-      - 533p
-      - 539p
-      - 545p
-      - 556p
-    - - 547p
-      - 549p
-      - 553p
-      - 559p
-      - 605p
-      - 616p
-    - - 602p
-      - 604p
-      - 608p
-      - 614p
-      - 620p
-      - 631p
-    - - 618p
-      - 620p
-      - 624p
-      - 630p
-      - 636p
-      - 645p
-    - - 718p
-      - 720p
-      - 723p
-      - 727p
-      - 733p
-      - 742p
-    - - 818p
-      - 820p
-      - 823p
-      - 827p
-      - 833p
-      - 842p
-    - - 918p
-      - 920p
-      - 923p
-      - 927p
-      - 933p
-      - 942p
-    - - 1018p
-      - 1020p
-      - 1023p
-      - 1027p
-      - 1033p
-      - 1042p
-    - - 1118p
-      - 1120p
-      - 1123p
-      - 1127p
-      - 1133p
-      - 1142p
-    time_points: 
-    - Cameron Ave Bus Station - Platform 5
-    - Lathlain St Bus Station - Platform 6
-    - Cohen St Bus Station - Platform 5
-    - Florey Shops
-    - Latham Shops
-    - Kippax
+    stop_times: [[701a, 703a, 707a, 712a, 718a, 727a], [801a, 803a, 807a, 813a, 819a, 830a], [857a, 859a, 903a, 909a, 915a, 926a], [927a, 929a, 933a, 938a, 944a, 953a], [957a, 959a, 1003a, 1008a, 1014a, 1023a], [1027a, 1029a, 1033a, 1038a, 1044a, 1053a], [1057a, 1059a, 1103a, 1108a, 1114a, 1123a], [1127a, 1129a, 1133a, 1138a, 1144a, 1153a], [1157a, 1159a, 1203p, 1208p, 1214p, 1223p], [1227p, 1229p, 1233p, 1238p, 1244p, 1253p], [1257p, 1259p, 103p, 108p, 114p, 123p], [127p, 129p, 133p, 138p, 144p, 153p], [157p, 159p, 203p, 208p, 214p, 223p], [227p, 229p, 233p, 238p, 244p, 253p], [257p, 259p, 303p, 309p, 315p, 326p], [327p, 329p, 333p, 339p, 345p, 356p], [357p, 359p, 403p, 409p, 415p, 426p], [427p, 429p, 433p, 439p, 445p, 456p], [447p, 449p, 453p, 459p, 505p, 516p], [507p, 509p, 513p, 519p, 525p, 536p], [527p, 529p, 533p, 539p, 545p, 556p], [547p, 549p, 553p, 559p, 605p, 616p], [602p, 604p, 608p, 614p, 620p, 631p], [618p, 620p, 624p, 630p, 636p, 645p], [718p, 720p, 723p, 727p, 733p, 742p], [818p, 820p, 823p, 827p, 833p, 842p], [918p, 920p, 923p, 927p, 933p, 942p], [1018p, 1020p, 1023p, 1027p, 1033p, 1042p], [1118p, 1120p, 1123p, 1127p, 1133p, 1142p]]
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Florey Shops, Latham Shops, Kippax]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 3: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
     short_name: "170"
     stop_times: [[710a, 720a, 732a, 749a, 804a, 806a], [728a, 738a, 750a, 807a, 822a, 824a]]
     time_points: [Erindale Dr/ Charleston St Monash, Gowrie, Erindale Drive/Sternberg, Woden Interchange - Platform 9, City Interchange - Platform 3, Citywest]
   -  
     long_name: To Erindale Dr/ Charleston St Monash
-    between_stops: []
+    between_stops: 
+      City Interchange - Platform 1-Woden Interchange - Platform 12: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: "170"
     stop_times: [[500p, 505p, 521p, 536p, 546p, 556p]]
     time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 12, Erindale Drive/Sternberg, Gowrie, Erindale Dr/ Charleston St Monash]
   -  
     long_name: To Cameron Ave Station
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
     short_name: "17"
-    stop_times: 
-    - - 601a
-      - 606a
-      - 612a
-      - 617a
-      - 620a
-      - 625a
-      - 627a
-      - 631a
-    - - 631a
-      - 636a
-      - 642a
-      - 647a
-      - 650a
-      - 655a
-      - 657a
-      - 701a
-    - - 701a
-      - 706a
-      - 712a
-      - 717a
-      - 720a
-      - 725a
-      - 727a
-      - 731a
-    - - 721a
-      - 726a
-      - 732a
-      - 737a
-      - 740a
-      - 746a
-      - 748a
-      - 752a
-    - - 741a
-      - 747a
-      - 753a
-      - 758a
-      - 801a
-      - 807a
-      - 809a
-      - 813a
-    - - 801a
-      - 807a
-      - 813a
-      - 818a
-      - 821a
-      - 827a
-      - 829a
-      - 833a
-    - - 821a
-      - 827a
-      - 833a
-      - 838a
-      - 841a
-      - 847a
-      - 849a
-      - 853a
-    - - 841a
-      - 847a
-      - 853a
-      - 858a
-      - 901a
-      - 907a
-      - 909a
-      - 913a
-    - - 925a
-      - 931a
-      - 937a
-      - 942a
-      - 945a
-      - 950a
-      - 952a
-      - 956a
-    - - 956a
-      - 1001a
-      - 1007a
-      - 1012a
-      - 1015a
-      - 1020a
-      - 1022a
-      - 1026a
-    - - 1026a
-      - 1031a
-      - 1037a
-      - 1042a
-      - 1045a
-      - 1050a
-      - 1052a
-      - 1056a
-    - - 1056a
-      - 1101a
-      - 1107a
-      - 1112a
-      - 1115a
-      - 1120a
-      - 1122a
-      - 1126a
-    - - 1126a
-      - 1131a
-      - 1137a
-      - 1142a
-      - 1145a
-      - 1150a
-      - 1152a
-      - 1156a
-    - - 1156a
-      - 1201p
-      - 1207p
-      - 1212p
-      - 1215p
-      - 1220p
-      - 1222p
-      - 1226p
-    - - 1226p
-      - 1231p
-      - 1237p
-      - 1242p
-      - 1245p
-      - 1250p
-      - 1252p
-      - 1256p
-    - - 1256p
-      - 101p
-      - 107p
-      - 112p
-      - 115p
-      - 120p
-      - 122p
-      - 126p
-    - - 126p
-      - 131p
-      - 137p
-      - 142p
-      - 145p
-      - 150p
-      - 152p
-      - 156p
-    - - 156p
-      - 201p
-      - 207p
-      - 212p
-      - 215p
-      - 220p
-      - 222p
-      - 226p
-    - - 226p
-      - 231p
-      - 237p
-      - 242p
-      - 245p
-      - 250p
-      - 252p
-      - 256p
-    - - 255p
-      - 300p
-      - 306p
-      - 311p
-      - 314p
-      - 320p
-      - 322p
-      - 326p
-    - - "-"
-      - "-"
-      - 325p
-      - 330p
-      - 333p
-      - 339p
-      - 341p
-      - 345p
-    - - 326p
-      - 332p
-      - 338p
-      - 343p
-      - 346p
-      - 352p
-      - 354p
-      - 358p
-    - - 347p
-      - 353p
-      - 359p
-      - 404p
-      - 407p
-      - 413p
-      - 415p
-      - 419p
-    - - "-"
-      - "-"
-      - 403p
-      - 408p
-      - 411p
-      - 417p
-      - 419p
-      - 423p
-    - - 417p
-      - 423p
-      - 429p
-      - 434p
-      - 437p
-      - 443p
-      - 445p
-      - 449p
-    - - 447p
-      - 453p
-      - 459p
-      - 504p
-      - 507p
-      - 513p
-      - 515p
-      - 519p
-    - - 517p
-      - 523p
-      - 529p
-      - 534p
-      - 537p
-      - 543p
-      - 545p
-      - 549p
-    - - 547p
-      - 553p
-      - 559p
-      - 604p
-      - 607p
-      - 613p
-      - 615p
-      - 619p
-    - - 617p
-      - 623p
-      - 629p
-      - 634p
-      - 637p
-      - 641p
-      - 643p
-      - 646p
-    - - 657p
-      - 702p
-      - 708p
-      - 713p
-      - 716p
-      - 720p
-      - 722p
-      - 725p
-    - - 757p
-      - 802p
-      - 808p
-      - 813p
-      - 816p
-      - 820p
-      - 822p
-      - 825p
-    - - 857p
-      - 902p
-      - 908p
-      - 913p
-      - 916p
-      - 920p
-      - 922p
-      - 925p
-    - - 957p
-      - 1002p
-      - 1008p
-      - 1013p
-      - 1016p
-      - 1020p
-      - 1022p
-      - 1025p
-    - - 1057p
-      - 1102p
-      - 1108p
-      - 1113p
-      - 1116p
-      - 1120p
-      - 1122p
-      - 1125p
-    time_points: 
-    - Kippax
-    - Higgins
-    - Hawker College
-    - Hawker
-    - Weetangera Shops
-    - Cohen St Bus Station
-    - Lathlain St Bus Station
-    - Cameron Ave Bus Station
+    stop_times: [[601a, 606a, 612a, 617a, 620a, 625a, 627a, 631a], [631a, 636a, 642a, 647a, 650a, 655a, 657a, 701a], [701a, 706a, 712a, 717a, 720a, 725a, 727a, 731a], [721a, 726a, 732a, 737a, 740a, 746a, 748a, 752a], [741a, 747a, 753a, 758a, 801a, 807a, 809a, 813a], [801a, 807a, 813a, 818a, 821a, 827a, 829a, 833a], [821a, 827a, 833a, 838a, 841a, 847a, 849a, 853a], [841a, 847a, 853a, 858a, 901a, 907a, 909a, 913a], [925a, 931a, 937a, 942a, 945a, 950a, 952a, 956a], [956a, 1001a, 1007a, 1012a, 1015a, 1020a, 1022a, 1026a], [1026a, 1031a, 1037a, 1042a, 1045a, 1050a, 1052a, 1056a], [1056a, 1101a, 1107a, 1112a, 1115a, 1120a, 1122a, 1126a], [1126a, 1131a, 1137a, 1142a, 1145a, 1150a, 1152a, 1156a], [1156a, 1201p, 1207p, 1212p, 1215p, 1220p, 1222p, 1226p], [1226p, 1231p, 1237p, 1242p, 1245p, 1250p, 1252p, 1256p], [1256p, 101p, 107p, 112p, 115p, 120p, 122p, 126p], [126p, 131p, 137p, 142p, 145p, 150p, 152p, 156p], [156p, 201p, 207p, 212p, 215p, 220p, 222p, 226p], [226p, 231p, 237p, 242p, 245p, 250p, 252p, 256p], [255p, 300p, 306p, 311p, 314p, 320p, 322p, 326p], ["-", "-", 325p, 330p, 333p, 339p, 341p, 345p], [326p, 332p, 338p, 343p, 346p, 352p, 354p, 358p], [347p, 353p, 359p, 404p, 407p, 413p, 415p, 419p], ["-", "-", 403p, 408p, 411p, 417p, 419p, 423p], [417p, 423p, 429p, 434p, 437p, 443p, 445p, 449p], [447p, 453p, 459p, 504p, 507p, 513p, 515p, 519p], [517p, 523p, 529p, 534p, 537p, 543p, 545p, 549p], [547p, 553p, 559p, 604p, 607p, 613p, 615p, 619p], [617p, 623p, 629p, 634p, 637p, 641p, 643p, 646p], [657p, 702p, 708p, 713p, 716p, 720p, 722p, 725p], [757p, 802p, 808p, 813p, 816p, 820p, 822p, 825p], [857p, 902p, 908p, 913p, 916p, 920p, 922p, 925p], [957p, 1002p, 1008p, 1013p, 1016p, 1020p, 1022p, 1025p], [1057p, 1102p, 1108p, 1113p, 1116p, 1120p, 1122p, 1125p]]
+    time_points: [Kippax, Higgins, Hawker College, Hawker, Weetangera Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Kippax
-    between_stops: []
-    
+    between_stops: 
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     short_name: "17"
-    stop_times: 
-    - - 707a
-      - 709a
-      - 713a
-      - 717a
-      - 720a
-      - 725a
-      - 730a
-      - 737a
-    - - 807a
-      - 809a
-      - 813a
-      - 818a
-      - 821a
-      - 826a
-      - 831a
-      - 838a
-    - - 837a
-      - 839a
-      - 843a
-      - 848a
-      - 851a
-      - 856a
-      - 901a
-      - 908a
-    - - 855a
-      - 857a
-      - 901a
-      - 906a
-      - 909a
-      - 914a
-      - 919a
-      - 926a
-    - - 925a
-      - 927a
-      - 931a
-      - 935a
-      - 938a
-      - 943a
-      - 948a
-      - 953a
-    - - 955a
-      - 957a
-      - 1001a
-      - 1005a
-      - 1008a
-      - 1013a
-      - 1018a
-      - 1023a
-    - - 1025a
-      - 1027a
-      - 1031a
-      - 1035a
-      - 1038a
-      - 1043a
-      - 1048a
-      - 1053a
-    - - 1055a
-      - 1057a
-      - 1101a
-      - 1105a
-      - 1108a
-      - 1113a
-      - 1118a
-      - 1123a
-    - - 1125a
-      - 1127a
-      - 1131a
-      - 1135a
-      - 1138a
-      - 1143a
-      - 1148a
-      - 1153a
-    - - 1155a
-      - 1157a
-      - 1201p
-      - 1205p
-      - 1208p
-      - 1213p
-      - 1218p
-      - 1223p
-    - - 1225p
-      - 1227p
-      - 1231p
-      - 1235p
-      - 1238p
-      - 1243p
-      - 1248p
-      - 1253p
-    - - 1255p
-      - 1257p
-      - 101p
-      - 105p
-      - 108p
-      - 113p
-      - 118p
-      - 123p
-    - - 125p
-      - 127p
-      - 131p
-      - 135p
-      - 138p
-      - 143p
-      - 148p
-      - 153p
-    - - 155p
-      - 157p
-      - 201p
-      - 205p
-      - 208p
-      - 213p
-      - 218p
-      - 223p
-    - - 225p
-      - 227p
-      - 231p
-      - 235p
-      - 238p
-      - 243p
-      - 248p
-      - 253p
-    - - 255p
-      - 257p
-      - 301p
-      - 306p
-      - 309p
-      - 314p
-      - 320p
-      - 327p
-    - - 325p
-      - 327p
-      - 331p
-      - 336p
-      - 339p
-      - 344p
-      - 350p
-      - 357p
-    - - 354p
-      - 356p
-      - 400p
-      - 405p
-      - 408p
-      - 413p
-      - 419p
-      - 426p
-    - - 413p
-      - 415p
-      - 419p
-      - 424p
-      - 427p
-      - 432p
-      - 438p
-      - 445p
-    - - 433p
-      - 435p
-      - 439p
-      - 444p
-      - 447p
-      - 452p
-      - 458p
-      - 505p
-    - - 453p
-      - 455p
-      - 459p
-      - 504p
-      - 507p
-      - 512p
-      - 518p
-      - 525p
-    - - 513p
-      - 515p
-      - 519p
-      - 524p
-      - 527p
-      - 532p
-      - 538p
-      - 545p
-    - - 533p
-      - 535p
-      - 539p
-      - 544p
-      - 547p
-      - 552p
-      - 558p
-      - 605p
-    - - 553p
-      - 555p
-      - 559p
-      - 604p
-      - 607p
-      - 612p
-      - 618p
-      - 625p
-    - - 624p
-      - 626p
-      - 630p
-      - 634p
-      - 637p
-      - 642p
-      - 647p
-      - 652p
-    - - 724p
-      - 726p
-      - 729p
-      - 733p
-      - 736p
-      - 741p
-      - 746p
-      - 751p
-    - - 824p
-      - 826p
-      - 829p
-      - 833p
-      - 836p
-      - 841p
-      - 846p
-      - 851p
-    - - 924p
-      - 926p
-      - 929p
-      - 933p
-      - 936p
-      - 941p
-      - 946p
-      - 951p
-    - - 1024p
-      - 1026p
-      - 1029p
-      - 1033p
-      - 1036p
-      - 1041p
-      - 1046p
-      - 1051p
-    - - 1124p
-      - 1126p
-      - 1129p
-      - 1133p
-      - 1136p
-      - 1141p
-      - 1146p
-      - 1151p
-    time_points: 
-    - Cameron Ave Bus Station - Platform 5
-    - Lathlain St Bus Station - Platform 6
-    - Cohen St Bus Station - Platform 5
-    - Weetangera Shops
-    - Hawker
-    - Hawker College
-    - Higgins
-    - Kippax
+    stop_times: [[707a, 709a, 713a, 717a, 720a, 725a, 730a, 737a], [807a, 809a, 813a, 818a, 821a, 826a, 831a, 838a], [837a, 839a, 843a, 848a, 851a, 856a, 901a, 908a], [855a, 857a, 901a, 906a, 909a, 914a, 919a, 926a], [925a, 927a, 931a, 935a, 938a, 943a, 948a, 953a], [955a, 957a, 1001a, 1005a, 1008a, 1013a, 1018a, 1023a], [1025a, 1027a, 1031a, 1035a, 1038a, 1043a, 1048a, 1053a], [1055a, 1057a, 1101a, 1105a, 1108a, 1113a, 1118a, 1123a], [1125a, 1127a, 1131a, 1135a, 1138a, 1143a, 1148a, 1153a], [1155a, 1157a, 1201p, 1205p, 1208p, 1213p, 1218p, 1223p], [1225p, 1227p, 1231p, 1235p, 1238p, 1243p, 1248p, 1253p], [1255p, 1257p, 101p, 105p, 108p, 113p, 118p, 123p], [125p, 127p, 131p, 135p, 138p, 143p, 148p, 153p], [155p, 157p, 201p, 205p, 208p, 213p, 218p, 223p], [225p, 227p, 231p, 235p, 238p, 243p, 248p, 253p], [255p, 257p, 301p, 306p, 309p, 314p, 320p, 327p], [325p, 327p, 331p, 336p, 339p, 344p, 350p, 357p], [354p, 356p, 400p, 405p, 408p, 413p, 419p, 426p], [413p, 415p, 419p, 424p, 427p, 432p, 438p, 445p], [433p, 435p, 439p, 444p, 447p, 452p, 458p, 505p], [453p, 455p, 459p, 504p, 507p, 512p, 518p, 525p], [513p, 515p, 519p, 524p, 527p, 532p, 538p, 545p], [533p, 535p, 539p, 544p, 547p, 552p, 558p, 605p], [553p, 555p, 559p, 604p, 607p, 612p, 618p, 625p], [624p, 626p, 630p, 634p, 637p, 642p, 647p, 652p], [724p, 726p, 729p, 733p, 736p, 741p, 746p, 751p], [824p, 826p, 829p, 833p, 836p, 841p, 846p, 851p], [924p, 926p, 929p, 933p, 936p, 941p, 946p, 951p], [1024p, 1026p, 1029p, 1033p, 1036p, 1041p, 1046p, 1051p], [1124p, 1126p, 1129p, 1133p, 1136p, 1141p, 1146p, 1151p]]
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Weetangera Shops, Hawker, Hawker College, Higgins, Kippax]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      City Interchange - Platform 5-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 18/318
-    stop_times: 
-    - - 543a
-      - 552a
-      - 553a
-      - 556a
-      - 608a
-      - 626a
-      - 642a
-      - 659a
-      - 701a
-      - 705a
-    - - 613a
-      - 622a
-      - 623a
-      - 626a
-      - 638a
-      - 656a
-      - 712a
-      - 729a
-      - 731a
-      - 735a
-    - - 633a
-      - 642a
-      - 643a
-      - 646a
-      - 658a
-      - 716a
-      - 732a
-      - 750a
-      - 752a
-      - 756a
-    - - 655a
-      - 704a
-      - 705a
-      - 708a
-      - 720a
-      - 738a
-      - 756a
-      - 814a
-      - 816a
-      - 820a
-    - - 714a
-      - 723a
-      - 724a
-      - 727a
-      - 740a
-      - 759a
-      - 817a
-      - 835a
-      - 837a
-      - 841a
-    - - 731a
-      - 741a
-      - 742a
-      - 746a
-      - 800a
-      - 819a
-      - 837a
-      - 855a
-      - 857a
-      - 901a
-    - - "-"
-      - "-"
-      - 746a
-      - 750a
-      - 758a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 751a
-      - 801a
-      - 802a
-      - 806a
-      - 820a
-      - 839a
-      - 857a
-      - 915a
-      - 917a
-      - 921a
-    - - 811a
-      - 821a
-      - 822a
-      - 826a
-      - 840a
-      - 859a
-      - 917a
-      - 935a
-      - 937a
-      - 941a
-    - - 836a
-      - 846a
-      - 847a
-      - 851a
-      - 905a
-      - 924a
-      - 941a
-      - 958a
-      - 1000a
-      - 1004a
-    - - 906a
-      - 916a
-      - 917a
-      - 921a
-      - 935a
-      - 953a
-      - 1009a
-      - 1026a
-      - 1028a
-      - 1032a
-    - - 940a
-      - 949a
-      - 950a
-      - 953a
-      - 1005a
-      - 1023a
-      - 1039a
-      - 1056a
-      - 1058a
-      - 1102a
-    - - 1010a
-      - 1019a
-      - 1020a
-      - 1023a
-      - 1035a
-      - 1053a
-      - 1109a
-      - 1126a
-      - 1128a
-      - 1132a
-    - - 1040a
-      - 1049a
-      - 1050a
-      - 1053a
-      - 1105a
-      - 1123a
-      - 1139a
-      - 1156a
-      - 1158a
-      - 1202p
-    - - 1110a
-      - 1119a
-      - 1120a
-      - 1123a
-      - 1135a
-      - 1153a
-      - 1209p
-      - 1226p
-      - 1228p
-      - 1232p
-    - - 1140a
-      - 1149a
-      - 1150a
-      - 1153a
-      - 1205p
-      - 1223p
-      - 1239p
-      - 1256p
-      - 1258p
-      - 102p
-    - - 1210p
-      - 1219p
-      - 1220p
-      - 1223p
-      - 1235p
-      - 1253p
-      - 109p
-      - 126p
-      - 128p
-      - 132p
-    - - 1240p
-      - 1249p
-      - 1250p
-      - 1253p
-      - 105p
-      - 123p
-      - 139p
-      - 156p
-      - 158p
-      - 202p
-    - - 110p
-      - 119p
-      - 120p
-      - 123p
-      - 135p
-      - 153p
-      - 209p
-      - 226p
-      - 228p
-      - 232p
-    - - 140p
-      - 149p
-      - 150p
-      - 153p
-      - 205p
-      - 223p
-      - 239p
-      - 256p
-      - 258p
-      - 302p
-    - - 210p
-      - 219p
-      - 220p
-      - 223p
-      - 235p
-      - 253p
-      - 310p
-      - 328p
-      - 330p
-      - 334p
-    - - 239p
-      - 248p
-      - 249p
-      - 252p
-      - 304p
-      - 323p
-      - 341p
-      - 359p
-      - 401p
-      - 405p
-    - - 306p
-      - 316p
-      - 317p
-      - 321p
-      - 335p
-      - 354p
-      - 412p
-      - 430p
-      - 432p
-      - 436p
-    - - 331p
-      - 341p
-      - 342p
-      - 346p
-      - 400p
-      - 419p
-      - 437p
-      - 455p
-      - 457p
-      - 501p
-    - - 400p
-      - 410p
-      - 411p
-      - 415p
-      - 429p
-      - 448p
-      - 506p
-      - 524p
-      - 526p
-      - 530p
-    - - 435p
-      - 445p
-      - 446p
-      - 450p
-      - 504p
-      - 523p
-      - 541p
-      - 559p
-      - 601p
-      - 605p
-    - - 515p
-      - 525p
-      - 526p
-      - 530p
-      - 540p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 545p
-      - 555p
-      - 556p
-      - 600p
-      - 610p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 615p
-      - 625p
-      - 626p
-      - 630p
-      - 642p
-      - 659p
-      - 714p
-      - 731p
-      - 733p
-      - 736p
-    - - 713p
-      - 722p
-      - 723p
-      - 726p
-      - 734p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 814p
-      - 823p
-      - 824p
-      - 827p
-      - 835p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 914p
-      - 923p
-      - 924p
-      - 927p
-      - 935p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1014p
-      - 1023p
-      - 1024p
-      - 1027p
-      - 1035p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1114p
-      - 1123p
-      - 1124p
-      - 1127p
-      - 1135p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Lanyon Market Place
-    - Gordon Primary
-    - Lewis Luxton/Woodcock Dr
-    - Woodcock/Clare Dennis
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    stop_times: [[543a, 552a, 553a, 556a, 608a, 626a, 642a, 659a, 701a, 705a], [613a, 622a, 623a, 626a, 638a, 656a, 712a, 729a, 731a, 735a], [633a, 642a, 643a, 646a, 658a, 716a, 732a, 750a, 752a, 756a], [655a, 704a, 705a, 708a, 720a, 738a, 756a, 814a, 816a, 820a], [714a, 723a, 724a, 727a, 740a, 759a, 817a, 835a, 837a, 841a], [731a, 741a, 742a, 746a, 800a, 819a, 837a, 855a, 857a, 901a], ["-", "-", 746a, 750a, 758a, "-", "-", "-", "-", "-"], [751a, 801a, 802a, 806a, 820a, 839a, 857a, 915a, 917a, 921a], [811a, 821a, 822a, 826a, 840a, 859a, 917a, 935a, 937a, 941a], [836a, 846a, 847a, 851a, 905a, 924a, 941a, 958a, 1000a, 1004a], [906a, 916a, 917a, 921a, 935a, 953a, 1009a, 1026a, 1028a, 1032a], [940a, 949a, 950a, 953a, 1005a, 1023a, 1039a, 1056a, 1058a, 1102a], [1010a, 1019a, 1020a, 1023a, 1035a, 1053a, 1109a, 1126a, 1128a, 1132a], [1040a, 1049a, 1050a, 1053a, 1105a, 1123a, 1139a, 1156a, 1158a, 1202p], [1110a, 1119a, 1120a, 1123a, 1135a, 1153a, 1209p, 1226p, 1228p, 1232p], [1140a, 1149a, 1150a, 1153a, 1205p, 1223p, 1239p, 1256p, 1258p, 102p], [1210p, 1219p, 1220p, 1223p, 1235p, 1253p, 109p, 126p, 128p, 132p], [1240p, 1249p, 1250p, 1253p, 105p, 123p, 139p, 156p, 158p, 202p], [110p, 119p, 120p, 123p, 135p, 153p, 209p, 226p, 228p, 232p], [140p, 149p, 150p, 153p, 205p, 223p, 239p, 256p, 258p, 302p], [210p, 219p, 220p, 223p, 235p, 253p, 310p, 328p, 330p, 334p], [239p, 248p, 249p, 252p, 304p, 323p, 341p, 359p, 401p, 405p], [306p, 316p, 317p, 321p, 335p, 354p, 412p, 430p, 432p, 436p], [331p, 341p, 342p, 346p, 400p, 419p, 437p, 455p, 457p, 501p], [400p, 410p, 411p, 415p, 429p, 448p, 506p, 524p, 526p, 530p], [435p, 445p, 446p, 450p, 504p, 523p, 541p, 559p, 601p, 605p], [515p, 525p, 526p, 530p, 540p, "-", "-", "-", "-", "-"], [545p, 555p, 556p, 600p, 610p, "-", "-", "-", "-", "-"], [615p, 625p, 626p, 630p, 642p, 659p, 714p, 731p, 733p, 736p], [713p, 722p, 723p, 726p, 734p, "-", "-", "-", "-", "-"], [814p, 823p, 824p, 827p, 835p, "-", "-", "-", "-", "-"], [914p, 923p, 924p, 927p, 935p, "-", "-", "-", "-", "-"], [1014p, 1023p, 1024p, 1027p, 1035p, "-", "-", "-", "-", "-"], [1114p, 1123p, 1124p, 1127p, 1135p, "-", "-", "-", "-", "-"]]
+    time_points: [Lanyon Market Place, Gordon Primary, Lewis Luxton/Woodcock Dr, Woodcock/Clare Dennis, Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Lanyon Market Place
-    between_stops: []
-    
+    between_stops: 
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Woden Interchange - Platform 6-Tuggeranong Interchange - Platform 7: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 1: []
     short_name: 18/318
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 714a
-      - 722a
-      - 726a
-      - 736a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 740a
-      - 750a
-      - 755a
-      - 805a
-    - - 723a
-      - 725a
-      - 729a
-      - 748a
-      - 805a
-      - 823a
-      - 833a
-      - 838a
-      - 848a
-    - - 753a
-      - 755a
-      - 759a
-      - 818a
-      - 835a
-      - 853a
-      - 903a
-      - 908a
-      - 918a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 916a
-      - 926a
-      - 931a
-      - 940a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 949a
-      - 957a
-      - 1001a
-      - 1010a
-    - - 923a
-      - 925a
-      - 929a
-      - 946a
-      - 1003a
-      - 1019a
-      - 1027a
-      - 1031a
-      - 1040a
-    - - 953a
-      - 955a
-      - 959a
-      - 1016a
-      - 1033a
-      - 1049a
-      - 1057a
-      - 1101a
-      - 1110a
-    - - 1023a
-      - 1025a
-      - 1029a
-      - 1046a
-      - 1103a
-      - 1119a
-      - 1127a
-      - 1131a
-      - 1140a
-    - - 1053a
-      - 1055a
-      - 1059a
-      - 1116a
-      - 1133a
-      - 1149a
-      - 1157a
-      - 1201p
-      - 1210p
-    - - 1123a
-      - 1125a
-      - 1129a
-      - 1146a
-      - 1203p
-      - 1219p
-      - 1227p
-      - 1231p
-      - 1240p
-    - - 1153a
-      - 1155a
-      - 1159a
-      - 1216p
-      - 1233p
-      - 1249p
-      - 1257p
-      - 101p
-      - 110p
-    - - 1223p
-      - 1225p
-      - 1229p
-      - 1246p
-      - 103p
-      - 119p
-      - 127p
-      - 131p
-      - 140p
-    - - 1253p
-      - 1255p
-      - 1259p
-      - 116p
-      - 133p
-      - 149p
-      - 157p
-      - 201p
-      - 210p
-    - - 123p
-      - 125p
-      - 129p
-      - 146p
-      - 203p
-      - 219p
-      - 227p
-      - 231p
-      - 240p
-    - - 153p
-      - 155p
-      - 159p
-      - 216p
-      - 233p
-      - 249p
-      - 257p
-      - 301p
-      - 310p
-    - - 223p
-      - 225p
-      - 229p
-      - 246p
-      - 303p
-      - 323p
-      - 331p
-      - 335p
-      - 344p
-    - - 253p
-      - 255p
-      - 259p
-      - 318p
-      - 335p
-      - 355p
-      - 403p
-      - 407p
-      - 416p
-    - - 323p
-      - 325p
-      - 329p
-      - 348p
-      - 405p
-      - 425p
-      - 433p
-      - 437p
-      - 446p
-    - - 353p
-      - 355p
-      - 359p
-      - 418p
-      - 435p
-      - 455p
-      - 503p
-      - 507p
-      - 516p
-    - - 423p
-      - 425p
-      - 429p
-      - 448p
-      - 505p
-      - 525p
-      - 533p
-      - 537p
-      - 546p
-    - - 443p
-      - 445p
-      - 449p
-      - 508p
-      - 525p
-      - 545p
-      - 553p
-      - 557p
-      - 606p
-    - - 503p
-      - 505p
-      - 509p
-      - 528p
-      - 545p
-      - 605p
-      - 613p
-      - 617p
-      - 626p
-    - - 518p
-      - 520p
-      - 524p
-      - 543p
-      - 600p
-      - 620p
-      - 628p
-      - 632p
-      - 641p
-    - - 553p
-      - 555p
-      - 559p
-      - 618p
-      - 634p
-      - 650p
-      - 658p
-      - 702p
-      - 711p
-    - - 623p
-      - 625p
-      - 629p
-      - 645p
-      - 659p
-      - 715p
-      - 723p
-      - 727p
-      - 736p
-    - - 654p
-      - 656p
-      - 659p
-      - 715p
-      - 729p
-      - 745p
-      - 753p
-      - 757p
-      - 806p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 848p
-      - 856p
-      - 900p
-      - 909p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 948p
-      - 956p
-      - 1000p
-      - 1009p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1048p
-      - 1056p
-      - 1100p
-      - 1109p
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange - Platform 7
-    - Woodcock/Clare Dennis
-    - Gordon Primary
-    - Lanyon Market Place
+    stop_times: [["-", "-", "-", "-", "-", 714a, 722a, 726a, 736a], ["-", "-", "-", "-", "-", 740a, 750a, 755a, 805a], [723a, 725a, 729a, 748a, 805a, 823a, 833a, 838a, 848a], [753a, 755a, 759a, 818a, 835a, 853a, 903a, 908a, 918a], ["-", "-", "-", "-", "-", 916a, 926a, 931a, 940a], ["-", "-", "-", "-", "-", 949a, 957a, 1001a, 1010a], [923a, 925a, 929a, 946a, 1003a, 1019a, 1027a, 1031a, 1040a], [953a, 955a, 959a, 1016a, 1033a, 1049a, 1057a, 1101a, 1110a], [1023a, 1025a, 1029a, 1046a, 1103a, 1119a, 1127a, 1131a, 1140a], [1053a, 1055a, 1059a, 1116a, 1133a, 1149a, 1157a, 1201p, 1210p], [1123a, 1125a, 1129a, 1146a, 1203p, 1219p, 1227p, 1231p, 1240p], [1153a, 1155a, 1159a, 1216p, 1233p, 1249p, 1257p, 101p, 110p], [1223p, 1225p, 1229p, 1246p, 103p, 119p, 127p, 131p, 140p], [1253p, 1255p, 1259p, 116p, 133p, 149p, 157p, 201p, 210p], [123p, 125p, 129p, 146p, 203p, 219p, 227p, 231p, 240p], [153p, 155p, 159p, 216p, 233p, 249p, 257p, 301p, 310p], [223p, 225p, 229p, 246p, 303p, 323p, 331p, 335p, 344p], [253p, 255p, 259p, 318p, 335p, 355p, 403p, 407p, 416p], [323p, 325p, 329p, 348p, 405p, 425p, 433p, 437p, 446p], [353p, 355p, 359p, 418p, 435p, 455p, 503p, 507p, 516p], [423p, 425p, 429p, 448p, 505p, 525p, 533p, 537p, 546p], [443p, 445p, 449p, 508p, 525p, 545p, 553p, 557p, 606p], [503p, 505p, 509p, 528p, 545p, 605p, 613p, 617p, 626p], [518p, 520p, 524p, 543p, 600p, 620p, 628p, 632p, 641p], [553p, 555p, 559p, 618p, 634p, 650p, 658p, 702p, 711p], [623p, 625p, 629p, 645p, 659p, 715p, 723p, 727p, 736p], [654p, 656p, 659p, 715p, 729p, 745p, 753p, 757p, 806p], ["-", "-", "-", "-", "-", 848p, 856p, 900p, 909p], ["-", "-", "-", "-", "-", 948p, 956p, 1000p, 1009p], ["-", "-", "-", "-", "-", 1048p, 1056p, 1100p, 1109p]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange - Platform 7, Woodcock/Clare Dennis, Gordon Primary, Lanyon Market Place]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      City Interchange - Platform 5-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Tuggeranong Interchange - Platform 8-Woden Interchange - Platform 9: ["", Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
     short_name: 19/319
-    stop_times: 
-    - - 550a
-      - 556a
-      - 606a
-      - 612a
-      - 625a
-      - 643a
-      - 659a
-      - 716a
-      - 718a
-      - 722a
-    - - 620a
-      - 626a
-      - 636a
-      - 642a
-      - 655a
-      - 713a
-      - 729a
-      - 747a
-      - 749a
-      - 753a
-    - - 640a
-      - 646a
-      - 656a
-      - 702a
-      - 715a
-      - 733a
-      - 751a
-      - 809a
-      - 811a
-      - 815a
-    - - 700a
-      - 706a
-      - 716a
-      - 722a
-      - 735a
-      - 754a
-      - 812a
-      - 830a
-      - 832a
-      - 836a
-    - - 717a
-      - 723a
-      - 733a
-      - 741a
-      - 755a
-      - 814a
-      - 832a
-      - 850a
-      - 852a
-      - 856a
-    - - 724a
-      - 730a
-      - 740a
-      - 748a
-      - 758a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 736a
-      - 743a
-      - 753a
-      - 801a
-      - 815a
-      - 834a
-      - 852a
-      - 910a
-      - 912a
-      - 916a
-    - - 755a
-      - 802a
-      - 812a
-      - 820a
-      - 834a
-      - 853a
-      - 911a
-      - 929a
-      - 931a
-      - 935a
-    - - 816a
-      - 823a
-      - 833a
-      - 841a
-      - 855a
-      - 914a
-      - 932a
-      - 949a
-      - 951a
-      - 955a
-    - - 846a
-      - 853a
-      - 903a
-      - 911a
-      - 925a
-      - 943a
-      - 959a
-      - 1016a
-      - 1018a
-      - 1022a
-    - - 919a
-      - 926a
-      - 936a
-      - 942a
-      - 955a
-      - 1013a
-      - 1029a
-      - 1046a
-      - 1048a
-      - 1052a
-    - - 950a
-      - 956a
-      - 1006a
-      - 1012a
-      - 1025a
-      - 1043a
-      - 1059a
-      - 1116a
-      - 1118a
-      - 1122a
-    - - 1020a
-      - 1026a
-      - 1036a
-      - 1042a
-      - 1055a
-      - 1113a
-      - 1129a
-      - 1146a
-      - 1148a
-      - 1152a
-    - - 1050a
-      - 1056a
-      - 1106a
-      - 1112a
-      - 1125a
-      - 1143a
-      - 1159a
-      - 1216p
-      - 1218p
-      - 1222p
-    - - 1120a
-      - 1126a
-      - 1136a
-      - 1142a
-      - 1155a
-      - 1213p
-      - 1229p
-      - 1246p
-      - 1248p
-      - 1252p
-    - - 1150a
-      - 1156a
-      - 1206p
-      - 1212p
-      - 1225p
-      - 1243p
-      - 1259p
-      - 116p
-      - 118p
-      - 122p
-    - - 1220p
-      - 1226p
-      - 1236p
-      - 1242p
-      - 1255p
-      - 113p
-      - 129p
-      - 146p
-      - 148p
-      - 152p
-    - - 1250p
-      - 1256p
-      - 106p
-      - 112p
-      - 125p
-      - 143p
-      - 159p
-      - 216p
-      - 218p
-      - 222p
-    - - 120p
-      - 126p
-      - 136p
-      - 142p
-      - 155p
-      - 213p
-      - 229p
-      - 246p
-      - 248p
-      - 252p
-    - - 150p
-      - 156p
-      - 206p
-      - 212p
-      - 225p
-      - 243p
-      - 259p
-      - 317p
-      - 319p
-      - 323p
-    - - 219p
-      - 225p
-      - 235p
-      - 241p
-      - 254p
-      - 313p
-      - 331p
-      - 349p
-      - 351p
-      - 355p
-    - - 246p
-      - 252p
-      - 302p
-      - 310p
-      - 324p
-      - 343p
-      - 401p
-      - 419p
-      - 421p
-      - 425p
-    - - 320p
-      - 327p
-      - 337p
-      - 345p
-      - 355p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 352p
-      - 359p
-      - 409p
-      - 417p
-      - 427p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 424p
-      - 431p
-      - 441p
-      - 449p
-      - 459p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 454p
-      - 501p
-      - 511p
-      - 519p
-      - 529p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 524p
-      - 531p
-      - 541p
-      - 549p
-      - 559p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 556p
-      - 603p
-      - 613p
-      - 621p
-      - 631p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 654p
-      - 700p
-      - 710p
-      - 716p
-      - 725p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 754p
-      - 800p
-      - 810p
-      - 816p
-      - 825p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 849p
-      - 855p
-      - 905p
-      - 911p
-      - 920p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 949p
-      - 955p
-      - 1005p
-      - 1011p
-      - 1020p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1049p
-      - 1055p
-      - 1105p
-      - 1111p
-      - 1120p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Lanyon Market Place
-    - Conder Primary
-    - St Clare of Assisi Primary
-    - Bonython Primary
-    - Tuggeranong Interchange - Platform 8
-    - Woden Interchange - Platform 9
-    - City Interchange - Platform 5
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    stop_times: [[550a, 556a, 606a, 612a, 625a, 643a, 659a, 716a, 718a, 722a], [620a, 626a, 636a, 642a, 655a, 713a, 729a, 747a, 749a, 753a], [640a, 646a, 656a, 702a, 715a, 733a, 751a, 809a, 811a, 815a], [700a, 706a, 716a, 722a, 735a, 754a, 812a, 830a, 832a, 836a], [717a, 723a, 733a, 741a, 755a, 814a, 832a, 850a, 852a, 856a], [724a, 730a, 740a, 748a, 758a, "-", "-", "-", "-", "-"], [736a, 743a, 753a, 801a, 815a, 834a, 852a, 910a, 912a, 916a], [755a, 802a, 812a, 820a, 834a, 853a, 911a, 929a, 931a, 935a], [816a, 823a, 833a, 841a, 855a, 914a, 932a, 949a, 951a, 955a], [846a, 853a, 903a, 911a, 925a, 943a, 959a, 1016a, 1018a, 1022a], [919a, 926a, 936a, 942a, 955a, 1013a, 1029a, 1046a, 1048a, 1052a], [950a, 956a, 1006a, 1012a, 1025a, 1043a, 1059a, 1116a, 1118a, 1122a], [1020a, 1026a, 1036a, 1042a, 1055a, 1113a, 1129a, 1146a, 1148a, 1152a], [1050a, 1056a, 1106a, 1112a, 1125a, 1143a, 1159a, 1216p, 1218p, 1222p], [1120a, 1126a, 1136a, 1142a, 1155a, 1213p, 1229p, 1246p, 1248p, 1252p], [1150a, 1156a, 1206p, 1212p, 1225p, 1243p, 1259p, 116p, 118p, 122p], [1220p, 1226p, 1236p, 1242p, 1255p, 113p, 129p, 146p, 148p, 152p], [1250p, 1256p, 106p, 112p, 125p, 143p, 159p, 216p, 218p, 222p], [120p, 126p, 136p, 142p, 155p, 213p, 229p, 246p, 248p, 252p], [150p, 156p, 206p, 212p, 225p, 243p, 259p, 317p, 319p, 323p], [219p, 225p, 235p, 241p, 254p, 313p, 331p, 349p, 351p, 355p], [246p, 252p, 302p, 310p, 324p, 343p, 401p, 419p, 421p, 425p], [320p, 327p, 337p, 345p, 355p, "-", "-", "-", "-", "-"], [352p, 359p, 409p, 417p, 427p, "-", "-", "-", "-", "-"], [424p, 431p, 441p, 449p, 459p, "-", "-", "-", "-", "-"], [454p, 501p, 511p, 519p, 529p, "-", "-", "-", "-", "-"], [524p, 531p, 541p, 549p, 559p, "-", "-", "-", "-", "-"], [556p, 603p, 613p, 621p, 631p, "-", "-", "-", "-", "-"], [654p, 700p, 710p, 716p, 725p, "-", "-", "-", "-", "-"], [754p, 800p, 810p, 816p, 825p, "-", "-", "-", "-", "-"], [849p, 855p, 905p, 911p, 920p, "-", "-", "-", "-", "-"], [949p, 955p, 1005p, 1011p, 1020p, "-", "-", "-", "-", "-"], [1049p, 1055p, 1105p, 1111p, 1120p, "-", "-", "-", "-", "-"]]
+    time_points: [Lanyon Market Place, Conder Primary, St Clare of Assisi Primary, Bonython Primary, Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Lanyon Market Place
-    between_stops: []
-    
+    between_stops: 
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      Woden Interchange - Platform 6-Tuggeranong Interchange - Platform 4: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 1: []
     short_name: 19/319
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 705a
-      - 711a
-      - 716a
-      - 725a
-      - 731a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 740a
-      - 747a
-      - 754a
-      - 803a
-      - 810a
-    - - 703a
-      - 705a
-      - 709a
-      - 726a
-      - 743a
-      - 801a
-      - 808a
-      - 815a
-      - 824a
-      - 831a
-    - - 733a
-      - 735a
-      - 739a
-      - 758a
-      - 815a
-      - 833a
-      - 840a
-      - 847a
-      - 856a
-      - 903a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 904a
-      - 911a
-      - 918a
-      - 927a
-      - 933a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 933a
-      - 939a
-      - 944a
-      - 953a
-      - 959a
-    - - 903a
-      - 905a
-      - 909a
-      - 928a
-      - 945a
-      - 1001a
-      - 1007a
-      - 1012a
-      - 1021a
-      - 1027a
-    - - 933a
-      - 935a
-      - 939a
-      - 956a
-      - 1013a
-      - 1029a
-      - 1035a
-      - 1040a
-      - 1049a
-      - 1055a
-    - - 1003a
-      - 1005a
-      - 1009a
-      - 1026a
-      - 1043a
-      - 1059a
-      - 1105a
-      - 1110a
-      - 1119a
-      - 1125a
-    - - 1033a
-      - 1035a
-      - 1039a
-      - 1056a
-      - 1113a
-      - 1129a
-      - 1135a
-      - 1140a
-      - 1149a
-      - 1155a
-    - - 1103a
-      - 1105a
-      - 1109a
-      - 1126a
-      - 1143a
-      - 1159a
-      - 1205p
-      - 1210p
-      - 1219p
-      - 1225p
-    - - 1133a
-      - 1135a
-      - 1139a
-      - 1156a
-      - 1213p
-      - 1229p
-      - 1235p
-      - 1240p
-      - 1249p
-      - 1255p
-    - - 1203p
-      - 1205p
-      - 1209p
-      - 1226p
-      - 1243p
-      - 1259p
-      - 105p
-      - 110p
-      - 119p
-      - 125p
-    - - 1233p
-      - 1235p
-      - 1239p
-      - 1256p
-      - 113p
-      - 129p
-      - 135p
-      - 140p
-      - 149p
-      - 155p
-    - - 103p
-      - 105p
-      - 109p
-      - 126p
-      - 143p
-      - 159p
-      - 205p
-      - 210p
-      - 219p
-      - 225p
-    - - 133p
-      - 135p
-      - 139p
-      - 156p
-      - 213p
-      - 229p
-      - 235p
-      - 240p
-      - 249p
-      - 255p
-    - - 203p
-      - 205p
-      - 209p
-      - 226p
-      - 243p
-      - 259p
-      - 306p
-      - 313p
-      - 322p
-      - 329p
-    - - 233p
-      - 235p
-      - 239p
-      - 256p
-      - 313p
-      - 333p
-      - 340p
-      - 347p
-      - 356p
-      - 403p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 330p
-      - 350p
-      - 357p
-      - 404p
-      - 413p
-      - 420p
-    - - 303p
-      - 305p
-      - 309p
-      - 328p
-      - 345p
-      - 405p
-      - 412p
-      - 419p
-      - 428p
-      - 435p
-    - - 333p
-      - 335p
-      - 339p
-      - 358p
-      - 415p
-      - 435p
-      - 442p
-      - 449p
-      - 458p
-      - 505p
-    - - 403p
-      - 405p
-      - 409p
-      - 428p
-      - 445p
-      - 505p
-      - 512p
-      - 519p
-      - 528p
-      - 535p
-    - - 433p
-      - 435p
-      - 439p
-      - 458p
-      - 515p
-      - 535p
-      - 542p
-      - 549p
-      - 558p
-      - 605p
-    - - 453p
-      - 455p
-      - 459p
-      - 518p
-      - 535p
-      - 555p
-      - 602p
-      - 609p
-      - 618p
-      - 625p
-    - - 513p
-      - 515p
-      - 519p
-      - 538p
-      - 555p
-      - 615p
-      - 622p
-      - 629p
-      - 638p
-      - 644p
-    - - 533p
-      - 535p
-      - 539p
-      - 558p
-      - 615p
-      - 634p
-      - 640p
-      - 645p
-      - 654p
-      - 700p
-    - - 603p
-      - 605p
-      - 609p
-      - 628p
-      - 642p
-      - 658p
-      - 704p
-      - 709p
-      - 718p
-      - 724p
-    - - 634p
-      - 636p
-      - 639p
-      - 655p
-      - 709p
-      - 725p
-      - 731p
-      - 736p
-      - 745p
-      - 751p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 818p
-      - 824p
-      - 829p
-      - 838p
-      - 844p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 918p
-      - 924p
-      - 929p
-      - 938p
-      - 944p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1018p
-      - 1024p
-      - 1029p
-      - 1038p
-      - 1044p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1118p
-      - 1124p
-      - 1129p
-      - 1138p
-      - 1144p
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 1
-    - Cameron Ave Bus Station - Platform 1
-    - City Interchange - Platform 1
-    - Woden Interchange - Platform 6
-    - Tuggeranong Interchange - Platform 4
-    - Bonython Primary
-    - St Clare of Assisi Primary
-    - Conder Primary
-    - Lanyon Market Place
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
+    stop_times: [["-", "-", "-", "-", "-", 705a, 711a, 716a, 725a, 731a], ["-", "-", "-", "-", "-", 740a, 747a, 754a, 803a, 810a], [703a, 705a, 709a, 726a, 743a, 801a, 808a, 815a, 824a, 831a], [733a, 735a, 739a, 758a, 815a, 833a, 840a, 847a, 856a, 903a], ["-", "-", "-", "-", "-", 904a, 911a, 918a, 927a, 933a], ["-", "-", "-", "-", "-", 933a, 939a, 944a, 953a, 959a], [903a, 905a, 909a, 928a, 945a, 1001a, 1007a, 1012a, 1021a, 1027a], [933a, 935a, 939a, 956a, 1013a, 1029a, 1035a, 1040a, 1049a, 1055a], [1003a, 1005a, 1009a, 1026a, 1043a, 1059a, 1105a, 1110a, 1119a, 1125a], [1033a, 1035a, 1039a, 1056a, 1113a, 1129a, 1135a, 1140a, 1149a, 1155a], [1103a, 1105a, 1109a, 1126a, 1143a, 1159a, 1205p, 1210p, 1219p, 1225p], [1133a, 1135a, 1139a, 1156a, 1213p, 1229p, 1235p, 1240p, 1249p, 1255p], [1203p, 1205p, 1209p, 1226p, 1243p, 1259p, 105p, 110p, 119p, 125p], [1233p, 1235p, 1239p, 1256p, 113p, 129p, 135p, 140p, 149p, 155p], [103p, 105p, 109p, 126p, 143p, 159p, 205p, 210p, 219p, 225p], [133p, 135p, 139p, 156p, 213p, 229p, 235p, 240p, 249p, 255p], [203p, 205p, 209p, 226p, 243p, 259p, 306p, 313p, 322p, 329p], [233p, 235p, 239p, 256p, 313p, 333p, 340p, 347p, 356p, 403p], ["-", "-", "-", "-", 330p, 350p, 357p, 404p, 413p, 420p], [303p, 305p, 309p, 328p, 345p, 405p, 412p, 419p, 428p, 435p], [333p, 335p, 339p, 358p, 415p, 435p, 442p, 449p, 458p, 505p], [403p, 405p, 409p, 428p, 445p, 505p, 512p, 519p, 528p, 535p], [433p, 435p, 439p, 458p, 515p, 535p, 542p, 549p, 558p, 605p], [453p, 455p, 459p, 518p, 535p, 555p, 602p, 609p, 618p, 625p], [513p, 515p, 519p, 538p, 555p, 615p, 622p, 629p, 638p, 644p], [533p, 535p, 539p, 558p, 615p, 634p, 640p, 645p, 654p, 700p], [603p, 605p, 609p, 628p, 642p, 658p, 704p, 709p, 718p, 724p], [634p, 636p, 639p, 655p, 709p, 725p, 731p, 736p, 745p, 751p], ["-", "-", "-", "-", "-", 818p, 824p, 829p, 838p, 844p], ["-", "-", "-", "-", "-", 918p, 924p, 929p, 938p, 944p], ["-", "-", "-", "-", "-", 1018p, 1024p, 1029p, 1038p, 1044p], ["-", "-", "-", "-", "-", 1118p, 1124p, 1129p, 1138p, 1144p]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange - Platform 4, Bonython Primary, St Clare of Assisi Primary, Conder Primary, Lanyon Market Place]
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     short_name: "21"
     stop_times: [[657a, 703a, 706a, 712a, 724a], [727a, 734a, 737a, 744a, 757a], [757a, 804a, 807a, 814a, 827a], [827a, 834a, 837a, 844a, 857a], [904a, 911a, 914a, 921a, 934a], [1004a, 1010a, 1013a, 1019a, 1031a], [1104a, 1110a, 1113a, 1119a, 1131a], [1204p, 1210p, 1213p, 1219p, 1231p], [104p, 110p, 113p, 119p, 131p], [204p, 210p, 213p, 219p, 231p], [304p, 311p, 314p, 321p, 334p], [327p, 334p, 337p, 344p, 357p], [357p, 404p, 407p, 414p, 427p], [427p, 434p, 437p, 444p, 457p], [457p, 504p, 507p, 514p, 527p], [527p, 534p, 537p, 544p, 557p], [557p, 604p, 607p, 614p, 627p], [627p, 633p, 636p, 642p, 654p], [720p, 726p, 729p, 735p, 747p], [820p, 826p, 829p, 835p, 847p], [920p, 926p, 929p, 935p, 947p], [1020p, 1026p, 1029p, 1035p, 1047p], [1120p, 1126p, 1129p, 1135p, "-"]]
     time_points: [Woden Interchange - Platform 15, Pearce, Torrens Shops, Southlands Mawson, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "22"
     stop_times: [[635a, 648a, 656a, 659a, 707a], [705a, 718a, 726a, 729a, 738a], [735a, 749a, 758a, 801a, 810a], [805a, 819a, 828a, 831a, 840a], [843a, 857a, 906a, 909a, 918a], [943a, 956a, 1004a, 1007a, 1015a], [1043a, 1056a, 1104a, 1107a, 1115a], [1143a, 1156a, 1204p, 1207p, 1215p], [1243p, 1256p, 104p, 107p, 115p], [143p, 156p, 204p, 207p, 215p], [243p, 256p, 305p, 308p, 317p], [313p, 327p, 336p, 339p, 348p], [335p, 349p, 358p, 401p, 410p], [405p, 419p, 428p, 431p, 440p], [435p, 449p, 458p, 501p, 510p], [505p, 519p, 528p, 531p, 540p], [535p, 549p, 558p, 601p, 610p], [605p, 619p, 628p, 631p, 639p], [638p, 651p, 659p, 702p, 710p], [738p, 751p, 759p, 802p, 810p], [838p, 851p, 859p, 902p, 910p], [938p, 951p, 959p, 1002p, 1010p], [1038p, 1051p, 1059p, 1102p, 1110p]]
     time_points: [Woden Interchange - Platform 15, Southlands Mawson, Torrens Shops, Pearce, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "23"
     stop_times: [[607a, 609a, 613a, 622a, 628a, 634a, 642a, 647a], [644a, 646a, 650a, 659a, 705a, 711a, 719a, 724a], [714a, 716a, 720a, 729a, 736a, 742a, 752a, 757a], [744a, 748a, 753a, 801a, 808a, 814a, 824a, 829a], [814a, 818a, 823a, 831a, 838a, 844a, 854a, 859a], [844a, 848a, 853a, 901a, 908a, 914a, 924a, 929a], [926a, 930a, 934a, 943a, 949a, 955a, 1003a, 1008a], [1026a, 1028a, 1032a, 1041a, 1047a, 1053a, 1101a, 1106a], [1126a, 1128a, 1132a, 1141a, 1147a, 1153a, 1201p, 1206p], [1226p, 1228p, 1232p, 1241p, 1247p, 1253p, 101p, 106p], [126p, 128p, 132p, 141p, 147p, 153p, 201p, 206p], [226p, 228p, 232p, 241p, 247p, 253p, 301p, 306p], [314p, 318p, 323p, 331p, 338p, 344p, 354p, 359p], [344p, 348p, 353p, 401p, 408p, 414p, 424p, 429p], [414p, 418p, 423p, 431p, 438p, 444p, 454p, 459p], [444p, 448p, 453p, 501p, 508p, 514p, 524p, 529p], [514p, 518p, 523p, 531p, 538p, 544p, 554p, 559p], [544p, 548p, 553p, 601p, 608p, 614p, 624p, 629p], [626p, 630p, 634p, 643p, 649p, 655p, 703p, 708p], [726p, 728p, 732p, 741p, 747p, 753p, 801p, 806p], [826p, 828p, 832p, 841p, 847p, 853p, 901p, 906p], [926p, 928p, 932p, 941p, 947p, 953p, 1001p, 1006p], [1026p, 1028p, 1032p, 1041p, 1047p, 1053p, 1101p, 1106p], [1126p, 1128p, 1132p, 1141p, "-", "-", "-", "-"]]
     time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Southlands Mawson, Farrer Terminus, Isaacs, Canberra Hospital, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "24"
     stop_times: [["-", "-", "-", 703a, 709a, 715a, 720a, 724a], [702a, 708a, 715a, 720a, 726a, 732a, 737a, 742a], [739a, 746a, 754a, 800a, 806a, 813a, 818a, 823a], [809a, 816a, 824a, 830a, 836a, 843a, 848a, 853a], [839a, 846a, 854a, 900a, 906a, 913a, 918a, 923a], [956a, 1002a, 1009a, 1014a, 1020a, 1026a, 1031a, 1035a], [1056a, 1102a, 1109a, 1114a, 1120a, 1126a, 1131a, 1135a], [1156a, 1202p, 1209p, 1214p, 1220p, 1226p, 1231p, 1235p], [1256p, 102p, 109p, 114p, 120p, 126p, 131p, 135p], [156p, 202p, 209p, 214p, 220p, 226p, 231p, 235p], [256p, 302p, 310p, 316p, 322p, 329p, 334p, 339p], [339p, 346p, 354p, 400p, 406p, 413p, 418p, 423p], [409p, 416p, 424p, 430p, 436p, 443p, 448p, 453p], [439p, 446p, 454p, 500p, 506p, 513p, 518p, 523p], [509p, 516p, 524p, 530p, 536p, 543p, 548p, 553p], [538p, 545p, 553p, 559p, 605p, 612p, 617p, 622p], [608p, 615p, 623p, 629p, 635p, 641p, 646p, 650p], [700p, 706p, 713p, 718p, 724p, 730p, 735p, 739p], [800p, 806p, 813p, 818p, 824p, 830p, 835p, 839p], [900p, 906p, 913p, 918p, 924p, 930p, 935p, 939p], [1000p, 1006p, 1013p, 1018p, 1024p, 1030p, 1035p, 1039p], [1100p, 1106p, 1113p, 1118p, 1124p, 1130p, 1135p, 1139p]]
     time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Terminus, Southlands Mawson, Chifley, Lyons, Woden Interchange]
   -  
     long_name: To Campbell Park Offices
-    between_stops: []
+    between_stops: {}
+    
     short_name: 25/225
     stop_times: [[612a, 622a, 625a, 634a, "-", "-", "-", "-"], [642a, 652a, 655a, 705a, 719a, 722a, 726a, 730a], [702a, 712a, 715a, 725a, 739a, 743a, 747a, 751a], [734a, 749a, 752a, 805a, 819a, 823a, 827a, 831a], [808a, 823a, 826a, 838a, "-", "-", "-", "-"], [838a, 853a, 856a, 908a, "-", "-", "-", "-"], [910a, 925a, 928a, 938a, "-", "-", "-", "-"], [1012a, 1022a, 1025a, 1035a, "-", "-", "-", "-"], [1112a, 1122a, 1125a, 1135a, "-", "-", "-", "-"], [1212p, 1222p, 1225p, 1235p, "-", "-", "-", "-"], [112p, 122p, 125p, 135p, "-", "-", "-", "-"], [212p, 222p, 225p, 235p, "-", "-", "-", "-"], [312p, 324p, 327p, 336p, "-", "-", "-", "-"], [342p, 354p, 357p, 406p, "-", "-", "-", "-"], [412p, 424p, 427p, 436p, "-", "-", "-", "-"], [512p, 524p, 527p, 536p, "-", "-", "-", "-"], [622p, 633p, 636p, 645p, "-", "-", "-", "-"], [722p, 732p, 735p, 744p, "-", "-", "-", "-"], [822p, 832p, 835p, 844p, "-", "-", "-", "-"], [922p, 932p, 935p, 944p, "-", "-", "-", "-"], [1022p, 1032p, 1035p, 1044p, "-", "-", "-", "-"]]
     time_points: [Cooleman Court, Holder, Weston Primary, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: 25/225
     stop_times: [["-", "-", "-", "-", 712a, 720a, 723a, 734a], ["-", "-", "-", "-", 807a, 819a, 823a, 835a], ["-", "-", "-", "-", 842a, 854a, 858a, 910a], ["-", "-", "-", "-", 940a, 949a, 952a, 1002a], ["-", "-", "-", "-", 1040a, 1049a, 1052a, 1102a], ["-", "-", "-", "-", 1140a, 1149a, 1152a, 1202p], ["-", "-", "-", "-", 1240p, 1249p, 1252p, 102p], ["-", "-", "-", "-", 140p, 149p, 152p, 202p], ["-", "-", "-", "-", 240p, 249p, 252p, 306p], ["-", "-", "-", "-", 342p, 352p, 356p, 408p], ["-", "-", "-", "-", 412p, 422p, 426p, 438p], [417p, 421p, 425p, 428p, 443p, 453p, 457p, 509p], [447p, 451p, 455p, 458p, 513p, 523p, 527p, 539p], [517p, 521p, 525p, 528p, 543p, 553p, 557p, 609p], ["-", "-", "-", "-", 612p, 622p, 626p, 637p], ["-", "-", "-", "-", 656p, 704p, 707p, 717p], ["-", "-", "-", "-", 756p, 804p, 807p, 817p], ["-", "-", "-", "-", 856p, 904p, 907p, 917p], ["-", "-", "-", "-", 956p, 1004p, 1007p, 1017p], ["-", "-", "-", "-", 1056p, 1104p, 1107p, 1117p]]
     time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 16, Weston Primary, Holder, Cooleman Court]
   -  
     long_name: To Campbell Park Offices
-    between_stops: []
+    between_stops: {}
+    
     short_name: 26/226
     stop_times: [[615a, 619a, 623a, 625a, 632a, "-", "-", "-", "-"], [657a, 701a, 705a, 707a, 715a, 729a, 733a, 737a, 741a], [716a, 720a, 724a, 726a, 736a, 750a, 754a, 758a, 802a], [747a, 752a, 758a, 802a, 815a, 829a, 833a, 837a, 841a], [800a, 805a, 811a, 815a, 827a, "-", "-", "-", "-"], [820a, 825a, 831a, 835a, 847a, "-", "-", "-", "-"], [850a, 855a, 901a, 905a, 917a, "-", "-", "-", "-"], [925a, 930a, 935a, 938a, 948a, "-", "-", "-", "-"], [1025a, 1029a, 1034a, 1037a, 1047a, "-", "-", "-", "-"], [1125a, 1129a, 1134a, 1137a, 1147a, "-", "-", "-", "-"], [1225p, 1229p, 1234p, 1237p, 1247p, "-", "-", "-", "-"], [125p, 129p, 134p, 137p, 147p, "-", "-", "-", "-"], [225p, 229p, 234p, 237p, 247p, "-", "-", "-", "-"], [255p, 259p, 305p, 308p, 317p, "-", "-", "-", "-"], [320p, 324p, 330p, 333p, 342p, "-", "-", "-", "-"], [420p, 424p, 430p, 433p, 442p, "-", "-", "-", "-"], [520p, 524p, 530p, 533p, 542p, "-", "-", "-", "-"], [620p, 624p, 630p, 632p, 639p, "-", "-", "-", "-"], [714p, 718p, 722p, 724p, 731p, "-", "-", "-", "-"], [814p, 818p, 822p, 824p, 831p, "-", "-", "-", "-"], [914p, 918p, 922p, 924p, 931p, "-", "-", "-", "-"], [1014p, 1018p, 1022p, 1024p, 1031p, "-", "-", "-", "-"]]
     time_points: [Weston Creek Terminus, Chapman, Canberra College Weston, Cooleman Court, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
   -  
     long_name: To Weston Creek Terminus
-    between_stops: []
+    between_stops: {}
+    
     short_name: 26/226
     stop_times: [["-", "-", "-", "-", 718a, 725a, 727a, 731a, 735a], ["-", "-", "-", "-", 818a, 828a, 832a, 837a, 841a], ["-", "-", "-", "-", 858a, 908a, 912a, 917a, 921a], ["-", "-", "-", "-", 958a, 1007a, 1010a, 1015a, 1019a], ["-", "-", "-", "-", 1058a, 1107a, 1110a, 1115a, 1119a], ["-", "-", "-", "-", 1158a, 1207p, 1210p, 1215p, 1219p], ["-", "-", "-", "-", 1258p, 107p, 110p, 115p, 119p], ["-", "-", "-", "-", 158p, 207p, 210p, 215p, 219p], ["-", "-", "-", "-", 258p, 309p, 313p, 319p, 324p], ["-", "-", "-", "-", 328p, 340p, 344p, 350p, 355p], ["-", "-", "-", "-", 354p, 406p, 410p, 416p, 421p], ["-", "-", "-", "-", 418p, 430p, 434p, 440p, 445p], ["-", "-", "-", "-", 448p, 500p, 504p, 510p, 515p], [452p, 456p, 500p, 503p, 518p, 530p, 534p, 540p, 545p], [522p, 526p, 530p, 533p, 548p, 600p, 604p, 610p, 615p], ["-", "-", "-", "-", 618p, 630p, 632p, 636p, 640p], ["-", "-", "-", "-", 650p, 657p, 659p, 703p, 707p], ["-", "-", "-", "-", 750p, 757p, 759p, 803p, 807p], ["-", "-", "-", "-", 850p, 857p, 859p, 903p, 907p], ["-", "-", "-", "-", 950p, 957p, 959p, 1003p, 1007p], ["-", "-", "-", "-", 1050p, 1057p, 1059p, 1103p, 1107p]]
     time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 3, Cooleman Court, Canberra College Weston, Chapman, Weston Creek Terminus]
   -  
     long_name: To Campbell Park Offices
-    between_stops: []
+    between_stops: {}
+    
     short_name: 27/227
     stop_times: [[629a, 635a, 643a, 647a, 655a, 709a, 712a, 716a, 720a], [654a, 700a, 708a, 712a, 720a, 734a, 738a, 742a, 746a], ["-", "-", 728a, 735a, 746a, "-", "-", "-", "-"], [722a, 728a, 736a, 743a, 755a, 809a, 813a, 817a, 821a], [740a, 746a, 754a, 801a, 812a, "-", "-", "-", "-"], [748a, 754a, 804a, 810a, 820a, "-", "-", "-", "-"], [823a, 829a, 837a, 844a, 855a, "-", "-", "-", "-"], [853a, 859a, 907a, 914a, 925a, "-", "-", "-", "-"], [925a, 931a, 938a, 942a, 949a, "-", "-", "-", "-"], [1025a, 1031a, 1038a, 1042a, 1049a, "-", "-", "-", "-"], [1125a, 1131a, 1138a, 1142a, 1149a, "-", "-", "-", "-"], [1225p, 1231p, 1238p, 1242p, 1249p, "-", "-", "-", "-"], [125p, 131p, 138p, 142p, 149p, "-", "-", "-", "-"], [225p, 231p, 238p, 242p, 249p, "-", "-", "-", "-"], [325p, 330p, 337p, 341p, 349p, "-", "-", "-", "-"], [355p, 400p, 407p, 411p, 419p, "-", "-", "-", "-"], [425p, 430p, 437p, 441p, 449p, "-", "-", "-", "-"], [525p, 530p, 537p, 541p, 549p, "-", "-", "-", "-"], [625p, 630p, 637p, 640p, 647p, "-", "-", "-", "-"], [700p, 705p, 712p, 715p, 722p, "-", "-", "-", "-"], [800p, 805p, 812p, 815p, 822p, "-", "-", "-", "-"], [900p, 905p, 912p, 915p, 922p, "-", "-", "-", "-"], [1000p, 1005p, 1012p, 1015p, 1022p, "-", "-", "-", "-"]]
     time_points: [Cooleman Court, Rivett, Fisher, Waramanga, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: 27/227
     stop_times: [["-", "-", "-", "-", 821a, 829a, 833a, 840a, 845a], ["-", "-", "-", "-", 854a, 902a, 906a, 913a, 918a], ["-", "-", "-", "-", 954a, 1001a, 1005a, 1013a, 1019a], ["-", "-", "-", "-", 1054a, 1101a, 1105a, 1113a, 1119a], ["-", "-", "-", "-", 1154a, 1201p, 1205p, 1213p, 1219p], ["-", "-", "-", "-", 1254p, 101p, 105p, 113p, 119p], ["-", "-", "-", "-", 154p, 201p, 205p, 213p, 219p], ["-", "-", "-", "-", 254p, 302p, 307p, 314p, 322p], ["-", "-", "-", "-", 321p, 333p, 338p, 345p, 353p], ["-", "-", "-", "-", 351p, 403p, 408p, 415p, 423p], ["-", "-", "-", "-", 421p, 433p, 438p, 445p, 453p], [427p, 431p, 435p, 438p, 453p, 505p, 510p, 517p, 525p], ["-", "-", "-", "-", 521p, 533p, 538p, 545p, 553p], [527p, 531p, 535p, 538p, 553p, 605p, 610p, 617p, 625p], ["-", "-", "-", "-", 635p, 641p, 644p, 650p, 655p], ["-", "-", "-", "-", 735p, 741p, 744p, 750p, 755p], ["-", "-", "-", "-", 835p, 841p, 844p, 850p, 855p], ["-", "-", "-", "-", 935p, 941p, 944p, 950p, 955p], ["-", "-", "-", "-", 1035p, 1041p, 1044p, 1050p, 1055p]]
     time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 3, Waramanga, Fisher, Rivett, Cooleman Court]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: "28"
     stop_times: [["-", "-", "-", "-", 742a, 746a, 751a, 759a, 811a], ["-", "-", "-", "-", 845a, 849a, 854a, 902a, 914a], ["-", "-", "-", "-", 952a, 956a, 1000a, 1007a, 1019a], ["-", "-", "-", "-", 1052a, 1056a, 1100a, 1107a, 1119a], ["-", "-", "-", "-", 1152a, 1156a, 1200p, 1207p, 1219p], ["-", "-", "-", "-", 1252p, 1256p, 100p, 107p, 119p], ["-", "-", "-", "-", 152p, 156p, 200p, 207p, 219p], ["-", "-", "-", "-", 252p, 256p, 300p, 308p, 320p], ["-", "-", "-", "-", 312p, 316p, 321p, 329p, 341p], ["-", "-", "-", "-", 342p, 346p, 351p, 359p, 411p], ["-", "-", "-", "-", 412p, 416p, 421p, 429p, 441p], ["-", "-", "-", "-", 442p, 446p, 451p, 459p, 511p], [429p, 438p, 454p, 457p, 512p, 516p, 521p, 529p, 541p], [449p, 508p, 524p, 527p, 542p, 546p, 551p, 559p, 611p], [519p, 538p, 554p, 557p, 612p, 616p, 621p, 629p, 638p], [549p, 608p, 624p, 627p, 642p, 645p, 649p, 656p, 705p], ["-", "-", "-", "-", 732p, 735p, 739p, 746p, 755p], ["-", "-", "-", "-", 832p, 835p, 839p, 846p, 855p], ["-", "-", "-", "-", 932p, 935p, 939p, 946p, 955p], ["-", "-", "-", "-", 1032p, 1035p, 1039p, 1046p, 1055p]]
     time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 16, Lyons, Police College Weston, Duffy Primary School, Cooleman Court]
   -  
     long_name: To Fairbairn Park
-    between_stops: []
+    between_stops: {}
+    
     short_name: "28"
     stop_times: [[615a, 624a, 630a, 634a, 638a, 652a, 655a, 711a, 725a], [637a, 646a, 652a, 656a, 700a, 714a, 717a, 733a, 747a], [705a, 714a, 720a, 724a, 728a, 742a, 746a, 802a, 816a], [745a, 757a, 805a, 810a, 815a, 829a, 833a, 849a, 903a], [815a, 827a, 835a, 840a, 844a, "-", "-", "-", "-"], [844a, 856a, 904a, 909a, 913a, "-", "-", "-", "-"], [926a, 938a, 945a, 949a, 953a, "-", "-", "-", "-"], [1026a, 1038a, 1045a, 1049a, 1053a, "-", "-", "-", "-"], [1126a, 1138a, 1145a, 1149a, 1153a, "-", "-", "-", "-"], [1226p, 1238p, 1245p, 1249p, 1253p, "-", "-", "-", "-"], [126p, 138p, 145p, 149p, 153p, "-", "-", "-", "-"], [226p, 238p, 245p, 249p, 253p, "-", "-", "-", "-"], [326p, 338p, 346p, 351p, 354p, "-", "-", "-", "-"], [356p, 408p, 416p, 421p, 425p, "-", "-", "-", "-"], [415p, 427p, 435p, 440p, 444p, "-", "-", "-", "-"], [515p, 527p, 535p, 540p, 544p, "-", "-", "-", "-"], [615p, 627p, 634p, 638p, 641p, "-", "-", "-", "-"], [700p, 709p, 715p, 719p, 722p, "-", "-", "-", "-"], [800p, 809p, 815p, 819p, 822p, "-", "-", "-", "-"], [900p, 909p, 915p, 919p, 922p, "-", "-", "-", "-"], [1000p, 1009p, 1015p, 1019p, 1022p, "-", "-", "-", "-"]]
     time_points: [Cooleman Court, Duffy Primary School, Police College Weston, Lyons, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, Brindabella Business Park, Fairbairn Park]
   -  
     long_name: To Dickson
-    between_stops: []
+    between_stops: {}
+    
     short_name: "2"
     stop_times: [["-", "-", "-", "-", "-", "-", "-", 703a, 710a, 715a, 723a, 728a], [653a, 704a, 708a, 711a, 715a, 719a, 723a, 733a, 740a, 746a, 754a, 801a], [708a, 719a, 723a, 726a, 730a, 734a, 738a, 749a, 756a, 802a, 810a, 817a], [719a, 730a, 734a, 737a, 741a, 745a, 749a, 800a, 807a, 813a, 821a, 828a], [738a, 749a, 754a, 758a, 803a, 808a, 814a, 830a, 838a, 845a, 853a, 859a], [753a, 804a, 808a, 812a, 817a, 823a, 826a, 843a, 849a, 854a, 902a, 910a], [808a, 819a, 823a, 826a, 830a, 834a, 838a, 849a, 856a, 902a, 910a, 917a], [823a, 834a, 838a, 841a, 845a, 849a, 853a, 904a, 911a, 917a, 925a, 931a], [838a, 851a, 855a, 858a, 903a, 908a, 914a, 926a, "-", "-", "-", "-"], [853a, 904a, 908a, 911a, 915a, 919a, 923a, 934a, 941a, 946a, 954a, 959a], [923a, 934a, 938a, 941a, 945a, 949a, 953a, 1004a, 1011a, 1016a, 1024a, 1029a], [953a, 1004a, 1008a, 1011a, 1015a, 1019a, 1023a, 1034a, 1041a, 1046a, 1054a, 1059a], [1023a, 1034a, 1038a, 1041a, 1045a, 1049a, 1053a, 1104a, 1111a, 1116a, 1124a, 1129a], [1053a, 1104a, 1108a, 1111a, 1115a, 1119a, 1123a, 1134a, 1141a, 1146a, 1154a, 1159a], [1123a, 1134a, 1138a, 1141a, 1145a, 1149a, 1153a, 1204p, 1211p, 1216p, 1224p, 1229p], [1153a, 1204p, 1208p, 1211p, 1215p, 1219p, 1223p, 1234p, 1241p, 1246p, 1254p, 1259p], [1223p, 1234p, 1238p, 1241p, 1245p, 1249p, 1253p, 104p, 111p, 116p, 124p, 129p], [1253p, 104p, 108p, 111p, 115p, 119p, 123p, 134p, 141p, 146p, 154p, 159p], [123p, 134p, 138p, 141p, 145p, 149p, 153p, 204p, 211p, 216p, 224p, 229p], [153p, 204p, 208p, 211p, 215p, 219p, 223p, 234p, 241p, 246p, 254p, 259p], [223p, 234p, 238p, 241p, 245p, 249p, 253p, 304p, 311p, 316p, 324p, 329p], [238p, 249p, 253p, 256p, 300p, 304p, 308p, 319p, 326p, 332p, 340p, 347p], [253p, 304p, 308p, 311p, 315p, 319p, 323p, 334p, 341p, 346p, 354p, 359p], [308p, 319p, 323p, 326p, 330p, 334p, 338p, 349p, 356p, 402p, 410p, 417p], [323p, 334p, 338p, 341p, 345p, 349p, 353p, 404p, 411p, 417p, 425p, 432p], [338p, 349p, 353p, 356p, 400p, 404p, 408p, 419p, 426p, 432p, 440p, 447p], [353p, 404p, 408p, 411p, 415p, 419p, 423p, 434p, 441p, 447p, 455p, 502p], [408p, 419p, 423p, 426p, 430p, 434p, 438p, 449p, 456p, 502p, 510p, 517p], [423p, 434p, 438p, 441p, 445p, 449p, 453p, 504p, 511p, 517p, 525p, 532p], [438p, 449p, 453p, 456p, 500p, 504p, 508p, 519p, 526p, 532p, 540p, 547p], [453p, 504p, 508p, 511p, 515p, 519p, 523p, 534p, 541p, 547p, 555p, 602p], [508p, 519p, 523p, 526p, 530p, 534p, 538p, 549p, 556p, 602p, 610p, 617p], [523p, 534p, 538p, 541p, 545p, 549p, 553p, 604p, 611p, 617p, 625p, 631p], [538p, 549p, 553p, 556p, 600p, 604p, 608p, 619p, 626p, 632p, 638p, 642p], [553p, 604p, 608p, 611p, 615p, 619p, 623p, 634p, 639p, 644p, 650p, 654p], [640p, 650p, 653p, 656p, 700p, 703p, 707p, 717p, 722p, 727p, 733p, 737p], [740p, 750p, 753p, 756p, 800p, 803p, 807p, 817p, 822p, 827p, 833p, 837p], [840p, 850p, 853p, 856p, 900p, 903p, 907p, 917p, 922p, 927p, 933p, 937p], [940p, 950p, 953p, 956p, 1000p, 1003p, 1007p, 1017p, 1022p, 1027p, 1033p, 1037p], [1040p, 1050p, 1053p, 1056p, 1100p, 1103p, 1107p, 1117p, 1122p, 1127p, 1133p, 1137p]]
     time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, Deakin, Parliament House, Kings Ave/National Crt, City Interchange - Platform 10, Olims Hotel, Ainslie, Hackett, Dickson]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "2"
     stop_times: [["-", 634a, 639a, 647a, 653a, 702a, 711a, 715a, 720a, 724a, 727a, 731a, 742a], ["-", 704a, 709a, 717a, 723a, 732a, 742a, 747a, 752a, 756a, 759a, 803a, 814a], ["-", 719a, 724a, 732a, 738a, 747a, 757a, 802a, 807a, 811a, 814a, 818a, 829a], ["-", 732a, 739a, 747a, 753a, 802a, 812a, 817a, 822a, 826a, 829a, 833a, 844a], ["-", 749a, 756a, 804a, 810a, 819a, 829a, 834a, 839a, 843a, 846a, 850a, 901a], ["-", 802a, 809a, 817a, 825a, 838a, 847a, 853a, 857a, 901a, 905a, 908a, 921a], ["-", 819a, 826a, 834a, 840a, 848a, "-", "-", "-", "-", "-", "-", "-"], ["-", 832a, 839a, 847a, 853a, 902a, 912a, 917a, 922a, 926a, 929a, 933a, 944a], ["-", 849a, 856a, 904a, 910a, 918a, "-", "-", "-", "-", "-", "-", "-"], ["-", 904a, 909a, 917a, 923a, 932a, 942a, 946a, 951a, 955a, 958a, 1002a, 1013a], ["-", 934a, 939a, 947a, 953a, 1002a, 1012a, 1016a, 1021a, 1025a, 1028a, 1032a, 1043a], ["-", 1004a, 1009a, 1017a, 1023a, 1032a, 1042a, 1046a, 1051a, 1055a, 1058a, 1102a, 1113a], ["-", 1034a, 1039a, 1047a, 1053a, 1102a, 1112a, 1116a, 1121a, 1125a, 1128a, 1132a, 1143a], ["-", 1104a, 1109a, 1117a, 1123a, 1132a, 1142a, 1146a, 1151a, 1155a, 1158a, 1202p, 1213p], ["-", 1134a, 1139a, 1147a, 1153a, 1202p, 1212p, 1216p, 1221p, 1225p, 1228p, 1232p, 1243p], ["-", 1204p, 1209p, 1217p, 1223p, 1232p, 1242p, 1246p, 1251p, 1255p, 1258p, 102p, 113p], ["-", 1234p, 1239p, 1247p, 1253p, 102p, 112p, 116p, 121p, 125p, 128p, 132p, 143p], ["-", 104p, 109p, 117p, 123p, 132p, 142p, 146p, 151p, 155p, 158p, 202p, 213p], ["-", 134p, 139p, 147p, 153p, 202p, 212p, 216p, 221p, 225p, 228p, 232p, 243p], ["-", 204p, 209p, 217p, 223p, 232p, 242p, 246p, 251p, 255p, 258p, 302p, 313p], ["-", 234p, 239p, 247p, 253p, 302p, 312p, 316p, 321p, 325p, 328p, 332p, 343p], ["-", 249p, 254p, 302p, 308p, 317p, 327p, 332p, 337p, 341p, 344p, 348p, 359p], ["-", 304p, 309p, 317p, 323p, 332p, 342p, 346p, 351p, 355p, 358p, 402p, 413p], [313p, 319p, 326p, 334p, 340p, 349p, 359p, 404p, 409p, 413p, 416p, 420p, 431p], ["-", 332p, 339p, 347p, 353p, 402p, 412p, 417p, 422p, 426p, 429p, 433p, 444p], ["-", 349p, 356p, 404p, 410p, 419p, 429p, 434p, 439p, 443p, 446p, 450p, 501p], ["-", 402p, 409p, 417p, 423p, 432p, 442p, 447p, 452p, 456p, 459p, 503p, 514p], ["-", 419p, 426p, 434p, 440p, 449p, 459p, 504p, 509p, 513p, 516p, 520p, 531p], ["-", 432p, 439p, 447p, 453p, 502p, 512p, 517p, 522p, 526p, 529p, 533p, 544p], ["-", 449p, 456p, 504p, 510p, 519p, 529p, 534p, 539p, 543p, 546p, 550p, 601p], ["-", 502p, 509p, 517p, 523p, 532p, 542p, 547p, 552p, 556p, 559p, 603p, 614p], ["-", 519p, 526p, 534p, 540p, 549p, 559p, 604p, 609p, 613p, 616p, 620p, 631p], ["-", 532p, 539p, 547p, 553p, 602p, 612p, 617p, 622p, 626p, 629p, 633p, 643p], ["-", 549p, 556p, 604p, 610p, 619p, 629p, 634p, 638p, 642p, 645p, 649p, 659p], ["-", 603p, 610p, 618p, 624p, 632p, 641p, 646p, 650p, 654p, 657p, 701p, 711p], ["-", 626p, 632p, 638p, 643p, 649p, 658p, 703p, 707p, 711p, 714p, 718p, 728p], ["-", 726p, 731p, 737p, 742p, 748p, 757p, 802p, 806p, 810p, 813p, 817p, 827p], ["-", 826p, 831p, 837p, 842p, 848p, 857p, 902p, 906p, 910p, 913p, 917p, 927p], ["-", 926p, 931p, 937p, 942p, 948p, 957p, 1002p, 1006p, 1010p, 1013p, 1017p, 1027p], ["-", 1026p, 1031p, 1037p, 1042p, 1048p, 1057p, 1102p, 1106p, 1110p, 1113p, 1117p, 1127p], ["-", 1126p, 1131p, 1137p, 1142p, 1147p, "-", "-", "-", "-", "-", "-", "-"]]
     time_points: [Lyneham High, Dickson, Hackett, Ainslie, Olims Hotel, City Interchange - Platform 3, Kings Ave/National Crt, Parliament House, Deakin, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
+      Cameron Ave Bus Station - Platform 3-University of Canberra: [Wjz681S, Wjz689c]
     short_name: "30"
-    stop_times: 
-    - - 549a
-      - 551a
-      - 555a
-      - 558a
-      - 606a
-      - 613a
-      - 619a
-      - 624a
-      - 630a
-    - - 618a
-      - 620a
-      - 624a
-      - 627a
-      - 635a
-      - 642a
-      - 648a
-      - 653a
-      - 659a
-    - - 634a
-      - 636a
-      - 640a
-      - 643a
-      - 651a
-      - 658a
-      - 704a
-      - 709a
-      - 715a
-    - - 659a
-      - 701a
-      - 705a
-      - 708a
-      - 716a
-      - 723a
-      - 729a
-      - 738a
-      - 753a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 729a
-      - 738a
-      - 746a
-      - 755a
-      - 810a
-    - - 727a
-      - 729a
-      - 733a
-      - 736a
-      - 744a
-      - 753a
-      - 801a
-      - 810a
-      - 825a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 803a
-      - 812a
-      - 824a
-      - 833a
-      - 848a
-    - - 758a
-      - 800a
-      - 804a
-      - 807a
-      - 815a
-      - 824a
-      - 834a
-      - 843a
-      - 858a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 829a
-      - 838a
-      - 846a
-      - 855a
-      - 910a
-    - - 827a
-      - 829a
-      - 833a
-      - 836a
-      - 844a
-      - 853a
-      - 901a
-      - 910a
-      - 925a
-    - - 856a
-      - 858a
-      - 902a
-      - 905a
-      - 913a
-      - 922a
-      - 930a
-      - 935a
-      - 941a
-    - - 956a
-      - 958a
-      - 1002a
-      - 1005a
-      - 1012a
-      - 1020a
-      - 1028a
-      - 1033a
-      - 1039a
-    - - 1056a
-      - 1058a
-      - 1102a
-      - 1105a
-      - 1112a
-      - 1120a
-      - 1128a
-      - 1133a
-      - 1139a
-    - - 1156a
-      - 1158a
-      - 1202p
-      - 1205p
-      - 1212p
-      - 1220p
-      - 1228p
-      - 1233p
-      - 1239p
-    - - 1256p
-      - 1258p
-      - 102p
-      - 105p
-      - 112p
-      - 120p
-      - 128p
-      - 133p
-      - 139p
-    - - 156p
-      - 158p
-      - 202p
-      - 205p
-      - 212p
-      - 220p
-      - 228p
-      - 233p
-      - 239p
-    - - 245p
-      - 247p
-      - 251p
-      - 254p
-      - 301p
-      - 309p
-      - 317p
-      - 323p
-      - 330p
-    - - 310p
-      - 312p
-      - 316p
-      - 319p
-      - 328p
-      - 336p
-      - 344p
-      - 350p
-      - 357p
-    - - 334p
-      - 336p
-      - 340p
-      - 343p
-      - 352p
-      - 400p
-      - 408p
-      - 414p
-      - 421p
-    - - 404p
-      - 406p
-      - 410p
-      - 413p
-      - 422p
-      - 430p
-      - 438p
-      - 444p
-      - 451p
-    - - 434p
-      - 436p
-      - 440p
-      - 443p
-      - 452p
-      - 500p
-      - 508p
-      - 514p
-      - 521p
-    - - 504p
-      - 506p
-      - 510p
-      - 513p
-      - 522p
-      - 530p
-      - 538p
-      - 544p
-      - 551p
-    - - 534p
-      - 536p
-      - 540p
-      - 543p
-      - 552p
-      - 600p
-      - 608p
-      - 614p
-      - 621p
-    - - 555p
-      - 557p
-      - 601p
-      - 604p
-      - 613p
-      - 621p
-      - 629p
-      - 634p
-      - 639p
-    - - 656p
-      - 658p
-      - 701p
-      - 704p
-      - 712p
-      - 719p
-      - 725p
-      - 730p
-      - 735p
-    - - 756p
-      - 758p
-      - 801p
-      - 804p
-      - 812p
-      - 819p
-      - 825p
-      - 830p
-      - 835p
-    - - 856p
-      - 858p
-      - 901p
-      - 904p
-      - 912p
-      - 919p
-      - 925p
-      - 930p
-      - 935p
-    - - 956p
-      - 958p
-      - 1001p
-      - 1004p
-      - 1012p
-      - 1019p
-      - 1025p
-      - 1030p
-      - 1035p
-    - - 1056p
-      - 1058p
-      - 1101p
-      - 1104p
-      - 1112p
-      - 1119p
-      - 1125p
-      - 1130p
-      - 1135p
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - University of Canberra
-    - Giralang
-    - Kaleen Village/Maribyrnong
-    - North Lyneham
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [[549a, 551a, 555a, 558a, 606a, 613a, 619a, 624a, 630a], [618a, 620a, 624a, 627a, 635a, 642a, 648a, 653a, 659a], [634a, 636a, 640a, 643a, 651a, 658a, 704a, 709a, 715a], [659a, 701a, 705a, 708a, 716a, 723a, 729a, 738a, 753a], ["-", "-", "-", "-", 729a, 738a, 746a, 755a, 810a], [727a, 729a, 733a, 736a, 744a, 753a, 801a, 810a, 825a], ["-", "-", "-", "-", 803a, 812a, 824a, 833a, 848a], [758a, 800a, 804a, 807a, 815a, 824a, 834a, 843a, 858a], ["-", "-", "-", "-", 829a, 838a, 846a, 855a, 910a], [827a, 829a, 833a, 836a, 844a, 853a, 901a, 910a, 925a], [856a, 858a, 902a, 905a, 913a, 922a, 930a, 935a, 941a], [956a, 958a, 1002a, 1005a, 1012a, 1020a, 1028a, 1033a, 1039a], [1056a, 1058a, 1102a, 1105a, 1112a, 1120a, 1128a, 1133a, 1139a], [1156a, 1158a, 1202p, 1205p, 1212p, 1220p, 1228p, 1233p, 1239p], [1256p, 1258p, 102p, 105p, 112p, 120p, 128p, 133p, 139p], [156p, 158p, 202p, 205p, 212p, 220p, 228p, 233p, 239p], [245p, 247p, 251p, 254p, 301p, 309p, 317p, 323p, 330p], [310p, 312p, 316p, 319p, 328p, 336p, 344p, 350p, 357p], [334p, 336p, 340p, 343p, 352p, 400p, 408p, 414p, 421p], [404p, 406p, 410p, 413p, 422p, 430p, 438p, 444p, 451p], [434p, 436p, 440p, 443p, 452p, 500p, 508p, 514p, 521p], [504p, 506p, 510p, 513p, 522p, 530p, 538p, 544p, 551p], [534p, 536p, 540p, 543p, 552p, 600p, 608p, 614p, 621p], [555p, 557p, 601p, 604p, 613p, 621p, 629p, 634p, 639p], [656p, 658p, 701p, 704p, 712p, 719p, 725p, 730p, 735p], [756p, 758p, 801p, 804p, 812p, 819p, 825p, 830p, 835p], [856p, 858p, 901p, 904p, 912p, 919p, 925p, 930p, 935p], [956p, 958p, 1001p, 1004p, 1012p, 1019p, 1025p, 1030p, 1035p], [1056p, 1058p, 1101p, 1104p, 1112p, 1119p, 1125p, 1130p, 1135p]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Giralang, Kaleen Village/Maribyrnong, North Lyneham, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      University of Canberra-Cameron Ave Bus Station: [Wjz681S, Wjz689c]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "30"
-    stop_times: 
-    - - 603a
-      - 609a
-      - 614a
-      - 621a
-      - 628a
-      - 635a
-      - 638a
-      - 640a
-      - 644a
-    - - 633a
-      - 639a
-      - 644a
-      - 651a
-      - 658a
-      - 705a
-      - 708a
-      - 710a
-      - 714a
-    - - 701a
-      - 707a
-      - 712a
-      - 719a
-      - 726a
-      - 735a
-      - 738a
-      - 740a
-      - 744a
-    - - 726a
-      - 732a
-      - 737a
-      - 745a
-      - 753a
-      - 805a
-      - 808a
-      - 810a
-      - 814a
-    - - 759a
-      - 806a
-      - 811a
-      - 819a
-      - 827a
-      - 839a
-      - 842a
-      - 844a
-      - 848a
-    - - 829a
-      - 836a
-      - 841a
-      - 849a
-      - 857a
-      - 909a
-      - 912a
-      - 914a
-      - 918a
-    - - 859a
-      - 906a
-      - 911a
-      - 919a
-      - 927a
-      - 935a
-      - 938a
-      - 940a
-      - 944a
-    - - 933a
-      - 939a
-      - 944a
-      - 951a
-      - 958a
-      - 1005a
-      - 1008a
-      - 1010a
-      - 1014a
-    - - 1002a
-      - 1008a
-      - 1013a
-      - 1020a
-      - 1027a
-      - 1034a
-      - 1037a
-      - 1039a
-      - 1043a
-    - - 1102a
-      - 1108a
-      - 1113a
-      - 1120a
-      - 1127a
-      - 1134a
-      - 1137a
-      - 1139a
-      - 1143a
-    - - 1202p
-      - 1208p
-      - 1213p
-      - 1220p
-      - 1227p
-      - 1234p
-      - 1237p
-      - 1239p
-      - 1243p
-    - - 102p
-      - 108p
-      - 113p
-      - 120p
-      - 127p
-      - 134p
-      - 137p
-      - 139p
-      - 143p
-    - - 202p
-      - 208p
-      - 213p
-      - 220p
-      - 227p
-      - 234p
-      - 237p
-      - 239p
-      - 243p
-    - - 302p
-      - 309p
-      - 316p
-      - 324p
-      - 332p
-      - 344p
-      - 347p
-      - 349p
-      - 353p
-    - - 334p
-      - 341p
-      - 348p
-      - 356p
-      - 404p
-      - 416p
-      - 419p
-      - 421p
-      - 425p
-    - - 359p
-      - 406p
-      - 413p
-      - 421p
-      - 429p
-      - 441p
-      - 444p
-      - 446p
-      - 450p
-    - - 429p
-      - 436p
-      - 443p
-      - 451p
-      - 459p
-      - 511p
-      - 514p
-      - 516p
-      - 520p
-    - - 459p
-      - 506p
-      - 513p
-      - 521p
-      - 529p
-      - 541p
-      - 544p
-      - 546p
-      - 550p
-    - - 514p
-      - 521p
-      - 528p
-      - 536p
-      - 544p
-      - 556p
-      - 559p
-      - 601p
-      - 605p
-    - - 529p
-      - 536p
-      - 543p
-      - 551p
-      - 559p
-      - 611p
-      - 614p
-      - 616p
-      - 620p
-    - - 544p
-      - 551p
-      - 558p
-      - 606p
-      - 614p
-      - 626p
-      - 629p
-      - 631p
-      - 634p
-    - - 559p
-      - 606p
-      - 613p
-      - 621p
-      - 629p
-      - 636p
-      - 639p
-      - 641p
-      - 644p
-    - - 633p
-      - 639p
-      - 644p
-      - 651p
-      - 658p
-      - 705p
-      - 708p
-      - 710p
-      - 713p
-    - - 702p
-      - 708p
-      - 713p
-      - 720p
-      - 727p
-      - 734p
-      - 737p
-      - 739p
-      - 742p
-    - - 802p
-      - 808p
-      - 813p
-      - 820p
-      - 827p
-      - 834p
-      - 837p
-      - 839p
-      - 842p
-    - - 902p
-      - 908p
-      - 913p
-      - 920p
-      - 927p
-      - 934p
-      - 937p
-      - 939p
-      - 942p
-    - - 1002p
-      - 1008p
-      - 1013p
-      - 1020p
-      - 1027p
-      - 1034p
-      - 1037p
-      - 1039p
-      - 1042p
-    - - 1102p
-      - 1108p
-      - 1113p
-      - 1120p
-      - 1127p
-      - 1134p
-      - 1137p
-      - 1139p
-      - 1142p
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - North Lyneham
-    - Kaleen Village/Maribyrnong
-    - Giralang
-    - University of Canberra
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [[603a, 609a, 614a, 621a, 628a, 635a, 638a, 640a, 644a], [633a, 639a, 644a, 651a, 658a, 705a, 708a, 710a, 714a], [701a, 707a, 712a, 719a, 726a, 735a, 738a, 740a, 744a], [726a, 732a, 737a, 745a, 753a, 805a, 808a, 810a, 814a], [759a, 806a, 811a, 819a, 827a, 839a, 842a, 844a, 848a], [829a, 836a, 841a, 849a, 857a, 909a, 912a, 914a, 918a], [859a, 906a, 911a, 919a, 927a, 935a, 938a, 940a, 944a], [933a, 939a, 944a, 951a, 958a, 1005a, 1008a, 1010a, 1014a], [1002a, 1008a, 1013a, 1020a, 1027a, 1034a, 1037a, 1039a, 1043a], [1102a, 1108a, 1113a, 1120a, 1127a, 1134a, 1137a, 1139a, 1143a], [1202p, 1208p, 1213p, 1220p, 1227p, 1234p, 1237p, 1239p, 1243p], [102p, 108p, 113p, 120p, 127p, 134p, 137p, 139p, 143p], [202p, 208p, 213p, 220p, 227p, 234p, 237p, 239p, 243p], [302p, 309p, 316p, 324p, 332p, 344p, 347p, 349p, 353p], [334p, 341p, 348p, 356p, 404p, 416p, 419p, 421p, 425p], [359p, 406p, 413p, 421p, 429p, 441p, 444p, 446p, 450p], [429p, 436p, 443p, 451p, 459p, 511p, 514p, 516p, 520p], [459p, 506p, 513p, 521p, 529p, 541p, 544p, 546p, 550p], [514p, 521p, 528p, 536p, 544p, 556p, 559p, 601p, 605p], [529p, 536p, 543p, 551p, 559p, 611p, 614p, 616p, 620p], [544p, 551p, 558p, 606p, 614p, 626p, 629p, 631p, 634p], [559p, 606p, 613p, 621p, 629p, 636p, 639p, 641p, 644p], [633p, 639p, 644p, 651p, 658p, 705p, 708p, 710p, 713p], [702p, 708p, 713p, 720p, 727p, 734p, 737p, 739p, 742p], [802p, 808p, 813p, 820p, 827p, 834p, 837p, 839p, 842p], [902p, 908p, 913p, 920p, 927p, 934p, 937p, 939p, 942p], [1002p, 1008p, 1013p, 1020p, 1027p, 1034p, 1037p, 1039p, 1042p], [1102p, 1108p, 1113p, 1120p, 1127p, 1134p, 1137p, 1139p, 1142p]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, North Lyneham, Kaleen Village/Maribyrnong, Giralang, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
+      Cameron Ave Bus Station - Platform 3-University of Canberra: [Wjz681S, Wjz689c]
     short_name: "31"
-    stop_times: 
-    - - 615a
-      - 617a
-      - 621a
-      - 624a
-      - 629a
-      - 636a
-      - 641a
-      - 647a
-    - - 645a
-      - 647a
-      - 651a
-      - 654a
-      - 659a
-      - 706a
-      - 711a
-      - 717a
-    - - 712a
-      - 714a
-      - 718a
-      - 721a
-      - 726a
-      - 734a
-      - 742a
-      - 757a
-    - - 741a
-      - 743a
-      - 747a
-      - 750a
-      - 757a
-      - 806a
-      - 814a
-      - 829a
-    - - 811a
-      - 813a
-      - 817a
-      - 820a
-      - 827a
-      - 836a
-      - 844a
-      - 859a
-    - - 841a
-      - 843a
-      - 847a
-      - 850a
-      - 857a
-      - 906a
-      - 914a
-      - 929a
-    - - 930a
-      - 932a
-      - 936a
-      - 939a
-      - 945a
-      - 953a
-      - 958a
-      - 1004a
-    - - 1030a
-      - 1032a
-      - 1036a
-      - 1039a
-      - 1045a
-      - 1053a
-      - 1058a
-      - 1104a
-    - - 1130a
-      - 1132a
-      - 1136a
-      - 1139a
-      - 1145a
-      - 1153a
-      - 1158a
-      - 1204p
-    - - 1230p
-      - 1232p
-      - 1236p
-      - 1239p
-      - 1245p
-      - 1253p
-      - 1258p
-      - 104p
-    - - 130p
-      - 132p
-      - 136p
-      - 139p
-      - 145p
-      - 153p
-      - 158p
-      - 204p
-    - - 230p
-      - 232p
-      - 236p
-      - 239p
-      - 245p
-      - 253p
-      - 258p
-      - 305p
-    - - 315p
-      - 317p
-      - 321p
-      - 324p
-      - 330p
-      - 338p
-      - 343p
-      - 350p
-    - - 345p
-      - 347p
-      - 351p
-      - 354p
-      - 400p
-      - 408p
-      - 413p
-      - 420p
-    - - 415p
-      - 417p
-      - 421p
-      - 424p
-      - 430p
-      - 438p
-      - 443p
-      - 450p
-    - - 445p
-      - 447p
-      - 451p
-      - 454p
-      - 500p
-      - 508p
-      - 513p
-      - 520p
-    - - 514p
-      - 516p
-      - 520p
-      - 523p
-      - 529p
-      - 537p
-      - 542p
-      - 549p
-    - - 545p
-      - 547p
-      - 551p
-      - 554p
-      - 600p
-      - 608p
-      - 613p
-      - 620p
-    - - 630p
-      - 632p
-      - 635p
-      - 638p
-      - 643p
-      - 650p
-      - 655p
-      - 700p
-    - - 730p
-      - 732p
-      - 735p
-      - 738p
-      - 743p
-      - 750p
-      - 755p
-      - 800p
-    - - 830p
-      - 832p
-      - 835p
-      - 838p
-      - 843p
-      - 850p
-      - 855p
-      - 900p
-    - - 930p
-      - 932p
-      - 935p
-      - 938p
-      - 943p
-      - 950p
-      - 955p
-      - 1000p
-    - - 1030p
-      - 1032p
-      - 1035p
-      - 1038p
-      - 1043p
-      - 1050p
-      - 1055p
-      - 1100p
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - University of Canberra
-    - Gwydir Square Kaleen
-    - North Lyneham
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [[615a, 617a, 621a, 624a, 629a, 636a, 641a, 647a], [645a, 647a, 651a, 654a, 659a, 706a, 711a, 717a], [712a, 714a, 718a, 721a, 726a, 734a, 742a, 757a], [741a, 743a, 747a, 750a, 757a, 806a, 814a, 829a], [811a, 813a, 817a, 820a, 827a, 836a, 844a, 859a], [841a, 843a, 847a, 850a, 857a, 906a, 914a, 929a], [930a, 932a, 936a, 939a, 945a, 953a, 958a, 1004a], [1030a, 1032a, 1036a, 1039a, 1045a, 1053a, 1058a, 1104a], [1130a, 1132a, 1136a, 1139a, 1145a, 1153a, 1158a, 1204p], [1230p, 1232p, 1236p, 1239p, 1245p, 1253p, 1258p, 104p], [130p, 132p, 136p, 139p, 145p, 153p, 158p, 204p], [230p, 232p, 236p, 239p, 245p, 253p, 258p, 305p], [315p, 317p, 321p, 324p, 330p, 338p, 343p, 350p], [345p, 347p, 351p, 354p, 400p, 408p, 413p, 420p], [415p, 417p, 421p, 424p, 430p, 438p, 443p, 450p], [445p, 447p, 451p, 454p, 500p, 508p, 513p, 520p], [514p, 516p, 520p, 523p, 529p, 537p, 542p, 549p], [545p, 547p, 551p, 554p, 600p, 608p, 613p, 620p], [630p, 632p, 635p, 638p, 643p, 650p, 655p, 700p], [730p, 732p, 735p, 738p, 743p, 750p, 755p, 800p], [830p, 832p, 835p, 838p, 843p, 850p, 855p, 900p], [930p, 932p, 935p, 938p, 943p, 950p, 955p, 1000p], [1030p, 1032p, 1035p, 1038p, 1043p, 1050p, 1055p, 1100p]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, North Lyneham, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      University of Canberra-Cameron Ave Bus Station: [Wjz681S, Wjz689c]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "31"
-    stop_times: 
-    - - "-"
-      - "-"
-      - 637a
-      - 643a
-      - 648a
-      - 651a
-      - 653a
-      - 657a
-    - - "-"
-      - "-"
-      - 707a
-      - 713a
-      - 718a
-      - 721a
-      - 723a
-      - 727a
-    - - 733a
-      - 740a
-      - 745a
-      - 753a
-      - 800a
-      - 803a
-      - 805a
-      - 809a
-    - - 803a
-      - 810a
-      - 815a
-      - 823a
-      - 830a
-      - 833a
-      - 835a
-      - 839a
-    - - 829a
-      - 836a
-      - 841a
-      - 849a
-      - 856a
-      - 859a
-      - 901a
-      - 905a
-    - - 910a
-      - 917a
-      - 922a
-      - 930a
-      - 936a
-      - 939a
-      - 941a
-      - 945a
-    - - 948a
-      - 954a
-      - 959a
-      - 1005a
-      - 1011a
-      - 1014a
-      - 1016a
-      - 1020a
-    - - 1048a
-      - 1054a
-      - 1059a
-      - 1105a
-      - 1111a
-      - 1114a
-      - 1116a
-      - 1120a
-    - - 1148a
-      - 1154a
-      - 1159a
-      - 1205p
-      - 1211p
-      - 1214p
-      - 1216p
-      - 1220p
-    - - 1248p
-      - 1254p
-      - 1259p
-      - 105p
-      - 111p
-      - 114p
-      - 116p
-      - 120p
-    - - 148p
-      - 154p
-      - 159p
-      - 205p
-      - 211p
-      - 214p
-      - 216p
-      - 220p
-    - - 248p
-      - 254p
-      - 259p
-      - 307p
-      - 315p
-      - 318p
-      - 320p
-      - 324p
-    - - 303p
-      - 310p
-      - 315p
-      - 323p
-      - 331p
-      - 334p
-      - 336p
-      - 340p
-    - - 333p
-      - 340p
-      - 345p
-      - 353p
-      - 401p
-      - 404p
-      - 406p
-      - 410p
-    - - 403p
-      - 410p
-      - 415p
-      - 423p
-      - 431p
-      - 434p
-      - 436p
-      - 440p
-    - - 433p
-      - 440p
-      - 445p
-      - 453p
-      - 501p
-      - 504p
-      - 506p
-      - 510p
-    - - 503p
-      - 510p
-      - 515p
-      - 523p
-      - 531p
-      - 534p
-      - 536p
-      - 540p
-    - - 533p
-      - 540p
-      - 545p
-      - 553p
-      - 601p
-      - 604p
-      - 606p
-      - 610p
-    - - 603p
-      - 610p
-      - 615p
-      - 623p
-      - 631p
-      - 634p
-      - 636p
-      - 639p
-    - - 648p
-      - 654p
-      - 659p
-      - 705p
-      - 710p
-      - 713p
-      - 715p
-      - 718p
-    - - 748p
-      - 754p
-      - 759p
-      - 805p
-      - 810p
-      - 813p
-      - 815p
-      - 818p
-    - - 848p
-      - 854p
-      - 859p
-      - 905p
-      - 910p
-      - 913p
-      - 915p
-      - 918p
-    - - 948p
-      - 954p
-      - 959p
-      - 1005p
-      - 1010p
-      - 1013p
-      - 1015p
-      - 1018p
-    - - 1048p
-      - 1054p
-      - 1059p
-      - 1105p
-      - 1110p
-      - 1113p
-      - 1115p
-      - 1118p
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - North Lyneham
-    - Gwydir Square Kaleen
-    - University of Canberra
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    stop_times: [["-", "-", 637a, 643a, 648a, 651a, 653a, 657a], ["-", "-", 707a, 713a, 718a, 721a, 723a, 727a], [733a, 740a, 745a, 753a, 800a, 803a, 805a, 809a], [803a, 810a, 815a, 823a, 830a, 833a, 835a, 839a], [829a, 836a, 841a, 849a, 856a, 859a, 901a, 905a], [910a, 917a, 922a, 930a, 936a, 939a, 941a, 945a], [948a, 954a, 959a, 1005a, 1011a, 1014a, 1016a, 1020a], [1048a, 1054a, 1059a, 1105a, 1111a, 1114a, 1116a, 1120a], [1148a, 1154a, 1159a, 1205p, 1211p, 1214p, 1216p, 1220p], [1248p, 1254p, 1259p, 105p, 111p, 114p, 116p, 120p], [148p, 154p, 159p, 205p, 211p, 214p, 216p, 220p], [248p, 254p, 259p, 307p, 315p, 318p, 320p, 324p], [303p, 310p, 315p, 323p, 331p, 334p, 336p, 340p], [333p, 340p, 345p, 353p, 401p, 404p, 406p, 410p], [403p, 410p, 415p, 423p, 431p, 434p, 436p, 440p], [433p, 440p, 445p, 453p, 501p, 504p, 506p, 510p], [503p, 510p, 515p, 523p, 531p, 534p, 536p, 540p], [533p, 540p, 545p, 553p, 601p, 604p, 606p, 610p], [603p, 610p, 615p, 623p, 631p, 634p, 636p, 639p], [648p, 654p, 659p, 705p, 710p, 713p, 715p, 718p], [748p, 754p, 759p, 805p, 810p, 813p, 815p, 818p], [848p, 854p, 859p, 905p, 910p, 913p, 915p, 918p], [948p, 954p, 959p, 1005p, 1010p, 1013p, 1015p, 1018p], [1048p, 1054p, 1059p, 1105p, 1110p, 1113p, 1115p, 1118p]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, North Lyneham, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     short_name: "39"
     stop_times: [["-", "-", "-", 549a, 555a, 601a, 606a, 610a, 617a], [609a, 615a, 618a, 624a, 630a, 636a, 641a, 645a, 652a], [639a, 645a, 648a, 654a, 700a, 706a, 711a, 715a, 722a], ["-", "-", "-", 707a, 713a, 719a, 724a, 728a, 741a], [703a, 709a, 712a, 718a, 724a, 730a, 736a, 742a, 757a], ["-", "-", "-", 726a, 732a, 738a, 744a, 750a, 805a], [718a, 724a, 727a, 734a, 740a, 746a, 752a, 758a, 813a], ["-", "-", "-", 742a, 748a, 754a, 800a, 806a, 821a], [733a, 739a, 742a, 749a, 755a, 801a, 807a, 813a, 828a], ["-", "-", "-", 756a, 802a, 808a, 814a, 820a, 835a], [748a, 754a, 757a, 804a, 810a, 816a, 822a, 828a, 843a], [758a, 804a, 807a, 814a, 820a, 826a, 832a, 838a, 853a], ["-", "-", "-", 824a, 830a, 836a, 842a, 848a, 903a], [818a, 824a, 827a, 834a, 840a, 846a, 852a, 858a, 913a], [833a, 839a, 842a, 849a, 855a, 901a, 907a, 913a, 928a], [910a, 916a, 919a, 924a, 930a, 935a, 940a, 943a, 949a], [940a, 946a, 949a, 954a, 1000a, 1005a, 1010a, 1013a, 1019a], [1010a, 1016a, 1019a, 1024a, 1030a, 1035a, 1040a, 1043a, 1049a], [1040a, 1046a, 1049a, 1054a, 1100a, 1105a, 1110a, 1113a, 1119a], [1110a, 1116a, 1119a, 1124a, 1130a, 1135a, 1140a, 1143a, 1149a], [1140a, 1146a, 1149a, 1154a, 1200p, 1205p, 1210p, 1213p, 1219p], [1210p, 1216p, 1219p, 1224p, 1230p, 1235p, 1240p, 1243p, 1249p], [1240p, 1246p, 1249p, 1254p, 100p, 105p, 110p, 113p, 119p], [110p, 116p, 119p, 124p, 130p, 135p, 140p, 143p, 149p], [140p, 146p, 149p, 154p, 200p, 205p, 210p, 213p, 219p], [210p, 216p, 219p, 224p, 230p, 235p, 240p, 243p, 249p], [240p, 246p, 249p, 254p, 300p, 307p, 313p, 317p, 324p], [309p, 315p, 318p, 324p, 330p, 337p, 343p, 347p, 354p], [328p, 334p, 337p, 343p, 349p, 356p, 402p, 406p, 413p], [358p, 404p, 407p, 413p, 419p, 426p, 432p, 436p, 443p], [417p, 423p, 426p, 432p, 438p, 445p, 451p, 455p, 502p], [432p, 438p, 441p, 447p, 453p, 500p, 506p, 510p, 517p], [447p, 453p, 456p, 502p, 508p, 515p, 521p, 525p, 532p], [506p, 512p, 515p, 521p, 527p, 534p, 540p, 544p, 551p], [512p, 518p, 521p, 527p, 533p, 540p, "-", "-", "-"], [521p, 527p, 530p, 536p, 542p, 549p, 555p, 559p, 606p], [536p, 542p, 545p, 551p, 557p, 604p, 610p, 614p, 621p], [546p, 552p, 555p, 601p, 607p, 614p, "-", "-", "-"], [555p, 601p, 604p, 610p, 616p, 623p, 629p, 632p, 638p], [610p, 616p, 619p, 625p, 631p, 636p, 641p, 644p, 650p], [710p, 716p, 719p, 724p, 730p, 735p, 740p, 743p, 749p], [810p, 816p, 819p, 824p, 830p, 835p, 840p, 843p, 849p], [910p, 916p, 919p, 924p, 930p, 935p, 940p, 943p, 949p], [1010p, 1016p, 1019p, 1024p, 1030p, 1035p, 1040p, 1043p, 1049p], [1110p, 1116p, 1119p, 1124p, 1130p, 1135p, "-", "-", "-"]]
     time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Dickson Shops/Antill St, Watson, Watson Terminus, Watson, Dickson Shops/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "3"
-    stop_times: 
-    - - 612a
-      - 621a
-      - 625a
-      - 630a
-      - 634a
-      - 638a
-      - 650a
-      - 656a
-      - 701a
-      - 706a
-      - 713a
-      - 728a
-      - 730a
-      - 734a
-    - - 642a
-      - 651a
-      - 655a
-      - 700a
-      - 704a
-      - 708a
-      - 720a
-      - 726a
-      - 731a
-      - 736a
-      - 745a
-      - 802a
-      - 804a
-      - 808a
-    - - 712a
-      - 721a
-      - 725a
-      - 730a
-      - 734a
-      - 738a
-      - 750a
-      - 756a
-      - 801a
-      - 806a
-      - 815a
-      - 832a
-      - 834a
-      - 838a
-    - - 738a
-      - 748a
-      - 753a
-      - 800a
-      - 804a
-      - 808a
-      - 820a
-      - 826a
-      - 831a
-      - 836a
-      - 845a
-      - 902a
-      - 904a
-      - 908a
-    - - 808a
-      - 818a
-      - 823a
-      - 830a
-      - 834a
-      - 838a
-      - 850a
-      - 856a
-      - 901a
-      - 906a
-      - 915a
-      - 932a
-      - 934a
-      - 938a
-    - - 838a
-      - 848a
-      - 853a
-      - 900a
-      - 904a
-      - 908a
-      - 920a
-      - 926a
-      - 931a
-      - 936a
-      - 943a
-      - 958a
-      - 1000a
-      - 1004a
-    - - 912a
-      - 921a
-      - 925a
-      - 930a
-      - 934a
-      - 938a
-      - 950a
-      - 956a
-      - 1001a
-      - 1006a
-      - 1013a
-      - 1031a
-      - 1033a
-      - 1034a
-    - - 942a
-      - 951a
-      - 955a
-      - 1000a
-      - 1004a
-      - 1008a
-      - 1020a
-      - 1026a
-      - 1031a
-      - 1036a
-      - 1043a
-      - 1058a
-      - 1100a
-      - 1104a
-    - - 1012a
-      - 1021a
-      - 1025a
-      - 1030a
-      - 1034a
-      - 1038a
-      - 1050a
-      - 1056a
-      - 1101a
-      - 1106a
-      - 1113a
-      - 1128a
-      - 1130a
-      - 1134a
-    - - 1042a
-      - 1051a
-      - 1055a
-      - 1100a
-      - 1104a
-      - 1108a
-      - 1120a
-      - 1126a
-      - 1131a
-      - 1136a
-      - 1143a
-      - 1158a
-      - 1200p
-      - 1204p
-    - - 1112a
-      - 1121a
-      - 1125a
-      - 1130a
-      - 1134a
-      - 1138a
-      - 1150a
-      - 1156a
-      - 1201p
-      - 1206p
-      - 1213p
-      - 1228p
-      - 1230p
-      - 1234p
-    - - 1142a
-      - 1151a
-      - 1155a
-      - 1200p
-      - 1204p
-      - 1208p
-      - 1220p
-      - 1226p
-      - 1231p
-      - 1236p
-      - 1243p
-      - 1258p
-      - 100p
-      - 104p
-    - - 1212p
-      - 1221p
-      - 1225p
-      - 1230p
-      - 1234p
-      - 1238p
-      - 1250p
-      - 1256p
-      - 101p
-      - 106p
-      - 113p
-      - 128p
-      - 130p
-      - 134p
-    - - 1242p
-      - 1251p
-      - 1255p
-      - 100p
-      - 104p
-      - 108p
-      - 120p
-      - 126p
-      - 131p
-      - 136p
-      - 143p
-      - 158p
-      - 200p
-      - 204p
-    - - 112p
-      - 121p
-      - 125p
-      - 130p
-      - 134p
-      - 138p
-      - 150p
-      - 156p
-      - 201p
-      - 206p
-      - 213p
-      - 228p
-      - 230p
-      - 234p
-    - - 142p
-      - 151p
-      - 155p
-      - 200p
-      - 204p
-      - 208p
-      - 220p
-      - 226p
-      - 231p
-      - 236p
-      - 243p
-      - 258p
-      - 300p
-      - 304p
-    - - 212p
-      - 221p
-      - 225p
-      - 230p
-      - 234p
-      - 238p
-      - 250p
-      - 256p
-      - 301p
-      - 307p
-      - 315p
-      - 332p
-      - 334p
-      - 338p
-    - - 242p
-      - 251p
-      - 255p
-      - 300p
-      - 304p
-      - 308p
-      - 320p
-      - 326p
-      - 332p
-      - 338p
-      - 346p
-      - 403p
-      - 405p
-      - 409p
-    - - 309p
-      - 319p
-      - 324p
-      - 330p
-      - 334p
-      - 338p
-      - 350p
-      - 356p
-      - 402p
-      - 408p
-      - 416p
-      - 433p
-      - 435p
-      - 439p
-    - - 339p
-      - 349p
-      - 354p
-      - 400p
-      - 404p
-      - 408p
-      - 420p
-      - 426p
-      - 432p
-      - 438p
-      - 446p
-      - 503p
-      - 505p
-      - 509p
-    - - 409p
-      - 419p
-      - 424p
-      - 430p
-      - 434p
-      - 438p
-      - 450p
-      - 456p
-      - 502p
-      - 508p
-      - 516p
-      - 533p
-      - 535p
-      - 539p
-    - - 439p
-      - 449p
-      - 454p
-      - 500p
-      - 504p
-      - 508p
-      - 520p
-      - 526p
-      - 532p
-      - 538p
-      - 546p
-      - 603p
-      - 605p
-      - 609p
-    - - 511p
-      - 521p
-      - 526p
-      - 532p
-      - 536p
-      - 540p
-      - 552p
-      - 558p
-      - 604p
-      - 610p
-      - 618p
-      - 634p
-      - 636p
-      - 639p
-    - - 539p
-      - 549p
-      - 554p
-      - 600p
-      - 604p
-      - 608p
-      - 620p
-      - 626p
-      - 632p
-      - 637p
-      - 644p
-      - 659p
-      - 701p
-      - 704p
-    - - 608p
-      - 618p
-      - 623p
-      - 629p
-      - 632p
-      - 636p
-      - 648p
-      - 654p
-      - 659p
-      - 704p
-      - 711p
-      - 726p
-      - 728p
-      - 731p
-    - - 643p
-      - 651p
-      - 655p
-      - 700p
-      - 703p
-      - 707p
-      - 719p
-      - 725p
-      - 730p
-      - 735p
-      - 742p
-      - 757p
-      - 759p
-      - 802p
-    - - 713p
-      - 721p
-      - 725p
-      - 730p
-      - 733p
-      - 737p
-      - 749p
-      - 755p
-      - 800p
-      - 805p
-      - 812p
-      - 827p
-      - 829p
-      - 832p
-    - - 813p
-      - 821p
-      - 825p
-      - 830p
-      - 833p
-      - 837p
-      - 849p
-      - 855p
-      - 900p
-      - 905p
-      - 912p
-      - 927p
-      - 929p
-      - 932p
-    - - 913p
-      - 921p
-      - 925p
-      - 930p
-      - 933p
-      - 937p
-      - 949p
-      - 955p
-      - 1000p
-      - 1005p
-      - 1012p
-      - 1027p
-      - 1029p
-      - 1032p
-    - - 1013p
-      - 1021p
-      - 1025p
-      - 1030p
-      - 1033p
-      - 1037p
-      - 1049p
-      - 1055p
-      - 1100p
-      - 1105p
-      - 1112p
-      - 1127p
-      - 1129p
-      - 1132p
-    - - 1113p
-      - 1121p
-      - 1125p
-      - 1130p
-      - 1133p
-      - 1137p
-      - 1147p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Garran
-    - Hughes
-    - Deakin
-    - Parliament House
-    - Kings Ave/National Crt
-    - City Interchange - Platform 4
-    - National Museum
-    - Burton & Garran Hall/Daley Road ANU
-    - O'Connor
-    - Calvary Hospital
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
-    
+    stop_times: [[612a, 621a, 625a, 630a, 634a, 638a, 650a, 656a, 701a, 706a, 713a, 728a, 730a, 734a], [642a, 651a, 655a, 700a, 704a, 708a, 720a, 726a, 731a, 736a, 745a, 802a, 804a, 808a], [712a, 721a, 725a, 730a, 734a, 738a, 750a, 756a, 801a, 806a, 815a, 832a, 834a, 838a], [738a, 748a, 753a, 800a, 804a, 808a, 820a, 826a, 831a, 836a, 845a, 902a, 904a, 908a], [808a, 818a, 823a, 830a, 834a, 838a, 850a, 856a, 901a, 906a, 915a, 932a, 934a, 938a], [838a, 848a, 853a, 900a, 904a, 908a, 920a, 926a, 931a, 936a, 943a, 958a, 1000a, 1004a], [912a, 921a, 925a, 930a, 934a, 938a, 950a, 956a, 1001a, 1006a, 1013a, 1031a, 1033a, 1034a], [942a, 951a, 955a, 1000a, 1004a, 1008a, 1020a, 1026a, 1031a, 1036a, 1043a, 1058a, 1100a, 1104a], [1012a, 1021a, 1025a, 1030a, 1034a, 1038a, 1050a, 1056a, 1101a, 1106a, 1113a, 1128a, 1130a, 1134a], [1042a, 1051a, 1055a, 1100a, 1104a, 1108a, 1120a, 1126a, 1131a, 1136a, 1143a, 1158a, 1200p, 1204p], [1112a, 1121a, 1125a, 1130a, 1134a, 1138a, 1150a, 1156a, 1201p, 1206p, 1213p, 1228p, 1230p, 1234p], [1142a, 1151a, 1155a, 1200p, 1204p, 1208p, 1220p, 1226p, 1231p, 1236p, 1243p, 1258p, 100p, 104p], [1212p, 1221p, 1225p, 1230p, 1234p, 1238p, 1250p, 1256p, 101p, 106p, 113p, 128p, 130p, 134p], [1242p, 1251p, 1255p, 100p, 104p, 108p, 120p, 126p, 131p, 136p, 143p, 158p, 200p, 204p], [112p, 121p, 125p, 130p, 134p, 138p, 150p, 156p, 201p, 206p, 213p, 228p, 230p, 234p], [142p, 151p, 155p, 200p, 204p, 208p, 220p, 226p, 231p, 236p, 243p, 258p, 300p, 304p], [212p, 221p, 225p, 230p, 234p, 238p, 250p, 256p, 301p, 307p, 315p, 332p, 334p, 338p], [242p, 251p, 255p, 300p, 304p, 308p, 320p, 326p, 332p, 338p, 346p, 403p, 405p, 409p], [309p, 319p, 324p, 330p, 334p, 338p, 350p, 356p, 402p, 408p, 416p, 433p, 435p, 439p], [339p, 349p, 354p, 400p, 404p, 408p, 420p, 426p, 432p, 438p, 446p, 503p, 505p, 509p], [409p, 419p, 424p, 430p, 434p, 438p, 450p, 456p, 502p, 508p, 516p, 533p, 535p, 539p], [439p, 449p, 454p, 500p, 504p, 508p, 520p, 526p, 532p, 538p, 546p, 603p, 605p, 609p], [511p, 521p, 526p, 532p, 536p, 540p, 552p, 558p, 604p, 610p, 618p, 634p, 636p, 639p], [539p, 549p, 554p, 600p, 604p, 608p, 620p, 626p, 632p, 637p, 644p, 659p, 701p, 704p], [608p, 618p, 623p, 629p, 632p, 636p, 648p, 654p, 659p, 704p, 711p, 726p, 728p, 731p], [643p, 651p, 655p, 700p, 703p, 707p, 719p, 725p, 730p, 735p, 742p, 757p, 759p, 802p], [713p, 721p, 725p, 730p, 733p, 737p, 749p, 755p, 800p, 805p, 812p, 827p, 829p, 832p], [813p, 821p, 825p, 830p, 833p, 837p, 849p, 855p, 900p, 905p, 912p, 927p, 929p, 932p], [913p, 921p, 925p, 930p, 933p, 937p, 949p, 955p, 1000p, 1005p, 1012p, 1027p, 1029p, 1032p], [1013p, 1021p, 1025p, 1030p, 1033p, 1037p, 1049p, 1055p, 1100p, 1105p, 1112p, 1127p, 1129p, 1132p], [1113p, 1121p, 1125p, 1130p, 1133p, 1137p, 1147p, "-", "-", "-", "-", "-", "-", "-"]]
+    time_points: [Woden Interchange - Platform 14, Garran, Hughes, Deakin, Parliament House, Kings Ave/National Crt, City Interchange - Platform 4, National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To Woden Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "3"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 618a
-      - 627a
-      - 631a
-      - 636a
-      - 640a
-      - 644a
-      - 653a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 648a
-      - 657a
-      - 701a
-      - 706a
-      - 710a
-      - 714a
-      - 723a
-    - - 631a
-      - 633a
-      - 637a
-      - 652a
-      - 658a
-      - 702a
-      - 706a
-      - 718a
-      - 727a
-      - 731a
-      - 736a
-      - 742a
-      - 746a
-      - 758a
-    - - 659a
-      - 701a
-      - 705a
-      - 720a
-      - 726a
-      - 730a
-      - 735a
-      - 748a
-      - 758a
-      - 803a
-      - 808a
-      - 814a
-      - 818a
-      - 830a
-    - - 724a
-      - 726a
-      - 730a
-      - 747a
-      - 755a
-      - 800a
-      - 805a
-      - 818a
-      - 828a
-      - 833a
-      - 838a
-      - 844a
-      - 848a
-      - 900a
-    - - 748a
-      - 750a
-      - 754a
-      - 810a
-      - 819a
-      - 827a
-      - 832a
-      - 848a
-      - 853a
-      - 901a
-      - 906a
-      - 915a
-      - 919a
-      - 931a
-    - - 824a
-      - 826a
-      - 830a
-      - 847a
-      - 855a
-      - 900a
-      - 905a
-      - 918a
-      - 928a
-      - 932a
-      - 937a
-      - 942a
-      - 946a
-      - 955a
-    - - 854a
-      - 856a
-      - 900a
-      - 917a
-      - 925a
-      - 930a
-      - 935a
-      - 948a
-      - 958a
-      - 1002a
-      - 1007a
-      - 1012a
-      - 1016a
-      - 1025a
-    - - 927a
-      - 929a
-      - 933a
-      - 948a
-      - 955a
-      - 1000a
-      - 1005a
-      - 1018a
-      - 1028a
-      - 1032a
-      - 1037a
-      - 1042a
-      - 1046a
-      - 1055a
-    - - 957a
-      - 959a
-      - 1003a
-      - 1018a
-      - 1025a
-      - 1030a
-      - 1035a
-      - 1048a
-      - 1058a
-      - 1102a
-      - 1107a
-      - 1112a
-      - 1116a
-      - 1125a
-    - - 1027a
-      - 1029a
-      - 1033a
-      - 1048a
-      - 1055a
-      - 1100a
-      - 1105a
-      - 1118a
-      - 1128a
-      - 1132a
-      - 1137a
-      - 1142a
-      - 1146a
-      - 1155a
-    - - 1057a
-      - 1059a
-      - 1103a
-      - 1118a
-      - 1125a
-      - 1130a
-      - 1135a
-      - 1148a
-      - 1158a
-      - 1202p
-      - 1207p
-      - 1212p
-      - 1216p
-      - 1225p
-    - - 1127a
-      - 1129a
-      - 1133a
-      - 1148a
-      - 1155a
-      - 1200p
-      - 1205p
-      - 1218p
-      - 1228p
-      - 1232p
-      - 1237p
-      - 1242p
-      - 1246p
-      - 1255p
-    - - 1157a
-      - 1159a
-      - 1203p
-      - 1218p
-      - 1225p
-      - 1230p
-      - 1235p
-      - 1248p
-      - 1258p
-      - 102p
-      - 107p
-      - 112p
-      - 116p
-      - 125p
-    - - 1227p
-      - 1229p
-      - 1233p
-      - 1248p
-      - 1255p
-      - 100p
-      - 105p
-      - 118p
-      - 128p
-      - 132p
-      - 137p
-      - 142p
-      - 146p
-      - 155p
-    - - 1257p
-      - 1259p
-      - 103p
-      - 118p
-      - 125p
-      - 130p
-      - 135p
-      - 148p
-      - 158p
-      - 202p
-      - 207p
-      - 212p
-      - 216p
-      - 225p
-    - - 127p
-      - 129p
-      - 133p
-      - 148p
-      - 155p
-      - 200p
-      - 205p
-      - 218p
-      - 228p
-      - 232p
-      - 237p
-      - 242p
-      - 246p
-      - 255p
-    - - 157p
-      - 159p
-      - 203p
-      - 218p
-      - 225p
-      - 230p
-      - 235p
-      - 248p
-      - 258p
-      - 303p
-      - 308p
-      - 314p
-      - 318p
-      - 329p
-    - - 232p
-      - 234p
-      - 238p
-      - 248p
-      - 258p
-      - 303p
-      - 310p
-      - 324p
-      - 334p
-      - 339p
-      - 344p
-      - 350p
-      - 354p
-      - 405p
-    - - 253p
-      - 255p
-      - 259p
-      - 316p
-      - 324p
-      - 329p
-      - 335p
-      - 348p
-      - 358p
-      - 403p
-      - 408p
-      - 414p
-      - 418p
-      - 429p
-    - - 320p
-      - 322p
-      - 326p
-      - 343p
-      - 351p
-      - 356p
-      - 402p
-      - 415p
-      - 425p
-      - 430p
-      - 435p
-      - 441p
-      - 445p
-      - 456p
-    - - 349p
-      - 351p
-      - 355p
-      - 412p
-      - 420p
-      - 425p
-      - 431p
-      - 444p
-      - 454p
-      - 459p
-      - 504p
-      - 510p
-      - 514p
-      - 525p
-    - - 421p
-      - 423p
-      - 427p
-      - 444p
-      - 452p
-      - 457p
-      - 503p
-      - 516p
-      - 526p
-      - 531p
-      - 536p
-      - 542p
-      - 546p
-      - 557p
-    - - 448p
-      - 450p
-      - 454p
-      - 511p
-      - 519p
-      - 524p
-      - 530p
-      - 543p
-      - 553p
-      - 558p
-      - 603p
-      - 609p
-      - 613p
-      - 624p
-    - - 518p
-      - 520p
-      - 524p
-      - 541p
-      - 549p
-      - 554p
-      - 600p
-      - 613p
-      - 623p
-      - 628p
-      - 632p
-      - 637p
-      - 641p
-      - 650p
-    - - 550p
-      - 552p
-      - 556p
-      - 613p
-      - 621p
-      - 626p
-      - 632p
-      - 644p
-      - 653p
-      - 658p
-      - 702p
-      - 707p
-      - 711p
-      - 720p
-    - - 623p
-      - 625p
-      - 629p
-      - 644p
-      - 651p
-      - 656p
-      - 701p
-      - 713p
-      - 722p
-      - 727p
-      - 731p
-      - 736p
-      - 740p
-      - 749p
-    - - 727p
-      - 729p
-      - 732p
-      - 747p
-      - 754p
-      - 759p
-      - 804p
-      - 816p
-      - 825p
-      - 830p
-      - 834p
-      - 839p
-      - 843p
-      - 852p
-    - - 829p
-      - 831p
-      - 834p
-      - 849p
-      - 856p
-      - 901p
-      - 906p
-      - 918p
-      - 927p
-      - 932p
-      - 936p
-      - 941p
-      - 945p
-      - 954p
-    - - 929p
-      - 931p
-      - 934p
-      - 949p
-      - 956p
-      - 1001p
-      - 1006p
-      - 1018p
-      - 1027p
-      - 1032p
-      - 1036p
-      - 1041p
-      - 1045p
-      - 1054p
-    - - 1029p
-      - 1031p
-      - 1034p
-      - 1049p
-      - 1056p
-      - 1101p
-      - 1106p
-      - 1116p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Calvary Hospital
-    - O'Connor
-    - Burton & Garran Hall/Daley Road ANU
-    - National Museum
-    - City Interchange - Platform 3
-    - Kings Ave/National Crt
-    - Parliament House
-    - Deakin
-    - Hughes
-    - Garran
-    - Woden Interchange
+    stop_times: [["-", "-", "-", "-", "-", "-", "-", 618a, 627a, 631a, 636a, 640a, 644a, 653a], ["-", "-", "-", "-", "-", "-", "-", 648a, 657a, 701a, 706a, 710a, 714a, 723a], [631a, 633a, 637a, 652a, 658a, 702a, 706a, 718a, 727a, 731a, 736a, 742a, 746a, 758a], [659a, 701a, 705a, 720a, 726a, 730a, 735a, 748a, 758a, 803a, 808a, 814a, 818a, 830a], [724a, 726a, 730a, 747a, 755a, 800a, 805a, 818a, 828a, 833a, 838a, 844a, 848a, 900a], [748a, 750a, 754a, 810a, 819a, 827a, 832a, 848a, 853a, 901a, 906a, 915a, 919a, 931a], [824a, 826a, 830a, 847a, 855a, 900a, 905a, 918a, 928a, 932a, 937a, 942a, 946a, 955a], [854a, 856a, 900a, 917a, 925a, 930a, 935a, 948a, 958a, 1002a, 1007a, 1012a, 1016a, 1025a], [927a, 929a, 933a, 948a, 955a, 1000a, 1005a, 1018a, 1028a, 1032a, 1037a, 1042a, 1046a, 1055a], [957a, 959a, 1003a, 1018a, 1025a, 1030a, 1035a, 1048a, 1058a, 1102a, 1107a, 1112a, 1116a, 1125a], [1027a, 1029a, 1033a, 1048a, 1055a, 1100a, 1105a, 1118a, 1128a, 1132a, 1137a, 1142a, 1146a, 1155a], [1057a, 1059a, 1103a, 1118a, 1125a, 1130a, 1135a, 1148a, 1158a, 1202p, 1207p, 1212p, 1216p, 1225p], [1127a, 1129a, 1133a, 1148a, 1155a, 1200p, 1205p, 1218p, 1228p, 1232p, 1237p, 1242p, 1246p, 1255p], [1157a, 1159a, 1203p, 1218p, 1225p, 1230p, 1235p, 1248p, 1258p, 102p, 107p, 112p, 116p, 125p], [1227p, 1229p, 1233p, 1248p, 1255p, 100p, 105p, 118p, 128p, 132p, 137p, 142p, 146p, 155p], [1257p, 1259p, 103p, 118p, 125p, 130p, 135p, 148p, 158p, 202p, 207p, 212p, 216p, 225p], [127p, 129p, 133p, 148p, 155p, 200p, 205p, 218p, 228p, 232p, 237p, 242p, 246p, 255p], [157p, 159p, 203p, 218p, 225p, 230p, 235p, 248p, 258p, 303p, 308p, 314p, 318p, 329p], [232p, 234p, 238p, 248p, 258p, 303p, 310p, 324p, 334p, 339p, 344p, 350p, 354p, 405p], [253p, 255p, 259p, 316p, 324p, 329p, 335p, 348p, 358p, 403p, 408p, 414p, 418p, 429p], [320p, 322p, 326p, 343p, 351p, 356p, 402p, 415p, 425p, 430p, 435p, 441p, 445p, 456p], [349p, 351p, 355p, 412p, 420p, 425p, 431p, 444p, 454p, 459p, 504p, 510p, 514p, 525p], [421p, 423p, 427p, 444p, 452p, 457p, 503p, 516p, 526p, 531p, 536p, 542p, 546p, 557p], [448p, 450p, 454p, 511p, 519p, 524p, 530p, 543p, 553p, 558p, 603p, 609p, 613p, 624p], [518p, 520p, 524p, 541p, 549p, 554p, 600p, 613p, 623p, 628p, 632p, 637p, 641p, 650p], [550p, 552p, 556p, 613p, 621p, 626p, 632p, 644p, 653p, 658p, 702p, 707p, 711p, 720p], [623p, 625p, 629p, 644p, 651p, 656p, 701p, 713p, 722p, 727p, 731p, 736p, 740p, 749p], [727p, 729p, 732p, 747p, 754p, 759p, 804p, 816p, 825p, 830p, 834p, 839p, 843p, 852p], [829p, 831p, 834p, 849p, 856p, 901p, 906p, 918p, 927p, 932p, 936p, 941p, 945p, 954p], [929p, 931p, 934p, 949p, 956p, 1001p, 1006p, 1018p, 1027p, 1032p, 1036p, 1041p, 1045p, 1054p], [1029p, 1031p, 1034p, 1049p, 1056p, 1101p, 1106p, 1116p, "-", "-", "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange - Platform 3, Kings Ave/National Crt, Parliament House, Deakin, Hughes, Garran, Woden Interchange]
   -  
     long_name: To Cameron Ave Station
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 5: []
+      Lathlain St Bus Station - Platform 5-Cohen St Bus Station - Platform 5: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
     short_name: "43"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 622a
-      - 629a
-      - 638a
-      - 643a
-      - 648a
-      - 650a
-      - 654a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 641a
-      - 648a
-      - 657a
-      - 702a
-      - 707a
-      - 709a
-      - 713a
-    - - 645a
-      - 647a
-      - 651a
-      - 656a
-      - 701a
-      - 708a
-      - 717a
-      - 722a
-      - 727a
-      - 729a
-      - 733a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 721a
-      - 728a
-      - 739a
-      - 744a
-      - 752a
-      - 754a
-      - 758a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 742a
-      - 749a
-      - 800a
-      - 805a
-      - 813a
-      - 815a
-      - 819a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 803a
-      - 810a
-      - 821a
-      - 826a
-      - 834a
-      - 836a
-      - 840a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 825a
-      - 832a
-      - 843a
-      - 848a
-      - 856a
-      - 858a
-      - 902a
-    - - 824a
-      - 826a
-      - 830a
-      - 838a
-      - 843a
-      - 850a
-      - 901a
-      - 906a
-      - 914a
-      - 916a
-      - 920a
-    - - 844a
-      - 846a
-      - 850a
-      - 858a
-      - 903a
-      - 910a
-      - 921a
-      - 926a
-      - 933a
-      - 935a
-      - 939a
-    - - 904a
-      - 906a
-      - 910a
-      - 918a
-      - 923a
-      - 930a
-      - 939a
-      - 944a
-      - 950a
-      - 952a
-      - 956a
-    - - 1004a
-      - 1006a
-      - 1010a
-      - 1016a
-      - 1021a
-      - 1028a
-      - 1037a
-      - 1042a
-      - 1048a
-      - 1050a
-      - 1054a
-    - - 1104a
-      - 1106a
-      - 1110a
-      - 1116a
-      - 1121a
-      - 1128a
-      - 1137a
-      - 1142a
-      - 1148a
-      - 1150a
-      - 1154a
-    - - 1204p
-      - 1206p
-      - 1210p
-      - 1216p
-      - 1221p
-      - 1228p
-      - 1237p
-      - 1242p
-      - 1248p
-      - 1250p
-      - 1254p
-    - - 104p
-      - 106p
-      - 110p
-      - 116p
-      - 121p
-      - 128p
-      - 137p
-      - 142p
-      - 148p
-      - 150p
-      - 154p
-    - - 204p
-      - 206p
-      - 210p
-      - 216p
-      - 221p
-      - 228p
-      - 237p
-      - 242p
-      - 248p
-      - 250p
-      - 254p
-    - - 255p
-      - 257p
-      - 301p
-      - 309p
-      - 314p
-      - 321p
-      - 332p
-      - 337p
-      - 345p
-      - 347p
-      - 351p
-    - - 324p
-      - 326p
-      - 330p
-      - 338p
-      - 343p
-      - 350p
-      - 401p
-      - 406p
-      - 414p
-      - 416p
-      - 420p
-    - - 344p
-      - 346p
-      - 350p
-      - 358p
-      - 403p
-      - 410p
-      - 421p
-      - 426p
-      - 434p
-      - 436p
-      - 440p
-    - - 404p
-      - 406p
-      - 410p
-      - 418p
-      - 423p
-      - 430p
-      - 441p
-      - 446p
-      - 454p
-      - 456p
-      - 500p
-    - - 424p
-      - 426p
-      - 430p
-      - 438p
-      - 443p
-      - 450p
-      - 501p
-      - 506p
-      - 514p
-      - 516p
-      - 520p
-    - - 444p
-      - 446p
-      - 450p
-      - 458p
-      - 503p
-      - 510p
-      - 521p
-      - 526p
-      - 534p
-      - 536p
-      - 540p
-    - - 504p
-      - 506p
-      - 510p
-      - 518p
-      - 523p
-      - 530p
-      - 541p
-      - 546p
-      - 554p
-      - 556p
-      - 600p
-    - - 524p
-      - 526p
-      - 530p
-      - 538p
-      - 543p
-      - 550p
-      - 601p
-      - 606p
-      - 614p
-      - 616p
-      - 620p
-    - - 604p
-      - 606p
-      - 610p
-      - 618p
-      - 623p
-      - 629p
-      - 639p
-      - 644p
-      - 649p
-      - 651p
-      - 654p
-    - - 704p
-      - 706p
-      - 709p
-      - 714p
-      - 719p
-      - 726p
-      - 735p
-      - 740p
-      - 745p
-      - 747p
-      - 750p
-    - - 804p
-      - 806p
-      - 809p
-      - 814p
-      - 819p
-      - 826p
-      - 835p
-      - 840p
-      - 845p
-      - 847p
-      - 850p
-    - - 904p
-      - 906p
-      - 909p
-      - 914p
-      - 919p
-      - 926p
-      - 935p
-      - 940p
-      - 945p
-      - 947p
-      - 950p
-    - - 1004p
-      - 1006p
-      - 1009p
-      - 1014p
-      - 1019p
-      - 1026p
-      - 1035p
-      - 1040p
-      - 1045p
-      - 1047p
-      - 1050p
-    - - 1104p
-      - 1106p
-      - 1109p
-      - 1114p
-      - 1119p
-      - 1126p
-      - 1135p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cameron Ave Bus Station - Platform 5
-    - Lathlain St Bus Station - Platform 5
-    - Cohen St Bus Station - Platform 5
-    - Kippax
-    - Macgregor Shops
-    - Charnwood
-    - Macgregor Shops
-    - Kippax
-    - Cohen St Bus Station
-    - Lathlain St Bus Station
-    - Cameron Ave Bus Station
+    stop_times: [["-", "-", "-", "-", 622a, 629a, 638a, 643a, 648a, 650a, 654a], ["-", "-", "-", "-", 641a, 648a, 657a, 702a, 707a, 709a, 713a], [645a, 647a, 651a, 656a, 701a, 708a, 717a, 722a, 727a, 729a, 733a], ["-", "-", "-", "-", 721a, 728a, 739a, 744a, 752a, 754a, 758a], ["-", "-", "-", "-", 742a, 749a, 800a, 805a, 813a, 815a, 819a], ["-", "-", "-", "-", 803a, 810a, 821a, 826a, 834a, 836a, 840a], ["-", "-", "-", "-", 825a, 832a, 843a, 848a, 856a, 858a, 902a], [824a, 826a, 830a, 838a, 843a, 850a, 901a, 906a, 914a, 916a, 920a], [844a, 846a, 850a, 858a, 903a, 910a, 921a, 926a, 933a, 935a, 939a], [904a, 906a, 910a, 918a, 923a, 930a, 939a, 944a, 950a, 952a, 956a], [1004a, 1006a, 1010a, 1016a, 1021a, 1028a, 1037a, 1042a, 1048a, 1050a, 1054a], [1104a, 1106a, 1110a, 1116a, 1121a, 1128a, 1137a, 1142a, 1148a, 1150a, 1154a], [1204p, 1206p, 1210p, 1216p, 1221p, 1228p, 1237p, 1242p, 1248p, 1250p, 1254p], [104p, 106p, 110p, 116p, 121p, 128p, 137p, 142p, 148p, 150p, 154p], [204p, 206p, 210p, 216p, 221p, 228p, 237p, 242p, 248p, 250p, 254p], [255p, 257p, 301p, 309p, 314p, 321p, 332p, 337p, 345p, 347p, 351p], [324p, 326p, 330p, 338p, 343p, 350p, 401p, 406p, 414p, 416p, 420p], [344p, 346p, 350p, 358p, 403p, 410p, 421p, 426p, 434p, 436p, 440p], [404p, 406p, 410p, 418p, 423p, 430p, 441p, 446p, 454p, 456p, 500p], [424p, 426p, 430p, 438p, 443p, 450p, 501p, 506p, 514p, 516p, 520p], [444p, 446p, 450p, 458p, 503p, 510p, 521p, 526p, 534p, 536p, 540p], [504p, 506p, 510p, 518p, 523p, 530p, 541p, 546p, 554p, 556p, 600p], [524p, 526p, 530p, 538p, 543p, 550p, 601p, 606p, 614p, 616p, 620p], [604p, 606p, 610p, 618p, 623p, 629p, 639p, 644p, 649p, 651p, 654p], [704p, 706p, 709p, 714p, 719p, 726p, 735p, 740p, 745p, 747p, 750p], [804p, 806p, 809p, 814p, 819p, 826p, 835p, 840p, 845p, 847p, 850p], [904p, 906p, 909p, 914p, 919p, 926p, 935p, 940p, 945p, 947p, 950p], [1004p, 1006p, 1009p, 1014p, 1019p, 1026p, 1035p, 1040p, 1045p, 1047p, 1050p], [1104p, 1106p, 1109p, 1114p, 1119p, 1126p, 1135p, "-", "-", "-", "-"]]
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 5, Cohen St Bus Station - Platform 5, Kippax, Macgregor Shops, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Station
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
     short_name: "44"
-    stop_times: 
-    - - 605a
-      - 607a
-      - 615a
-      - 620a
-      - 625a
-      - 627a
-      - 631a
-    - - 638a
-      - 640a
-      - 648a
-      - 653a
-      - 658a
-      - 700a
-      - 704a
-    - - 705a
-      - 707a
-      - 715a
-      - 720a
-      - 725a
-      - 727a
-      - 731a
-    - - "-"
-      - "-"
-      - 732a
-      - 739a
-      - 745a
-      - 747a
-      - 751a
-    - - 738a
-      - 741a
-      - 750a
-      - 757a
-      - 803a
-      - 805a
-      - 809a
-    - - 807a
-      - 810a
-      - 819a
-      - 826a
-      - 832a
-      - 834a
-      - 838a
-    - - 842a
-      - 845a
-      - 854a
-      - 901a
-      - 907a
-      - 909a
-      - 913a
-    - - 912a
-      - 915a
-      - 924a
-      - 931a
-      - 937a
-      - 939a
-      - 943a
-    - - 937a
-      - 939a
-      - 948a
-      - 954a
-      - 1000a
-      - 1002a
-      - 1006a
-    - - 1037a
-      - 1039a
-      - 1048a
-      - 1054a
-      - 1100a
-      - 1102a
-      - 1106a
-    - - 1137a
-      - 1139a
-      - 1148a
-      - 1154a
-      - 1200p
-      - 1202p
-      - 1206p
-    - - 1237p
-      - 1239p
-      - 1248p
-      - 1254p
-      - 100p
-      - 102p
-      - 106p
-    - - 137p
-      - 139p
-      - 148p
-      - 154p
-      - 200p
-      - 202p
-      - 206p
-    - - 237p
-      - 239p
-      - 248p
-      - 254p
-      - 300p
-      - 302p
-      - 306p
-    - - 313p
-      - 315p
-      - 324p
-      - 331p
-      - 337p
-      - 339p
-      - 343p
-    - - 347p
-      - 349p
-      - 358p
-      - 405p
-      - 411p
-      - 413p
-      - 417p
-    - - 418p
-      - 420p
-      - 429p
-      - 436p
-      - 442p
-      - 444p
-      - 448p
-    - - 452p
-      - 454p
-      - 503p
-      - 510p
-      - 516p
-      - 518p
-      - 522p
-    - - 523p
-      - 525p
-      - 534p
-      - 541p
-      - 547p
-      - 549p
-      - 553p
-    - - 557p
-      - 559p
-      - 608p
-      - 615p
-      - 621p
-      - 623p
-      - 627p
-    - - 628p
-      - 630p
-      - 639p
-      - 645p
-      - 650p
-      - 652p
-      - 655p
-    - - 642p
-      - 644p
-      - 653p
-      - 659p
-      - 704p
-      - 706p
-      - 709p
-    - - 737p
-      - 739p
-      - 748p
-      - 754p
-      - 759p
-      - 801p
-      - 804p
-    - - 837p
-      - 839p
-      - 848p
-      - 854p
-      - 859p
-      - 901p
-      - 904p
-    - - 937p
-      - 939p
-      - 948p
-      - 954p
-      - 959p
-      - 1001p
-      - 1004p
-    - - 1037p
-      - 1039p
-      - 1048p
-      - 1054p
-      - 1059p
-      - 1101p
-      - 1104p
-    time_points: 
-    - Kippax Centre
-    - Holt
-    - Higgins
-    - Belconnen Way
-    - Cohen St Bus Station
-    - Lathlain St Bus Station
-    - Cameron Ave Bus Station
+    stop_times: [[605a, 607a, 615a, 620a, 625a, 627a, 631a], [638a, 640a, 648a, 653a, 658a, 700a, 704a], [705a, 707a, 715a, 720a, 725a, 727a, 731a], ["-", "-", 732a, 739a, 745a, 747a, 751a], [738a, 741a, 750a, 757a, 803a, 805a, 809a], [807a, 810a, 819a, 826a, 832a, 834a, 838a], [842a, 845a, 854a, 901a, 907a, 909a, 913a], [912a, 915a, 924a, 931a, 937a, 939a, 943a], [937a, 939a, 948a, 954a, 1000a, 1002a, 1006a], [1037a, 1039a, 1048a, 1054a, 1100a, 1102a, 1106a], [1137a, 1139a, 1148a, 1154a, 1200p, 1202p, 1206p], [1237p, 1239p, 1248p, 1254p, 100p, 102p, 106p], [137p, 139p, 148p, 154p, 200p, 202p, 206p], [237p, 239p, 248p, 254p, 300p, 302p, 306p], [313p, 315p, 324p, 331p, 337p, 339p, 343p], [347p, 349p, 358p, 405p, 411p, 413p, 417p], [418p, 420p, 429p, 436p, 442p, 444p, 448p], [452p, 454p, 503p, 510p, 516p, 518p, 522p], [523p, 525p, 534p, 541p, 547p, 549p, 553p], [557p, 559p, 608p, 615p, 621p, 623p, 627p], [628p, 630p, 639p, 645p, 650p, 652p, 655p], [642p, 644p, 653p, 659p, 704p, 706p, 709p], [737p, 739p, 748p, 754p, 759p, 801p, 804p], [837p, 839p, 848p, 854p, 859p, 901p, 904p], [937p, 939p, 948p, 954p, 959p, 1001p, 1004p], [1037p, 1039p, 1048p, 1054p, 1059p, 1101p, 1104p]]
+    time_points: [Kippax Centre, Holt, Higgins, Belconnen Way, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Kippax Centre
-    between_stops: []
-    
+    between_stops: 
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 5: []
+      Lathlain St Bus Station - Platform 5-Cohen St Bus Station - Platform 5: []
     short_name: "44"
-    stop_times: 
-    - - 734a
-      - 736a
-      - 740a
-      - 746a
-      - 753a
-      - 802a
-      - 804a
-    - - 803a
-      - 805a
-      - 809a
-      - 815a
-      - 822a
-      - 831a
-      - 833a
-    - - 903a
-      - 905a
-      - 909a
-      - 915a
-      - 922a
-      - 931a
-      - 933a
-    - - 1003a
-      - 1005a
-      - 1009a
-      - 1014a
-      - 1020a
-      - 1030a
-      - 1032a
-    - - 1103a
-      - 1105a
-      - 1109a
-      - 1114a
-      - 1120a
-      - 1130a
-      - 1132a
-    - - 1203p
-      - 1205p
-      - 1209p
-      - 1214p
-      - 1220p
-      - 1230p
-      - 1232p
-    - - 103p
-      - 105p
-      - 109p
-      - 114p
-      - 120p
-      - 130p
-      - 132p
-    - - 203p
-      - 205p
-      - 209p
-      - 214p
-      - 220p
-      - 230p
-      - 232p
-    - - 313p
-      - 315p
-      - 319p
-      - 325p
-      - 332p
-      - 341p
-      - 344p
-    - - 345p
-      - 347p
-      - 351p
-      - 357p
-      - 404p
-      - 413p
-      - 416p
-    - - 419p
-      - 421p
-      - 425p
-      - 431p
-      - 438p
-      - 447p
-      - 450p
-    - - 450p
-      - 452p
-      - 456p
-      - 502p
-      - 509p
-      - 518p
-      - 521p
-    - - 524p
-      - 526p
-      - 530p
-      - 536p
-      - 543p
-      - 552p
-      - 555p
-    - - 555p
-      - 557p
-      - 601p
-      - 607p
-      - 614p
-      - 623p
-      - 626p
-    - - 629p
-      - 631p
-      - 634p
-      - 639p
-      - 645p
-      - 655p
-      - 657p
-    - - 703p
-      - 705p
-      - 708p
-      - 713p
-      - 719p
-      - 729p
-      - 731p
-    - - 803p
-      - 805p
-      - 808p
-      - 813p
-      - 819p
-      - 829p
-      - 831p
-    - - 903p
-      - 905p
-      - 908p
-      - 913p
-      - 919p
-      - 929p
-      - 931p
-    - - 1003p
-      - 1005p
-      - 1008p
-      - 1013p
-      - 1019p
-      - 1029p
-      - 1031p
-    - - 1103p
-      - 1105p
-      - 1108p
-      - 1113p
-      - 1119p
-      - 1129p
-      - 1131p
-    time_points: 
-    - Cameron Ave Bus Station - Platform 5
-    - Lathlain St Bus Station - Platform 5
-    - Cohen St Bus Station - Platform 5
-    - Belconnen Way
-    - Higgins
-    - Holt
-    - Kippax Centre
+    stop_times: [[734a, 736a, 740a, 746a, 753a, 802a, 804a], [803a, 805a, 809a, 815a, 822a, 831a, 833a], [903a, 905a, 909a, 915a, 922a, 931a, 933a], [1003a, 1005a, 1009a, 1014a, 1020a, 1030a, 1032a], [1103a, 1105a, 1109a, 1114a, 1120a, 1130a, 1132a], [1203p, 1205p, 1209p, 1214p, 1220p, 1230p, 1232p], [103p, 105p, 109p, 114p, 120p, 130p, 132p], [203p, 205p, 209p, 214p, 220p, 230p, 232p], [313p, 315p, 319p, 325p, 332p, 341p, 344p], [345p, 347p, 351p, 357p, 404p, 413p, 416p], [419p, 421p, 425p, 431p, 438p, 447p, 450p], [450p, 452p, 456p, 502p, 509p, 518p, 521p], [524p, 526p, 530p, 536p, 543p, 552p, 555p], [555p, 557p, 601p, 607p, 614p, 623p, 626p], [629p, 631p, 634p, 639p, 645p, 655p, 657p], [703p, 705p, 708p, 713p, 719p, 729p, 731p], [803p, 805p, 808p, 813p, 819p, 829p, 831p], [903p, 905p, 908p, 913p, 919p, 929p, 931p], [1003p, 1005p, 1008p, 1013p, 1019p, 1029p, 1031p], [1103p, 1105p, 1108p, 1113p, 1119p, 1129p, 1131p]]
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 5, Cohen St Bus Station - Platform 5, Belconnen Way, Higgins, Holt, Kippax Centre]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "45"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 627a
-      - 631a
-      - 637a
-      - 639a
-      - 647a
-      - 654a
-      - 656a
-      - 700a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 657a
-      - 701a
-      - 707a
-      - 709a
-      - 717a
-      - 724a
-      - 726a
-      - 730a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 729a
-      - 733a
-      - 739a
-      - 741a
-      - 749a
-      - 756a
-      - 758a
-      - 802a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 759a
-      - 803a
-      - 809a
-      - 811a
-      - 819a
-      - 826a
-      - 828a
-      - 832a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 822a
-      - 826a
-      - 832a
-      - 834a
-      - 842a
-      - 849a
-      - 851a
-      - 855a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 844a
-      - 848a
-      - 854a
-      - 856a
-      - 904a
-      - 911a
-      - 913a
-      - 917a
-    - - 832a
-      - 834a
-      - 838a
-      - 846a
-      - 854a
-      - 856a
-      - 900a
-      - 906a
-      - 908a
-      - 916a
-      - 923a
-      - 925a
-      - 929a
-    - - 902a
-      - 904a
-      - 908a
-      - 916a
-      - 924a
-      - 926a
-      - 930a
-      - 936a
-      - 938a
-      - 946a
-      - 953a
-      - 955a
-      - 959a
-    - - 925a
-      - 927a
-      - 931a
-      - 939a
-      - 947a
-      - 949a
-      - 953a
-      - 959a
-      - 1001a
-      - 1009a
-      - 1016a
-      - 1018a
-      - 1022a
-    - - 1025a
-      - 1027a
-      - 1031a
-      - 1039a
-      - 1047a
-      - 1049a
-      - 1053a
-      - 1059a
-      - 1101a
-      - 1109a
-      - 1116a
-      - 1118a
-      - 1122a
-    - - 1125a
-      - 1127a
-      - 1131a
-      - 1139a
-      - 1147a
-      - 1149a
-      - 1153a
-      - 1159a
-      - 1201p
-      - 1209p
-      - 1216p
-      - 1218p
-      - 1222p
-    - - 1225p
-      - 1227p
-      - 1231p
-      - 1239p
-      - 1247p
-      - 1249p
-      - 1253p
-      - 1259p
-      - 101p
-      - 109p
-      - 116p
-      - 118p
-      - 122p
-    - - 125p
-      - 127p
-      - 131p
-      - 139p
-      - 147p
-      - 149p
-      - 153p
-      - 159p
-      - 201p
-      - 209p
-      - 216p
-      - 218p
-      - 222p
-    - - 225p
-      - 227p
-      - 231p
-      - 239p
-      - 247p
-      - 249p
-      - 253p
-      - 259p
-      - 301p
-      - 309p
-      - 316p
-      - 318p
-      - 322p
-    - - 302p
-      - 304p
-      - 308p
-      - 316p
-      - 324p
-      - 326p
-      - 330p
-      - 336p
-      - 338p
-      - 346p
-      - 353p
-      - 355p
-      - 359p
-    - - 332p
-      - 334p
-      - 338p
-      - 346p
-      - 354p
-      - 356p
-      - 400p
-      - 406p
-      - 408p
-      - 416p
-      - 423p
-      - 425p
-      - 429p
-    - - 402p
-      - 404p
-      - 408p
-      - 416p
-      - 424p
-      - 426p
-      - 430p
-      - 436p
-      - 438p
-      - 446p
-      - 453p
-      - 455p
-      - 459p
-    - - 432p
-      - 434p
-      - 438p
-      - 446p
-      - 454p
-      - 456p
-      - 500p
-      - 506p
-      - 508p
-      - 516p
-      - 523p
-      - 525p
-      - 529p
-    - - 502p
-      - 504p
-      - 508p
-      - 516p
-      - 524p
-      - 526p
-      - 530p
-      - 536p
-      - 538p
-      - 546p
-      - 553p
-      - 555p
-      - 559p
-    - - 532p
-      - 534p
-      - 538p
-      - 546p
-      - 554p
-      - 556p
-      - 600p
-      - 606p
-      - 608p
-      - 616p
-      - 623p
-      - 625p
-      - 629p
-    - - 602p
-      - 604p
-      - 608p
-      - 616p
-      - 624p
-      - 626p
-      - 630p
-      - 636p
-      - 638p
-      - 646p
-      - 652p
-      - 654p
-      - 657p
-    - - 625p
-      - 627p
-      - 631p
-      - 638p
-      - 646p
-      - 648p
-      - 652p
-      - 658p
-      - 700p
-      - 708p
-      - 714p
-      - 716p
-      - 719p
-    - - 725p
-      - 727p
-      - 730p
-      - 737p
-      - 745p
-      - 747p
-      - 751p
-      - 757p
-      - 759p
-      - 807p
-      - 813p
-      - 815p
-      - 818p
-    - - 825p
-      - 827p
-      - 830p
-      - 837p
-      - 845p
-      - 847p
-      - 851p
-      - 857p
-      - 859p
-      - 907p
-      - 913p
-      - 915p
-      - 918p
-    - - 925p
-      - 927p
-      - 930p
-      - 937p
-      - 945p
-      - 947p
-      - 951p
-      - 957p
-      - 959p
-      - 1007p
-      - 1013p
-      - 1015p
-      - 1018p
-    - - 1025p
-      - 1027p
-      - 1030p
-      - 1037p
-      - 1045p
-      - 1047p
-      - 1051p
-      - 1057p
-      - 1059p
-      - 1107p
-      - 1113p
-      - 1115p
-      - 1118p
-    - - 1125p
-      - 1127p
-      - 1130p
-      - 1137p
-      - 1145p
-      - 1147p
-      - 1151p
-      - 1157p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 2
-    - Copland College
-    - Cnr Tillyard Dr & Spalding St
-    - Charnwood
-    - Cnr Kerrigan/Lhotsky
-    - Charnwood
-    - Cnr Tillyard Dr & Spalding St
-    - Copland College
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    stop_times: [["-", "-", "-", "-", "-", 627a, 631a, 637a, 639a, 647a, 654a, 656a, 700a], ["-", "-", "-", "-", "-", 657a, 701a, 707a, 709a, 717a, 724a, 726a, 730a], ["-", "-", "-", "-", "-", 729a, 733a, 739a, 741a, 749a, 756a, 758a, 802a], ["-", "-", "-", "-", "-", 759a, 803a, 809a, 811a, 819a, 826a, 828a, 832a], ["-", "-", "-", "-", "-", 822a, 826a, 832a, 834a, 842a, 849a, 851a, 855a], ["-", "-", "-", "-", "-", 844a, 848a, 854a, 856a, 904a, 911a, 913a, 917a], [832a, 834a, 838a, 846a, 854a, 856a, 900a, 906a, 908a, 916a, 923a, 925a, 929a], [902a, 904a, 908a, 916a, 924a, 926a, 930a, 936a, 938a, 946a, 953a, 955a, 959a], [925a, 927a, 931a, 939a, 947a, 949a, 953a, 959a, 1001a, 1009a, 1016a, 1018a, 1022a], [1025a, 1027a, 1031a, 1039a, 1047a, 1049a, 1053a, 1059a, 1101a, 1109a, 1116a, 1118a, 1122a], [1125a, 1127a, 1131a, 1139a, 1147a, 1149a, 1153a, 1159a, 1201p, 1209p, 1216p, 1218p, 1222p], [1225p, 1227p, 1231p, 1239p, 1247p, 1249p, 1253p, 1259p, 101p, 109p, 116p, 118p, 122p], [125p, 127p, 131p, 139p, 147p, 149p, 153p, 159p, 201p, 209p, 216p, 218p, 222p], [225p, 227p, 231p, 239p, 247p, 249p, 253p, 259p, 301p, 309p, 316p, 318p, 322p], [302p, 304p, 308p, 316p, 324p, 326p, 330p, 336p, 338p, 346p, 353p, 355p, 359p], [332p, 334p, 338p, 346p, 354p, 356p, 400p, 406p, 408p, 416p, 423p, 425p, 429p], [402p, 404p, 408p, 416p, 424p, 426p, 430p, 436p, 438p, 446p, 453p, 455p, 459p], [432p, 434p, 438p, 446p, 454p, 456p, 500p, 506p, 508p, 516p, 523p, 525p, 529p], [502p, 504p, 508p, 516p, 524p, 526p, 530p, 536p, 538p, 546p, 553p, 555p, 559p], [532p, 534p, 538p, 546p, 554p, 556p, 600p, 606p, 608p, 616p, 623p, 625p, 629p], [602p, 604p, 608p, 616p, 624p, 626p, 630p, 636p, 638p, 646p, 652p, 654p, 657p], [625p, 627p, 631p, 638p, 646p, 648p, 652p, 658p, 700p, 708p, 714p, 716p, 719p], [725p, 727p, 730p, 737p, 745p, 747p, 751p, 757p, 759p, 807p, 813p, 815p, 818p], [825p, 827p, 830p, 837p, 845p, 847p, 851p, 857p, 859p, 907p, 913p, 915p, 918p], [925p, 927p, 930p, 937p, 945p, 947p, 951p, 957p, 959p, 1007p, 1013p, 1015p, 1018p], [1025p, 1027p, 1030p, 1037p, 1045p, 1047p, 1051p, 1057p, 1059p, 1107p, 1113p, 1115p, 1118p], [1125p, 1127p, 1130p, 1137p, 1145p, 1147p, 1151p, 1157p, "-", "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 2, Copland College, Cnr Tillyard Dr & Spalding St, Charnwood, Cnr Kerrigan/Lhotsky, Charnwood, Cnr Tillyard Dr & Spalding St, Copland College, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
     
     short_name: "4"
-    stop_times: 
-    - - 712a
-      - "-"
-      - 715a
-      - 722a
-      - 725a
-      - 729a
-      - 734a
-      - 743a
-    - - 743a
-      - "-"
-      - 746a
-      - 755a
-      - 759a
-      - 804a
-      - 809a
-      - 818a
-    - - 817a
-      - "-"
-      - 820a
-      - 829a
-      - 833a
-      - 838a
-      - 843a
-      - 852a
-    - - 847a
-      - "-"
-      - 850a
-      - 859a
-      - 903a
-      - 908a
-      - 913a
-      - 922a
-    - - 917a
-      - "-"
-      - 920a
-      - 929a
-      - 932a
-      - 936a
-      - 940a
-      - 948a
-    - - 946a
-      - "-"
-      - 949a
-      - 956a
-      - 959a
-      - 1003a
-      - 1007a
-      - 1015a
-    - - 1013a
-      - "-"
-      - 1016a
-      - 1023a
-      - 1026a
-      - 1030a
-      - 1034a
-      - 1042a
-    - - 1043a
-      - "-"
-      - 1046a
-      - 1053a
-      - 1056a
-      - 1100a
-      - 1104a
-      - 1112a
-    - - 1113a
-      - "-"
-      - 1116a
-      - 1123a
-      - 1126a
-      - 1130a
-      - 1134a
-      - 1142a
-    - - 1143a
-      - "-"
-      - 1146a
-      - 1153a
-      - 1156a
-      - 1200p
-      - 1204p
-      - 1212p
-    - - 1213p
-      - "-"
-      - 1216p
-      - 1223p
-      - 1226p
-      - 1230p
-      - 1234p
-      - 1242p
-    - - 1243p
-      - "-"
-      - 1246p
-      - 1253p
-      - 1256p
-      - 100p
-      - 104p
-      - 112p
-    - - 113p
-      - "-"
-      - 116p
-      - 123p
-      - 126p
-      - 130p
-      - 134p
-      - 142p
-    - - 143p
-      - "-"
-      - 146p
-      - 153p
-      - 156p
-      - 200p
-      - 204p
-      - 212p
-    - - 213p
-      - "-"
-      - 216p
-      - 223p
-      - 226p
-      - 230p
-      - 234p
-      - 242p
-    - - 243p
-      - "-"
-      - 246p
-      - 253p
-      - 256p
-      - 300p
-      - 305p
-      - 314p
-    - - 313p
-      - "-"
-      - 316p
-      - 325p
-      - 329p
-      - 334p
-      - 339p
-      - 348p
-    - - 346p
-      - "-"
-      - 349p
-      - 358p
-      - 402p
-      - 407p
-      - 412p
-      - 421p
-    - - 416p
-      - "-"
-      - 419p
-      - 428p
-      - 432p
-      - 437p
-      - 442p
-      - 451p
-    - - 446p
-      - "-"
-      - 449p
-      - 456p
-      - 500p
-      - 505p
-      - 510p
-      - 521p
-    - - 516p
-      - "-"
-      - 519p
-      - 528p
-      - 532p
-      - 537p
-      - 542p
-      - 551p
-    - - 546p
-      - "-"
-      - 549p
-      - 558p
-      - 602p
-      - 607p
-      - 612p
-      - 621p
-    - - "-"
-      - 616p
-      - 619p
-      - 628p
-      - 632p
-      - 636p
-      - 640p
-      - 648p
-    - - "-"
-      - 709p
-      - 712p
-      - 717p
-      - 720p
-      - 724p
-      - 728p
-      - 736p
-    - - "-"
-      - 809p
-      - 812p
-      - 817p
-      - 820p
-      - 824p
-      - 828p
-      - 836p
-    - - "-"
-      - 909p
-      - 912p
-      - 917p
-      - 920p
-      - 924p
-      - 928p
-      - 936p
-    - - "-"
-      - 1009p
-      - 1012p
-      - 1017p
-      - 1020p
-      - 1024p
-      - 1028p
-      - 1036p
-    - - "-"
-      - 1109p
-      - 1112p
-      - 1117p
-      - 1120p
-      - 1124p
-      - 1128p
-      - 1136p
-    time_points: 
-    - Geoscience Australia
-    - Narrabundah Terminus
-    - Narrabundah College
-    - Manuka/Captain Cook
-    - Kingston
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange
+    stop_times: [[712a, "-", 715a, 722a, 725a, 729a, 734a, 743a], [743a, "-", 746a, 755a, 759a, 804a, 809a, 818a], [817a, "-", 820a, 829a, 833a, 838a, 843a, 852a], [847a, "-", 850a, 859a, 903a, 908a, 913a, 922a], [917a, "-", 920a, 929a, 932a, 936a, 940a, 948a], [946a, "-", 949a, 956a, 959a, 1003a, 1007a, 1015a], [1013a, "-", 1016a, 1023a, 1026a, 1030a, 1034a, 1042a], [1043a, "-", 1046a, 1053a, 1056a, 1100a, 1104a, 1112a], [1113a, "-", 1116a, 1123a, 1126a, 1130a, 1134a, 1142a], [1143a, "-", 1146a, 1153a, 1156a, 1200p, 1204p, 1212p], [1213p, "-", 1216p, 1223p, 1226p, 1230p, 1234p, 1242p], [1243p, "-", 1246p, 1253p, 1256p, 100p, 104p, 112p], [113p, "-", 116p, 123p, 126p, 130p, 134p, 142p], [143p, "-", 146p, 153p, 156p, 200p, 204p, 212p], [213p, "-", 216p, 223p, 226p, 230p, 234p, 242p], [243p, "-", 246p, 253p, 256p, 300p, 305p, 314p], [313p, "-", 316p, 325p, 329p, 334p, 339p, 348p], [346p, "-", 349p, 358p, 402p, 407p, 412p, 421p], [416p, "-", 419p, 428p, 432p, 437p, 442p, 451p], [446p, "-", 449p, 456p, 500p, 505p, 510p, 521p], [516p, "-", 519p, 528p, 532p, 537p, 542p, 551p], [546p, "-", 549p, 558p, 602p, 607p, 612p, 621p], ["-", 616p, 619p, 628p, 632p, 636p, 640p, 648p], ["-", 709p, 712p, 717p, 720p, 724p, 728p, 736p], ["-", 809p, 812p, 817p, 820p, 824p, 828p, 836p], ["-", 909p, 912p, 917p, 920p, 924p, 928p, 936p], ["-", 1009p, 1012p, 1017p, 1020p, 1024p, 1028p, 1036p], ["-", 1109p, 1112p, 1117p, 1120p, 1124p, 1128p, 1136p]]
+    time_points: [Geoscience Australia, Narrabundah Terminus, Narrabundah College, Manuka/Captain Cook, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
   -  
     long_name: To Geoscience Australia
-    between_stops: []
+    between_stops: {}
     
     short_name: "4"
-    stop_times: 
-    - - 637a
-      - 645a
-      - 649a
-      - 653a
-      - 656a
-      - 704a
-      - "-"
-      - 707a
-    - - 707a
-      - 715a
-      - 719a
-      - 723a
-      - 726a
-      - 735a
-      - "-"
-      - 738a
-    - - 737a
-      - 746a
-      - 751a
-      - 756a
-      - 759a
-      - 809a
-      - "-"
-      - 812a
-    - - 807a
-      - 816a
-      - 821a
-      - 826a
-      - 829a
-      - 839a
-      - "-"
-      - 842a
-    - - 821a
-      - 830a
-      - 835a
-      - 840a
-      - 843a
-      - 853a
-      - "-"
-      - 856a
-    - - 837a
-      - 846a
-      - 851a
-      - 856a
-      - 859a
-      - 909a
-      - "-"
-      - 912a
-    - - 907a
-      - 916a
-      - 921a
-      - 926a
-      - 929a
-      - 938a
-      - "-"
-      - 941a
-    - - 937a
-      - 945a
-      - 949a
-      - 953a
-      - 956a
-      - 1005a
-      - "-"
-      - 1008a
-    - - 1007a
-      - 1015a
-      - 1019a
-      - 1023a
-      - 1026a
-      - 1035a
-      - "-"
-      - 1038a
-    - - 1037a
-      - 1045a
-      - 1049a
-      - 1053a
-      - 1056a
-      - 1105a
-      - "-"
-      - 1108a
-    - - 1107a
-      - 1115a
-      - 1119a
-      - 1123a
-      - 1126a
-      - 1135a
-      - "-"
-      - 1138a
-    - - 1137a
-      - 1145a
-      - 1149a
-      - 1153a
-      - 1156a
-      - 1205p
-      - "-"
-      - 1208p
-    - - 1207p
-      - 1215p
-      - 1219p
-      - 1223p
-      - 1226p
-      - 1235p
-      - "-"
-      - 1238p
-    - - 1237p
-      - 1245p
-      - 1249p
-      - 1253p
-      - 1256p
-      - 105p
-      - "-"
-      - 108p
-    - - 107p
-      - 115p
-      - 119p
-      - 123p
-      - 126p
-      - 135p
-      - "-"
-      - 138p
-    - - 137p
-      - 145p
-      - 149p
-      - 153p
-      - 156p
-      - 205p
-      - "-"
-      - 208p
-    - - 207p
-      - 215p
-      - 219p
-      - 223p
-      - 226p
-      - 235p
-      - "-"
-      - 238p
-    - - 237p
-      - 245p
-      - 249p
-      - 253p
-      - 256p
-      - 305p
-      - "-"
-      - 308p
-    - - 307p
-      - 316p
-      - 321p
-      - 326p
-      - 329p
-      - 338p
-      - "-"
-      - 341p
-    - - 337p
-      - 346p
-      - 351p
-      - 356p
-      - 359p
-      - 408p
-      - "-"
-      - 411p
-    - - 407p
-      - 416p
-      - 421p
-      - 426p
-      - 429p
-      - 438p
-      - "-"
-      - 441p
-    - - 437p
-      - 446p
-      - 451p
-      - 456p
-      - 459p
-      - 508p
-      - "-"
-      - 511p
-    - - 507p
-      - 516p
-      - 521p
-      - 526p
-      - 529p
-      - 538p
-      - "-"
-      - 541p
-    - - 537p
-      - 546p
-      - 551p
-      - 556p
-      - 559p
-      - 608p
-      - 611p
-      - "-"
-    - - 637p
-      - 645p
-      - 649p
-      - 653p
-      - 656p
-      - 701p
-      - 704p
-      - "-"
-    - - 737p
-      - 745p
-      - 749p
-      - 753p
-      - 756p
-      - 801p
-      - 804p
-      - "-"
-    - - 837p
-      - 845p
-      - 849p
-      - 853p
-      - 856p
-      - 901p
-      - 904p
-      - "-"
-    - - 937p
-      - 945p
-      - 949p
-      - 953p
-      - 956p
-      - 1001p
-      - 1004p
-      - "-"
-    - - 1037p
-      - 1045p
-      - 1049p
-      - 1053p
-      - 1056p
-      - 1101p
-      - 1104p
-      - "-"
-    - - 1137p
-      - 1145p
-      - 1149p
-      - 1153p
-      - 1156p
-      - 1201a
-      - 1204a
-      - "-"
-    time_points: 
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Kingston
-    - Manuka/Captain Cook
-    - Narrabundah College
-    - Narrabundah Terminus
-    - Geoscience Australia
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [[637a, 645a, 649a, 653a, 656a, 704a, "-", 707a], [707a, 715a, 719a, 723a, 726a, 735a, "-", 738a], [737a, 746a, 751a, 756a, 759a, 809a, "-", 812a], [807a, 816a, 821a, 826a, 829a, 839a, "-", 842a], [821a, 830a, 835a, 840a, 843a, 853a, "-", 856a], [837a, 846a, 851a, 856a, 859a, 909a, "-", 912a], [907a, 916a, 921a, 926a, 929a, 938a, "-", 941a], [937a, 945a, 949a, 953a, 956a, 1005a, "-", 1008a], [1007a, 1015a, 1019a, 1023a, 1026a, 1035a, "-", 1038a], [1037a, 1045a, 1049a, 1053a, 1056a, 1105a, "-", 1108a], [1107a, 1115a, 1119a, 1123a, 1126a, 1135a, "-", 1138a], [1137a, 1145a, 1149a, 1153a, 1156a, 1205p, "-", 1208p], [1207p, 1215p, 1219p, 1223p, 1226p, 1235p, "-", 1238p], [1237p, 1245p, 1249p, 1253p, 1256p, 105p, "-", 108p], [107p, 115p, 119p, 123p, 126p, 135p, "-", 138p], [137p, 145p, 149p, 153p, 156p, 205p, "-", 208p], [207p, 215p, 219p, 223p, 226p, 235p, "-", 238p], [237p, 245p, 249p, 253p, 256p, 305p, "-", 308p], [307p, 316p, 321p, 326p, 329p, 338p, "-", 341p], [337p, 346p, 351p, 356p, 359p, 408p, "-", 411p], [407p, 416p, 421p, 426p, 429p, 438p, "-", 441p], [437p, 446p, 451p, 456p, 459p, 508p, "-", 511p], [507p, 516p, 521p, 526p, 529p, 538p, "-", 541p], [537p, 546p, 551p, 556p, 559p, 608p, 611p, "-"], [637p, 645p, 649p, 653p, 656p, 701p, 704p, "-"], [737p, 745p, 749p, 753p, 756p, 801p, 804p, "-"], [837p, 845p, 849p, 853p, 856p, 901p, 904p, "-"], [937p, 945p, 949p, 953p, 956p, 1001p, 1004p, "-"], [1037p, 1045p, 1049p, 1053p, 1056p, 1101p, 1104p, "-"], [1137p, 1145p, 1149p, 1153p, 1156p, 1201a, 1204a, "-"]]
+    time_points: [City Interchange - Platform 9, Russell Offices, Kings Ave/National Crt, Kingston, Manuka/Captain Cook, Narrabundah College, Narrabundah Terminus, Geoscience Australia]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "51"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 532a
-      - 541a
-      - 550a
-      - 559a
-      - 602a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 616a
-      - 625a
-      - 634a
-      - 643a
-      - 646a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 618a
-      - 620a
-      - 624a
-      - 631a
-      - 636a
-      - 645a
-      - 654a
-      - 703a
-      - 706a
-      - 709a
-      - 716a
-      - 718a
-      - 725a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 656a
-      - 705a
-      - 714a
-      - 723a
-      - 726a
-      - 729a
-      - 736a
-      - 738a
-      - 745a
-    - - 654a
-      - 656a
-      - 700a
-      - 707a
-      - 712a
-      - 721a
-      - 730a
-      - 739a
-      - 742a
-      - 745a
-      - 756a
-      - 801a
-      - 815a
-    - - "-"
-      - "-"
-      - "-"
-      - 721a
-      - 726a
-      - 735a
-      - 744a
-      - 753a
-      - 756a
-      - 801a
-      - 812a
-      - 817a
-      - 832a
-    - - 732a
-      - 734a
-      - 738a
-      - 745a
-      - 750a
-      - 800a
-      - 810a
-      - 819a
-      - 822a
-      - 827a
-      - 838a
-      - 843a
-      - 858a
-    - - 751a
-      - 753a
-      - 757a
-      - 805a
-      - 810a
-      - 820a
-      - 830a
-      - 839a
-      - 842a
-      - 847a
-      - 856a
-      - 901a
-      - 912a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 830a
-      - 840a
-      - 850a
-      - 859a
-      - 902a
-      - 905a
-      - 912a
-      - 917a
-      - 928a
-    - - 838a
-      - 840a
-      - 844a
-      - 852a
-      - 857a
-      - 906a
-      - 915a
-      - 924a
-      - 927a
-      - 930a
-      - 937a
-      - 939a
-      - 946a
-    - - 913a
-      - 915a
-      - 919a
-      - 926a
-      - 931a
-      - 940a
-      - 949a
-      - 958a
-      - 1001a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 943a
-      - 945a
-      - 949a
-      - 956a
-      - 1001a
-      - 1010a
-      - 1019a
-      - 1028a
-      - 1031a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1043a
-      - 1045a
-      - 1049a
-      - 1056a
-      - 1101a
-      - 1110a
-      - 1119a
-      - 1128a
-      - 1131a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1143a
-      - 1145a
-      - 1149a
-      - 1156a
-      - 1201p
-      - 1210p
-      - 1219p
-      - 1228p
-      - 1231p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1243p
-      - 1245p
-      - 1249p
-      - 1256p
-      - 101p
-      - 110p
-      - 119p
-      - 128p
-      - 131p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 143p
-      - 145p
-      - 149p
-      - 156p
-      - 201p
-      - 210p
-      - 219p
-      - 228p
-      - 231p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 243p
-      - 245p
-      - 249p
-      - 256p
-      - 301p
-      - 310p
-      - 319p
-      - 328p
-      - 331p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 338p
-      - 340p
-      - 344p
-      - 351p
-      - 356p
-      - 406p
-      - 416p
-      - 425p
-      - 428p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 418p
-      - 420p
-      - 424p
-      - 432p
-      - 437p
-      - 448p
-      - 458p
-      - 507p
-      - 510p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 438p
-      - 440p
-      - 444p
-      - 452p
-      - 457p
-      - 508p
-      - 518p
-      - 527p
-      - 530p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 458p
-      - 500p
-      - 504p
-      - 512p
-      - 517p
-      - 528p
-      - 538p
-      - 547p
-      - 550p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 517p
-      - 519p
-      - 523p
-      - 531p
-      - 536p
-      - 547p
-      - 557p
-      - 606p
-      - 609p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 539p
-      - 541p
-      - 545p
-      - 553p
-      - 558p
-      - 607p
-      - 616p
-      - 625p
-      - 628p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 643p
-      - 645p
-      - 648p
-      - 655p
-      - 700p
-      - 709p
-      - 718p
-      - 727p
-      - 730p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 743p
-      - 745p
-      - 748p
-      - 755p
-      - 800p
-      - 809p
-      - 818p
-      - 827p
-      - 830p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 843p
-      - 845p
-      - 848p
-      - 855p
-      - 900p
-      - 909p
-      - 918p
-      - 927p
-      - 930p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 943p
-      - 945p
-      - 948p
-      - 955p
-      - 1000p
-      - 1009p
-      - 1018p
-      - 1027p
-      - 1030p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1043p
-      - 1045p
-      - 1048p
-      - 1055p
-      - 1100p
-      - 1109p
-      - 1118p
-      - 1127p
-      - 1130p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Chuculba/William Slim
-    - Federation Square
-    - Nicholls Primary
-    - Ngunnawal Primary
-    - Gungahlin Market Place
-    - Hibberson/Kate Crace
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [["-", "-", "-", "-", 532a, 541a, 550a, 559a, 602a, "-", "-", "-", "-"], ["-", "-", "-", "-", 616a, 625a, 634a, 643a, 646a, "-", "-", "-", "-"], [618a, 620a, 624a, 631a, 636a, 645a, 654a, 703a, 706a, 709a, 716a, 718a, 725a], ["-", "-", "-", "-", 656a, 705a, 714a, 723a, 726a, 729a, 736a, 738a, 745a], [654a, 656a, 700a, 707a, 712a, 721a, 730a, 739a, 742a, 745a, 756a, 801a, 815a], ["-", "-", "-", 721a, 726a, 735a, 744a, 753a, 756a, 801a, 812a, 817a, 832a], [732a, 734a, 738a, 745a, 750a, 800a, 810a, 819a, 822a, 827a, 838a, 843a, 858a], [751a, 753a, 757a, 805a, 810a, 820a, 830a, 839a, 842a, 847a, 856a, 901a, 912a], ["-", "-", "-", "-", 830a, 840a, 850a, 859a, 902a, 905a, 912a, 917a, 928a], [838a, 840a, 844a, 852a, 857a, 906a, 915a, 924a, 927a, 930a, 937a, 939a, 946a], [913a, 915a, 919a, 926a, 931a, 940a, 949a, 958a, 1001a, "-", "-", "-", "-"], [943a, 945a, 949a, 956a, 1001a, 1010a, 1019a, 1028a, 1031a, "-", "-", "-", "-"], [1043a, 1045a, 1049a, 1056a, 1101a, 1110a, 1119a, 1128a, 1131a, "-", "-", "-", "-"], [1143a, 1145a, 1149a, 1156a, 1201p, 1210p, 1219p, 1228p, 1231p, "-", "-", "-", "-"], [1243p, 1245p, 1249p, 1256p, 101p, 110p, 119p, 128p, 131p, "-", "-", "-", "-"], [143p, 145p, 149p, 156p, 201p, 210p, 219p, 228p, 231p, "-", "-", "-", "-"], [243p, 245p, 249p, 256p, 301p, 310p, 319p, 328p, 331p, "-", "-", "-", "-"], [338p, 340p, 344p, 351p, 356p, 406p, 416p, 425p, 428p, "-", "-", "-", "-"], [418p, 420p, 424p, 432p, 437p, 448p, 458p, 507p, 510p, "-", "-", "-", "-"], [438p, 440p, 444p, 452p, 457p, 508p, 518p, 527p, 530p, "-", "-", "-", "-"], [458p, 500p, 504p, 512p, 517p, 528p, 538p, 547p, 550p, "-", "-", "-", "-"], [517p, 519p, 523p, 531p, 536p, 547p, 557p, 606p, 609p, "-", "-", "-", "-"], [539p, 541p, 545p, 553p, 558p, 607p, 616p, 625p, 628p, "-", "-", "-", "-"], [643p, 645p, 648p, 655p, 700p, 709p, 718p, 727p, 730p, "-", "-", "-", "-"], [743p, 745p, 748p, 755p, 800p, 809p, 818p, 827p, 830p, "-", "-", "-", "-"], [843p, 845p, 848p, 855p, 900p, 909p, 918p, 927p, 930p, "-", "-", "-", "-"], [943p, 945p, 948p, 955p, 1000p, 1009p, 1018p, 1027p, 1030p, "-", "-", "-", "-"], [1043p, 1045p, 1048p, 1055p, 1100p, 1109p, 1118p, 1127p, 1130p, "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "51"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 701a
-      - 704a
-      - 713a
-      - 723a
-      - 733a
-      - 738a
-      - 748a
-      - 750a
-      - 754a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 721a
-      - 724a
-      - 733a
-      - 743a
-      - 753a
-      - 758a
-      - 809a
-      - 811a
-      - 815a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 741a
-      - 744a
-      - 753a
-      - 803a
-      - 813a
-      - 818a
-      - 829a
-      - 831a
-      - 835a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 800a
-      - 803a
-      - 812a
-      - 822a
-      - 832a
-      - 837a
-      - 848a
-      - 850a
-      - 854a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 821a
-      - 824a
-      - 833a
-      - 843a
-      - 853a
-      - 858a
-      - 906a
-      - 908a
-      - 912a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 840a
-      - 843a
-      - 852a
-      - 902a
-      - 911a
-      - 916a
-      - 923a
-      - 925a
-      - 929a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 940a
-      - 943a
-      - 952a
-      - 1001a
-      - 1010a
-      - 1015a
-      - 1022a
-      - 1024a
-      - 1028a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1040a
-      - 1043a
-      - 1052a
-      - 1101a
-      - 1110a
-      - 1115a
-      - 1122a
-      - 1124a
-      - 1128a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1140a
-      - 1143a
-      - 1152a
-      - 1201p
-      - 1210p
-      - 1215p
-      - 1222p
-      - 1224p
-      - 1228p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1240p
-      - 1243p
-      - 1252p
-      - 101p
-      - 110p
-      - 115p
-      - 122p
-      - 124p
-      - 128p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 140p
-      - 143p
-      - 152p
-      - 201p
-      - 210p
-      - 215p
-      - 222p
-      - 224p
-      - 228p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 240p
-      - 243p
-      - 252p
-      - 301p
-      - 310p
-      - 315p
-      - 322p
-      - 324p
-      - 328p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 307p
-      - 310p
-      - 319p
-      - 328p
-      - 337p
-      - 342p
-      - 349p
-      - 351p
-      - 355p
-    - - 328p
-      - 334p
-      - 336p
-      - 344p
-      - 347p
-      - 350p
-      - 359p
-      - 409p
-      - 419p
-      - 424p
-      - 432p
-      - 434p
-      - 438p
-    - - 404p
-      - 411p
-      - 413p
-      - 422p
-      - 427p
-      - 430p
-      - 439p
-      - 449p
-      - 459p
-      - 504p
-      - 512p
-      - 514p
-      - 518p
-    - - 424p
-      - 431p
-      - 433p
-      - 442p
-      - 447p
-      - 450p
-      - 459p
-      - 509p
-      - 519p
-      - 524p
-      - 532p
-      - 534p
-      - 538p
-    - - 444p
-      - 451p
-      - 453p
-      - 502p
-      - 507p
-      - 510p
-      - 519p
-      - 529p
-      - 539p
-      - 544p
-      - 552p
-      - 554p
-      - 558p
-    - - 508p
-      - 515p
-      - 517p
-      - 526p
-      - 531p
-      - 534p
-      - 543p
-      - 553p
-      - 603p
-      - 608p
-      - 615p
-      - 617p
-      - 620p
-    - - 524p
-      - 531p
-      - 533p
-      - 542p
-      - 547p
-      - 550p
-      - 559p
-      - 608p
-      - 617p
-      - 622p
-      - 629p
-      - 631p
-      - 634p
-    - - 535p
-      - 542p
-      - 544p
-      - 553p
-      - 558p
-      - 601p
-      - 610p
-      - 619p
-      - 628p
-      - 633p
-      - 640p
-      - 642p
-      - 645p
-    - - 547p
-      - 554p
-      - 556p
-      - 604p
-      - 607p
-      - 610p
-      - 619p
-      - 628p
-      - 637p
-      - 642p
-      - 649p
-      - 651p
-      - 654p
-    - - 613p
-      - 619p
-      - 621p
-      - 628p
-      - 631p
-      - 634p
-      - 643p
-      - 652p
-      - 701p
-      - 706p
-      - 713p
-      - 715p
-      - 718p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 740p
-      - 743p
-      - 752p
-      - 801p
-      - 810p
-      - 815p
-      - 822p
-      - 824p
-      - 827p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 840p
-      - 843p
-      - 852p
-      - 901p
-      - 910p
-      - 915p
-      - 922p
-      - 924p
-      - 927p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 940p
-      - 943p
-      - 952p
-      - 1001p
-      - 1010p
-      - 1015p
-      - 1022p
-      - 1024p
-      - 1027p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1040p
-      - 1043p
-      - 1052p
-      - 1101p
-      - 1110p
-      - 1115p
-      - 1122p
-      - 1124p
-      - 1127p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1140p
-      - 1143p
-      - 1152p
-      - 1201a
-      - 1210a
-      - 1215a
-      - 1222a
-      - 1224a
-      - 1227a
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Hibberson/Kate Crace
-    - Gungahlin Market Place
-    - Ngunnawal Primary
-    - Nicholls Primary
-    - Federation Square
-    - Chuculba/William Slim
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [["-", "-", "-", "-", 701a, 704a, 713a, 723a, 733a, 738a, 748a, 750a, 754a], ["-", "-", "-", "-", 721a, 724a, 733a, 743a, 753a, 758a, 809a, 811a, 815a], ["-", "-", "-", "-", 741a, 744a, 753a, 803a, 813a, 818a, 829a, 831a, 835a], ["-", "-", "-", "-", 800a, 803a, 812a, 822a, 832a, 837a, 848a, 850a, 854a], ["-", "-", "-", "-", 821a, 824a, 833a, 843a, 853a, 858a, 906a, 908a, 912a], ["-", "-", "-", "-", 840a, 843a, 852a, 902a, 911a, 916a, 923a, 925a, 929a], ["-", "-", "-", "-", 940a, 943a, 952a, 1001a, 1010a, 1015a, 1022a, 1024a, 1028a], ["-", "-", "-", "-", 1040a, 1043a, 1052a, 1101a, 1110a, 1115a, 1122a, 1124a, 1128a], ["-", "-", "-", "-", 1140a, 1143a, 1152a, 1201p, 1210p, 1215p, 1222p, 1224p, 1228p], ["-", "-", "-", "-", 1240p, 1243p, 1252p, 101p, 110p, 115p, 122p, 124p, 128p], ["-", "-", "-", "-", 140p, 143p, 152p, 201p, 210p, 215p, 222p, 224p, 228p], ["-", "-", "-", "-", 240p, 243p, 252p, 301p, 310p, 315p, 322p, 324p, 328p], ["-", "-", "-", "-", 307p, 310p, 319p, 328p, 337p, 342p, 349p, 351p, 355p], [328p, 334p, 336p, 344p, 347p, 350p, 359p, 409p, 419p, 424p, 432p, 434p, 438p], [404p, 411p, 413p, 422p, 427p, 430p, 439p, 449p, 459p, 504p, 512p, 514p, 518p], [424p, 431p, 433p, 442p, 447p, 450p, 459p, 509p, 519p, 524p, 532p, 534p, 538p], [444p, 451p, 453p, 502p, 507p, 510p, 519p, 529p, 539p, 544p, 552p, 554p, 558p], [508p, 515p, 517p, 526p, 531p, 534p, 543p, 553p, 603p, 608p, 615p, 617p, 620p], [524p, 531p, 533p, 542p, 547p, 550p, 559p, 608p, 617p, 622p, 629p, 631p, 634p], [535p, 542p, 544p, 553p, 558p, 601p, 610p, 619p, 628p, 633p, 640p, 642p, 645p], [547p, 554p, 556p, 604p, 607p, 610p, 619p, 628p, 637p, 642p, 649p, 651p, 654p], [613p, 619p, 621p, 628p, 631p, 634p, 643p, 652p, 701p, 706p, 713p, 715p, 718p], ["-", "-", "-", "-", 740p, 743p, 752p, 801p, 810p, 815p, 822p, 824p, 827p], ["-", "-", "-", "-", 840p, 843p, 852p, 901p, 910p, 915p, 922p, 924p, 927p], ["-", "-", "-", "-", 940p, 943p, 952p, 1001p, 1010p, 1015p, 1022p, 1024p, 1027p], ["-", "-", "-", "-", 1040p, 1043p, 1052p, 1101p, 1110p, 1115p, 1122p, 1124p, 1127p], ["-", "-", "-", "-", 1140p, 1143p, 1152p, 1201a, 1210a, 1215a, 1222a, 1224a, 1227a]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "52"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 539a
-      - 547a
-      - 555a
-      - 601a
-      - 604a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 618a
-      - 626a
-      - 634a
-      - 640a
-      - 643a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 630a
-      - 632a
-      - 636a
-      - 646a
-      - 651a
-      - 659a
-      - 707a
-      - 713a
-      - 716a
-      - 719a
-      - 726a
-      - 728a
-      - 735a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 708a
-      - 716a
-      - 724a
-      - 730a
-      - 733a
-      - 736a
-      - 743a
-      - 745a
-      - 800a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 725a
-      - 733a
-      - 741a
-      - 747a
-      - 750a
-      - 755a
-      - 806a
-      - 811a
-      - 826a
-    - - 723a
-      - 725a
-      - 729a
-      - 739a
-      - 744a
-      - 752a
-      - 800a
-      - 807a
-      - 810a
-      - 815a
-      - 826a
-      - 831a
-      - 846a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 806a
-      - 814a
-      - 822a
-      - 829a
-      - 832a
-      - 837a
-      - 848a
-      - 853a
-      - 905a
-    - - 801a
-      - 803a
-      - 807a
-      - 818a
-      - 823a
-      - 831a
-      - 839a
-      - 846a
-      - 849a
-      - 854a
-      - 902a
-      - 907a
-      - 918a
-    - - 830a
-      - 832a
-      - 836a
-      - 847a
-      - 852a
-      - 900a
-      - 908a
-      - 914a
-      - 917a
-      - 920a
-      - 927a
-      - 929a
-      - 936a
-    - - 916a
-      - 918a
-      - 922a
-      - 932a
-      - 937a
-      - 945a
-      - 953a
-      - 959a
-      - 1002a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1016a
-      - 1018a
-      - 1022a
-      - 1032a
-      - 1037a
-      - 1045a
-      - 1053a
-      - 1059a
-      - 1102a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1116a
-      - 1118a
-      - 1122a
-      - 1132a
-      - 1137a
-      - 1145a
-      - 1153a
-      - 1159a
-      - 1202p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1216p
-      - 1218p
-      - 1222p
-      - 1232p
-      - 1237p
-      - 1245p
-      - 1253p
-      - 1259p
-      - 102p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 116p
-      - 118p
-      - 122p
-      - 132p
-      - 137p
-      - 145p
-      - 153p
-      - 159p
-      - 202p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 216p
-      - 218p
-      - 222p
-      - 232p
-      - 237p
-      - 245p
-      - 253p
-      - 259p
-      - 302p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 233p
-      - 235p
-      - 239p
-      - 249p
-      - 254p
-      - 302p
-      - 310p
-      - 316p
-      - 319p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 316p
-      - 318p
-      - 322p
-      - 332p
-      - 337p
-      - 345p
-      - 353p
-      - 359p
-      - 402p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 356p
-      - 358p
-      - 402p
-      - 413p
-      - 418p
-      - 427p
-      - 435p
-      - 442p
-      - 445p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 416p
-      - 418p
-      - 422p
-      - 433p
-      - 438p
-      - 447p
-      - 455p
-      - 502p
-      - 505p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 436p
-      - 438p
-      - 442p
-      - 453p
-      - 458p
-      - 507p
-      - 515p
-      - 522p
-      - 525p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 456p
-      - 458p
-      - 502p
-      - 513p
-      - 518p
-      - 527p
-      - 535p
-      - 542p
-      - 545p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 516p
-      - 518p
-      - 522p
-      - 533p
-      - 538p
-      - 547p
-      - 555p
-      - 602p
-      - 605p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 536p
-      - 538p
-      - 542p
-      - 553p
-      - 558p
-      - 606p
-      - 614p
-      - 620p
-      - 623p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 616p
-      - 618p
-      - 621p
-      - 631p
-      - 636p
-      - 644p
-      - 652p
-      - 658p
-      - 701p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 716p
-      - 718p
-      - 721p
-      - 731p
-      - 736p
-      - 744p
-      - 752p
-      - 758p
-      - 801p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 816p
-      - 818p
-      - 821p
-      - 831p
-      - 836p
-      - 844p
-      - 852p
-      - 858p
-      - 901p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 916p
-      - 918p
-      - 921p
-      - 931p
-      - 936p
-      - 944p
-      - 952p
-      - 958p
-      - 1001p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1016p
-      - 1018p
-      - 1021p
-      - 1031p
-      - 1036p
-      - 1044p
-      - 1052p
-      - 1058p
-      - 1101p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Chuculba/William Slim
-    - Federation Square
-    - Nicholls Primary
-    - Ngunnawal Primary
-    - Gungahlin Market Place
-    - Hibberson/Kate Crace
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [["-", "-", "-", "-", 539a, 547a, 555a, 601a, 604a, "-", "-", "-", "-"], ["-", "-", "-", "-", 618a, 626a, 634a, 640a, 643a, "-", "-", "-", "-"], [630a, 632a, 636a, 646a, 651a, 659a, 707a, 713a, 716a, 719a, 726a, 728a, 735a], ["-", "-", "-", "-", 708a, 716a, 724a, 730a, 733a, 736a, 743a, 745a, 800a], ["-", "-", "-", "-", 725a, 733a, 741a, 747a, 750a, 755a, 806a, 811a, 826a], [723a, 725a, 729a, 739a, 744a, 752a, 800a, 807a, 810a, 815a, 826a, 831a, 846a], ["-", "-", "-", "-", 806a, 814a, 822a, 829a, 832a, 837a, 848a, 853a, 905a], [801a, 803a, 807a, 818a, 823a, 831a, 839a, 846a, 849a, 854a, 902a, 907a, 918a], [830a, 832a, 836a, 847a, 852a, 900a, 908a, 914a, 917a, 920a, 927a, 929a, 936a], [916a, 918a, 922a, 932a, 937a, 945a, 953a, 959a, 1002a, "-", "-", "-", "-"], [1016a, 1018a, 1022a, 1032a, 1037a, 1045a, 1053a, 1059a, 1102a, "-", "-", "-", "-"], [1116a, 1118a, 1122a, 1132a, 1137a, 1145a, 1153a, 1159a, 1202p, "-", "-", "-", "-"], [1216p, 1218p, 1222p, 1232p, 1237p, 1245p, 1253p, 1259p, 102p, "-", "-", "-", "-"], [116p, 118p, 122p, 132p, 137p, 145p, 153p, 159p, 202p, "-", "-", "-", "-"], [216p, 218p, 222p, 232p, 237p, 245p, 253p, 259p, 302p, "-", "-", "-", "-"], [233p, 235p, 239p, 249p, 254p, 302p, 310p, 316p, 319p, "-", "-", "-", "-"], [316p, 318p, 322p, 332p, 337p, 345p, 353p, 359p, 402p, "-", "-", "-", "-"], [356p, 358p, 402p, 413p, 418p, 427p, 435p, 442p, 445p, "-", "-", "-", "-"], [416p, 418p, 422p, 433p, 438p, 447p, 455p, 502p, 505p, "-", "-", "-", "-"], [436p, 438p, 442p, 453p, 458p, 507p, 515p, 522p, 525p, "-", "-", "-", "-"], [456p, 458p, 502p, 513p, 518p, 527p, 535p, 542p, 545p, "-", "-", "-", "-"], [516p, 518p, 522p, 533p, 538p, 547p, 555p, 602p, 605p, "-", "-", "-", "-"], [536p, 538p, 542p, 553p, 558p, 606p, 614p, 620p, 623p, "-", "-", "-", "-"], [616p, 618p, 621p, 631p, 636p, 644p, 652p, 658p, 701p, "-", "-", "-", "-"], [716p, 718p, 721p, 731p, 736p, 744p, 752p, 758p, 801p, "-", "-", "-", "-"], [816p, 818p, 821p, 831p, 836p, 844p, 852p, 858p, 901p, "-", "-", "-", "-"], [916p, 918p, 921p, 931p, 936p, 944p, 952p, 958p, 1001p, "-", "-", "-", "-"], [1016p, 1018p, 1021p, 1031p, 1036p, 1044p, 1052p, 1058p, 1101p, "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "52"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 715a
-      - 718a
-      - 724a
-      - 732a
-      - 740a
-      - 745a
-      - 756a
-      - 758a
-      - 802a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 735a
-      - 738a
-      - 744a
-      - 753a
-      - 801a
-      - 806a
-      - 817a
-      - 819a
-      - 823a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 755a
-      - 758a
-      - 804a
-      - 813a
-      - 821a
-      - 826a
-      - 837a
-      - 839a
-      - 843a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 815a
-      - 818a
-      - 824a
-      - 833a
-      - 841a
-      - 846a
-      - 857a
-      - 859a
-      - 903a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 835a
-      - 838a
-      - 844a
-      - 853a
-      - 901a
-      - 906a
-      - 916a
-      - 918a
-      - 922a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 855a
-      - 858a
-      - 904a
-      - 912a
-      - 920a
-      - 925a
-      - 935a
-      - 937a
-      - 941a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 915a
-      - 918a
-      - 924a
-      - 932a
-      - 940a
-      - 945a
-      - 955a
-      - 957a
-      - 1001a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 942a
-      - 945a
-      - 951a
-      - 959a
-      - 1007a
-      - 1012a
-      - 1022a
-      - 1024a
-      - 1028a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1005a
-      - 1008a
-      - 1014a
-      - 1022a
-      - 1030a
-      - 1035a
-      - 1045a
-      - 1047a
-      - 1051a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1105a
-      - 1108a
-      - 1114a
-      - 1122a
-      - 1130a
-      - 1135a
-      - 1145a
-      - 1147a
-      - 1151a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1205p
-      - 1208p
-      - 1214p
-      - 1222p
-      - 1230p
-      - 1235p
-      - 1245p
-      - 1247p
-      - 1251p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 105p
-      - 108p
-      - 114p
-      - 122p
-      - 130p
-      - 135p
-      - 145p
-      - 147p
-      - 151p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 205p
-      - 208p
-      - 214p
-      - 222p
-      - 230p
-      - 235p
-      - 245p
-      - 247p
-      - 251p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 301p
-      - 304p
-      - 310p
-      - 318p
-      - 326p
-      - 331p
-      - 341p
-      - 343p
-      - 347p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 340p
-      - 343p
-      - 349p
-      - 357p
-      - 405p
-      - 410p
-      - 421p
-      - 423p
-      - 427p
-    - - 341p
-      - 347p
-      - 349p
-      - 357p
-      - 400p
-      - 403p
-      - 409p
-      - 418p
-      - 426p
-      - 431p
-      - 442p
-      - 444p
-      - 448p
-    - - 357p
-      - 404p
-      - 406p
-      - 415p
-      - 420p
-      - 423p
-      - 429p
-      - 438p
-      - 446p
-      - 451p
-      - 502p
-      - 504p
-      - 508p
-    - - 417p
-      - 424p
-      - 426p
-      - 435p
-      - 440p
-      - 443p
-      - 449p
-      - 458p
-      - 506p
-      - 511p
-      - 522p
-      - 524p
-      - 528p
-    - - 437p
-      - 444p
-      - 446p
-      - 455p
-      - 500p
-      - 503p
-      - 509p
-      - 518p
-      - 526p
-      - 531p
-      - 542p
-      - 544p
-      - 548p
-    - - 457p
-      - 504p
-      - 506p
-      - 515p
-      - 520p
-      - 523p
-      - 529p
-      - 538p
-      - 546p
-      - 551p
-      - 602p
-      - 604p
-      - 607p
-    - - 517p
-      - 524p
-      - 526p
-      - 535p
-      - 540p
-      - 543p
-      - 549p
-      - 558p
-      - 606p
-      - 611p
-      - 621p
-      - 623p
-      - 626p
-    - - 534p
-      - 541p
-      - 543p
-      - 552p
-      - 557p
-      - 600p
-      - 606p
-      - 614p
-      - 622p
-      - 627p
-      - 637p
-      - 639p
-      - 642p
-    - - 557p
-      - 603p
-      - 605p
-      - 612p
-      - 615p
-      - 618p
-      - 624p
-      - 632p
-      - 640p
-      - 645p
-      - 655p
-      - 657p
-      - 700p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 705p
-      - 708p
-      - 714p
-      - 722p
-      - 730p
-      - 735p
-      - 745p
-      - 747p
-      - 750p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 805p
-      - 808p
-      - 814p
-      - 822p
-      - 830p
-      - 835p
-      - 845p
-      - 847p
-      - 850p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 905p
-      - 908p
-      - 914p
-      - 922p
-      - 930p
-      - 935p
-      - 945p
-      - 947p
-      - 950p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1005p
-      - 1008p
-      - 1014p
-      - 1022p
-      - 1030p
-      - 1035p
-      - 1045p
-      - 1047p
-      - 1050p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1105p
-      - 1108p
-      - 1114p
-      - 1122p
-      - 1130p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Hibberson/Kate Crace
-    - Gungahlin Market Place
-    - Ngunnawal Primary
-    - Nicholls Primary
-    - Federation Square
-    - Chuculba/William Slim
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [["-", "-", "-", "-", 715a, 718a, 724a, 732a, 740a, 745a, 756a, 758a, 802a], ["-", "-", "-", "-", 735a, 738a, 744a, 753a, 801a, 806a, 817a, 819a, 823a], ["-", "-", "-", "-", 755a, 758a, 804a, 813a, 821a, 826a, 837a, 839a, 843a], ["-", "-", "-", "-", 815a, 818a, 824a, 833a, 841a, 846a, 857a, 859a, 903a], ["-", "-", "-", "-", 835a, 838a, 844a, 853a, 901a, 906a, 916a, 918a, 922a], ["-", "-", "-", "-", 855a, 858a, 904a, 912a, 920a, 925a, 935a, 937a, 941a], ["-", "-", "-", "-", 915a, 918a, 924a, 932a, 940a, 945a, 955a, 957a, 1001a], ["-", "-", "-", "-", 942a, 945a, 951a, 959a, 1007a, 1012a, 1022a, 1024a, 1028a], ["-", "-", "-", "-", 1005a, 1008a, 1014a, 1022a, 1030a, 1035a, 1045a, 1047a, 1051a], ["-", "-", "-", "-", 1105a, 1108a, 1114a, 1122a, 1130a, 1135a, 1145a, 1147a, 1151a], ["-", "-", "-", "-", 1205p, 1208p, 1214p, 1222p, 1230p, 1235p, 1245p, 1247p, 1251p], ["-", "-", "-", "-", 105p, 108p, 114p, 122p, 130p, 135p, 145p, 147p, 151p], ["-", "-", "-", "-", 205p, 208p, 214p, 222p, 230p, 235p, 245p, 247p, 251p], ["-", "-", "-", "-", 301p, 304p, 310p, 318p, 326p, 331p, 341p, 343p, 347p], ["-", "-", "-", "-", 340p, 343p, 349p, 357p, 405p, 410p, 421p, 423p, 427p], [341p, 347p, 349p, 357p, 400p, 403p, 409p, 418p, 426p, 431p, 442p, 444p, 448p], [357p, 404p, 406p, 415p, 420p, 423p, 429p, 438p, 446p, 451p, 502p, 504p, 508p], [417p, 424p, 426p, 435p, 440p, 443p, 449p, 458p, 506p, 511p, 522p, 524p, 528p], [437p, 444p, 446p, 455p, 500p, 503p, 509p, 518p, 526p, 531p, 542p, 544p, 548p], [457p, 504p, 506p, 515p, 520p, 523p, 529p, 538p, 546p, 551p, 602p, 604p, 607p], [517p, 524p, 526p, 535p, 540p, 543p, 549p, 558p, 606p, 611p, 621p, 623p, 626p], [534p, 541p, 543p, 552p, 557p, 600p, 606p, 614p, 622p, 627p, 637p, 639p, 642p], [557p, 603p, 605p, 612p, 615p, 618p, 624p, 632p, 640p, 645p, 655p, 657p, 700p], ["-", "-", "-", "-", 705p, 708p, 714p, 722p, 730p, 735p, 745p, 747p, 750p], ["-", "-", "-", "-", 805p, 808p, 814p, 822p, 830p, 835p, 845p, 847p, 850p], ["-", "-", "-", "-", 905p, 908p, 914p, 922p, 930p, 935p, 945p, 947p, 950p], ["-", "-", "-", "-", 1005p, 1008p, 1014p, 1022p, 1030p, 1035p, 1045p, 1047p, 1050p], ["-", "-", "-", "-", 1105p, 1108p, 1114p, 1122p, 1130p, "-", "-", "-", "-"]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "56"
-    stop_times: 
-    - - 537a
-      - 539a
-      - 543a
-      - 557a
-      - 608a
-      - 618a
-      - 625a
-      - 631a
-      - 633a
-      - 639a
-    - - 617a
-      - 619a
-      - 623a
-      - 637a
-      - 648a
-      - 658a
-      - 705a
-      - 711a
-      - 713a
-      - 719a
-    - - 637a
-      - 639a
-      - 643a
-      - 657a
-      - 708a
-      - 718a
-      - 725a
-      - 731a
-      - 733a
-      - 739a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 722a
-      - 731a
-      - 738a
-      - 744a
-      - 749a
-      - 804a
-    - - 701a
-      - 703a
-      - 707a
-      - 721a
-      - 732a
-      - 741a
-      - 749a
-      - 800a
-      - 805a
-      - 820a
-    - - 720a
-      - 722a
-      - 726a
-      - 740a
-      - 751a
-      - 805a
-      - 813a
-      - 824a
-      - 829a
-      - 844a
-    - - 741a
-      - 743a
-      - 747a
-      - 802a
-      - 813a
-      - 827a
-      - 835a
-      - 846a
-      - 851a
-      - 902a
-    - - 805a
-      - 807a
-      - 811a
-      - 826a
-      - 837a
-      - 851a
-      - 858a
-      - 904a
-      - 909a
-      - 919a
-    - - 850a
-      - 852a
-      - 856a
-      - 910a
-      - 920a
-      - 930a
-      - 937a
-      - 943a
-      - 945a
-      - 951a
-    - - 933a
-      - 935a
-      - 939a
-      - 953a
-      - 1003a
-      - 1013a
-      - 1020a
-      - 1026a
-      - 1028a
-      - 1034a
-    - - 1033a
-      - 1035a
-      - 1039a
-      - 1053a
-      - 1103a
-      - 1113a
-      - 1120a
-      - 1126a
-      - 1128a
-      - 1134a
-    - - 1133a
-      - 1135a
-      - 1139a
-      - 1153a
-      - 1203p
-      - 1213p
-      - 1220p
-      - 1226p
-      - 1228p
-      - 1234p
-    - - 1233p
-      - 1235p
-      - 1239p
-      - 1253p
-      - 103p
-      - 113p
-      - 120p
-      - 126p
-      - 128p
-      - 134p
-    - - 133p
-      - 135p
-      - 139p
-      - 153p
-      - 203p
-      - 213p
-      - 220p
-      - 226p
-      - 228p
-      - 234p
-    - - 238p
-      - 240p
-      - 244p
-      - 258p
-      - 308p
-      - 318p
-      - 325p
-      - 331p
-      - 333p
-      - 339p
-    - - 315p
-      - 317p
-      - 321p
-      - 335p
-      - 345p
-      - 355p
-      - 402p
-      - 409p
-      - 411p
-      - 418p
-    - - 343p
-      - 345p
-      - 349p
-      - 403p
-      - 414p
-      - 426p
-      - 434p
-      - 441p
-      - 443p
-      - 450p
-    - - 423p
-      - 425p
-      - 429p
-      - 444p
-      - 455p
-      - 507p
-      - 515p
-      - 522p
-      - 524p
-      - 531p
-    - - 443p
-      - 445p
-      - 449p
-      - 504p
-      - 515p
-      - 525p
-      - 533p
-      - 540p
-      - 542p
-      - 549p
-    - - 459p
-      - 501p
-      - 505p
-      - 520p
-      - 531p
-      - 543p
-      - 551p
-      - 558p
-      - 600p
-      - 605p
-    - - 519p
-      - 521p
-      - 525p
-      - 540p
-      - 551p
-      - 603p
-      - 610p
-      - 616p
-      - 618p
-      - 623p
-    - - 539p
-      - 541p
-      - 545p
-      - 600p
-      - 610p
-      - 620p
-      - 627p
-      - 633p
-      - 635p
-      - 640p
-    - - 600p
-      - 602p
-      - 605p
-      - 619p
-      - 629p
-      - 639p
-      - 646p
-      - 652p
-      - 654p
-      - 659p
-    - - 633p
-      - 635p
-      - 638p
-      - 652p
-      - 702p
-      - 712p
-      - 719p
-      - 725p
-      - 727p
-      - 732p
-    - - 733p
-      - 735p
-      - 738p
-      - 752p
-      - 802p
-      - 812p
-      - 819p
-      - 825p
-      - 827p
-      - 832p
-    - - 833p
-      - 835p
-      - 838p
-      - 852p
-      - 902p
-      - 912p
-      - 919p
-      - 925p
-      - 927p
-      - 932p
-    - - 933p
-      - 935p
-      - 938p
-      - 952p
-      - 1002p
-      - 1012p
-      - 1019p
-      - 1025p
-      - 1027p
-      - 1032p
-    - - 1033p
-      - 1035p
-      - 1038p
-      - 1052p
-      - 1102p
-      - 1112p
-      - 1119p
-      - 1125p
-      - 1127p
-      - 1132p
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Chuculba/William Slim
-    - Gungahlin Market Place
-    - Kosciuszko/Everard
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [[537a, 539a, 543a, 557a, 608a, 618a, 625a, 631a, 633a, 639a], [617a, 619a, 623a, 637a, 648a, 658a, 705a, 711a, 713a, 719a], [637a, 639a, 643a, 657a, 708a, 718a, 725a, 731a, 733a, 739a], ["-", "-", "-", "-", 722a, 731a, 738a, 744a, 749a, 804a], [701a, 703a, 707a, 721a, 732a, 741a, 749a, 800a, 805a, 820a], [720a, 722a, 726a, 740a, 751a, 805a, 813a, 824a, 829a, 844a], [741a, 743a, 747a, 802a, 813a, 827a, 835a, 846a, 851a, 902a], [805a, 807a, 811a, 826a, 837a, 851a, 858a, 904a, 909a, 919a], [850a, 852a, 856a, 910a, 920a, 930a, 937a, 943a, 945a, 951a], [933a, 935a, 939a, 953a, 1003a, 1013a, 1020a, 1026a, 1028a, 1034a], [1033a, 1035a, 1039a, 1053a, 1103a, 1113a, 1120a, 1126a, 1128a, 1134a], [1133a, 1135a, 1139a, 1153a, 1203p, 1213p, 1220p, 1226p, 1228p, 1234p], [1233p, 1235p, 1239p, 1253p, 103p, 113p, 120p, 126p, 128p, 134p], [133p, 135p, 139p, 153p, 203p, 213p, 220p, 226p, 228p, 234p], [238p, 240p, 244p, 258p, 308p, 318p, 325p, 331p, 333p, 339p], [315p, 317p, 321p, 335p, 345p, 355p, 402p, 409p, 411p, 418p], [343p, 345p, 349p, 403p, 414p, 426p, 434p, 441p, 443p, 450p], [423p, 425p, 429p, 444p, 455p, 507p, 515p, 522p, 524p, 531p], [443p, 445p, 449p, 504p, 515p, 525p, 533p, 540p, 542p, 549p], [459p, 501p, 505p, 520p, 531p, 543p, 551p, 558p, 600p, 605p], [519p, 521p, 525p, 540p, 551p, 603p, 610p, 616p, 618p, 623p], [539p, 541p, 545p, 600p, 610p, 620p, 627p, 633p, 635p, 640p], [600p, 602p, 605p, 619p, 629p, 639p, 646p, 652p, 654p, 659p], [633p, 635p, 638p, 652p, 702p, 712p, 719p, 725p, 727p, 732p], [733p, 735p, 738p, 752p, 802p, 812p, 819p, 825p, 827p, 832p], [833p, 835p, 838p, 852p, 902p, 912p, 919p, 925p, 927p, 932p], [933p, 935p, 938p, 952p, 1002p, 1012p, 1019p, 1025p, 1027p, 1032p], [1033p, 1035p, 1038p, 1052p, 1102p, 1112p, 1119p, 1125p, 1127p, 1132p]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "56"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 602a
-      - 612a
-      - 623a
-      - 637a
-      - 639a
-      - 643a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 636a
-      - 646a
-      - 657a
-      - 711a
-      - 713a
-      - 717a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 706a
-      - 716a
-      - 727a
-      - 741a
-      - 743a
-      - 747a
-    - - 651a
-      - 657a
-      - 659a
-      - 705a
-      - 712a
-      - 722a
-      - 733a
-      - 747a
-      - 749a
-      - 753a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 726a
-      - 736a
-      - 747a
-      - 802a
-      - 804a
-      - 808a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 744a
-      - 756a
-      - 807a
-      - 822a
-      - 824a
-      - 828a
-    - - 741a
-      - 747a
-      - 749a
-      - 755a
-      - 803a
-      - 815a
-      - 826a
-      - 841a
-      - 843a
-      - 847a
-    - - 801a
-      - 808a
-      - 810a
-      - 816a
-      - 824a
-      - 836a
-      - 847a
-      - 902a
-      - 904a
-      - 908a
-    - - 821a
-      - 828a
-      - 830a
-      - 836a
-      - 844a
-      - 856a
-      - 906a
-      - 920a
-      - 922a
-      - 926a
-    - - 851a
-      - 858a
-      - 900a
-      - 906a
-      - 913a
-      - 925a
-      - 935a
-      - 949a
-      - 951a
-      - 955a
-    - - 1004a
-      - 1010a
-      - 1012a
-      - 1018a
-      - 1025a
-      - 1037a
-      - 1047a
-      - 1101a
-      - 1103a
-      - 1107a
-    - - 1104a
-      - 1110a
-      - 1112a
-      - 1118a
-      - 1125a
-      - 1137a
-      - 1147a
-      - 1201p
-      - 1203p
-      - 1207p
-    - - 1204p
-      - 1210p
-      - 1212p
-      - 1218p
-      - 1225p
-      - 1237p
-      - 1247p
-      - 101p
-      - 103p
-      - 107p
-    - - 104p
-      - 110p
-      - 112p
-      - 118p
-      - 125p
-      - 137p
-      - 147p
-      - 201p
-      - 203p
-      - 207p
-    - - 204p
-      - 210p
-      - 212p
-      - 218p
-      - 225p
-      - 237p
-      - 247p
-      - 301p
-      - 303p
-      - 307p
-    - - 304p
-      - 311p
-      - 313p
-      - 320p
-      - 328p
-      - 340p
-      - 351p
-      - 406p
-      - 408p
-      - 412p
-    - - 358p
-      - 405p
-      - 407p
-      - 414p
-      - 422p
-      - 434p
-      - 445p
-      - 501p
-      - 502p
-      - 509p
-    - - 409p
-      - 416p
-      - 418p
-      - 425p
-      - 433p
-      - 445p
-      - 456p
-      - 511p
-      - 513p
-      - 517p
-    - - 429p
-      - 436p
-      - 438p
-      - 445p
-      - 453p
-      - 505p
-      - 516p
-      - 531p
-      - 533p
-      - 537p
-    - - 449p
-      - 456p
-      - 458p
-      - 505p
-      - 513p
-      - 525p
-      - 536p
-      - 551p
-      - 553p
-      - 557p
-    - - 510p
-      - 517p
-      - 519p
-      - 526p
-      - 534p
-      - 546p
-      - 557p
-      - 611p
-      - 613p
-      - 616p
-    - - 530p
-      - 537p
-      - 539p
-      - 546p
-      - 554p
-      - 605p
-      - 615p
-      - 629p
-      - 631p
-      - 634p
-    - - 550p
-      - 557p
-      - 559p
-      - 604p
-      - 611p
-      - 621p
-      - 631p
-      - 645p
-      - 647p
-      - 650p
-    - - 610p
-      - 616p
-      - 618p
-      - 623p
-      - 630p
-      - 640p
-      - 650p
-      - 704p
-      - 706p
-      - 709p
-    - - 704p
-      - 710p
-      - 712p
-      - 717p
-      - 724p
-      - 734p
-      - 744p
-      - 758p
-      - 800p
-      - 803p
-    - - 804p
-      - 810p
-      - 812p
-      - 817p
-      - 824p
-      - 834p
-      - 844p
-      - 858p
-      - 900p
-      - 903p
-    - - 904p
-      - 910p
-      - 912p
-      - 917p
-      - 924p
-      - 934p
-      - 944p
-      - 958p
-      - 1000p
-      - 1003p
-    - - 1004p
-      - 1010p
-      - 1012p
-      - 1017p
-      - 1024p
-      - 1034p
-      - 1044p
-      - 1058p
-      - 1100p
-      - 1103p
-    - - 1104p
-      - 1110p
-      - 1112p
-      - 1117p
-      - 1124p
-      - 1134p
-      - 1144p
-      - 1158p
-      - 1200a
-      - 1203a
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Kosciuszko/Everard
-    - Gungahlin Market Place
-    - Chuculba/William Slim
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [["-", "-", "-", "-", 602a, 612a, 623a, 637a, 639a, 643a], ["-", "-", "-", "-", 636a, 646a, 657a, 711a, 713a, 717a], ["-", "-", "-", "-", 706a, 716a, 727a, 741a, 743a, 747a], [651a, 657a, 659a, 705a, 712a, 722a, 733a, 747a, 749a, 753a], ["-", "-", "-", "-", 726a, 736a, 747a, 802a, 804a, 808a], ["-", "-", "-", "-", 744a, 756a, 807a, 822a, 824a, 828a], [741a, 747a, 749a, 755a, 803a, 815a, 826a, 841a, 843a, 847a], [801a, 808a, 810a, 816a, 824a, 836a, 847a, 902a, 904a, 908a], [821a, 828a, 830a, 836a, 844a, 856a, 906a, 920a, 922a, 926a], [851a, 858a, 900a, 906a, 913a, 925a, 935a, 949a, 951a, 955a], [1004a, 1010a, 1012a, 1018a, 1025a, 1037a, 1047a, 1101a, 1103a, 1107a], [1104a, 1110a, 1112a, 1118a, 1125a, 1137a, 1147a, 1201p, 1203p, 1207p], [1204p, 1210p, 1212p, 1218p, 1225p, 1237p, 1247p, 101p, 103p, 107p], [104p, 110p, 112p, 118p, 125p, 137p, 147p, 201p, 203p, 207p], [204p, 210p, 212p, 218p, 225p, 237p, 247p, 301p, 303p, 307p], [304p, 311p, 313p, 320p, 328p, 340p, 351p, 406p, 408p, 412p], [358p, 405p, 407p, 414p, 422p, 434p, 445p, 501p, 502p, 509p], [409p, 416p, 418p, 425p, 433p, 445p, 456p, 511p, 513p, 517p], [429p, 436p, 438p, 445p, 453p, 505p, 516p, 531p, 533p, 537p], [449p, 456p, 458p, 505p, 513p, 525p, 536p, 551p, 553p, 557p], [510p, 517p, 519p, 526p, 534p, 546p, 557p, 611p, 613p, 616p], [530p, 537p, 539p, 546p, 554p, 605p, 615p, 629p, 631p, 634p], [550p, 557p, 559p, 604p, 611p, 621p, 631p, 645p, 647p, 650p], [610p, 616p, 618p, 623p, 630p, 640p, 650p, 704p, 706p, 709p], [704p, 710p, 712p, 717p, 724p, 734p, 744p, 758p, 800p, 803p], [804p, 810p, 812p, 817p, 824p, 834p, 844p, 858p, 900p, 903p], [904p, 910p, 912p, 917p, 924p, 934p, 944p, 958p, 1000p, 1003p], [1004p, 1010p, 1012p, 1017p, 1024p, 1034p, 1044p, 1058p, 1100p, 1103p], [1104p, 1110p, 1112p, 1117p, 1124p, 1134p, 1144p, 1158p, 1200a, 1203a]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "58"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 543a
-      - 554a
-      - 602a
-      - 609a
-      - 615a
-      - 621a
-      - 623a
-      - 629a
-    - - "-"
-      - "-"
-      - "-"
-      - 623a
-      - 634a
-      - 642a
-      - 649a
-      - 655a
-      - 701a
-      - 703a
-      - 709a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 654a
-      - 702a
-      - 709a
-      - 715a
-      - 721a
-      - 723a
-      - 729a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 713a
-      - 721a
-      - 728a
-      - 734a
-      - 740a
-      - 742a
-      - 752a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 723a
-      - 731a
-      - 738a
-      - 744a
-      - 754a
-      - 759a
-      - 814a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 740a
-      - 748a
-      - 755a
-      - 803a
-      - 814a
-      - 819a
-      - 834a
-    - - 726a
-      - 728a
-      - 732a
-      - 746a
-      - 757a
-      - 806a
-      - 813a
-      - 821a
-      - 833a
-      - 839a
-      - 854a
-    - - 747a
-      - 749a
-      - 753a
-      - 808a
-      - 819a
-      - 828a
-      - 835a
-      - 843a
-      - 854a
-      - 859a
-      - 909a
-    - - 829a
-      - 831a
-      - 835a
-      - 850a
-      - 901a
-      - 909a
-      - 916a
-      - 923a
-      - 929a
-      - 931a
-      - 937a
-    - - 909a
-      - 911a
-      - 915a
-      - 929a
-      - 939a
-      - 947a
-      - 954a
-      - 1001a
-      - 1007a
-      - 1009a
-      - 1015a
-    - - 1009a
-      - 1011a
-      - 1015a
-      - 1029a
-      - 1039a
-      - 1047a
-      - 1054a
-      - 1101a
-      - 1107a
-      - 1109a
-      - 1115a
-    - - 1109a
-      - 1111a
-      - 1115a
-      - 1129a
-      - 1139a
-      - 1147a
-      - 1154a
-      - 1201p
-      - 1207p
-      - 1209p
-      - 1215p
-    - - 1209p
-      - 1211p
-      - 1215p
-      - 1229p
-      - 1239p
-      - 1247p
-      - 1254p
-      - 101p
-      - 107p
-      - 109p
-      - 115p
-    - - 109p
-      - 111p
-      - 115p
-      - 129p
-      - 139p
-      - 147p
-      - 154p
-      - 201p
-      - 207p
-      - 209p
-      - 215p
-    - - 209p
-      - 211p
-      - 215p
-      - 229p
-      - 239p
-      - 247p
-      - 254p
-      - 301p
-      - 307p
-      - 309p
-      - 315p
-    - - 309p
-      - 311p
-      - 315p
-      - 329p
-      - 339p
-      - 347p
-      - 354p
-      - 401p
-      - 408p
-      - 410p
-      - 417p
-    - - 409p
-      - 411p
-      - 415p
-      - 430p
-      - 441p
-      - 450p
-      - 457p
-      - 505p
-      - 512p
-      - 514p
-      - 521p
-    - - 429p
-      - 431p
-      - 435p
-      - 450p
-      - 501p
-      - 510p
-      - 517p
-      - 525p
-      - 532p
-      - 534p
-      - 541p
-    - - 449p
-      - 451p
-      - 455p
-      - 510p
-      - 521p
-      - 530p
-      - 537p
-      - 545p
-      - 552p
-      - 554p
-      - 601p
-    - - 509p
-      - 511p
-      - 515p
-      - 530p
-      - 541p
-      - 550p
-      - 557p
-      - 604p
-      - 610p
-      - 612p
-      - 617p
-    - - 529p
-      - 531p
-      - 535p
-      - 550p
-      - 601p
-      - 609p
-      - 616p
-      - 622p
-      - 628p
-      - 630p
-      - 635p
-    - - 549p
-      - 551p
-      - 555p
-      - 609p
-      - 619p
-      - 627p
-      - 633p
-      - 639p
-      - 645p
-      - 647p
-      - 652p
-    - - 609p
-      - 611p
-      - 614p
-      - 628p
-      - 638p
-      - 646p
-      - 653p
-      - 659p
-      - 705p
-      - 707p
-      - 712p
-    - - 709p
-      - 711p
-      - 714p
-      - 728p
-      - 738p
-      - 746p
-      - 753p
-      - 759p
-      - 805p
-      - 807p
-      - 812p
-    - - 809p
-      - 811p
-      - 814p
-      - 828p
-      - 838p
-      - 846p
-      - 853p
-      - 859p
-      - 905p
-      - 907p
-      - 912p
-    - - 909p
-      - 911p
-      - 914p
-      - 928p
-      - 938p
-      - 946p
-      - 953p
-      - 959p
-      - 1005p
-      - 1007p
-      - 1012p
-    - - 1009p
-      - 1011p
-      - 1014p
-      - 1028p
-      - 1038p
-      - 1046p
-      - 1053p
-      - 1059p
-      - 1105p
-      - 1107p
-      - 1112p
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Chuculba/William Slim
-    - Gungahlin Market Place
-    - Anthony Rolfe/Moonlight
-    - Flemington/Nullabor
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [["-", "-", "-", 543a, 554a, 602a, 609a, 615a, 621a, 623a, 629a], ["-", "-", "-", 623a, 634a, 642a, 649a, 655a, 701a, 703a, 709a], ["-", "-", "-", "-", 654a, 702a, 709a, 715a, 721a, 723a, 729a], ["-", "-", "-", "-", 713a, 721a, 728a, 734a, 740a, 742a, 752a], ["-", "-", "-", "-", 723a, 731a, 738a, 744a, 754a, 759a, 814a], ["-", "-", "-", "-", 740a, 748a, 755a, 803a, 814a, 819a, 834a], [726a, 728a, 732a, 746a, 757a, 806a, 813a, 821a, 833a, 839a, 854a], [747a, 749a, 753a, 808a, 819a, 828a, 835a, 843a, 854a, 859a, 909a], [829a, 831a, 835a, 850a, 901a, 909a, 916a, 923a, 929a, 931a, 937a], [909a, 911a, 915a, 929a, 939a, 947a, 954a, 1001a, 1007a, 1009a, 1015a], [1009a, 1011a, 1015a, 1029a, 1039a, 1047a, 1054a, 1101a, 1107a, 1109a, 1115a], [1109a, 1111a, 1115a, 1129a, 1139a, 1147a, 1154a, 1201p, 1207p, 1209p, 1215p], [1209p, 1211p, 1215p, 1229p, 1239p, 1247p, 1254p, 101p, 107p, 109p, 115p], [109p, 111p, 115p, 129p, 139p, 147p, 154p, 201p, 207p, 209p, 215p], [209p, 211p, 215p, 229p, 239p, 247p, 254p, 301p, 307p, 309p, 315p], [309p, 311p, 315p, 329p, 339p, 347p, 354p, 401p, 408p, 410p, 417p], [409p, 411p, 415p, 430p, 441p, 450p, 457p, 505p, 512p, 514p, 521p], [429p, 431p, 435p, 450p, 501p, 510p, 517p, 525p, 532p, 534p, 541p], [449p, 451p, 455p, 510p, 521p, 530p, 537p, 545p, 552p, 554p, 601p], [509p, 511p, 515p, 530p, 541p, 550p, 557p, 604p, 610p, 612p, 617p], [529p, 531p, 535p, 550p, 601p, 609p, 616p, 622p, 628p, 630p, 635p], [549p, 551p, 555p, 609p, 619p, 627p, 633p, 639p, 645p, 647p, 652p], [609p, 611p, 614p, 628p, 638p, 646p, 653p, 659p, 705p, 707p, 712p], [709p, 711p, 714p, 728p, 738p, 746p, 753p, 759p, 805p, 807p, 812p], [809p, 811p, 814p, 828p, 838p, 846p, 853p, 859p, 905p, 907p, 912p], [909p, 911p, 914p, 928p, 938p, 946p, 953p, 959p, 1005p, 1007p, 1012p], [1009p, 1011p, 1014p, 1028p, 1038p, 1046p, 1053p, 1059p, 1105p, 1107p, 1112p]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "58"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 551a
-      - 558a
-      - 606a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 624a
-      - 631a
-      - 639a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 631a
-      - 637a
-      - 639a
-      - 645a
-      - 651a
-      - 658a
-      - 706a
-      - 717a
-      - 731a
-      - 733a
-      - 737a
-    - - 711a
-      - 717a
-      - 719a
-      - 725a
-      - 731a
-      - 738a
-      - 746a
-      - 757a
-      - 812a
-      - 814a
-      - 818a
-    - - 727a
-      - 733a
-      - 735a
-      - 741a
-      - 748a
-      - 757a
-      - 806a
-      - 817a
-      - 832a
-      - 834a
-      - 838a
-    - - 745a
-      - 752a
-      - 754a
-      - 800a
-      - 808a
-      - 817a
-      - 826a
-      - 837a
-      - 852a
-      - 854a
-      - 858a
-    - - 805a
-      - 812a
-      - 814a
-      - 820a
-      - 828a
-      - 837a
-      - 846a
-      - 857a
-      - 911a
-      - 913a
-      - 917a
-    - - 917a
-      - 923a
-      - 925a
-      - 931a
-      - 938a
-      - 945a
-      - 953a
-      - 1003a
-      - 1017a
-      - 1019a
-      - 1023a
-    - - 1017a
-      - 1023a
-      - 1025a
-      - 1031a
-      - 1038a
-      - 1045a
-      - 1053a
-      - 1103a
-      - 1117a
-      - 1119a
-      - 1123a
-    - - 1117a
-      - 1123a
-      - 1125a
-      - 1131a
-      - 1138a
-      - 1145a
-      - 1153a
-      - 1203p
-      - 1217p
-      - 1219p
-      - 1223p
-    - - 1217p
-      - 1223p
-      - 1225p
-      - 1231p
-      - 1238p
-      - 1245p
-      - 1253p
-      - 103p
-      - 117p
-      - 119p
-      - 123p
-    - - 117p
-      - 123p
-      - 125p
-      - 131p
-      - 138p
-      - 145p
-      - 153p
-      - 203p
-      - 217p
-      - 219p
-      - 223p
-    - - 217p
-      - 223p
-      - 225p
-      - 231p
-      - 238p
-      - 245p
-      - 253p
-      - 303p
-      - 318p
-      - 320p
-      - 324p
-    - - 328p
-      - 335p
-      - 337p
-      - 344p
-      - 352p
-      - 401p
-      - 410p
-      - 421p
-      - 436p
-      - 438p
-      - 442p
-    - - 419p
-      - 426p
-      - 428p
-      - 435p
-      - 443p
-      - 452p
-      - 501p
-      - 512p
-      - 527p
-      - 529p
-      - 533p
-    - - 439p
-      - 446p
-      - 448p
-      - 455p
-      - 503p
-      - 512p
-      - 521p
-      - 532p
-      - 547p
-      - 549p
-      - 553p
-    - - 500p
-      - 507p
-      - 509p
-      - 516p
-      - 524p
-      - 533p
-      - 542p
-      - 553p
-      - 607p
-      - 609p
-      - 612p
-    - - 520p
-      - 527p
-      - 529p
-      - 536p
-      - 544p
-      - 553p
-      - 602p
-      - 612p
-      - 626p
-      - 628p
-      - 631p
-    - - 540p
-      - 547p
-      - 549p
-      - 556p
-      - 603p
-      - 610p
-      - 618p
-      - 628p
-      - 642p
-      - 644p
-      - 647p
-    - - 600p
-      - 606p
-      - 608p
-      - 613p
-      - 619p
-      - 626p
-      - 634p
-      - 644p
-      - 658p
-      - 700p
-      - 703p
-    - - 631p
-      - 637p
-      - 639p
-      - 644p
-      - 650p
-      - 657p
-      - 705p
-      - 715p
-      - 729p
-      - 731p
-      - 734p
-    - - 717p
-      - 723p
-      - 725p
-      - 730p
-      - 736p
-      - 743p
-      - 751p
-      - 801p
-      - 815p
-      - 817p
-      - 820p
-    - - 817p
-      - 823p
-      - 825p
-      - 830p
-      - 836p
-      - 843p
-      - 851p
-      - 901p
-      - 915p
-      - 917p
-      - 920p
-    - - 917p
-      - 923p
-      - 925p
-      - 930p
-      - 936p
-      - 943p
-      - 951p
-      - 1001p
-      - 1015p
-      - 1017p
-      - 1020p
-    - - 1017p
-      - 1023p
-      - 1025p
-      - 1030p
-      - 1036p
-      - 1043p
-      - 1051p
-      - 1101p
-      - 1115p
-      - 1117p
-      - 1120p
-    - - 1117p
-      - 1123p
-      - 1125p
-      - 1130p
-      - 1136p
-      - 1143p
-      - 1151p
-      - 1201a
-      - 1215a
-      - 1217a
-      - 1220a
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Flemington/Nullabor
-    - Anthony Rolfe/Moonlight
-    - Gungahlin Market Place
-    - Chuculba/William Slim
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [["-", "-", "-", "-", 551a, 558a, 606a, "-", "-", "-", "-"], ["-", "-", "-", "-", 624a, 631a, 639a, "-", "-", "-", "-"], [631a, 637a, 639a, 645a, 651a, 658a, 706a, 717a, 731a, 733a, 737a], [711a, 717a, 719a, 725a, 731a, 738a, 746a, 757a, 812a, 814a, 818a], [727a, 733a, 735a, 741a, 748a, 757a, 806a, 817a, 832a, 834a, 838a], [745a, 752a, 754a, 800a, 808a, 817a, 826a, 837a, 852a, 854a, 858a], [805a, 812a, 814a, 820a, 828a, 837a, 846a, 857a, 911a, 913a, 917a], [917a, 923a, 925a, 931a, 938a, 945a, 953a, 1003a, 1017a, 1019a, 1023a], [1017a, 1023a, 1025a, 1031a, 1038a, 1045a, 1053a, 1103a, 1117a, 1119a, 1123a], [1117a, 1123a, 1125a, 1131a, 1138a, 1145a, 1153a, 1203p, 1217p, 1219p, 1223p], [1217p, 1223p, 1225p, 1231p, 1238p, 1245p, 1253p, 103p, 117p, 119p, 123p], [117p, 123p, 125p, 131p, 138p, 145p, 153p, 203p, 217p, 219p, 223p], [217p, 223p, 225p, 231p, 238p, 245p, 253p, 303p, 318p, 320p, 324p], [328p, 335p, 337p, 344p, 352p, 401p, 410p, 421p, 436p, 438p, 442p], [419p, 426p, 428p, 435p, 443p, 452p, 501p, 512p, 527p, 529p, 533p], [439p, 446p, 448p, 455p, 503p, 512p, 521p, 532p, 547p, 549p, 553p], [500p, 507p, 509p, 516p, 524p, 533p, 542p, 553p, 607p, 609p, 612p], [520p, 527p, 529p, 536p, 544p, 553p, 602p, 612p, 626p, 628p, 631p], [540p, 547p, 549p, 556p, 603p, 610p, 618p, 628p, 642p, 644p, 647p], [600p, 606p, 608p, 613p, 619p, 626p, 634p, 644p, 658p, 700p, 703p], [631p, 637p, 639p, 644p, 650p, 657p, 705p, 715p, 729p, 731p, 734p], [717p, 723p, 725p, 730p, 736p, 743p, 751p, 801p, 815p, 817p, 820p], [817p, 823p, 825p, 830p, 836p, 843p, 851p, 901p, 915p, 917p, 920p], [917p, 923p, 925p, 930p, 936p, 943p, 951p, 1001p, 1015p, 1017p, 1020p], [1017p, 1023p, 1025p, 1030p, 1036p, 1043p, 1051p, 1101p, 1115p, 1117p, 1120p], [1117p, 1123p, 1125p, 1130p, 1136p, 1143p, 1151p, 1201a, 1215a, 1217a, 1220a]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "59"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 542a
-      - 548a
-      - 603a
-      - 606a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 617a
-      - 623a
-      - 638a
-      - 641a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 650a
-      - 656a
-      - 711a
-      - 714a
-      - 717a
-      - 724a
-      - 726a
-      - 733a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 706a
-      - 712a
-      - 727a
-      - 730a
-      - 733a
-      - 740a
-      - 742a
-      - 754a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 718a
-      - 724a
-      - 739a
-      - 742a
-      - 745a
-      - 756a
-      - 801a
-      - 815a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 741a
-      - 747a
-      - 802a
-      - 805a
-      - 810a
-      - 821a
-      - 826a
-      - 841a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 813a
-      - 819a
-      - 834a
-      - 837a
-      - 842a
-      - 853a
-      - 858a
-      - 906a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 824a
-      - 830a
-      - 845a
-      - 848a
-      - 853a
-      - 904a
-      - 909a
-      - 920a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 857a
-      - 903a
-      - 918a
-      - 921a
-      - 924a
-      - 931a
-      - 933a
-      - 940a
-    - - 907a
-      - 909a
-      - 913a
-      - 927a
-      - 937a
-      - 943a
-      - 958a
-      - 1001a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1007a
-      - 1009a
-      - 1013a
-      - 1027a
-      - 1037a
-      - 1043a
-      - 1058a
-      - 1101a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1107a
-      - 1109a
-      - 1113a
-      - 1127a
-      - 1137a
-      - 1143a
-      - 1158a
-      - 1201p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1207p
-      - 1209p
-      - 1213p
-      - 1227p
-      - 1237p
-      - 1243p
-      - 1258p
-      - 101p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 107p
-      - 109p
-      - 113p
-      - 127p
-      - 137p
-      - 143p
-      - 158p
-      - 201p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 207p
-      - 209p
-      - 213p
-      - 227p
-      - 237p
-      - 243p
-      - 258p
-      - 301p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 244p
-      - 246p
-      - 250p
-      - 304p
-      - 314p
-      - 320p
-      - 335p
-      - 338p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 322p
-      - 324p
-      - 328p
-      - 343p
-      - 353p
-      - 359p
-      - 414p
-      - 417p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 337p
-      - 339p
-      - 343p
-      - 358p
-      - 408p
-      - 414p
-      - 429p
-      - 432p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 352p
-      - 354p
-      - 358p
-      - 413p
-      - 423p
-      - 429p
-      - 444p
-      - 447p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 407p
-      - 409p
-      - 413p
-      - 428p
-      - 438p
-      - 444p
-      - 459p
-      - 502p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 422p
-      - 424p
-      - 428p
-      - 443p
-      - 453p
-      - 459p
-      - 514p
-      - 517p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 437p
-      - 439p
-      - 443p
-      - 458p
-      - 508p
-      - 514p
-      - 529p
-      - 532p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 452p
-      - 454p
-      - 458p
-      - 513p
-      - 523p
-      - 529p
-      - 544p
-      - 547p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 507p
-      - 509p
-      - 513p
-      - 528p
-      - 538p
-      - 544p
-      - 559p
-      - 602p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 522p
-      - 524p
-      - 528p
-      - 543p
-      - 553p
-      - 559p
-      - 614p
-      - 617p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 535p
-      - 537p
-      - 541p
-      - 556p
-      - 605p
-      - 611p
-      - 626p
-      - 629p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 552p
-      - 554p
-      - 558p
-      - 612p
-      - 621p
-      - 627p
-      - 642p
-      - 645p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 608p
-      - 610p
-      - 613p
-      - 627p
-      - 636p
-      - 642p
-      - 657p
-      - 700p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 708p
-      - 710p
-      - 713p
-      - 727p
-      - 736p
-      - 742p
-      - 757p
-      - 800p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 808p
-      - 810p
-      - 813p
-      - 827p
-      - 836p
-      - 842p
-      - 857p
-      - 900p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 908p
-      - 910p
-      - 913p
-      - 927p
-      - 936p
-      - 942p
-      - 957p
-      - 1000p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1008p
-      - 1010p
-      - 1013p
-      - 1027p
-      - 1036p
-      - 1042p
-      - 1057p
-      - 1100p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1108p
-      - 1110p
-      - 1113p
-      - 1127p
-      - 1136p
-      - 1142p
-      - 1157p
-      - 1200a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Chuculba/William Slim
-    - Paul Coe / Mirrabei
-    - Katherine / Horse Park
-    - Gungahlin Market Place
-    - Hibberson/Kate Crace
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange
+    stop_times: [["-", "-", "-", "-", 542a, 548a, 603a, 606a, "-", "-", "-", "-"], ["-", "-", "-", "-", 617a, 623a, 638a, 641a, "-", "-", "-", "-"], ["-", "-", "-", "-", 650a, 656a, 711a, 714a, 717a, 724a, 726a, 733a], ["-", "-", "-", "-", 706a, 712a, 727a, 730a, 733a, 740a, 742a, 754a], ["-", "-", "-", "-", 718a, 724a, 739a, 742a, 745a, 756a, 801a, 815a], ["-", "-", "-", "-", 741a, 747a, 802a, 805a, 810a, 821a, 826a, 841a], ["-", "-", "-", "-", 813a, 819a, 834a, 837a, 842a, 853a, 858a, 906a], ["-", "-", "-", "-", 824a, 830a, 845a, 848a, 853a, 904a, 909a, 920a], ["-", "-", "-", "-", 857a, 903a, 918a, 921a, 924a, 931a, 933a, 940a], [907a, 909a, 913a, 927a, 937a, 943a, 958a, 1001a, "-", "-", "-", "-"], [1007a, 1009a, 1013a, 1027a, 1037a, 1043a, 1058a, 1101a, "-", "-", "-", "-"], [1107a, 1109a, 1113a, 1127a, 1137a, 1143a, 1158a, 1201p, "-", "-", "-", "-"], [1207p, 1209p, 1213p, 1227p, 1237p, 1243p, 1258p, 101p, "-", "-", "-", "-"], [107p, 109p, 113p, 127p, 137p, 143p, 158p, 201p, "-", "-", "-", "-"], [207p, 209p, 213p, 227p, 237p, 243p, 258p, 301p, "-", "-", "-", "-"], [244p, 246p, 250p, 304p, 314p, 320p, 335p, 338p, "-", "-", "-", "-"], [322p, 324p, 328p, 343p, 353p, 359p, 414p, 417p, "-", "-", "-", "-"], [337p, 339p, 343p, 358p, 408p, 414p, 429p, 432p, "-", "-", "-", "-"], [352p, 354p, 358p, 413p, 423p, 429p, 444p, 447p, "-", "-", "-", "-"], [407p, 409p, 413p, 428p, 438p, 444p, 459p, 502p, "-", "-", "-", "-"], [422p, 424p, 428p, 443p, 453p, 459p, 514p, 517p, "-", "-", "-", "-"], [437p, 439p, 443p, 458p, 508p, 514p, 529p, 532p, "-", "-", "-", "-"], [452p, 454p, 458p, 513p, 523p, 529p, 544p, 547p, "-", "-", "-", "-"], [507p, 509p, 513p, 528p, 538p, 544p, 559p, 602p, "-", "-", "-", "-"], [522p, 524p, 528p, 543p, 553p, 559p, 614p, 617p, "-", "-", "-", "-"], [535p, 537p, 541p, 556p, 605p, 611p, 626p, 629p, "-", "-", "-", "-"], [552p, 554p, 558p, 612p, 621p, 627p, 642p, 645p, "-", "-", "-", "-"], [608p, 610p, 613p, 627p, 636p, 642p, 657p, 700p, "-", "-", "-", "-"], [708p, 710p, 713p, 727p, 736p, 742p, 757p, 800p, "-", "-", "-", "-"], [808p, 810p, 813p, 827p, 836p, 842p, 857p, 900p, "-", "-", "-", "-"], [908p, 910p, 913p, 927p, 936p, 942p, 957p, 1000p, "-", "-", "-", "-"], [1008p, 1010p, 1013p, 1027p, 1036p, 1042p, 1057p, 1100p, "-", "-", "-", "-"], [1108p, 1110p, 1113p, 1127p, 1136p, 1142p, 1157p, 1200a, "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Paul Coe / Mirrabei, Katherine / Horse Park, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen Street Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "59"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 645a
-      - 648a
-      - 703a
-      - 709a
-      - 718a
-      - 732a
-      - 734a
-      - 738a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 710a
-      - 713a
-      - 728a
-      - 734a
-      - 743a
-      - 758a
-      - 800a
-      - 804a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 730a
-      - 733a
-      - 748a
-      - 754a
-      - 803a
-      - 818a
-      - 820a
-      - 824a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 755a
-      - 758a
-      - 813a
-      - 819a
-      - 828a
-      - 843a
-      - 845a
-      - 849a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 815a
-      - 818a
-      - 833a
-      - 839a
-      - 848a
-      - 903a
-      - 905a
-      - 909a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 907a
-      - 910a
-      - 925a
-      - 931a
-      - 940a
-      - 954a
-      - 956a
-      - 1000a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1007a
-      - 1010a
-      - 1025a
-      - 1031a
-      - 1040a
-      - 1054a
-      - 1056a
-      - 1100a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1107a
-      - 1110a
-      - 1125a
-      - 1131a
-      - 1140a
-      - 1154a
-      - 1156a
-      - 1200p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1207p
-      - 1210p
-      - 1225p
-      - 1231p
-      - 1240p
-      - 1254p
-      - 1256p
-      - 100p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 107p
-      - 110p
-      - 125p
-      - 131p
-      - 140p
-      - 154p
-      - 156p
-      - 200p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 207p
-      - 210p
-      - 225p
-      - 231p
-      - 240p
-      - 254p
-      - 256p
-      - 300p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 307p
-      - 310p
-      - 325p
-      - 331p
-      - 340p
-      - 354p
-      - 356p
-      - 400p
-    - - 326p
-      - 332p
-      - 334p
-      - 342p
-      - 345p
-      - 348p
-      - 403p
-      - 409p
-      - 419p
-      - 434p
-      - 436p
-      - 440p
-    - - 341p
-      - 347p
-      - 349p
-      - 357p
-      - 400p
-      - 403p
-      - 418p
-      - 424p
-      - 434p
-      - 449p
-      - 451p
-      - 455p
-    - - 353p
-      - 359p
-      - 401p
-      - 410p
-      - 415p
-      - 418p
-      - 433p
-      - 439p
-      - 449p
-      - 504p
-      - 506p
-      - 510p
-    - - 407p
-      - 414p
-      - 416p
-      - 425p
-      - 430p
-      - 433p
-      - 448p
-      - 454p
-      - 504p
-      - 519p
-      - 521p
-      - 525p
-    - - 422p
-      - 429p
-      - 431p
-      - 440p
-      - 445p
-      - 448p
-      - 503p
-      - 509p
-      - 519p
-      - 534p
-      - 536p
-      - 540p
-    - - 437p
-      - 444p
-      - 446p
-      - 455p
-      - 500p
-      - 503p
-      - 518p
-      - 524p
-      - 534p
-      - 549p
-      - 551p
-      - 555p
-    - - 452p
-      - 459p
-      - 501p
-      - 510p
-      - 515p
-      - 518p
-      - 533p
-      - 539p
-      - 549p
-      - 604p
-      - 606p
-      - 609p
-    - - 507p
-      - 514p
-      - 516p
-      - 525p
-      - 530p
-      - 533p
-      - 548p
-      - 554p
-      - 604p
-      - 618p
-      - 620p
-      - 623p
-    - - 522p
-      - 529p
-      - 531p
-      - 540p
-      - 545p
-      - 548p
-      - 603p
-      - 609p
-      - 618p
-      - 632p
-      - 634p
-      - 637p
-    - - 536p
-      - 543p
-      - 545p
-      - 554p
-      - 559p
-      - 602p
-      - 617p
-      - 623p
-      - 632p
-      - 646p
-      - 648p
-      - 651p
-    - - 552p
-      - 559p
-      - 601p
-      - 608p
-      - 611p
-      - 614p
-      - 629p
-      - 635p
-      - 644p
-      - 658p
-      - 700p
-      - 703p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 707p
-      - 710p
-      - 725p
-      - 731p
-      - 740p
-      - 754p
-      - 756p
-      - 759p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 807p
-      - 810p
-      - 825p
-      - 831p
-      - 840p
-      - 854p
-      - 856p
-      - 859p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 907p
-      - 910p
-      - 925p
-      - 931p
-      - 940p
-      - 954p
-      - 956p
-      - 959p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1007p
-      - 1010p
-      - 1025p
-      - 1031p
-      - 1040p
-      - 1054p
-      - 1056p
-      - 1059p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1107p
-      - 1110p
-      - 1125p
-      - 1131p
-      - 1140p
-      - 1154p
-      - 1156p
-      - 1159p
-    time_points: 
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Hibberson/Kate Crace
-    - Gungahlin Market Place
-    - Katherine / Horse Park
-    - Paul Coe / Mirrabei
-    - Chuculba/William Slim
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    stop_times: [["-", "-", "-", "-", 645a, 648a, 703a, 709a, 718a, 732a, 734a, 738a], ["-", "-", "-", "-", 710a, 713a, 728a, 734a, 743a, 758a, 800a, 804a], ["-", "-", "-", "-", 730a, 733a, 748a, 754a, 803a, 818a, 820a, 824a], ["-", "-", "-", "-", 755a, 758a, 813a, 819a, 828a, 843a, 845a, 849a], ["-", "-", "-", "-", 815a, 818a, 833a, 839a, 848a, 903a, 905a, 909a], ["-", "-", "-", "-", 907a, 910a, 925a, 931a, 940a, 954a, 956a, 1000a], ["-", "-", "-", "-", 1007a, 1010a, 1025a, 1031a, 1040a, 1054a, 1056a, 1100a], ["-", "-", "-", "-", 1107a, 1110a, 1125a, 1131a, 1140a, 1154a, 1156a, 1200p], ["-", "-", "-", "-", 1207p, 1210p, 1225p, 1231p, 1240p, 1254p, 1256p, 100p], ["-", "-", "-", "-", 107p, 110p, 125p, 131p, 140p, 154p, 156p, 200p], ["-", "-", "-", "-", 207p, 210p, 225p, 231p, 240p, 254p, 256p, 300p], ["-", "-", "-", "-", 307p, 310p, 325p, 331p, 340p, 354p, 356p, 400p], [326p, 332p, 334p, 342p, 345p, 348p, 403p, 409p, 419p, 434p, 436p, 440p], [341p, 347p, 349p, 357p, 400p, 403p, 418p, 424p, 434p, 449p, 451p, 455p], [353p, 359p, 401p, 410p, 415p, 418p, 433p, 439p, 449p, 504p, 506p, 510p], [407p, 414p, 416p, 425p, 430p, 433p, 448p, 454p, 504p, 519p, 521p, 525p], [422p, 429p, 431p, 440p, 445p, 448p, 503p, 509p, 519p, 534p, 536p, 540p], [437p, 444p, 446p, 455p, 500p, 503p, 518p, 524p, 534p, 549p, 551p, 555p], [452p, 459p, 501p, 510p, 515p, 518p, 533p, 539p, 549p, 604p, 606p, 609p], [507p, 514p, 516p, 525p, 530p, 533p, 548p, 554p, 604p, 618p, 620p, 623p], [522p, 529p, 531p, 540p, 545p, 548p, 603p, 609p, 618p, 632p, 634p, 637p], [536p, 543p, 545p, 554p, 559p, 602p, 617p, 623p, 632p, 646p, 648p, 651p], [552p, 559p, 601p, 608p, 611p, 614p, 629p, 635p, 644p, 658p, 700p, 703p], ["-", "-", "-", "-", 707p, 710p, 725p, 731p, 740p, 754p, 756p, 759p], ["-", "-", "-", "-", 807p, 810p, 825p, 831p, 840p, 854p, 856p, 859p], ["-", "-", "-", "-", 907p, 910p, 925p, 931p, 940p, 954p, 956p, 959p], ["-", "-", "-", "-", 1007p, 1010p, 1025p, 1031p, 1040p, 1054p, 1056p, 1059p], ["-", "-", "-", "-", 1107p, 1110p, 1125p, 1131p, 1140p, 1154p, 1156p, 1159p]]
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Katherine / Horse Park, Paul Coe / Mirrabei, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Gungahlin Market Place
-    between_stops: []
+    between_stops: {}
     
     short_name: "5"
-    stop_times: 
-    - - 617a
-      - 623a
-      - 632a
-      - 638a
-      - 642a
-      - 646a
-      - 650a
-      - 707a
-      - 710a
-      - 712a
-      - 717a
-      - 723a
-    - - 646a
-      - 654a
-      - 704a
-      - 716a
-      - 719a
-      - 723a
-      - 727a
-      - 736a
-      - 742a
-      - 744a
-      - 752a
-      - 800a
-    - - 713a
-      - 721a
-      - 731a
-      - 743a
-      - 746a
-      - 752a
-      - 757a
-      - 808a
-      - 815a
-      - 817a
-      - 825a
-      - 833a
-    - - 728a
-      - 736a
-      - 746a
-      - 759a
-      - 802a
-      - 808a
-      - 813a
-      - 824a
-      - 831a
-      - 833a
-      - 841a
-      - 849a
-    - - 742a
-      - 750a
-      - 800a
-      - 813a
-      - 816a
-      - 822a
-      - 827a
-      - 838a
-      - 845a
-      - 847a
-      - 855a
-      - 902a
-    - - 757a
-      - 805a
-      - 815a
-      - 828a
-      - 831a
-      - 837a
-      - 842a
-      - 853a
-      - 900a
-      - 902a
-      - 910a
-      - 916a
-    - - 813a
-      - 821a
-      - 831a
-      - 844a
-      - 847a
-      - 853a
-      - 858a
-      - 907a
-      - 913a
-      - 915a
-      - 923a
-      - 929a
-    - - 830a
-      - 838a
-      - 848a
-      - 901a
-      - 904a
-      - 908a
-      - 912a
-      - 921a
-      - 927a
-      - 929a
-      - 937a
-      - 943a
-    - - 847a
-      - 855a
-      - 905a
-      - 917a
-      - 920a
-      - 924a
-      - 928a
-      - 937a
-      - 943a
-      - 945a
-      - 953a
-      - 959a
-    - - 919a
-      - 927a
-      - 937a
-      - 949a
-      - 952a
-      - 956a
-      - 1000a
-      - 1009a
-      - 1015a
-      - 1017a
-      - 1025a
-      - 1031a
-    - - 949a
-      - 957a
-      - 1007a
-      - 1019a
-      - 1022a
-      - 1026a
-      - 1030a
-      - 1039a
-      - 1045a
-      - 1047a
-      - 1055a
-      - 1101a
-    - - 1019a
-      - 1027a
-      - 1037a
-      - 1049a
-      - 1052a
-      - 1056a
-      - 1100a
-      - 1109a
-      - 1115a
-      - 1117a
-      - 1125a
-      - 1131a
-    - - 1049a
-      - 1057a
-      - 1107a
-      - 1119a
-      - 1122a
-      - 1126a
-      - 1130a
-      - 1139a
-      - 1145a
-      - 1147a
-      - 1155a
-      - 1201p
-    - - 1119a
-      - 1127a
-      - 1137a
-      - 1149a
-      - 1152a
-      - 1156a
-      - 1200p
-      - 1209p
-      - 1215p
-      - 1217p
-      - 1225p
-      - 1231p
-    - - 1149a
-      - 1157a
-      - 1207p
-      - 1219p
-      - 1222p
-      - 1226p
-      - 1230p
-      - 1239p
-      - 1245p
-      - 1247p
-      - 1255p
-      - 101p
-    - - 1219p
-      - 1227p
-      - 1237p
-      - 1249p
-      - 1252p
-      - 1256p
-      - 100p
-      - 109p
-      - 115p
-      - 117p
-      - 125p
-      - 131p
-    - - 1249p
-      - 1257p
-      - 107p
-      - 119p
-      - 122p
-      - 126p
-      - 130p
-      - 139p
-      - 145p
-      - 147p
-      - 155p
-      - 201p
-    - - 119p
-      - 127p
-      - 137p
-      - 149p
-      - 152p
-      - 156p
-      - 200p
-      - 209p
-      - 215p
-      - 217p
-      - 225p
-      - 231p
-    - - 149p
-      - 154p
-      - 204p
-      - 216p
-      - 219p
-      - 223p
-      - 227p
-      - 239p
-      - 245p
-      - 247p
-      - 255p
-      - 301p
-    - - 219p
-      - 227p
-      - 237p
-      - 249p
-      - 252p
-      - 256p
-      - 300p
-      - 308p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 249p
-      - 257p
-      - 307p
-      - 319p
-      - 322p
-      - 326p
-      - 330p
-      - 338p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 315p
-      - 323p
-      - 333p
-      - 345p
-      - 348p
-      - 352p
-      - 356p
-      - 405p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 341p
-      - 349p
-      - 359p
-      - 412p
-      - 415p
-      - 421p
-      - 426p
-      - 435p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 411p
-      - 419p
-      - 429p
-      - 442p
-      - 445p
-      - 451p
-      - 456p
-      - 505p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 442p
-      - 450p
-      - 500p
-      - 513p
-      - 516p
-      - 522p
-      - 527p
-      - 536p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 515p
-      - 523p
-      - 533p
-      - 546p
-      - 549p
-      - 555p
-      - 600p
-      - 608p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 550p
-      - 558p
-      - 607p
-      - 619p
-      - 622p
-      - 626p
-      - 630p
-      - 639p
-      - 645p
-      - 647p
-      - 654p
-      - 700p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 709p
-      - 715p
-      - 717p
-      - 724p
-      - 730p
-    - - 651p
-      - 658p
-      - 707p
-      - 719p
-      - 722p
-      - 726p
-      - 730p
-      - 739p
-      - 745p
-      - 747p
-      - 754p
-      - 800p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 809p
-      - 815p
-      - 817p
-      - 824p
-      - 830p
-    - - 751p
-      - 758p
-      - 807p
-      - 819p
-      - 822p
-      - 826p
-      - 830p
-      - 839p
-      - 845p
-      - 847p
-      - 854p
-      - 900p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 909p
-      - 915p
-      - 917p
-      - 924p
-      - 930p
-    - - 851p
-      - 858p
-      - 907p
-      - 919p
-      - 922p
-      - 926p
-      - 930p
-      - 939p
-      - 945p
-      - 947p
-      - 954p
-      - 1000p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1009p
-      - 1015p
-      - 1017p
-      - 1024p
-      - 1030p
-    - - 951p
-      - 958p
-      - 1007p
-      - 1019p
-      - 1022p
-      - 1026p
-      - 1030p
-      - 1039p
-      - 1045p
-      - 1047p
-      - 1054p
-      - 1100p
-    - - 1051p
-      - 1058p
-      - 1107p
-      - 1119p
-      - 1122p
-      - 1126p
-      - 1130p
-      - 1138p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1109p
-      - 1115p
-      - 1117p
-      - 1124p
-      - 1130p
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Canberra Hospital
-    - Narrabundah College
-    - Manuka/Captain Cook
-    - Kingston
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Gungahlin Market Place
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
+    stop_times: [[617a, 623a, 632a, 638a, 642a, 646a, 650a, 707a, 710a, 712a, 717a, 723a], [646a, 654a, 704a, 716a, 719a, 723a, 727a, 736a, 742a, 744a, 752a, 800a], [713a, 721a, 731a, 743a, 746a, 752a, 757a, 808a, 815a, 817a, 825a, 833a], [728a, 736a, 746a, 759a, 802a, 808a, 813a, 824a, 831a, 833a, 841a, 849a], [742a, 750a, 800a, 813a, 816a, 822a, 827a, 838a, 845a, 847a, 855a, 902a], [757a, 805a, 815a, 828a, 831a, 837a, 842a, 853a, 900a, 902a, 910a, 916a], [813a, 821a, 831a, 844a, 847a, 853a, 858a, 907a, 913a, 915a, 923a, 929a], [830a, 838a, 848a, 901a, 904a, 908a, 912a, 921a, 927a, 929a, 937a, 943a], [847a, 855a, 905a, 917a, 920a, 924a, 928a, 937a, 943a, 945a, 953a, 959a], [919a, 927a, 937a, 949a, 952a, 956a, 1000a, 1009a, 1015a, 1017a, 1025a, 1031a], [949a, 957a, 1007a, 1019a, 1022a, 1026a, 1030a, 1039a, 1045a, 1047a, 1055a, 1101a], [1019a, 1027a, 1037a, 1049a, 1052a, 1056a, 1100a, 1109a, 1115a, 1117a, 1125a, 1131a], [1049a, 1057a, 1107a, 1119a, 1122a, 1126a, 1130a, 1139a, 1145a, 1147a, 1155a, 1201p], [1119a, 1127a, 1137a, 1149a, 1152a, 1156a, 1200p, 1209p, 1215p, 1217p, 1225p, 1231p], [1149a, 1157a, 1207p, 1219p, 1222p, 1226p, 1230p, 1239p, 1245p, 1247p, 1255p, 101p], [1219p, 1227p, 1237p, 1249p, 1252p, 1256p, 100p, 109p, 115p, 117p, 125p, 131p], [1249p, 1257p, 107p, 119p, 122p, 126p, 130p, 139p, 145p, 147p, 155p, 201p], [119p, 127p, 137p, 149p, 152p, 156p, 200p, 209p, 215p, 217p, 225p, 231p], [149p, 154p, 204p, 216p, 219p, 223p, 227p, 239p, 245p, 247p, 255p, 301p], [219p, 227p, 237p, 249p, 252p, 256p, 300p, 308p, "-", "-", "-", "-"], [249p, 257p, 307p, 319p, 322p, 326p, 330p, 338p, "-", "-", "-", "-"], [315p, 323p, 333p, 345p, 348p, 352p, 356p, 405p, "-", "-", "-", "-"], [341p, 349p, 359p, 412p, 415p, 421p, 426p, 435p, "-", "-", "-", "-"], [411p, 419p, 429p, 442p, 445p, 451p, 456p, 505p, "-", "-", "-", "-"], [442p, 450p, 500p, 513p, 516p, 522p, 527p, 536p, "-", "-", "-", "-"], [515p, 523p, 533p, 546p, 549p, 555p, 600p, 608p, "-", "-", "-", "-"], [550p, 558p, 607p, 619p, 622p, 626p, 630p, 639p, 645p, 647p, 654p, 700p], ["-", "-", "-", "-", "-", "-", "-", 709p, 715p, 717p, 724p, 730p], [651p, 658p, 707p, 719p, 722p, 726p, 730p, 739p, 745p, 747p, 754p, 800p], ["-", "-", "-", "-", "-", "-", "-", 809p, 815p, 817p, 824p, 830p], [751p, 758p, 807p, 819p, 822p, 826p, 830p, 839p, 845p, 847p, 854p, 900p], ["-", "-", "-", "-", "-", "-", "-", 909p, 915p, 917p, 924p, 930p], [851p, 858p, 907p, 919p, 922p, 926p, 930p, 939p, 945p, 947p, 954p, 1000p], ["-", "-", "-", "-", "-", "-", "-", 1009p, 1015p, 1017p, 1024p, 1030p], [951p, 958p, 1007p, 1019p, 1022p, 1026p, 1030p, 1039p, 1045p, 1047p, 1054p, 1100p], [1051p, 1058p, 1107p, 1119p, 1122p, 1126p, 1130p, 1138p, "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1109p, 1115p, 1117p, 1124p, 1130p]]
+    time_points: [Woden Interchange - Platform 14, Canberra Hospital, Narrabundah College, Manuka/Captain Cook, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Gungahlin Market Place]
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
     
     short_name: "5"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 630a
-      - 638a
-      - 642a
-      - 646a
-      - 649a
-      - 701a
-      - 711a
-      - 719a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 710a
-      - 718a
-      - 722a
-      - 726a
-      - 729a
-      - 741a
-      - 752a
-      - 800a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 730a
-      - 738a
-      - 742a
-      - 746a
-      - 749a
-      - 802a
-      - 814a
-      - 822a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 740a
-      - 748a
-      - 753a
-      - 758a
-      - 801a
-      - 814a
-      - 826a
-      - 834a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 755a
-      - 804a
-      - 809a
-      - 814a
-      - 817a
-      - 830a
-      - 842a
-      - 850a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 810a
-      - 819a
-      - 824a
-      - 829a
-      - 832a
-      - 845a
-      - 857a
-      - 905a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 830a
-      - 839a
-      - 844a
-      - 849a
-      - 852a
-      - 905a
-      - 915a
-      - 923a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 840a
-      - 849a
-      - 854a
-      - 859a
-      - 902a
-      - 914a
-      - 924a
-      - 932a
-    - - 909a
-      - 915a
-      - 922a
-      - 924a
-      - 932a
-      - 940a
-      - 944a
-      - 948a
-      - 951a
-      - 1003a
-      - 1013a
-      - 1021a
-    - - 939a
-      - 945a
-      - 952a
-      - 954a
-      - 1002a
-      - 1010a
-      - 1014a
-      - 1018a
-      - 1021a
-      - 1033a
-      - 1043a
-      - 1051a
-    - - 1009a
-      - 1015a
-      - 1022a
-      - 1024a
-      - 1032a
-      - 1040a
-      - 1044a
-      - 1048a
-      - 1051a
-      - 1103a
-      - 1113a
-      - 1121a
-    - - 1039a
-      - 1045a
-      - 1052a
-      - 1054a
-      - 1102a
-      - 1110a
-      - 1114a
-      - 1118a
-      - 1121a
-      - 1133a
-      - 1143a
-      - 1151a
-    - - 1109a
-      - 1115a
-      - 1122a
-      - 1124a
-      - 1132a
-      - 1140a
-      - 1144a
-      - 1148a
-      - 1151a
-      - 1203p
-      - 1213p
-      - 1221p
-    - - 1139a
-      - 1145a
-      - 1152a
-      - 1154a
-      - 1202p
-      - 1210p
-      - 1214p
-      - 1218p
-      - 1221p
-      - 1233p
-      - 1243p
-      - 1251p
-    - - 1209p
-      - 1215p
-      - 1222p
-      - 1224p
-      - 1232p
-      - 1240p
-      - 1244p
-      - 1248p
-      - 1251p
-      - 103p
-      - 113p
-      - 121p
-    - - 1239p
-      - 1245p
-      - 1252p
-      - 1254p
-      - 102p
-      - 110p
-      - 114p
-      - 118p
-      - 121p
-      - 133p
-      - 143p
-      - 151p
-    - - 109p
-      - 115p
-      - 122p
-      - 124p
-      - 132p
-      - 140p
-      - 144p
-      - 148p
-      - 151p
-      - 203p
-      - 213p
-      - 221p
-    - - 139p
-      - 145p
-      - 152p
-      - 154p
-      - 202p
-      - 210p
-      - 214p
-      - 218p
-      - 221p
-      - 233p
-      - 243p
-      - 251p
-    - - 209p
-      - 215p
-      - 222p
-      - 224p
-      - 232p
-      - 240p
-      - 244p
-      - 248p
-      - 251p
-      - 303p
-      - 313p
-      - 321p
-    - - 239p
-      - 245p
-      - 252p
-      - 254p
-      - 302p
-      - 310p
-      - 314p
-      - 318p
-      - 321p
-      - 333p
-      - 343p
-      - 351p
-    - - 309p
-      - 315p
-      - 322p
-      - 324p
-      - 332p
-      - 340p
-      - 344p
-      - 348p
-      - 351p
-      - 403p
-      - 415p
-      - 423p
-    - - 339p
-      - 345p
-      - 352p
-      - 354p
-      - 403p
-      - 412p
-      - 417p
-      - 422p
-      - 425p
-      - 438p
-      - 450p
-      - 458p
-    - - 407p
-      - 415p
-      - 422p
-      - 424p
-      - 433p
-      - 442p
-      - 447p
-      - 452p
-      - 455p
-      - 508p
-      - 520p
-      - 528p
-    - - 437p
-      - 445p
-      - 452p
-      - 454p
-      - 503p
-      - 512p
-      - 517p
-      - 522p
-      - 525p
-      - 538p
-      - 550p
-      - 558p
-    - - 510p
-      - 518p
-      - 525p
-      - 527p
-      - 536p
-      - 545p
-      - 550p
-      - 554p
-      - 556p
-      - 608p
-      - 617p
-      - 625p
-    - - 537p
-      - 545p
-      - 552p
-      - 554p
-      - 602p
-      - 610p
-      - 614p
-      - 618p
-      - 621p
-      - 633p
-      - 642p
-      - 650p
-    - - 609p
-      - 615p
-      - 622p
-      - 624p
-      - 632p
-      - 640p
-      - 644p
-      - 648p
-      - 651p
-      - 703p
-      - 712p
-      - 720p
-    - - 639p
-      - 645p
-      - 652p
-      - 654p
-      - 702p
-      - 710p
-      - 714p
-      - 718p
-      - 721p
-      - 733p
-      - 742p
-      - 750p
-    - - 709p
-      - 715p
-      - 722p
-      - 724p
-      - 732p
-      - 740p
-      - 744p
-      - 748p
-      - 751p
-      - 803p
-      - 812p
-      - 820p
-    - - 739p
-      - 745p
-      - 752p
-      - 754p
-      - 801p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 809p
-      - 815p
-      - 822p
-      - 824p
-      - 832p
-      - 840p
-      - 844p
-      - 848p
-      - 851p
-      - 903p
-      - 912p
-      - 920p
-    - - 839p
-      - 845p
-      - 852p
-      - 854p
-      - 901p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 909p
-      - 915p
-      - 922p
-      - 924p
-      - 932p
-      - 940p
-      - 944p
-      - 948p
-      - 951p
-      - 1003p
-      - 1012p
-      - 1020p
-    - - 939p
-      - 945p
-      - 952p
-      - 954p
-      - 1001p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1009p
-      - 1015p
-      - 1022p
-      - 1024p
-      - 1032p
-      - 1040p
-      - 1044p
-      - 1048p
-      - 1051p
-      - 1103p
-      - 1112p
-      - 1120p
-    - - 1039p
-      - 1045p
-      - 1052p
-      - 1054p
-      - 1101p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1109p
-      - 1115p
-      - 1122p
-      - 1124p
-      - 1131p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Gungahlin Market Place
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Kingston
-    - Manuka/Captain Cook
-    - Narrabundah College
-    - Canberra Hospital
-    - Woden Interchange
+    stop_times: [["-", "-", "-", "-", 630a, 638a, 642a, 646a, 649a, 701a, 711a, 719a], ["-", "-", "-", "-", 710a, 718a, 722a, 726a, 729a, 741a, 752a, 800a], ["-", "-", "-", "-", 730a, 738a, 742a, 746a, 749a, 802a, 814a, 822a], ["-", "-", "-", "-", 740a, 748a, 753a, 758a, 801a, 814a, 826a, 834a], ["-", "-", "-", "-", 755a, 804a, 809a, 814a, 817a, 830a, 842a, 850a], ["-", "-", "-", "-", 810a, 819a, 824a, 829a, 832a, 845a, 857a, 905a], ["-", "-", "-", "-", 830a, 839a, 844a, 849a, 852a, 905a, 915a, 923a], ["-", "-", "-", "-", 840a, 849a, 854a, 859a, 902a, 914a, 924a, 932a], [909a, 915a, 922a, 924a, 932a, 940a, 944a, 948a, 951a, 1003a, 1013a, 1021a], [939a, 945a, 952a, 954a, 1002a, 1010a, 1014a, 1018a, 1021a, 1033a, 1043a, 1051a], [1009a, 1015a, 1022a, 1024a, 1032a, 1040a, 1044a, 1048a, 1051a, 1103a, 1113a, 1121a], [1039a, 1045a, 1052a, 1054a, 1102a, 1110a, 1114a, 1118a, 1121a, 1133a, 1143a, 1151a], [1109a, 1115a, 1122a, 1124a, 1132a, 1140a, 1144a, 1148a, 1151a, 1203p, 1213p, 1221p], [1139a, 1145a, 1152a, 1154a, 1202p, 1210p, 1214p, 1218p, 1221p, 1233p, 1243p, 1251p], [1209p, 1215p, 1222p, 1224p, 1232p, 1240p, 1244p, 1248p, 1251p, 103p, 113p, 121p], [1239p, 1245p, 1252p, 1254p, 102p, 110p, 114p, 118p, 121p, 133p, 143p, 151p], [109p, 115p, 122p, 124p, 132p, 140p, 144p, 148p, 151p, 203p, 213p, 221p], [139p, 145p, 152p, 154p, 202p, 210p, 214p, 218p, 221p, 233p, 243p, 251p], [209p, 215p, 222p, 224p, 232p, 240p, 244p, 248p, 251p, 303p, 313p, 321p], [239p, 245p, 252p, 254p, 302p, 310p, 314p, 318p, 321p, 333p, 343p, 351p], [309p, 315p, 322p, 324p, 332p, 340p, 344p, 348p, 351p, 403p, 415p, 423p], [339p, 345p, 352p, 354p, 403p, 412p, 417p, 422p, 425p, 438p, 450p, 458p], [407p, 415p, 422p, 424p, 433p, 442p, 447p, 452p, 455p, 508p, 520p, 528p], [437p, 445p, 452p, 454p, 503p, 512p, 517p, 522p, 525p, 538p, 550p, 558p], [510p, 518p, 525p, 527p, 536p, 545p, 550p, 554p, 556p, 608p, 617p, 625p], [537p, 545p, 552p, 554p, 602p, 610p, 614p, 618p, 621p, 633p, 642p, 650p], [609p, 615p, 622p, 624p, 632p, 640p, 644p, 648p, 651p, 703p, 712p, 720p], [639p, 645p, 652p, 654p, 702p, 710p, 714p, 718p, 721p, 733p, 742p, 750p], [709p, 715p, 722p, 724p, 732p, 740p, 744p, 748p, 751p, 803p, 812p, 820p], [739p, 745p, 752p, 754p, 801p, "-", "-", "-", "-", "-", "-", "-"], [809p, 815p, 822p, 824p, 832p, 840p, 844p, 848p, 851p, 903p, 912p, 920p], [839p, 845p, 852p, 854p, 901p, "-", "-", "-", "-", "-", "-", "-"], [909p, 915p, 922p, 924p, 932p, 940p, 944p, 948p, 951p, 1003p, 1012p, 1020p], [939p, 945p, 952p, 954p, 1001p, "-", "-", "-", "-", "-", "-", "-"], [1009p, 1015p, 1022p, 1024p, 1032p, 1040p, 1044p, 1048p, 1051p, 1103p, 1112p, 1120p], [1039p, 1045p, 1052p, 1054p, 1101p, "-", "-", "-", "-", "-", "-", "-"], [1109p, 1115p, 1122p, 1124p, 1131p, "-", "-", "-", "-", "-", "-", "-"]]
+    time_points: [Gungahlin Market Place, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange - Platform 9, Russell Offices, Kings Ave/National Crt, Kingston, Manuka/Captain Cook, Narrabundah College, Canberra Hospital, Woden Interchange]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
     short_name: 60/160
     stop_times: [[606a, 615a, 621a, 632a, "-", "-"], [706a, 715a, 721a, 734a, 749a, 752a], [730a, 740a, 748a, 802a, "-", "-"], [738a, 748a, 756a, 811a, 826a, 829a], [752a, 802a, 810a, 824a, "-", "-"], [808a, 818a, 826a, 841a, 856a, 859a], [836a, 846a, 854a, 908a, "-", "-"], [906a, 916a, 924a, 937a, "-", "-"], [1006a, 1016a, 1024a, 1036a, "-", "-"], [1106a, 1116a, 1124a, 1136a, "-", "-"], [1206p, 1216p, 1224p, 1236p, "-", "-"], [106p, 116p, 124p, 136p, "-", "-"], [206p, 216p, 224p, 236p, "-", "-"], [236p, 246p, 254p, 307p, "-", "-"], [306p, 316p, 324p, 338p, "-", "-"], [336p, 346p, 354p, 408p, "-", "-"], [406p, 416p, 424p, 438p, "-", "-"], [436p, 446p, 454p, 508p, "-", "-"], [506p, 516p, 524p, 538p, "-", "-"], [536p, 546p, 554p, 608p, "-", "-"], [606p, 616p, 624p, 637p, "-", "-"], [706p, 716p, 722p, 734p, "-", "-"], [806p, 816p, 822p, 834p, "-", "-"], [906p, 916p, 922p, 934p, "-", "-"], [1006p, 1016p, 1022p, 1034p, "-", "-"], [1106p, 1116p, 1122p, 1134p, "-", "-"]]
     time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange - Platform 9, City Interchange, Citywest]
   -  
     long_name: To Tuggeranong Interchange - Platform 3
-    between_stops: []
+    between_stops: 
+      City Interchange - Platform 1-Woden Interchange - Platform 5: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 60/160
     stop_times: [["-", "-", 647a, 701a, 708a, 718a], ["-", "-", 717a, 731a, 739a, 750a], ["-", "-", 747a, 801a, 809a, 820a], ["-", "-", 817a, 831a, 839a, 850a], ["-", "-", 847a, 901a, 909a, 920a], ["-", "-", 947a, 1001a, 1009a, 1019a], ["-", "-", 1047a, 1101a, 1109a, 1119a], ["-", "-", 1147a, 1201p, 1209p, 1219p], ["-", "-", 1247p, 101p, 109p, 119p], ["-", "-", 147p, 201p, 209p, 219p], ["-", "-", 247p, 301p, 309p, 320p], ["-", "-", 317p, 331p, 339p, 350p], ["-", "-", 347p, 401p, 409p, 420p], ["-", "-", 417p, 431p, 439p, 450p], ["-", "-", 447p, 501p, 509p, 520p], [455p, 501p, 517p, 531p, 539p, 550p], [531p, 537p, 553p, 607p, 615p, 626p], [555p, 601p, 617p, 631p, 638p, 647p], ["-", "-", 647p, 701p, 708p, 717p], ["-", "-", 747p, 801p, 808p, 817p], ["-", "-", 847p, 901p, 908p, 917p], ["-", "-", 947p, 1001p, 1008p, 1017p], ["-", "-", 1047p, 1101p, 1108p, 1117p]]
     time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange - Platform 3]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
     short_name: 61/161
     stop_times: [[630a, 641a, 646a, 651a, 658a, "-", "-"], [700a, 712a, 717a, 722a, 733a, "-", "-"], [726a, 739a, 746a, 751a, 805a, 819a, 822a], [740a, 754a, 759a, 804a, 813a, "-", "-"], [800a, 814a, 819a, 825a, 839a, "-", "-"], [837a, 851a, 856a, 901a, 910a, "-", "-"], [900a, 914a, 919a, 924a, 933a, "-", "-"], [930a, 943a, 948a, 953a, 1001a, "-", "-"], [1030a, 1043a, 1048a, 1053a, 1101a, "-", "-"], [1130a, 1143a, 1148a, 1153a, 1201p, "-", "-"], [1230p, 1243p, 1248p, 1253p, 101p, "-", "-"], [130p, 143p, 148p, 153p, 201p, "-", "-"], [230p, 243p, 248p, 253p, 301p, "-", "-"], [330p, 344p, 349p, 354p, 403p, "-", "-"], [400p, 414p, 419p, 424p, 433p, "-", "-"], [430p, 444p, 449p, 454p, 503p, "-", "-"], [500p, 514p, 519p, 524p, 533p, "-", "-"], [530p, 544p, 549p, 554p, 603p, "-", "-"], [600p, 614p, 619p, 624p, 633p, "-", "-"], [630p, 643p, 648p, 653p, 701p, "-", "-"], [730p, 743p, 748p, 753p, 801p, "-", "-"], [830p, 843p, 848p, 853p, 901p, "-", "-"], [930p, 943p, 948p, 953p, 1001p, "-", "-"], [1030p, 1043p, 1048p, 1053p, 1101p, "-", "-"], [1130p, 1143p, 1148p, 1153p, "-", "-", "-"]]
     time_points: [Tuggeranong Interchange - Platform 3, Taverner/Erindale, Livingston Shops Kambah, Athllon/Sulwood Kambah, Woden Interchange - Platform 9, City Interchange, Citywest]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: 
+      City Interchange - Platform 1-Woden Interchange - Platform 11: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 61/161
     stop_times: [["-", "-", 642a, 649a, 654a, 659a, 710a], ["-", "-", 712a, 719a, 724a, 729a, 743a], ["-", "-", 742a, 751a, 756a, 801a, 815a], ["-", "-", 812a, 821a, 826a, 831a, 845a], ["-", "-", 842a, 859a, 905a, 909a, 920a], ["-", "-", 912a, 921a, 926a, 931a, 944a], ["-", "-", 1012a, 1020a, 1025a, 1030a, 1043a], ["-", "-", 1112a, 1120a, 1125a, 1130a, 1143a], ["-", "-", 1212p, 1220p, 1225p, 1230p, 1243p], ["-", "-", 112p, 120p, 125p, 130p, 143p], ["-", "-", 212p, 220p, 225p, 230p, 243p], ["-", "-", 320p, 329p, 334p, 339p, 353p], ["-", "-", 342p, 351p, 356p, 401p, 415p], ["-", "-", 412p, 421p, 426p, 431p, 445p], ["-", "-", 442p, 451p, 456p, 501p, 515p], ["-", "-", 512p, 521p, 526p, 531p, 545p], [520p, 526p, 542p, 551p, 556p, 601p, 615p], ["-", "-", 612p, 621p, 626p, 631p, 644p], ["-", "-", 712p, 720p, 725p, 730p, 743p], ["-", "-", 810p, 818p, 823p, 828p, 841p], ["-", "-", 910p, 918p, 923p, 928p, 941p], ["-", "-", 1010p, 1018p, 1023p, 1028p, 1041p], ["-", "-", 1112p, 1120p, 1125p, 1130p, 1143p]]
     time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Livingston Shops Kambah, Taverner/Erindale, Tuggeranong Interchange]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
     short_name: 62/162
     stop_times: [[609a, 616a, 624a, 637a, "-", "-"], [639a, 646a, 654a, 707a, "-", "-"], [709a, 716a, 725a, 740a, 755a, 758a], [736a, 743a, 752a, 807a, 822a, 825a], [754a, 801a, 810a, 824a, "-", "-"], [809a, 816a, 825a, 840a, 855a, 858a], [839a, 846a, 855a, 909a, "-", "-"], [939a, 946a, 954a, 1007a, "-", "-"], [1039a, 1046a, 1054a, 1107a, "-", "-"], [1139a, 1146a, 1154a, 1207p, "-", "-"], [1239p, 1246p, 1254p, 107p, "-", "-"], [139p, 146p, 154p, 207p, "-", "-"], [239p, 246p, 254p, 308p, "-", "-"], [309p, 316p, 325p, 339p, "-", "-"], [339p, 346p, 355p, 409p, "-", "-"], [409p, 416p, 425p, 439p, "-", "-"], [439p, 446p, 455p, 509p, "-", "-"], [509p, 516p, 525p, 539p, "-", "-"], [539p, 546p, 555p, 609p, "-", "-"], [609p, 616p, 625p, 637p, "-", "-"], [639p, 645p, 652p, 703p, "-", "-"], [739p, 745p, 752p, 803p, "-", "-"], [839p, 845p, 852p, 903p, "-", "-"], [940p, 946p, 953p, 1004p, "-", "-"], [1040p, 1046p, 1053p, 1104p, "-", "-"]]
     time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange - Platform 9, City Interchange, Citywest]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: 
+      City Interchange - Platform 1-Woden Interchange - Platform 5: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
     short_name: 62/162
     stop_times: [["-", "-", "-", 709a, 716a, 723a], ["-", "-", 732a, 744a, 753a, 800a], ["-", "-", 802a, 814a, 823a, 830a], ["-", "-", 832a, 844a, 853a, 900a], ["-", "-", 902a, 914a, 923a, 930a], ["-", "-", 932a, 943a, 951a, 958a], ["-", "-", 1032a, 1043a, 1051a, 1058a], ["-", "-", 1132a, 1143a, 1151a, 1158a], ["-", "-", 1232p, 1243p, 1251p, 1258p], ["-", "-", 132p, 143p, 151p, 158p], ["-", "-", 232p, 243p, 251p, 258p], ["-", "-", 332p, 344p, 353p, 400p], ["-", "-", 402p, 414p, 423p, 430p], ["-", "-", 432p, 444p, 453p, 500p], ["-", "-", 502p, 514p, 523p, 530p], [510p, 516p, 532p, 544p, 553p, 600p], [540p, 546p, 602p, 614p, 623p, 630p], [610p, 616p, 632p, 643p, 651p, 658p], ["-", "-", 732p, 743p, 751p, 758p], ["-", "-", 832p, 843p, 851p, 858p], ["-", "-", 932p, 943p, 951p, 958p], ["-", "-", 1032p, 1043p, 1051p, 1058p], ["-", "-", 1132p, 1143p, 1151p, 1158p]]
     time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
   -  
     long_name: To Campbell Park Offices
-    between_stops: []
+    between_stops: {}
+    
     short_name: "63"
     stop_times: [[611a, 619a, 623a, 628a, 633a, 640a, "-", "-", "-", "-"], [640a, 648a, 652a, 657a, 702a, 710a, 724a, 727a, 731a, 735a], [712a, 720a, 724a, 729a, 735a, 745a, 759a, 803a, 807a, 811a], [744a, 754a, 759a, 804a, 810a, 820a, 834a, 838a, 842a, 846a], [810a, 820a, 825a, 830a, 836a, 845a, "-", "-", "-", "-"], [845a, 855a, 900a, 905a, 911a, 920a, "-", "-", "-", "-"], [945a, 954a, 958a, 1003a, 1009a, 1017a, "-", "-", "-", "-"], [1045a, 1054a, 1058a, 1103a, 1109a, 1117a, "-", "-", "-", "-"], [1145a, 1154a, 1158a, 1203p, 1209p, 1217p, "-", "-", "-", "-"], [1245p, 1254p, 1258p, 103p, 109p, 117p, "-", "-", "-", "-"], [145p, 154p, 158p, 203p, 209p, 217p, "-", "-", "-", "-"], [245p, 254p, 258p, 303p, 309p, 318p, "-", "-", "-", "-"], [314p, 324p, 329p, 334p, 340p, 349p, "-", "-", "-", "-"], [345p, 355p, 400p, 405p, 411p, 420p, "-", "-", "-", "-"], [415p, 425p, 430p, 435p, 441p, 450p, "-", "-", "-", "-"], [445p, 455p, 500p, 505p, 511p, 520p, "-", "-", "-", "-"], [515p, 525p, 530p, 535p, 541p, 550p, "-", "-", "-", "-"], [545p, 555p, 600p, 605p, 611p, 620p, "-", "-", "-", "-"], [645p, 654p, 658p, 703p, 709p, 717p, "-", "-", "-", "-"], [745p, 754p, 758p, 803p, 809p, 817p, "-", "-", "-", "-"], [845p, 854p, 858p, 903p, 909p, 917p, "-", "-", "-", "-"], [945p, 954p, 958p, 1003p, 1009p, 1017p, "-", "-", "-", "-"], [1045p, 1054p, 1058p, 1103p, 1109p, "-", "-", "-", "-", "-"]]
     time_points: [Tuggeranong Interchange - Platform 5, Monash, Erindale Centre, Wanniassa High, Athllon/Sulwood Kambah, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "63"
     stop_times: [["-", "-", "-", "-", "-", "-", 610a, 615a, 619a, 623a, 631a], ["-", "-", "-", "-", "-", "-", 640a, 645a, 649a, 653a, 701a], ["-", "-", "-", "-", 703a, 710a, 711a, 715a, 719a, 723a, 731a], ["-", "-", "-", "-", 723a, 730a, 732a, 736a, 741a, 746a, 756a], ["-", "-", "-", "-", 803a, 812a, 814a, 818a, 823a, 828a, 838a], ["-", "-", "-", "-", 823a, 832a, 834a, 838a, 843a, 848a, 858a], ["-", "-", "-", "-", 903a, 912a, 914a, 918a, 923a, 928a, 937a], ["-", "-", "-", "-", 1003a, 1011a, 1013a, 1017a, 1022a, 1026a, 1035a], ["-", "-", "-", "-", 1103a, 1111a, 1113a, 1117a, 1122a, 1126a, 1135a], ["-", "-", "-", "-", 1203p, 1211p, 1213p, 1217p, 1222p, 1226p, 1235p], ["-", "-", "-", "-", 103p, 111p, 113p, 117p, 122p, 126p, 135p], ["-", "-", "-", "-", 203p, 211p, 213p, 217p, 222p, 226p, 235p], ["-", "-", "-", "-", 303p, 312p, 314p, 318p, 323p, 328p, 338p], ["-", "-", "-", "-", 323p, 332p, 334p, 338p, 343p, 348p, 358p], ["-", "-", "-", "-", 403p, 412p, 414p, 418p, 423p, 428p, 438p], ["-", "-", "-", "-", 423p, 432p, 434p, 438p, 443p, 448p, 458p], [437p, 441p, 445p, 448p, 503p, 512p, 514p, 518p, 523p, 528p, 538p], [457p, 501p, 505p, 508p, 523p, 532p, 534p, 538p, 543p, 548p, 558p], [537p, 541p, 545p, 548p, 603p, 612p, 614p, 618p, 623p, 628p, 637p], [557p, 601p, 605p, 608p, 623p, 632p, 634p, 638p, 643p, 647p, 656p], ["-", "-", "-", "-", 703p, 711p, 713p, 717p, 722p, 726p, 735p], ["-", "-", "-", "-", 803p, 811p, 813p, 817p, 822p, 826p, 835p], ["-", "-", "-", "-", 903p, 911p, 913p, 917p, 922p, 926p, 935p], ["-", "-", "-", "-", 1003p, 1011p, 1013p, 1017p, 1022p, 1026p, 1035p], ["-", "-", "-", "-", 1103p, 1111p, 1113p, 1117p, 1122p, 1126p, 1135p]]
     time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 12, Athllon/Sulwood Kambah, Sainsbury Street, Wanniassa High, Erindale Centre, Monash, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "64"
     stop_times: [[], ["-", 651a, 655a, 702a], [714a, 721a, 725a, 733a], ["-", 751a, 756a, 805a], [816a, 823a, 828a, 837a], [846a, 853a, 858a, 907a], [916a, 923a, 928a, 936a], [1015a, 1022a, 1026a, 1034a], [1115a, 1122a, 1126a, 1134a], [1215p, 1222p, 1226p, 1234p], [115p, 122p, 126p, 134p], [215p, 222p, 226p, 234p], [316p, 323p, 328p, 337p], [346p, 353p, 358p, 407p], [416p, 423p, 428p, 437p], [446p, 453p, 458p, 507p], [516p, 523p, 528p, 537p], [546p, 553p, 558p, 607p], [616p, 623p, 628p, 636p], [715p, 722p, 726p, 734p], [815p, 822p, 826p, 834p], [915p, 922p, 926p, 934p], [1015p, 1022p, 1026p, 1034p], [1115p, 1122p, 1126p, 1134p]]
     time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, MacKillop College Wanniassa Campus, Monash Primary, Tuggeranong Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "64"
     stop_times: [[], [612a, 616a, 623a, 631a], [642a, 646a, 653a, 701a], [712a, 716a, 723a, 731a], [744a, 749a, 756a, 806a], [814a, 819a, 826a, 836a], [834a, 839a, 846a, 856a], [914a, 919a, 926a, 935a], [943a, 947a, 954a, 1003a], [1043a, 1047a, 1054a, 1103a], [1143a, 1147a, 1154a, 1203p], [1243p, 1247p, 1254p, 103p], [143p, 147p, 154p, 203p], [243p, 247p, 254p, 303p], [314p, 319p, 326p, 336p], [344p, 349p, 356p, 406p], [444p, 449p, 456p, 506p], [514p, 519p, 526p, 536p], [544p, 549p, 556p, 606p], [644p, 648p, 655p, 704p], [743p, 747p, 754p, 803p], [843p, 847p, 854p, 903p], [943p, 947p, 954p, 1003p], [1043p, 1047p, 1054p, "-"]]
     time_points: [Tuggeranong Interchange - Platform 5, Monash Primary, MacKillop College Wanniassa Campus, Athllon/Sulwood Kambah, Woden Interchange]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: {}
     
     short_name: "65"
-    stop_times: 
-    - - 535a
-      - 541a
-      - 552a
-      - 557a
-      - 611a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 635a
-      - 641a
-      - 652a
-      - 657a
-      - 711a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 653a
-      - 700a
-      - 712a
-      - 721a
-      - 737a
-      - 752a
-      - 756a
-      - 805a
-      - 808a
-    - - 720a
-      - 726a
-      - 734a
-      - 743a
-      - 801a
-      - 815a
-      - 819a
-      - 829a
-      - 832a
-    - - 730a
-      - 739a
-      - 756a
-      - 805a
-      - 822a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 745a
-      - 754a
-      - 811a
-      - 820a
-      - 842a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 815a
-      - 824a
-      - 841a
-      - 850a
-      - 907a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 845a
-      - 854a
-      - 911a
-      - 920a
-      - 936a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 945a
-      - 952a
-      - 1005a
-      - 1012a
-      - 1027a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1045a
-      - 1052a
-      - 1105a
-      - 1112a
-      - 1127a
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1145a
-      - 1152a
-      - 1205p
-      - 1212p
-      - 1227p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1245p
-      - 1252p
-      - 105p
-      - 112p
-      - 127p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 145p
-      - 152p
-      - 205p
-      - 212p
-      - 227p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 245p
-      - 252p
-      - 305p
-      - 312p
-      - 331p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 315p
-      - 324p
-      - 337p
-      - 344p
-      - 403p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 345p
-      - 354p
-      - 407p
-      - 414p
-      - 433p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 420p
-      - 429p
-      - 442p
-      - 449p
-      - 508p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 445p
-      - 454p
-      - 507p
-      - 514p
-      - 533p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 515p
-      - 524p
-      - 537p
-      - 544p
-      - 603p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 545p
-      - 554p
-      - 607p
-      - 614p
-      - 633p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 615p
-      - 624p
-      - 636p
-      - 641p
-      - 657p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 641p
-      - 647p
-      - 659p
-      - 704p
-      - 720p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 741p
-      - 747p
-      - 759p
-      - 804p
-      - 820p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 841p
-      - 847p
-      - 859p
-      - 904p
-      - 920p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 941p
-      - 947p
-      - 959p
-      - 1004p
-      - 1020p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1041p
-      - 1047p
-      - 1059p
-      - 1104p
-      - 1120p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - Tuggeranong Interchange - Platform 5
-    - MacKillop College Isabella Campus
-    - Gowrie
-    - Erindale Centre /Sternberg Crescent
-    - Woden Interchange - Platform 10
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange
-    - Citywest
+    stop_times: [[535a, 541a, 552a, 557a, 611a, "-", "-", "-", "-"], [635a, 641a, 652a, 657a, 711a, "-", "-", "-", "-"], [653a, 700a, 712a, 721a, 737a, 752a, 756a, 805a, 808a], [720a, 726a, 734a, 743a, 801a, 815a, 819a, 829a, 832a], [730a, 739a, 756a, 805a, 822a, "-", "-", "-", "-"], [745a, 754a, 811a, 820a, 842a, "-", "-", "-", "-"], [815a, 824a, 841a, 850a, 907a, "-", "-", "-", "-"], [845a, 854a, 911a, 920a, 936a, "-", "-", "-", "-"], [945a, 952a, 1005a, 1012a, 1027a, "-", "-", "-", "-"], [1045a, 1052a, 1105a, 1112a, 1127a, "-", "-", "-", "-"], [1145a, 1152a, 1205p, 1212p, 1227p, "-", "-", "-", "-"], [1245p, 1252p, 105p, 112p, 127p, "-", "-", "-", "-"], [145p, 152p, 205p, 212p, 227p, "-", "-", "-", "-"], [245p, 252p, 305p, 312p, 331p, "-", "-", "-", "-"], [315p, 324p, 337p, 344p, 403p, "-", "-", "-", "-"], [345p, 354p, 407p, 414p, 433p, "-", "-", "-", "-"], [420p, 429p, 442p, 449p, 508p, "-", "-", "-", "-"], [445p, 454p, 507p, 514p, 533p, "-", "-", "-", "-"], [515p, 524p, 537p, 544p, 603p, "-", "-", "-", "-"], [545p, 554p, 607p, 614p, 633p, "-", "-", "-", "-"], [615p, 624p, 636p, 641p, 657p, "-", "-", "-", "-"], [641p, 647p, 659p, 704p, 720p, "-", "-", "-", "-"], [741p, 747p, 759p, 804p, 820p, "-", "-", "-", "-"], [841p, 847p, 859p, 904p, 920p, "-", "-", "-", "-"], [941p, 947p, 959p, 1004p, 1020p, "-", "-", "-", "-"], [1041p, 1047p, 1059p, 1104p, 1120p, "-", "-", "-", "-"]]
+    time_points: [Tuggeranong Interchange - Platform 5, MacKillop College Isabella Campus, Gowrie, Erindale Drive/Sternberg, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, City Interchange, Citywest]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
     
     short_name: "65"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 608a
-      - 619a
-      - 625a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 625a
-      - 637a
-      - 643a
-      - 654a
-      - 700a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 655a
-      - 710a
-      - 718a
-      - 734a
-      - 744a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 725a
-      - 742a
-      - 750a
-      - 806a
-      - 816a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 755a
-      - 812a
-      - 820a
-      - 836a
-      - 846a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 825a
-      - 842a
-      - 850a
-      - 906a
-      - 916a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 855a
-      - 912a
-      - 920a
-      - 935a
-      - 943a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 955a
-      - 1009a
-      - 1015a
-      - 1027a
-      - 1035a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1055a
-      - 1109a
-      - 1115a
-      - 1127a
-      - 1135a
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1155a
-      - 1209p
-      - 1215p
-      - 1227p
-      - 1235p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1255p
-      - 109p
-      - 115p
-      - 127p
-      - 135p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 155p
-      - 209p
-      - 215p
-      - 227p
-      - 235p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 255p
-      - 311p
-      - 318p
-      - 332p
-      - 341p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 325p
-      - 342p
-      - 349p
-      - 403p
-      - 412p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 355p
-      - 412p
-      - 419p
-      - 433p
-      - 442p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 420p
-      - 437p
-      - 444p
-      - 458p
-      - 507p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 455p
-      - 512p
-      - 519p
-      - 533p
-      - 542p
-    - - 455p
-      - 501p
-      - 510p
-      - 513p
-      - 528p
-      - 545p
-      - 552p
-      - 606p
-      - 615p
-    - - 525p
-      - 531p
-      - 540p
-      - 543p
-      - 558p
-      - 615p
-      - 622p
-      - 635p
-      - 643p
-    - - 555p
-      - 601p
-      - 610p
-      - 613p
-      - 628p
-      - 642p
-      - 648p
-      - 700p
-      - 708p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 654p
-      - 708p
-      - 714p
-      - 726p
-      - 734p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 754p
-      - 808p
-      - 814p
-      - 826p
-      - 834p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 854p
-      - 908p
-      - 914p
-      - 926p
-      - 934p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 954p
-      - 1008p
-      - 1014p
-      - 1026p
-      - 1034p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 1054p
-      - 1108p
-      - 1114p
-      - 1126p
-      - 1134p
-    time_points: 
-    - Citywest
-    - City Interchange - Platform 10
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Woden Interchange - Platform 12
-    - Erindale Centre
-    - Gowrie
-    - MacKillop College Isabella Campus
-    - Tuggeranong Interchange
+    stop_times: [["-", "-", "-", "-", "-", "-", 608a, 619a, 625a], ["-", "-", "-", "-", 625a, 637a, 643a, 654a, 700a], ["-", "-", "-", "-", 655a, 710a, 718a, 734a, 744a], ["-", "-", "-", "-", 725a, 742a, 750a, 806a, 816a], ["-", "-", "-", "-", 755a, 812a, 820a, 836a, 846a], ["-", "-", "-", "-", 825a, 842a, 850a, 906a, 916a], ["-", "-", "-", "-", 855a, 912a, 920a, 935a, 943a], ["-", "-", "-", "-", 955a, 1009a, 1015a, 1027a, 1035a], ["-", "-", "-", "-", 1055a, 1109a, 1115a, 1127a, 1135a], ["-", "-", "-", "-", 1155a, 1209p, 1215p, 1227p, 1235p], ["-", "-", "-", "-", 1255p, 109p, 115p, 127p, 135p], ["-", "-", "-", "-", 155p, 209p, 215p, 227p, 235p], ["-", "-", "-", "-", 255p, 311p, 318p, 332p, 341p], ["-", "-", "-", "-", 325p, 342p, 349p, 403p, 412p], ["-", "-", "-", "-", 355p, 412p, 419p, 433p, 442p], ["-", "-", "-", "-", 420p, 437p, 444p, 458p, 507p], ["-", "-", "-", "-", 455p, 512p, 519p, 533p, 542p], [455p, 501p, 510p, 513p, 528p, 545p, 552p, 606p, 615p], [525p, 531p, 540p, 543p, 558p, 615p, 622p, 635p, 643p], [555p, 601p, 610p, 613p, 628p, 642p, 648p, 700p, 708p], ["-", "-", "-", "-", 654p, 708p, 714p, 726p, 734p], ["-", "-", "-", "-", 754p, 808p, 814p, 826p, 834p], ["-", "-", "-", "-", 854p, 908p, 914p, 926p, 934p], ["-", "-", "-", "-", 954p, 1008p, 1014p, 1026p, 1034p], ["-", "-", "-", "-", 1054p, 1108p, 1114p, 1126p, 1134p]]
+    time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 12, Erindale Centre, Gowrie, MacKillop College Isabella Campus, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "66"
     stop_times: [["-", 602a, 610a, 617a, 622a, 631a], [622a, 632a, 640a, 647a, 652a, 701a], [652a, 702a, 710a, 717a, 722a, 731a], [722a, 734a, 744a, 751a, 758a, 808a], [752a, 813a, 823a, 830a, 837a, 847a], [822a, 843a, 853a, 900a, 907a, 917a], [916a, 934a, 942a, 949a, 955a, 1004a], [1022a, 1034a, 1042a, 1049a, 1055a, 1104a], [1122a, 1134a, 1142a, 1149a, 1155a, 1204p], [1222p, 1234p, 1242p, 1249p, 1255p, 104p], [122p, 134p, 142p, 149p, 155p, 204p], [222p, 234p, 242p, 249p, 255p, 304p], [252p, 304p, 315p, 322p, 329p, 339p], [322p, 334p, 345p, 352p, 359p, 409p], [352p, 404p, 415p, 422p, 429p, 439p], [422p, 434p, 445p, 452p, 459p, 509p], [452p, 504p, 515p, 522p, 529p, 539p], [522p, 534p, 545p, 552p, 559p, 609p], [552p, 604p, 615p, 622p, 629p, 638p], [622p, 634p, 642p, 649p, 654p, 703p], [722p, 734p, 742p, 749p, 754p, 803p], [822p, 834p, 842p, 849p, 854p, 903p], [922p, 934p, 942p, 949p, 954p, 1003p], [1022p, 1034p, 1042p, 1049p, 1054p, 1103p], [1122p, 1134p, 1142p, 1149p, 1154p, "-"]]
     time_points: [Woden Interchange - Platform 11, Erindale Centre, Proctor / Mead, Deamer/Clift Richardson, Bonython Primary, Tuggeranong Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "66"
     stop_times: [[612a, 618a, 625a, 631a, 638a, 652a], [641a, 647a, 654a, 700a, 712a, 727a], [706a, 714a, 723a, 732a, 744a, 800a], [736a, 744a, 753a, 802a, 814a, 830a], [806a, 814a, 823a, 832a, 844a, 900a], [836a, 844a, 853a, 902a, 914a, 930a], [909a, 917a, 926a, 933a, 941a, 956a], [1012a, 1018a, 1026a, 1032a, 1040a, 1055a], [1112a, 1118a, 1126a, 1132a, 1140a, 1155a], [1212p, 1218p, 1226p, 1232p, 1240p, 1255p], [112p, 118p, 126p, 132p, 140p, 155p], [212p, 218p, 226p, 232p, 240p, 255p], [312p, 319p, 327p, 334p, 345p, 400p], [412p, 419p, 427p, 434p, 445p, 500p], [442p, 449p, 457p, 504p, 515p, 530p], [512p, 519p, 527p, 534p, 545p, 600p], [542p, 549p, 557p, 604p, 615p, 630p], [613p, 620p, 628p, 634p, 642p, 657p], [714p, 720p, 728p, 734p, 742p, 757p], [814p, 820p, 828p, 834p, 842p, 857p], [914p, 920p, 928p, 934p, 942p, 957p], [1014p, 1020p, 1028p, 1034p, 1042p, 1057p], [1114p, 1120p, 1128p, 1134p, 1142p, "-"]]
     time_points: [Tuggeranong Interchange - Platform 7, Bonython Primary, Deamer/Clift Richardson, Proctor / Mead, Erindale Centre, Woden Interchange]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: {}
+    
     short_name: 67/267
     stop_times: [[603a, 616a, 627a, 635a, 644a, "-", "-", "-", "-"], [633a, 646a, 657a, 705a, 714a, "-", "-", "-", "-"], [702a, 715a, 726a, 735a, 750a, 804a, 808a, 818a, 821a], [718a, 731a, 745a, 755a, 809a, "-", "-", "-", "-"], [731a, 746a, 800a, 810a, 825a, 839a, 843a, 853a, 856a], [803a, 818a, 832a, 842a, 856a, "-", "-", "-", "-"], [833a, 848a, 902a, 912a, 926a, "-", "-", "-", "-"], [903a, 918a, 932a, 940a, 953a, "-", "-", "-", "-"], [1003a, 1017a, 1028a, 1036a, 1049a, "-", "-", "-", "-"], [1103a, 1117a, 1128a, 1136a, 1149a, "-", "-", "-", "-"], [1203p, 1217p, 1228p, 1236p, 1249p, "-", "-", "-", "-"], [103p, 117p, 128p, 136p, 149p, "-", "-", "-", "-"], [203p, 217p, 228p, 236p, 249p, "-", "-", "-", "-"], [303p, 318p, 332p, 342p, 356p, "-", "-", "-", "-"], [333p, 348p, 402p, 412p, 426p, "-", "-", "-", "-"], [403p, 418p, 432p, 442p, 456p, "-", "-", "-", "-"], [433p, 448p, 502p, 512p, 526p, "-", "-", "-", "-"], [503p, 518p, 532p, 542p, 556p, "-", "-", "-", "-"], [533p, 548p, 602p, 612p, 626p, "-", "-", "-", "-"], [603p, 618p, 632p, 640p, 653p, "-", "-", "-", "-"], [703p, 717p, 728p, 736p, 749p, "-", "-", "-", "-"], [803p, 817p, 828p, 836p, 849p, "-", "-", "-", "-"], [903p, 917p, 928p, 936p, 949p, "-", "-", "-", "-"], [1003p, 1017p, 1028p, 1036p, 1049p, "-", "-", "-", "-"], [1103p, 1117p, 1128p, 1136p, "-", "-", "-", "-", "-"]]
     time_points: [Tuggeranong Interchange - Platform 7, Calwell Shops, Chisholm Shops, Erindale Drive/Sternberg, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, City Interchange - Platform 11, Citywest]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: 67/267
     stop_times: [["-", "-", "-", "-", "-", "-", 601a, 608a, 618a, 632a], ["-", "-", "-", "-", 617a, 626a, 626a, 633a, 643a, 657a], ["-", "-", "-", "-", 647a, 656a, 656a, 703a, 713a, 727a], ["-", "-", "-", "-", 717a, 726a, 726a, 734a, 746a, 803a], ["-", "-", "-", "-", 747a, 801a, 801a, 810a, 822a, 839a], ["-", "-", "-", "-", 817a, 831a, 831a, 840a, 852a, 909a], ["-", "-", "-", "-", 847a, 901a, 901a, 910a, 922a, 938a], ["-", "-", "-", "-", 917a, 931a, 931a, 938a, 947a, 1002a], ["-", "-", "-", "-", 1017a, 1030a, 1030a, 1037a, 1046a, 1101a], ["-", "-", "-", "-", 1117a, 1130a, 1130a, 1137a, 1146a, 1201p], ["-", "-", "-", "-", 1217p, 1230p, 1230p, 1237p, 1246p, 101p], ["-", "-", "-", "-", 117p, 130p, 130p, 137p, 146p, 201p], ["-", "-", "-", "-", 217p, 230p, 230p, 237p, 246p, 301p], ["-", "-", "-", "-", 247p, 300p, 300p, 310p, 325p, 341p], ["-", "-", "-", "-", 317p, 334p, 334p, 344p, 359p, 415p], ["-", "-", "-", "-", 347p, 404p, 404p, 414p, 429p, 445p], ["-", "-", "-", "-", 417p, 434p, 434p, 444p, 459p, 515p], ["-", "-", "-", "-", 447p, 504p, 504p, 514p, 529p, 545p], [430p, 436p, 445p, 448p, 503p, 520p, 520p, 530p, 545p, 601p], [500p, 506p, 515p, 518p, 533p, 550p, 550p, 600p, 615p, 631p], [544p, 550p, 559p, 602p, 617p, 633p, 633p, 640p, 649p, 704p], ["-", "-", "-", "-", 717p, 730p, 730p, 737p, 746p, 801p], ["-", "-", "-", "-", 817p, 830p, 830p, 837p, 846p, 901p], ["-", "-", "-", "-", 917p, 930p, 930p, 937p, 946p, 1001p], ["-", "-", "-", "-", 1017p, 1030p, 1030p, 1037p, 1046p, 1101p], ["-", "-", "-", "-", 1117p, 1130p, 1130p, 1137p, 1146p, 1201a]]
     time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 5, Erindale Drive/Sternberg, Bugden/Sternberg, Chisholm Shops, Calwell Shops, Tuggeranong Interchange]
   -  
     long_name: To Dickson
-    between_stops: []
+    between_stops: {}
     
     short_name: "6"
-    stop_times: 
-    - - 618a
-      - 626a
-      - 638a
-      - 645a
-      - 650a
-      - 701a
-      - 713a
-      - 719a
-      - 725a
-    - - 653a
-      - 701a
-      - 713a
-      - 720a
-      - 725a
-      - 737a
-      - 751a
-      - 759a
-      - 806a
-    - - 723a
-      - 731a
-      - 745a
-      - 753a
-      - 758a
-      - 812a
-      - 826a
-      - 834a
-      - 841a
-    - - 753a
-      - 803a
-      - 817a
-      - 825a
-      - 830a
-      - 844a
-      - 858a
-      - 906a
-      - 913a
-    - - 823a
-      - 833a
-      - 847a
-      - 855a
-      - 900a
-      - 914a
-      - 928a
-      - 936a
-      - 943a
-    - - 853a
-      - 903a
-      - 917a
-      - 925a
-      - 930a
-      - 944a
-      - 956a
-      - 1004a
-      - 1011a
-    - - 923a
-      - 933a
-      - 945a
-      - 952a
-      - 957a
-      - 1011a
-      - 1023a
-      - 1031a
-      - 1038a
-    - - 1023a
-      - 1033a
-      - 1045a
-      - 1052a
-      - 1057a
-      - 1111a
-      - 1123a
-      - 1131a
-      - 1138a
-    - - 1123a
-      - 1133a
-      - 1145a
-      - 1152a
-      - 1157a
-      - 1211p
-      - 1223p
-      - 1231p
-      - 1238p
-    - - 1223p
-      - 1233p
-      - 1245p
-      - 1252p
-      - 1257p
-      - 111p
-      - 123p
-      - 131p
-      - 138p
-    - - 123p
-      - 133p
-      - 145p
-      - 152p
-      - 157p
-      - 211p
-      - 223p
-      - 231p
-      - 238p
-    - - 223p
-      - 233p
-      - 245p
-      - 252p
-      - 257p
-      - 311p
-      - 325p
-      - 333p
-      - 340p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 344p
-      - 358p
-      - 406p
-      - 413p
-    - - 323p
-      - 333p
-      - 347p
-      - 355p
-      - 400p
-      - 414p
-      - 428p
-      - 436p
-      - 443p
-    - - 353p
-      - 403p
-      - 417p
-      - 425p
-      - 430p
-      - 444p
-      - 458p
-      - 506p
-      - 513p
-    - - 423p
-      - 433p
-      - 447p
-      - 455p
-      - 500p
-      - 514p
-      - 528p
-      - 536p
-      - 543p
-    - - 453p
-      - 503p
-      - 517p
-      - 525p
-      - 530p
-      - 544p
-      - 558p
-      - 606p
-      - 613p
-    - - 516p
-      - 526p
-      - 540p
-      - 548p
-      - 553p
-      - 607p
-      - 621p
-      - 629p
-      - 635p
-    - - 553p
-      - 603p
-      - 617p
-      - 625p
-      - 630p
-      - 640p
-      - 650p
-      - 656p
-      - 702p
-    - - 630p
-      - 638p
-      - 648p
-      - 655p
-      - 700p
-      - 710p
-      - 720p
-      - 726p
-      - 732p
-    - - 730p
-      - 738p
-      - 748p
-      - 755p
-      - 800p
-      - 810p
-      - 820p
-      - 826p
-      - 832p
-    - - 830p
-      - 838p
-      - 848p
-      - 855p
-      - 900p
-      - 910p
-      - 920p
-      - 926p
-      - 932p
-    - - 930p
-      - 938p
-      - 948p
-      - 955p
-      - 1000p
-      - 1010p
-      - 1020p
-      - 1026p
-      - 1032p
-    - - 1030p
-      - 1038p
-      - 1048p
-      - 1055p
-      - 1100p
-      - 1110p
-      - 1120p
-      - 1126p
-      - 1132p
-    time_points: 
-    - Woden Interchange
-    - Canberra Hospital
-    - Red Hill
-    - Manuka/Captain Cook
-    - Kings Ave/National Crt
-    - City Interchange
-    - Lyneham
-    - North Lyneham
-    - Dickson
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
+    stop_times: [[618a, 626a, 638a, 645a, 650a, 701a, 713a, 719a, 725a], [653a, 701a, 713a, 720a, 725a, 737a, 751a, 759a, 806a], [723a, 731a, 745a, 753a, 758a, 812a, 826a, 834a, 841a], [753a, 803a, 817a, 825a, 830a, 844a, 858a, 906a, 913a], [823a, 833a, 847a, 855a, 900a, 914a, 928a, 936a, 943a], [853a, 903a, 917a, 925a, 930a, 944a, 956a, 1004a, 1011a], [923a, 933a, 945a, 952a, 957a, 1011a, 1023a, 1031a, 1038a], [1023a, 1033a, 1045a, 1052a, 1057a, 1111a, 1123a, 1131a, 1138a], [1123a, 1133a, 1145a, 1152a, 1157a, 1211p, 1223p, 1231p, 1238p], [1223p, 1233p, 1245p, 1252p, 1257p, 111p, 123p, 131p, 138p], [123p, 133p, 145p, 152p, 157p, 211p, 223p, 231p, 238p], [223p, 233p, 245p, 252p, 257p, 311p, 325p, 333p, 340p], ["-", "-", "-", "-", "-", 344p, 358p, 406p, 413p], [323p, 333p, 347p, 355p, 400p, 414p, 428p, 436p, 443p], [353p, 403p, 417p, 425p, 430p, 444p, 458p, 506p, 513p], [423p, 433p, 447p, 455p, 500p, 514p, 528p, 536p, 543p], [453p, 503p, 517p, 525p, 530p, 544p, 558p, 606p, 613p], [516p, 526p, 540p, 548p, 553p, 607p, 621p, 629p, 635p], [553p, 603p, 617p, 625p, 630p, 640p, 650p, 656p, 702p], [630p, 638p, 648p, 655p, 700p, 710p, 720p, 726p, 732p], [730p, 738p, 748p, 755p, 800p, 810p, 820p, 826p, 832p], [830p, 838p, 848p, 855p, 900p, 910p, 920p, 926p, 932p], [930p, 938p, 948p, 955p, 1000p, 1010p, 1020p, 1026p, 1032p], [1030p, 1038p, 1048p, 1055p, 1100p, 1110p, 1120p, 1126p, 1132p]]
+    time_points: [Woden Interchange, Canberra Hospital, Red Hill, Manuka/Captain Cook, Kings Ave/National Crt, City Interchange, Lyneham, North Lyneham, Dickson]
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
     
     short_name: "6"
-    stop_times: 
-    - - "-"
-      - "-"
-      - "-"
-      - 650a
-      - 658a
-      - 703a
-      - 710a
-      - 720a
-      - 728a
-    - - 648a
-      - 655a
-      - 701a
-      - 715a
-      - 723a
-      - 728a
-      - 736a
-      - 750a
-      - 758a
-    - - 718a
-      - 725a
-      - 731a
-      - 747a
-      - 759a
-      - 804a
-      - 812a
-      - 826a
-      - 834a
-    - - 748a
-      - 756a
-      - 804a
-      - 820a
-      - 828a
-      - 838a
-      - 846a
-      - 903a
-      - 911a
-    - - 818a
-      - 826a
-      - 833a
-      - 849a
-      - 901a
-      - 906a
-      - 914a
-      - 928a
-      - 936a
-    - - 848a
-      - 856a
-      - 903a
-      - 919a
-      - 931a
-      - 936a
-      - 943a
-      - 955a
-      - 1003a
-    - - 918a
-      - 926a
-      - 933a
-      - 947a
-      - 957a
-      - 1002a
-      - 1009a
-      - 1021a
-      - 1029a
-    - - 948a
-      - 956a
-      - 1003a
-      - 1017a
-      - 1027a
-      - 1032a
-      - 1039a
-      - 1051a
-      - 1059a
-    - - 1048a
-      - 1056a
-      - 1103a
-      - 1117a
-      - 1127a
-      - 1132a
-      - 1139a
-      - 1151a
-      - 1159a
-    - - 1148a
-      - 1156a
-      - 1203p
-      - 1217p
-      - 1227p
-      - 1232p
-      - 1239p
-      - 1251p
-      - 1259p
-    - - 1248p
-      - 1256p
-      - 103p
-      - 117p
-      - 127p
-      - 132p
-      - 139p
-      - 151p
-      - 159p
-    - - 148p
-      - 156p
-      - 203p
-      - 217p
-      - 227p
-      - 232p
-      - 239p
-      - 251p
-      - 259p
-    - - 248p
-      - 256p
-      - 303p
-      - 319p
-      - 331p
-      - 336p
-      - 344p
-      - 358p
-      - 406p
-    - - 318p
-      - 326p
-      - 333p
-      - 349p
-      - 401p
-      - 406p
-      - 414p
-      - 428p
-      - 436p
-    - - 348p
-      - 356p
-      - 403p
-      - 419p
-      - 431p
-      - 436p
-      - 444p
-      - 458p
-      - 506p
-    - - 418p
-      - 426p
-      - 433p
-      - 449p
-      - 501p
-      - 506p
-      - 514p
-      - 528p
-      - 536p
-    - - 448p
-      - 456p
-      - 503p
-      - 519p
-      - 531p
-      - 536p
-      - 544p
-      - 558p
-      - 606p
-    - - 518p
-      - 526p
-      - 533p
-      - 549p
-      - 601p
-      - 606p
-      - 614p
-      - 628p
-      - 636p
-    - - 548p
-      - 556p
-      - 603p
-      - 619p
-      - 631p
-      - 636p
-      - 643p
-      - 653p
-      - 701p
-    - - 640p
-      - 647p
-      - 653p
-      - 705p
-      - 713p
-      - 718p
-      - 725p
-      - 735p
-      - 743p
-    - - 740p
-      - 747p
-      - 753p
-      - 805p
-      - 813p
-      - 818p
-      - 825p
-      - 835p
-      - 843p
-    - - 840p
-      - 847p
-      - 853p
-      - 905p
-      - 913p
-      - 918p
-      - 925p
-      - 935p
-      - 943p
-    - - 940p
-      - 947p
-      - 953p
-      - 1005p
-      - 1013p
-      - 1018p
-      - 1025p
-      - 1035p
-      - 1043p
-    - - 1040p
-      - 1047p
-      - 1053p
-      - 1105p
-      - 1113p
-      - 1118p
-      - 1125p
-      - 1135p
-      - 1143p
-    time_points: 
-    - Dickson
-    - North Lyneham
-    - Lyneham
-    - City Interchange
-    - Kings Ave/National Crt
-    - Manuka/Captain Cook
-    - Red Hill
-    - Canberra Hospital
-    - Woden Interchange
+    stop_times: [["-", "-", "-", 650a, 658a, 703a, 710a, 720a, 728a], [648a, 655a, 701a, 715a, 723a, 728a, 736a, 750a, 758a], [718a, 725a, 731a, 747a, 759a, 804a, 812a, 826a, 834a], [748a, 756a, 804a, 820a, 828a, 838a, 846a, 903a, 911a], [818a, 826a, 833a, 849a, 901a, 906a, 914a, 928a, 936a], [848a, 856a, 903a, 919a, 931a, 936a, 943a, 955a, 1003a], [918a, 926a, 933a, 947a, 957a, 1002a, 1009a, 1021a, 1029a], [948a, 956a, 1003a, 1017a, 1027a, 1032a, 1039a, 1051a, 1059a], [1048a, 1056a, 1103a, 1117a, 1127a, 1132a, 1139a, 1151a, 1159a], [1148a, 1156a, 1203p, 1217p, 1227p, 1232p, 1239p, 1251p, 1259p], [1248p, 1256p, 103p, 117p, 127p, 132p, 139p, 151p, 159p], [148p, 156p, 203p, 217p, 227p, 232p, 239p, 251p, 259p], [248p, 256p, 303p, 319p, 331p, 336p, 344p, 358p, 406p], [318p, 326p, 333p, 349p, 401p, 406p, 414p, 428p, 436p], [348p, 356p, 403p, 419p, 431p, 436p, 444p, 458p, 506p], [418p, 426p, 433p, 449p, 501p, 506p, 514p, 528p, 536p], [448p, 456p, 503p, 519p, 531p, 536p, 544p, 558p, 606p], [518p, 526p, 533p, 549p, 601p, 606p, 614p, 628p, 636p], [548p, 556p, 603p, 619p, 631p, 636p, 643p, 653p, 701p], [640p, 647p, 653p, 705p, 713p, 718p, 725p, 735p, 743p], [740p, 747p, 753p, 805p, 813p, 818p, 825p, 835p, 843p], [840p, 847p, 853p, 905p, 913p, 918p, 925p, 935p, 943p], [940p, 947p, 953p, 1005p, 1013p, 1018p, 1025p, 1035p, 1043p], [1040p, 1047p, 1053p, 1105p, 1113p, 1118p, 1125p, 1135p, 1143p]]
+    time_points: [Dickson, North Lyneham, Lyneham, City Interchange, Kings Ave/National Crt, Manuka/Captain Cook, Red Hill, Canberra Hospital, Woden Interchange]
   -  
     long_name: To National Circ/Canberra Ave
-    between_stops: []
+    between_stops: {}
     
     short_name: "701"
-    stop_times: 
-    - - 658a
-      - 703a
-      - 710a
-      - 714a
-      - 726a
-      - 737a
-      - 746a
-      - 754a
-    - - 731a
-      - 736a
-      - 743a
-      - 747a
-      - 810a
-      - 826a
-      - 835a
-      - 843a
-    - - 745a
-      - 750a
-      - 757a
-      - 801a
-      - 824a
-      - 840a
-      - 849a
-      - 857a
-    time_points: 
-    - Spence Terminus
-    - Spence
-    - Copland College
-    - William Webb / Ginninderra Drive
-    - Macarthur / Northbourne
-    - City Interchange - Platform 10
-    - Russell Offices
-    - National Circuit / Canberra Ave
+    stop_times: [[658a, 703a, 710a, 714a, 726a, 737a, 746a, 754a], [731a, 736a, 743a, 747a, 810a, 826a, 835a, 843a], [745a, 750a, 757a, 801a, 824a, 840a, 849a, 857a]]
+    time_points: [Spence Terminus, Spence, Copland College, William Webb / Ginninderra Drive, Macarthur / Northbourne, City Interchange - Platform 10, Russell Offices, National Circuit / Canberra Ave]
   -  
     long_name: To Spence Terminus
-    between_stops: []
+    between_stops: {}
+    
     short_name: "701"
     stop_times: [[442p, 450p, 502p, 509p, 522p, 527p, 534p, 540p], ["-", "-", 520p, 527p, 539p, 543p, 550p, 554p], [525p, 533p, 543p, 550p, 602p, 606p, 613p, 617p], [542p, 550p, 600p, 607p, 619p, 623p, 630p, 634p]]
     time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Macarthur / Northbourne, William Webb / Ginninderra Drive, Copland College, Spence, Spence Terminus]
   -  
     long_name: To Fraser East Terminus
-    between_stops: []
+    between_stops: {}
+    
     short_name: "702"
     stop_times: [[450p, 458p, 508p, 513p, 515p, 527p, 532p, 538p, 542p], ["-", "-", 530p, 535p, 537p, 549p, 554p, 600p, 604p], [535p, 543p, 553p, 558p, 600p, 612p, 617p, 623p, 627p]]
     time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Macarthur / Northbourne, Northbourne Ave/Antill St, Flynn, Charnwood, Fraser, Fraser East Terminus]
   -  
     long_name: To National Circ/Canberra Ave
-    between_stops: []
+    between_stops: {}
     
     short_name: "702"
-    stop_times: 
-    - - 658a
-      - 703a
-      - 709a
-      - 714a
-      - 727a
-      - 730a
-      - 745a
-      - 754a
-      - 802a
-    - - 735a
-      - 740a
-      - 746a
-      - 751a
-      - 805a
-      - 810a
-      - 826a
-      - 835a
-      - 843a
-    - - 754a
-      - 759a
-      - 806a
-      - 811a
-      - 828a
-      - 833a
-      - 849a
-      - 858a
-      - 906a
-    time_points: 
-    - Fraser East Terminus
-    - Fraser
-    - Charnwood
-    - Flynn
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange - Platform 10
-    - Russell Offices
-    - National Circuit / Canberra Ave
+    stop_times: [[658a, 703a, 709a, 714a, 727a, 730a, 745a, 754a, 802a], [735a, 740a, 746a, 751a, 805a, 810a, 826a, 835a, 843a], [754a, 759a, 806a, 811a, 828a, 833a, 849a, 858a, 906a]]
+    time_points: [Fraser East Terminus, Fraser, Charnwood, Flynn, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange - Platform 10, Russell Offices, National Circuit / Canberra Ave]
   -  
     long_name: To Fraser West Terminus
-    between_stops: []
+    between_stops: {}
+    
     short_name: "703"
     stop_times: [[440p, 448p, 458p, 516p, 527p, 534p, 541p], ["-", "-", 515p, 533p, 544p, 551p, 558p], ["-", "-", 526p, 544p, 555p, 602p, 609p], [520p, 528p, 538p, 556p, 607p, 614p, 621p], [545p, 553p, 603p, 621p, 632p, 639p, 646p]]
     time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Belconnen Way, Macgregor Shops, Dunlop, Fraser West Terminus]
   -  
     long_name: To National Circ/Canberra Ave
-    between_stops: []
+    between_stops: {}
     
     short_name: "703"
-    stop_times: 
-    - - 654a
-      - 701a
-      - 707a
-      - 719a
-      - 738a
-      - 747a
-      - 755a
-    - - 710a
-      - 717a
-      - 723a
-      - 735a
-      - 753a
-      - "-"
-      - "-"
-    - - 723a
-      - 730a
-      - 736a
-      - 748a
-      - 806a
-      - "-"
-      - "-"
-    - - 738a
-      - 745a
-      - 751a
-      - 803a
-      - 834a
-      - 843a
-      - 851a
-    - - 758a
-      - 806a
-      - 813a
-      - 827a
-      - 849a
-      - 858a
-      - 906a
-    time_points: 
-    - Fraser West Terminus
-    - Dunlop
-    - Macgregor Shops
-    - Belconnen Way
-    - City Interchange - Platform 10
-    - Russell Offices
-    - National Circuit / Canberra Ave
+    stop_times: [[654a, 701a, 707a, 719a, 738a, 747a, 755a], [710a, 717a, 723a, 735a, 753a, "-", "-"], [723a, 730a, 736a, 748a, 806a, "-", "-"], [738a, 745a, 751a, 803a, 834a, 843a, 851a], [758a, 806a, 813a, 827a, 849a, 858a, 906a]]
+    time_points: [Fraser West Terminus, Dunlop, Macgregor Shops, Belconnen Way, City Interchange - Platform 10, Russell Offices, National Circuit / Canberra Ave]
   -  
     long_name: To Kippax
-    between_stops: []
+    between_stops: {}
+    
     short_name: "704"
     stop_times: [[506p, 514p, 524p, 533p, 542p, 550p, 555p, 600p, 606p]]
     time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Aranda, Macquarie, Hawker, Hawker College, Higgins, Kippax]
   -  
     long_name: To National Circ/Canberra Ave
-    between_stops: []
+    between_stops: {}
     
     short_name: "704"
-    stop_times: 
-    - - 738a
-      - 744a
-      - 749a
-      - 754a
-      - 803a
-      - 812a
-      - 825a
-      - 833a
-      - 840a
-    - - 753a
-      - 759a
-      - 804a
-      - 809a
-      - 818a
-      - 827a
-      - 840a
-      - 848a
-      - 855a
-    time_points: 
-    - Kippax
-    - Higgins
-    - Hawker College
-    - Hawker
-    - Macquarie
-    - Aranda
-    - City Interchange - Platform 10
-    - Russell Offices
-    - National Circuit / Canberra Ave
+    stop_times: [[738a, 744a, 749a, 754a, 803a, 812a, 825a, 833a, 840a], [753a, 759a, 804a, 809a, 818a, 827a, 840a, 848a, 855a]]
+    time_points: [Kippax, Higgins, Hawker College, Hawker, Macquarie, Aranda, City Interchange - Platform 10, Russell Offices, National Circuit / Canberra Ave]
   -  
     long_name: To Centre Link Tuggeranong
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 2: []
     short_name: "705"
     stop_times: [[721a, 723a, 727a, 803a, 805a], [747a, 749a, 753a, 829a, 831a], [813a, 815a, 819a, 855a, 857a], [445p, 447p, 451p, 526p, "-"], [511p, 513p, 517p, 552p, "-"], [538p, 540p, 544p, 619p, "-"]]
     time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Tuggeranong Interchange - Platform 7, Centre Link Tuggeranong]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "705"
     stop_times: [["-", 723a, 749a, 751a, 755a], ["-", 749a, 815a, 817a, 821a], ["-", 814a, 840a, 842a, 846a], [442p, 447p, 513p, 515p, 519p], [507p, 512p, 538p, 540p, 544p], [535p, 540p, 606p, 608p, 612p]]
     time_points: [Centre Link Tuggeranong, Tuggeranong Interchange - Platform 7, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      City Interchange - Platform 11-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "710"
     stop_times: [[407p, 415p, 425p, 442p, 444p, 448p], [427p, 435p, 445p, 502p, 504p, 508p], [445p, 453p, 503p, 520p, 522p, 526p], [507p, 515p, 525p, 542p, 544p, 548p], [527p, 535p, 545p, 602p, 604p, 608p]]
     time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To National Circ/Canberra Ave
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 2: []
+      Cameron Ave Bus Station - Platform 2-City Interchange - Platform 10: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
     short_name: "710"
-    stop_times: 
-    - - 704a
-      - 706a
-      - 710a
-      - 726a
-      - 735a
-      - 743a
-    - - 734a
-      - 736a
-      - 740a
-      - 756a
-      - 805a
-      - 813a
-    - - 749a
-      - 751a
-      - 755a
-      - 811a
-      - 820a
-      - 828a
-    - - 804a
-      - 806a
-      - 810a
-      - 826a
-      - 835a
-      - 843a
-    - - 819a
-      - 821a
-      - 825a
-      - 841a
-      - 850a
-      - 858a
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - City Interchange - Platform 10
-    - Russell Offices
-    - National Circuit / Canberra Ave
+    stop_times: [[704a, 706a, 710a, 726a, 735a, 743a], [734a, 736a, 740a, 756a, 805a, 813a], [749a, 751a, 755a, 811a, 820a, 828a], [804a, 806a, 810a, 826a, 835a, 843a], [819a, 821a, 825a, 841a, 850a, 858a]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, City Interchange - Platform 10, Russell Offices, National Circuit / Canberra Ave]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "71"
     stop_times: [[930a, 932a, 936a, 943a, 948a, 956a, 958a, 1003a, 1010a, 1012a, 1016a], [1030a, 1032a, 1036a, 1043a, 1048a, 1056a, 1058a, 1103a, 1110a, 1112a, 1116a], [1130a, 1132a, 1136a, 1143a, 1148a, 1156a, 1158a, 1203p, 1210p, 1212p, 1216p], [1230p, 1232p, 1236p, 1243p, 1248p, 1256p, 1258p, 103p, 110p, 112p, 116p], [130p, 132p, 136p, 143p, 148p, 156p, 158p, 203p, 210p, 212p, 216p]]
     time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Electricity House
-    between_stops: []
+    between_stops: {}
+    
     short_name: "720"
     stop_times: [[710a, 716a, 728a, 734a, 752a, 756a, 757a], [740a, 746a, 758a, 804a, 822a, 826a, 827a], [816a, 822a, 834a, 840a, 858a, 902a, 903a], [840a, 846a, 858a, 904a, 922a, 926a, 927a]]
     time_points: [Farrer Terminus, Southlands Mawson, Garran, Hughes, Citywest, City Interchange, Electricity House]
   -  
     long_name: To Farrer Terminus
-    between_stops: []
+    between_stops: {}
+    
     short_name: "720"
     stop_times: [[440p, 446p, 504p, 510p, 523p, 529p], [510p, 516p, 534p, 540p, 553p, 559p], [540p, 546p, 604p, 610p, 623p, 629p]]
     time_points: [Citywest, City Interchange - Platform 10, Hughes, Garran, Southlands Mawson, Farrer Terminus]
   -  
     long_name: To Gungahlin Market Place
-    between_stops: []
+    between_stops: {}
     
     short_name: "727"
-    stop_times: 
-    - - 706a
-      - 713a
-      - 717a
-      - 725a
-      - 732a
-      - 734a
-      - 741a
-      - 748a
-    - - 721a
-      - 728a
-      - 732a
-      - 740a
-      - 747a
-      - 749a
-      - 756a
-      - 804a
-    - - 736a
-      - 743a
-      - 747a
-      - 755a
-      - 802a
-      - 804a
-      - 811a
-      - 821a
-    - - 751a
-      - 758a
-      - 803a
-      - 812a
-      - 818a
-      - 820a
-      - 827a
-      - 837a
-    - - 806a
-      - 814a
-      - 820a
-      - 829a
-      - 835a
-      - 837a
-      - 844a
-      - 854a
-    - - 821a
-      - 829a
-      - 835a
-      - 844a
-      - 850a
-      - 852a
-      - 859a
-      - 906a
-    - - 836a
-      - 844a
-      - 850a
-      - 859a
-      - 906a
-      - 908a
-      - 915a
-      - 922a
-    - - 851a
-      - 859a
-      - 903a
-      - 911a
-      - 918a
-      - 920a
-      - 927a
-      - 934a
-    - - 906a
-      - 913a
-      - 917a
-      - 925a
-      - 932a
-      - 934a
-      - 941a
-      - 948a
-    - - 921a
-      - 928a
-      - 932a
-      - 940a
-      - 947a
-      - 949a
-      - 956a
-      - 1003a
-    - - 936a
-      - 943a
-      - 947a
-      - 955a
-      - 1002a
-      - 1004a
-      - 1011a
-      - 1018a
-    - - 951a
-      - 958a
-      - 1002a
-      - 1010a
-      - 1017a
-      - 1019a
-      - 1026a
-      - 1033a
-    - - 1006a
-      - 1013a
-      - 1017a
-      - 1025a
-      - 1032a
-      - 1034a
-      - 1041a
-      - 1048a
-    - - 1021a
-      - 1028a
-      - 1032a
-      - 1040a
-      - 1047a
-      - 1049a
-      - 1056a
-      - 1103a
-    - - 1036a
-      - 1043a
-      - 1047a
-      - 1055a
-      - 1102a
-      - 1104a
-      - 1111a
-      - 1118a
-    - - 1051a
-      - 1058a
-      - 1102a
-      - 1110a
-      - 1117a
-      - 1119a
-      - 1126a
-      - 1133a
-    - - 1106a
-      - 1113a
-      - 1117a
-      - 1125a
-      - 1132a
-      - 1134a
-      - 1141a
-      - 1148a
-    - - 1121a
-      - 1128a
-      - 1132a
-      - 1140a
-      - 1147a
-      - 1149a
-      - 1156a
-      - 1203p
-    - - 1136a
-      - 1143a
-      - 1147a
-      - 1155a
-      - 1202p
-      - 1204p
-      - 1211p
-      - 1218p
-    - - 1151a
-      - 1158a
-      - 1202p
-      - 1210p
-      - 1217p
-      - 1219p
-      - 1226p
-      - 1233p
-    - - 1206p
-      - 1213p
-      - 1217p
-      - 1225p
-      - 1232p
-      - 1234p
-      - 1241p
-      - 1248p
-    - - 1221p
-      - 1228p
-      - 1232p
-      - 1240p
-      - 1247p
-      - 1249p
-      - 1256p
-      - 103p
-    - - 1236p
-      - 1243p
-      - 1247p
-      - 1255p
-      - 102p
-      - 104p
-      - 111p
-      - 118p
-    - - 1251p
-      - 1258p
-      - 102p
-      - 110p
-      - 117p
-      - 119p
-      - 126p
-      - 133p
-    - - 106p
-      - 113p
-      - 117p
-      - 125p
-      - 132p
-      - 134p
-      - 141p
-      - 148p
-    - - 121p
-      - 128p
-      - 132p
-      - 140p
-      - 147p
-      - 149p
-      - 156p
-      - 203p
-    - - 136p
-      - 143p
-      - 147p
-      - 155p
-      - 202p
-      - 204p
-      - 211p
-      - 218p
-    - - 151p
-      - 158p
-      - 202p
-      - 210p
-      - 217p
-      - 219p
-      - 226p
-      - 233p
-    - - 206p
-      - 213p
-      - 217p
-      - 225p
-      - 232p
-      - 234p
-      - 241p
-      - 248p
-    - - 221p
-      - 228p
-      - 232p
-      - 240p
-      - 247p
-      - 249p
-      - 256p
-      - 303p
-    - - 236p
-      - 243p
-      - 247p
-      - 255p
-      - 302p
-      - 304p
-      - 311p
-      - 318p
-    - - 251p
-      - 258p
-      - 302p
-      - 310p
-      - 317p
-      - 319p
-      - 326p
-      - 333p
-    - - 306p
-      - 313p
-      - 317p
-      - 325p
-      - 332p
-      - 334p
-      - 341p
-      - 348p
-    - - 321p
-      - 328p
-      - 332p
-      - 340p
-      - 347p
-      - 349p
-      - 356p
-      - 404p
-    - - 336p
-      - 343p
-      - 347p
-      - 355p
-      - 401p
-      - 404p
-      - 411p
-      - 421p
-    - - 351p
-      - 358p
-      - 403p
-      - 415p
-      - 420p
-      - 423p
-      - 430p
-      - 440p
-    - - 406p
-      - 414p
-      - 420p
-      - 432p
-      - 437p
-      - 440p
-      - 447p
-      - 457p
-    - - 421p
-      - 429p
-      - 435p
-      - 447p
-      - 452p
-      - 455p
-      - 502p
-      - 512p
-    - - 436p
-      - 444p
-      - 450p
-      - 502p
-      - 507p
-      - 510p
-      - 517p
-      - 527p
-    - - 451p
-      - 459p
-      - 505p
-      - 517p
-      - 522p
-      - 525p
-      - 532p
-      - 542p
-    - - 506p
-      - 514p
-      - 520p
-      - 532p
-      - 537p
-      - 540p
-      - 547p
-      - 557p
-    - - 521p
-      - 529p
-      - 535p
-      - 547p
-      - 552p
-      - 555p
-      - 602p
-      - 610p
-    - - 536p
-      - 544p
-      - 550p
-      - 602p
-      - 606p
-      - 609p
-      - 615p
-      - 623p
-    - - 551p
-      - 559p
-      - 603p
-      - 612p
-      - 616p
-      - 619p
-      - 625p
-      - 633p
-    - - 606p
-      - 612p
-      - 616p
-      - 625p
-      - 629p
-      - 632p
-      - 638p
-      - 646p
-    - - 621p
-      - 627p
-      - 631p
-      - 640p
-      - 644p
-      - 647p
-      - 653p
-      - 701p
-    - - 636p
-      - 642p
-      - 646p
-      - 655p
-      - 659p
-      - 702p
-      - 708p
-      - 716p
-    time_points: 
-    - Railway Station Kingston
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange - Platform 8
-    - Macarthur / Northbourne
-    - Northbourne Ave/Antill St
-    - Flemington Rd/Sandford St
-    - Gungahlin Market Place
+    stop_times: [[706a, 713a, 717a, 725a, 732a, 734a, 741a, 748a], [721a, 728a, 732a, 740a, 747a, 749a, 756a, 804a], [736a, 743a, 747a, 755a, 802a, 804a, 811a, 821a], [751a, 758a, 803a, 812a, 818a, 820a, 827a, 837a], [806a, 814a, 820a, 829a, 835a, 837a, 844a, 854a], [821a, 829a, 835a, 844a, 850a, 852a, 859a, 906a], [836a, 844a, 850a, 859a, 906a, 908a, 915a, 922a], [851a, 859a, 903a, 911a, 918a, 920a, 927a, 934a], [906a, 913a, 917a, 925a, 932a, 934a, 941a, 948a], [921a, 928a, 932a, 940a, 947a, 949a, 956a, 1003a], [936a, 943a, 947a, 955a, 1002a, 1004a, 1011a, 1018a], [951a, 958a, 1002a, 1010a, 1017a, 1019a, 1026a, 1033a], [1006a, 1013a, 1017a, 1025a, 1032a, 1034a, 1041a, 1048a], [1021a, 1028a, 1032a, 1040a, 1047a, 1049a, 1056a, 1103a], [1036a, 1043a, 1047a, 1055a, 1102a, 1104a, 1111a, 1118a], [1051a, 1058a, 1102a, 1110a, 1117a, 1119a, 1126a, 1133a], [1106a, 1113a, 1117a, 1125a, 1132a, 1134a, 1141a, 1148a], [1121a, 1128a, 1132a, 1140a, 1147a, 1149a, 1156a, 1203p], [1136a, 1143a, 1147a, 1155a, 1202p, 1204p, 1211p, 1218p], [1151a, 1158a, 1202p, 1210p, 1217p, 1219p, 1226p, 1233p], [1206p, 1213p, 1217p, 1225p, 1232p, 1234p, 1241p, 1248p], [1221p, 1228p, 1232p, 1240p, 1247p, 1249p, 1256p, 103p], [1236p, 1243p, 1247p, 1255p, 102p, 104p, 111p, 118p], [1251p, 1258p, 102p, 110p, 117p, 119p, 126p, 133p], [106p, 113p, 117p, 125p, 132p, 134p, 141p, 148p], [121p, 128p, 132p, 140p, 147p, 149p, 156p, 203p], [136p, 143p, 147p, 155p, 202p, 204p, 211p, 218p], [151p, 158p, 202p, 210p, 217p, 219p, 226p, 233p], [206p, 213p, 217p, 225p, 232p, 234p, 241p, 248p], [221p, 228p, 232p, 240p, 247p, 249p, 256p, 303p], [236p, 243p, 247p, 255p, 302p, 304p, 311p, 318p], [251p, 258p, 302p, 310p, 317p, 319p, 326p, 333p], [306p, 313p, 317p, 325p, 332p, 334p, 341p, 348p], [321p, 328p, 332p, 340p, 347p, 349p, 356p, 404p], [336p, 343p, 347p, 355p, 401p, 404p, 411p, 421p], [351p, 358p, 403p, 415p, 420p, 423p, 430p, 440p], [406p, 414p, 420p, 432p, 437p, 440p, 447p, 457p], [421p, 429p, 435p, 447p, 452p, 455p, 502p, 512p], [436p, 444p, 450p, 502p, 507p, 510p, 517p, 527p], [451p, 459p, 505p, 517p, 522p, 525p, 532p, 542p], [506p, 514p, 520p, 532p, 537p, 540p, 547p, 557p], [521p, 529p, 535p, 547p, 552p, 555p, 602p, 610p], [536p, 544p, 550p, 602p, 606p, 609p, 615p, 623p], [551p, 559p, 603p, 612p, 616p, 619p, 625p, 633p], [606p, 612p, 616p, 625p, 629p, 632p, 638p, 646p], [621p, 627p, 631p, 640p, 644p, 647p, 653p, 701p], [636p, 642p, 646p, 655p, 659p, 702p, 708p, 716p]]
+    time_points: [Railway Station Kingston, Kings Ave/National Crt, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Gungahlin Market Place]
   -  
     long_name: To Railway Station Kingston
-    between_stops: []
+    between_stops: {}
     
     short_name: "727"
-    stop_times: 
-    - - 701a
-      - 709a
-      - 715a
-      - 718a
-      - 723a
-      - 731a
-      - 735a
-      - 741a
-    - - 716a
-      - 724a
-      - 730a
-      - 736a
-      - 746a
-      - 756a
-      - 800a
-      - 806a
-    - - 731a
-      - 740a
-      - 749a
-      - 755a
-      - 805a
-      - 815a
-      - 819a
-      - 825a
-    - - 746a
-      - 755a
-      - 804a
-      - 810a
-      - 820a
-      - 830a
-      - 834a
-      - 840a
-    - - 801a
-      - 810a
-      - 819a
-      - 825a
-      - 835a
-      - 845a
-      - 849a
-      - 855a
-    - - 816a
-      - 825a
-      - 834a
-      - 840a
-      - 850a
-      - 900a
-      - 904a
-      - 910a
-    - - 831a
-      - 840a
-      - 849a
-      - 855a
-      - 903a
-      - 911a
-      - 915a
-      - 921a
-    - - 846a
-      - 855a
-      - 903a
-      - 906a
-      - 911a
-      - 919a
-      - 923a
-      - 929a
-    - - 901a
-      - 909a
-      - 915a
-      - 918a
-      - 923a
-      - 931a
-      - 935a
-      - 941a
-    - - 916a
-      - 924a
-      - 930a
-      - 933a
-      - 938a
-      - 946a
-      - 950a
-      - 956a
-    - - 931a
-      - 939a
-      - 945a
-      - 948a
-      - 953a
-      - 1001a
-      - 1005a
-      - 1011a
-    - - 946a
-      - 954a
-      - 1000a
-      - 1003a
-      - 1008a
-      - 1016a
-      - 1020a
-      - 1026a
-    - - 1001a
-      - 1009a
-      - 1015a
-      - 1018a
-      - 1023a
-      - 1031a
-      - 1035a
-      - 1041a
-    - - 1016a
-      - 1024a
-      - 1030a
-      - 1033a
-      - 1038a
-      - 1046a
-      - 1050a
-      - 1056a
-    - - 1031a
-      - 1039a
-      - 1045a
-      - 1048a
-      - 1053a
-      - 1101a
-      - 1105a
-      - 1111a
-    - - 1046a
-      - 1054a
-      - 1100a
-      - 1103a
-      - 1108a
-      - 1116a
-      - 1120a
-      - 1126a
-    - - 1101a
-      - 1109a
-      - 1115a
-      - 1118a
-      - 1123a
-      - 1131a
-      - 1135a
-      - 1141a
-    - - 1116a
-      - 1124a
-      - 1130a
-      - 1133a
-      - 1138a
-      - 1146a
-      - 1150a
-      - 1156a
-    - - 1131a
-      - 1139a
-      - 1145a
-      - 1148a
-      - 1153a
-      - 1201p
-      - 1205p
-      - 1211p
-    - - 1146a
-      - 1154a
-      - 1200p
-      - 1203p
-      - 1208p
-      - 1216p
-      - 1220p
-      - 1226p
-    - - 1201p
-      - 1209p
-      - 1215p
-      - 1218p
-      - 1223p
-      - 1231p
-      - 1235p
-      - 1241p
-    - - 1216p
-      - 1224p
-      - 1230p
-      - 1233p
-      - 1238p
-      - 1246p
-      - 1250p
-      - 1256p
-    - - 1231p
-      - 1239p
-      - 1245p
-      - 1248p
-      - 1253p
-      - 101p
-      - 105p
-      - 111p
-    - - 1246p
-      - 1254p
-      - 100p
-      - 103p
-      - 108p
-      - 116p
-      - 120p
-      - 126p
-    - - 101p
-      - 109p
-      - 115p
-      - 118p
-      - 123p
-      - 131p
-      - 135p
-      - 141p
-    - - 116p
-      - 124p
-      - 130p
-      - 133p
-      - 138p
-      - 146p
-      - 150p
-      - 156p
-    - - 131p
-      - 139p
-      - 145p
-      - 148p
-      - 153p
-      - 201p
-      - 205p
-      - 211p
-    - - 146p
-      - 154p
-      - 200p
-      - 203p
-      - 208p
-      - 216p
-      - 220p
-      - 226p
-    - - 201p
-      - 209p
-      - 215p
-      - 218p
-      - 223p
-      - 231p
-      - 235p
-      - 241p
-    - - 216p
-      - 224p
-      - 230p
-      - 233p
-      - 238p
-      - 246p
-      - 250p
-      - 256p
-    - - 231p
-      - 239p
-      - 245p
-      - 248p
-      - 253p
-      - 301p
-      - 305p
-      - 311p
-    - - 246p
-      - 254p
-      - 300p
-      - 303p
-      - 308p
-      - 316p
-      - 320p
-      - 326p
-    - - 301p
-      - 309p
-      - 315p
-      - 318p
-      - 323p
-      - 331p
-      - 335p
-      - 341p
-    - - 316p
-      - 324p
-      - 330p
-      - 333p
-      - 338p
-      - 346p
-      - 350p
-      - 356p
-    - - 331p
-      - 339p
-      - 345p
-      - 348p
-      - 353p
-      - 401p
-      - 406p
-      - 414p
-    - - 346p
-      - 354p
-      - 400p
-      - 403p
-      - 412p
-      - 422p
-      - 427p
-      - 435p
-    - - 401p
-      - 410p
-      - 417p
-      - 420p
-      - 429p
-      - 439p
-      - 444p
-      - 452p
-    - - 416p
-      - 425p
-      - 432p
-      - 435p
-      - 444p
-      - 454p
-      - 459p
-      - 507p
-    - - 431p
-      - 440p
-      - 447p
-      - 450p
-      - 459p
-      - 509p
-      - 514p
-      - 522p
-    - - 446p
-      - 455p
-      - 502p
-      - 505p
-      - 514p
-      - 524p
-      - 529p
-      - 537p
-    - - 501p
-      - 510p
-      - 517p
-      - 520p
-      - 529p
-      - 539p
-      - 544p
-      - 552p
-    - - 516p
-      - 525p
-      - 532p
-      - 535p
-      - 544p
-      - 554p
-      - 559p
-      - 605p
-    - - 531p
-      - 540p
-      - 547p
-      - 550p
-      - 559p
-      - 607p
-      - 611p
-      - 617p
-    - - 546p
-      - 555p
-      - 602p
-      - 605p
-      - 610p
-      - 618p
-      - 622p
-      - 628p
-    - - 601p
-      - 609p
-      - 615p
-      - 618p
-      - 623p
-      - 631p
-      - 635p
-      - 641p
-    - - 616p
-      - 624p
-      - 630p
-      - 633p
-      - 638p
-      - 646p
-      - 650p
-      - 656p
-    - - 631p
-      - 639p
-      - 645p
-      - 648p
-      - 653p
-      - 701p
-      - 705p
-      - 711p
-    - - 646p
-      - 654p
-      - 700p
-      - 703p
-      - 708p
-      - 716p
-      - 720p
-      - 726p
-    time_points: 
-    - Gungahlin Market Place
-    - Flemington Rd/Sandford St
-    - Northbourne Ave/Antill St
-    - Macarthur / Northbourne
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Railway Station Kingston
+    stop_times: [[701a, 709a, 715a, 718a, 723a, 731a, 735a, 741a], [716a, 724a, 730a, 736a, 746a, 756a, 800a, 806a], [731a, 740a, 749a, 755a, 805a, 815a, 819a, 825a], [746a, 755a, 804a, 810a, 820a, 830a, 834a, 840a], [801a, 810a, 819a, 825a, 835a, 845a, 849a, 855a], [816a, 825a, 834a, 840a, 850a, 900a, 904a, 910a], [831a, 840a, 849a, 855a, 903a, 911a, 915a, 921a], [846a, 855a, 903a, 906a, 911a, 919a, 923a, 929a], [901a, 909a, 915a, 918a, 923a, 931a, 935a, 941a], [916a, 924a, 930a, 933a, 938a, 946a, 950a, 956a], [931a, 939a, 945a, 948a, 953a, 1001a, 1005a, 1011a], [946a, 954a, 1000a, 1003a, 1008a, 1016a, 1020a, 1026a], [1001a, 1009a, 1015a, 1018a, 1023a, 1031a, 1035a, 1041a], [1016a, 1024a, 1030a, 1033a, 1038a, 1046a, 1050a, 1056a], [1031a, 1039a, 1045a, 1048a, 1053a, 1101a, 1105a, 1111a], [1046a, 1054a, 1100a, 1103a, 1108a, 1116a, 1120a, 1126a], [1101a, 1109a, 1115a, 1118a, 1123a, 1131a, 1135a, 1141a], [1116a, 1124a, 1130a, 1133a, 1138a, 1146a, 1150a, 1156a], [1131a, 1139a, 1145a, 1148a, 1153a, 1201p, 1205p, 1211p], [1146a, 1154a, 1200p, 1203p, 1208p, 1216p, 1220p, 1226p], [1201p, 1209p, 1215p, 1218p, 1223p, 1231p, 1235p, 1241p], [1216p, 1224p, 1230p, 1233p, 1238p, 1246p, 1250p, 1256p], [1231p, 1239p, 1245p, 1248p, 1253p, 101p, 105p, 111p], [1246p, 1254p, 100p, 103p, 108p, 116p, 120p, 126p], [101p, 109p, 115p, 118p, 123p, 131p, 135p, 141p], [116p, 124p, 130p, 133p, 138p, 146p, 150p, 156p], [131p, 139p, 145p, 148p, 153p, 201p, 205p, 211p], [146p, 154p, 200p, 203p, 208p, 216p, 220p, 226p], [201p, 209p, 215p, 218p, 223p, 231p, 235p, 241p], [216p, 224p, 230p, 233p, 238p, 246p, 250p, 256p], [231p, 239p, 245p, 248p, 253p, 301p, 305p, 311p], [246p, 254p, 300p, 303p, 308p, 316p, 320p, 326p], [301p, 309p, 315p, 318p, 323p, 331p, 335p, 341p], [316p, 324p, 330p, 333p, 338p, 346p, 350p, 356p], [331p, 339p, 345p, 348p, 353p, 401p, 406p, 414p], [346p, 354p, 400p, 403p, 412p, 422p, 427p, 435p], [401p, 410p, 417p, 420p, 429p, 439p, 444p, 452p], [416p, 425p, 432p, 435p, 444p, 454p, 459p, 507p], [431p, 440p, 447p, 450p, 459p, 509p, 514p, 522p], [446p, 455p, 502p, 505p, 514p, 524p, 529p, 537p], [501p, 510p, 517p, 520p, 529p, 539p, 544p, 552p], [516p, 525p, 532p, 535p, 544p, 554p, 559p, 605p], [531p, 540p, 547p, 550p, 559p, 607p, 611p, 617p], [546p, 555p, 602p, 605p, 610p, 618p, 622p, 628p], [601p, 609p, 615p, 618p, 623p, 631p, 635p, 641p], [616p, 624p, 630p, 633p, 638p, 646p, 650p, 656p], [631p, 639p, 645p, 648p, 653p, 701p, 705p, 711p], [646p, 654p, 700p, 703p, 708p, 716p, 720p, 726p]]
+    time_points: [Gungahlin Market Place, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange - Platform 9, Russell Offices, Kings Ave/National Crt, Railway Station Kingston]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: "729"
     stop_times: [[445p, 451p, 513p, 518p, 526p, 532p], [515p, 521p, 543p, 548p, 556p, 602p]]
     time_points: [Citywest, City Interchange - Platform 10, Holder, Duffy, Rivett, Cooleman Court]
   -  
     long_name: To Electricity House
-    between_stops: []
+    between_stops: {}
+    
     short_name: "729"
     stop_times: [[709a, 715a, 724a, 728a, 749a, 753a, 755a], [739a, 745a, 754a, 758a, 819a, 823a, 825a]]
     time_points: [Cooleman Court, Rivett, Duffy, Holder, Citywest, City Interchange, Electricity House]
   -  
     long_name: To Electricity House
-    between_stops: []
+    between_stops: {}
+    
     short_name: "732"
     stop_times: [[715a, 724a, 738a, 742a, 744a], [748a, 803a, 814a, 819a, 821a], [818a, 827a, 841a, 845a, 847a]]
     time_points: [Woden Interchange - Platform 4, Curtin, Citywest, City Interchange, Electricity House]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "732"
     stop_times: [[435p, 441p, 453p, 503p], [505p, 511p, 523p, 533p], [535p, 541p, 553p, 603p]]
     time_points: [Citywest, City Interchange - Platform 10, Curtin, Woden Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "737"
     stop_times: [[431p, 441p, 455p, 507p], [445p, 453p, 512p, 527p], [505p, 513p, 532p, 547p], [525p, 533p, 552p, 607p], [545p, 553p, 612p, 627p]]
     time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, City Interchange]
   -  
     long_name: To Fairbairn Park
-    between_stops: []
+    between_stops: {}
+    
     short_name: "737"
     stop_times: [[643a, 652a, 710a, "-"], [658a, 707a, 725a, "-"], [718a, 727a, 745a, "-"], [738a, 747a, 805a, "-"], [758a, 807a, 825a, 837a], [818a, 827a, 845a, 857a]]
     time_points: [City Interchange - Platform 7, Russell Offices, Brindabella Business Park, Fairbairn Park]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 5: []
+      Lathlain St Bus Station - Platform 5-Cohen St Bus Station - Platform 5: []
     short_name: "73"
-    stop_times: 
-    - - 917a
-      - 919a
-      - 923a
-      - 928a
-      - 934a
-      - 938a
-      - 944a
-      - 947a
-      - 954a
-      - 1002a
-      - 1004a
-      - 1008a
-    - - 1047a
-      - 1049a
-      - 1053a
-      - 1058a
-      - 1104a
-      - 1108a
-      - 1114a
-      - 1117a
-      - 1124a
-      - 1132a
-      - 1134a
-      - 1138a
-    - - 1217p
-      - 1219p
-      - 1223p
-      - 1228p
-      - 1234p
-      - 1238p
-      - 1244p
-      - 1247p
-      - 1254p
-      - 102p
-      - 104p
-      - 108p
-    - - 147p
-      - 149p
-      - 153p
-      - 158p
-      - 204p
-      - 208p
-      - 214p
-      - 217p
-      - 224p
-      - 232p
-      - 234p
-      - 238p
-    time_points: 
-    - Cameron Ave Bus Station - Platform 5
-    - Lathlain St Bus Station - Platform 5
-    - Cohen St Bus Station - Platform 5
-    - Florey Shops
-    - Page Shops
-    - Hawker
-    - Cook
-    - Jamison Centre
-    - Calvary Hospital
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    stop_times: [[917a, 919a, 923a, 928a, 934a, 938a, 944a, 947a, 954a, 1002a, 1004a, 1008a], [1047a, 1049a, 1053a, 1058a, 1104a, 1108a, 1114a, 1117a, 1124a, 1132a, 1134a, 1138a], [1217p, 1219p, 1223p, 1228p, 1234p, 1238p, 1244p, 1247p, 1254p, 102p, 104p, 108p], [147p, 149p, 153p, 158p, 204p, 208p, 214p, 217p, 224p, 232p, 234p, 238p]]
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 5, Cohen St Bus Station - Platform 5, Florey Shops, Page Shops, Hawker, Cook, Jamison Centre, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "749"
     stop_times: [[753a, 817a, 819a, 823a], [436p, 502p, 504p, 508p], [510p, 536p, 538p, 542p], [540p, 606p, 608p, 612p]]
     time_points: [Woden Interchange - Platform 4, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Woden Interchange
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 2: []
     short_name: "749"
-    stop_times: 
-    - - 702a
-      - 704a
-      - 708a
-      - 730a
-    - - 737a
-      - 739a
-      - 743a
-      - 810a
-    - - 807a
-      - 809a
-      - 813a
-      - 840a
-    - - 459p
-      - 501p
-      - 505p
-      - 535p
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 2
-    - Cameron Ave Bus Station - Platform 2
-    - Woden Interchange
+    stop_times: [[702a, 704a, 708a, 730a], [737a, 739a, 743a, 810a], [807a, 809a, 813a, 840a], [459p, 501p, 505p, 535p]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Woden Interchange]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
     short_name: "74"
-    stop_times: 
-    - - 954a
-      - 956a
-      - 1000a
-      - 1006a
-      - 1013a
-      - 1016a
-      - 1023a
-      - 1027a
-      - 1033a
-      - 1039a
-      - 1041a
-      - 1045a
-    - - 1124a
-      - 1126a
-      - 1130a
-      - 1136a
-      - 1143a
-      - 1146a
-      - 1153a
-      - 1157p
-      - 1203p
-      - 1209p
-      - 1211p
-      - 1215p
-    - - 1254p
-      - 1256p
-      - 100p
-      - 106p
-      - 113p
-      - 116p
-      - 123p
-      - 127p
-      - 133p
-      - 139p
-      - 141p
-      - 145p
-    - - 224p
-      - 226p
-      - 230p
-      - 236p
-      - 243p
-      - 246p
-      - 253p
-      - 257p
-      - 303p
-      - 309p
-      - 311p
-      - 315p
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Calvary Hospital
-    - Jamison Centre
-    - Cook
-    - Hawker
-    - Page Shops
-    - Florey Shops
-    - Cohen St Bus Station
-    - Lathlain St Bus Station
-    - Cameron Ave Bus Station
+    stop_times: [[954a, 956a, 1000a, 1006a, 1013a, 1016a, 1023a, 1027a, 1033a, 1039a, 1041a, 1045a], [1124a, 1126a, 1130a, 1136a, 1143a, 1146a, 1153a, 1157p, 1203p, 1209p, 1211p, 1215p], [1254p, 1256p, 100p, 106p, 113p, 116p, 123p, 127p, 133p, 139p, 141p, 145p], [224p, 226p, 230p, 236p, 243p, 246p, 253p, 257p, 303p, 309p, 311p, 315p]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Calvary Hospital, Jamison Centre, Cook, Hawker, Page Shops, Florey Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Fairbairn Park
-    between_stops: []
+    between_stops: {}
+    
     short_name: "757"
     stop_times: [[645a, 655a, 706a, 722a, 735a], [705a, 715a, 726a, 742a, 755a]]
     time_points: [Gungahlin Market Place, Dickson College, Russell Offices, Brindabella Business Park, Fairbairn Park]
   -  
     long_name: To Gungahlin Market Place
-    between_stops: []
+    between_stops: {}
+    
     short_name: "757"
     stop_times: [[433p, 442p, 457p, 510p, 524p], [508p, 522p, 532p, 543p, 556p], [538p, 552p, 602p, 613p, 626p]]
     time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, Dickson College, Gungahlin Market Place]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: "75"
     stop_times: [[1055a, 1108a, 1117a], [1255p, 108p, 117p]]
     time_points: [Woden Interchange - Platform 2, Stromlo High Waramanga, Cooleman Court]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "75"
     stop_times: [[925a, 934a, 947a], [1125a, 1134a, 1147a], [125p, 134p, 147p]]
     time_points: [Cooleman Court, Stromlo High Waramanga, Woden Interchange]
   -  
     long_name: To Calwell Shops
-    between_stops: []
+    between_stops: {}
+    
     short_name: "768"
     stop_times: [[447p, 453p, 502p, 526p, 537p, 545p], [519p, 525p, 534p, 558p, 609p, 617p]]
     time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Chisholm Shops, Isabella Shops, Calwell Shops]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: {}
+    
     short_name: "768"
     stop_times: [[707a, 715a, 726a, 751a, 800a, 804a], [737a, 745a, 756a, 821a, 830a, 834a]]
     time_points: [Calwell Shops, Isabella Shops, Chisholm Shops, Russell Offices, City Interchange - Platform 11, Citywest]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: {}
+    
     short_name: "769"
     stop_times: [[641a, 646a, 656a, 706a, 733a, 743a, 747a], [721a, 726a, 736a, 746a, 813a, 823a, 827a], [741a, 746a, 756a, 806a, 833a, 843a, 847a]]
     time_points: [Tharwa Drive, Theodore, Calwell Shops, Chisholm Shops, Russell Offices, City Interchange - Platform 11, Citywest]
   -  
     long_name: To Tharwa Drive
-    between_stops: []
+    between_stops: {}
+    
     short_name: "769"
     stop_times: [[427p, 433p, 442p, 507p, 517p, 527p, 532p], [500p, 506p, 515p, 540p, 550p, 600p, 605p], [537p, 543p, 552p, 617p, 627p, 637p, 642p]]
     time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Chisholm Shops, Calwell Shops, Theodore, Tharwa Drive]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "76"
     stop_times: [[1000a, 1007a, 1015a, 1020a, 1028a], [1200p, 1207p, 1215p, 1220p, 1228p], [200p, 207p, 215p, 220p, 228p]]
     time_points: [Woden Interchange - Platform 2, Brindabella Gardens Nursing Home, Saint Andrews Village Hughes, Canberra Hospital, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "77"
     stop_times: [[1100a, 1108a, 1113a, 1121a, 1128a], [100p, 108p, 113p, 121p, 128p]]
     time_points: [Woden Interchange - Platform 2, Canberra Hospital, Saint Andrews Village Hughes, Brindabella Gardens Nursing Home, Woden Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "780"
     stop_times: [[405p, 421p, 440p], [435p, 451p, 510p]]
     time_points: [Fyshwick Terminus, Canberra Times, City Interchange]
   -  
     long_name: To Fyshwick Terminus
-    between_stops: []
+    between_stops: {}
     
     short_name: "780"
-    stop_times: 
-    - - 648a
-      - 707a
-      - 723a
-    - - 719a
-      - 738a
-      - 754a
-    time_points: 
-    - City Interchange - Platform 7
-    - Newcastle / Isa Street Fyshwick
-    - Fyshwick Terminus
+    stop_times: [[648a, 707a, 723a], [719a, 738a, 754a]]
+    time_points: [City Interchange - Platform 7, Newcastle / Isa Street Fyshwick, Fyshwick Terminus]
   -  
     long_name: To Electricity House
-    between_stops: []
+    between_stops: {}
     
     short_name: "785"
-    stop_times: 
-    - - 652a
-      - 655a
-      - 713a
-      - 743a
-      - 747a
-      - 749a
-    - - 725a
-      - 728a
-      - 746a
-      - 816a
-      - 820a
-      - 822a
-    time_points: 
-    - Lanyon Market Place
-    - Tharwa/Pockett
-    - Mentone View/Tharwa Drive
-    - Citywest
-    - City Interchange - Platform 10
-    - Electricity House
+    stop_times: [[652a, 655a, 713a, 743a, 747a, 749a], [725a, 728a, 746a, 816a, 820a, 822a]]
+    time_points: [Lanyon Market Place, Tharwa/Pockett, Mentone View/Tharwa Drive, Citywest, City Interchange - Platform 10, Electricity House]
   -  
     long_name: To Lanyon Market Place
-    between_stops: []
+    between_stops: {}
     
     short_name: "785"
-    stop_times: 
-    - - 505p
-      - 511p
-      - 513p
-      - 549p
-      - 605p
-      - 607p
-    - - 530p
-      - 536p
-      - 538p
-      - 614p
-      - 630p
-      - 632p
-    time_points: 
-    - Citywest
-    - City Interchange - Platform 10
-    - Electricity House
-    - Mentone View/Tharwa Drive
-    - Tharwa/Pockett
-    - Lanyon Market Place
+    stop_times: [[505p, 511p, 513p, 549p, 605p, 607p], [530p, 536p, 538p, 614p, 630p, 632p]]
+    time_points: [Citywest, City Interchange - Platform 10, Electricity House, Mentone View/Tharwa Drive, Tharwa/Pockett, Lanyon Market Place]
   -  
     long_name: To Fairbairn Park
-    between_stops: []
+    between_stops: {}
+    
     short_name: "786"
     stop_times: [[646a, 656a, 730a, 742a], [706a, 716a, 735a, 747a], [727a, 737a, 811a, 823a]]
     time_points: [Tuggeranong Interchange - Platform 7, Chisholm Shops, Brindabella Business Park, Fairbairn Park]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "786"
     stop_times: [[445p, 453p, 524p, 537p], [515p, 523p, 554p, 607p], [545p, 553p, 624p, 637p]]
     time_points: [Fairbairn Park, Brindabella Business Park, Chisholm Shops, Tuggeranong Interchange]
   -  
     long_name: To Electricity House
-    between_stops: []
+    between_stops: {}
+    
     short_name: "787"
     stop_times: [[647a, 650a, 702a, 728a, 732a, 734a], [720a, 723a, 735a, 801a, 805a, 807a]]
     time_points: [Lanyon Market Place, Tharwa/Knoke, Woodcock/Clare Dennis, Citywest, City Interchange - Platform 10, Electricity House]
   -  
     long_name: To Lanyon Market Place
-    between_stops: []
+    between_stops: {}
+    
     short_name: "787"
     stop_times: [[516p, 522p, 524p, 556p, 607p, 609p], [535p, 541p, 543p, 615p, 626p, 628p]]
     time_points: [Citywest, City Interchange - Platform 10, Electricity House, Woodcock/Clare Dennis, Tharwa/Knoke, Lanyon Market Place]
   -  
     long_name: To Citywest
-    between_stops: []
+    between_stops: {}
     
     short_name: "788"
-    stop_times: 
-    - - 710a
-      - 719a
-      - 734a
-      - 811a
-      - 820a
-      - 824a
-    - - 740a
-      - 749a
-      - 804a
-      - 841a
-      - 850a
-      - 854a
-    time_points: 
-    - Woodcock/Clare Dennis
-    - Tharwa/Pockett
-    - Mentone View/Tharwa Drive
-    - Russell Offices
-    - City Interchange - Platform 11
-    - Citywest
+    stop_times: [[710a, 719a, 734a, 811a, 820a, 824a], [740a, 749a, 804a, 841a, 850a, 854a]]
+    time_points: [Woodcock/Clare Dennis, Tharwa/Pockett, Mentone View/Tharwa Drive, Russell Offices, City Interchange - Platform 11, Citywest]
   -  
     long_name: To Woodcock/Clare Dennis
-    between_stops: []
+    between_stops: {}
     
     short_name: "788"
-    stop_times: 
-    - - 426p
-      - 432p
-      - 441p
-      - 512p
-      - 526p
-      - 536p
-    - - 502p
-      - 507p
-      - 518p
-      - 552p
-      - 606p
-      - 615p
-    - - 532p
-      - 538p
-      - 547p
-      - 618p
-      - 632p
-      - 642p
-    time_points: 
-    - Citywest
-    - City Interchange - Platform 10
-    - Russell Offices
-    - Mentone View/Tharwa Drive
-    - Tharwa/Pockett
-    - Woodcock/Clare Dennis
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
+    stop_times: [[426p, 432p, 441p, 512p, 526p, 536p], [502p, 507p, 518p, 552p, 606p, 615p], [532p, 538p, 547p, 618p, 632p, 642p]]
+    time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Mentone View/Tharwa Drive, Tharwa/Pockett, Woodcock/Clare Dennis]
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "7"
-    stop_times: 
-    - - 544a
-      - 546a
-      - 550a
-      - 601a
-      - 609a
-      - 616a
-      - 623a
-    - - 614a
-      - 616a
-      - 620a
-      - 631a
-      - 639a
-      - 646a
-      - 653a
-    - - 644a
-      - 646a
-      - 650a
-      - 701a
-      - 709a
-      - 716a
-      - 723a
-    - - 714a
-      - 716a
-      - 720a
-      - 731a
-      - 740a
-      - 747a
-      - 755a
-    - - 744a
-      - 746a
-      - 750a
-      - 803a
-      - 812a
-      - 819a
-      - 827a
-    - - 814a
-      - 816a
-      - 820a
-      - 833a
-      - 842a
-      - 849a
-      - 857a
-    - - 844a
-      - 846a
-      - 850a
-      - 903a
-      - 912a
-      - 919a
-      - 927a
-    - - 918a
-      - 920a
-      - 924a
-      - 936a
-      - 944a
-      - 951a
-      - 958a
-    - - 949a
-      - 951a
-      - 955a
-      - 1006a
-      - 1014a
-      - 1021a
-      - 1028a
-    - - 1019a
-      - 1021a
-      - 1025a
-      - 1036a
-      - 1044a
-      - 1051a
-      - 1058a
-    - - 1049a
-      - 1051a
-      - 1055a
-      - 1106a
-      - 1114a
-      - 1121a
-      - 1128a
-    - - 1119a
-      - 1121a
-      - 1125a
-      - 1136a
-      - 1144a
-      - 1151a
-      - 1158a
-    - - 1149a
-      - 1151a
-      - 1155a
-      - 1206p
-      - 1214p
-      - 1221p
-      - 1228p
-    - - 1219p
-      - 1221p
-      - 1225p
-      - 1236p
-      - 1244p
-      - 1251p
-      - 1258p
-    - - 1249p
-      - 1251p
-      - 1255p
-      - 106p
-      - 114p
-      - 121p
-      - 128p
-    - - 119p
-      - 121p
-      - 125p
-      - 136p
-      - 144p
-      - 151p
-      - 158p
-    - - 149p
-      - 151p
-      - 155p
-      - 206p
-      - 214p
-      - 221p
-      - 228p
-    - - 219p
-      - 221p
-      - 225p
-      - 236p
-      - 244p
-      - 251p
-      - 258p
-    - - 249p
-      - 251p
-      - 255p
-      - 307p
-      - 315p
-      - 322p
-      - 330p
-    - - 314p
-      - 316p
-      - 320p
-      - 333p
-      - 341p
-      - 348p
-      - 356p
-    - - 344p
-      - 346p
-      - 350p
-      - 403p
-      - 411p
-      - 418p
-      - 426p
-    - - 414p
-      - 416p
-      - 420p
-      - 433p
-      - 441p
-      - 448p
-      - 456p
-    - - 444p
-      - 446p
-      - 450p
-      - 503p
-      - 511p
-      - 518p
-      - 526p
-    - - 514p
-      - 516p
-      - 520p
-      - 533p
-      - 541p
-      - 548p
-      - 556p
-    - - 544p
-      - 546p
-      - 550p
-      - 603p
-      - 611p
-      - 618p
-      - 626p
-    - - 650p
-      - 652p
-      - 655p
-      - 706p
-      - 714p
-      - 720p
-      - 727p
-    - - 750p
-      - 752p
-      - 755p
-      - 806p
-      - 814p
-      - 820p
-      - 827p
-    - - 850p
-      - 852p
-      - 855p
-      - 906p
-      - 914p
-      - 920p
-      - 927p
-    - - 950p
-      - 952p
-      - 955p
-      - 1006p
-      - 1014p
-      - 1020p
-      - 1027p
-    - - 1050p
-      - 1052p
-      - 1055p
-      - 1106p
-      - 1114p
-      - 1120p
-      - 1127p
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Australian Institute Sports Bruce
-    - Dickson
-    - Merici Braddon
-    - City Interchange
+    stop_times: [[544a, 546a, 550a, 601a, 609a, 616a, 623a], [614a, 616a, 620a, 631a, 639a, 646a, 653a], [644a, 646a, 650a, 701a, 709a, 716a, 723a], [714a, 716a, 720a, 731a, 740a, 747a, 755a], [744a, 746a, 750a, 803a, 812a, 819a, 827a], [814a, 816a, 820a, 833a, 842a, 849a, 857a], [844a, 846a, 850a, 903a, 912a, 919a, 927a], [918a, 920a, 924a, 936a, 944a, 951a, 958a], [949a, 951a, 955a, 1006a, 1014a, 1021a, 1028a], [1019a, 1021a, 1025a, 1036a, 1044a, 1051a, 1058a], [1049a, 1051a, 1055a, 1106a, 1114a, 1121a, 1128a], [1119a, 1121a, 1125a, 1136a, 1144a, 1151a, 1158a], [1149a, 1151a, 1155a, 1206p, 1214p, 1221p, 1228p], [1219p, 1221p, 1225p, 1236p, 1244p, 1251p, 1258p], [1249p, 1251p, 1255p, 106p, 114p, 121p, 128p], [119p, 121p, 125p, 136p, 144p, 151p, 158p], [149p, 151p, 155p, 206p, 214p, 221p, 228p], [219p, 221p, 225p, 236p, 244p, 251p, 258p], [249p, 251p, 255p, 307p, 315p, 322p, 330p], [314p, 316p, 320p, 333p, 341p, 348p, 356p], [344p, 346p, 350p, 403p, 411p, 418p, 426p], [414p, 416p, 420p, 433p, 441p, 448p, 456p], [444p, 446p, 450p, 503p, 511p, 518p, 526p], [514p, 516p, 520p, 533p, 541p, 548p, 556p], [544p, 546p, 550p, 603p, 611p, 618p, 626p], [650p, 652p, 655p, 706p, 714p, 720p, 727p], [750p, 752p, 755p, 806p, 814p, 820p, 827p], [850p, 852p, 855p, 906p, 914p, 920p, 927p], [950p, 952p, 955p, 1006p, 1014p, 1020p, 1027p], [1050p, 1052p, 1055p, 1106p, 1114p, 1120p, 1127p]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Australian Institute Sports Bruce, Dickson, Merici Braddon, City Interchange]
   -  
     long_name: To Cohen Street Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "7"
-    stop_times: 
-    - - 632a
-      - 639a
-      - 646a
-      - 654a
-      - 705a
-      - 707a
-      - 711a
-    - - 701a
-      - 708a
-      - 715a
-      - 723a
-      - 735a
-      - 737a
-      - 741a
-    - - 731a
-      - 739a
-      - 746a
-      - 754a
-      - 807a
-      - 809a
-      - 813a
-    - - 801a
-      - 809a
-      - 816a
-      - 824a
-      - 837a
-      - 839a
-      - 843a
-    - - 829a
-      - 837a
-      - 844a
-      - 852a
-      - 905a
-      - 907a
-      - 911a
-    - - 858a
-      - 906a
-      - 913a
-      - 921a
-      - 933a
-      - 935a
-      - 939a
-    - - 930a
-      - 937a
-      - 944a
-      - 952a
-      - 1003a
-      - 1005a
-      - 1009a
-    - - 1000a
-      - 1007a
-      - 1014a
-      - 1022a
-      - 1033a
-      - 1035a
-      - 1039a
-    - - 1030a
-      - 1037a
-      - 1044a
-      - 1052a
-      - 1103a
-      - 1105a
-      - 1109a
-    - - 1100a
-      - 1107a
-      - 1114a
-      - 1122a
-      - 1133a
-      - 1135a
-      - 1139a
-    - - 1130a
-      - 1137a
-      - 1144a
-      - 1152a
-      - 1203p
-      - 1205p
-      - 1209p
-    - - 1200p
-      - 1207p
-      - 1214p
-      - 1222p
-      - 1233p
-      - 1235p
-      - 1239p
-    - - 1230p
-      - 1237p
-      - 1244p
-      - 1252p
-      - 103p
-      - 105p
-      - 109p
-    - - 100p
-      - 107p
-      - 114p
-      - 122p
-      - 133p
-      - 135p
-      - 139p
-    - - 130p
-      - 137p
-      - 144p
-      - 152p
-      - 203p
-      - 205p
-      - 209p
-    - - 200p
-      - 207p
-      - 214p
-      - 222p
-      - 233p
-      - 235p
-      - 239p
-    - - 230p
-      - 237p
-      - 244p
-      - 252p
-      - 304p
-      - 306p
-      - 310p
-    - - 259p
-      - 307p
-      - 314p
-      - 323p
-      - 336p
-      - 338p
-      - 342p
-    - - 331p
-      - 339p
-      - 346p
-      - 355p
-      - 408p
-      - 410p
-      - 414p
-    - - 401p
-      - 409p
-      - 416p
-      - 425p
-      - 438p
-      - 440p
-      - 444p
-    - - 431p
-      - 439p
-      - 446p
-      - 455p
-      - 508p
-      - 510p
-      - 514p
-    - - 501p
-      - 509p
-      - 516p
-      - 525p
-      - 538p
-      - 540p
-      - 544p
-    - - 531p
-      - 539p
-      - 546p
-      - 555p
-      - 608p
-      - 610p
-      - 614p
-    - - 631p
-      - 637p
-      - 644p
-      - 652p
-      - 703p
-      - 705p
-      - 708p
-    - - 731p
-      - 737p
-      - 744p
-      - 752p
-      - 803p
-      - 805p
-      - 808p
-    - - 831p
-      - 837p
-      - 844p
-      - 852p
-      - 903p
-      - 905p
-      - 908p
-    - - 931p
-      - 937p
-      - 944p
-      - 952p
-      - 1003p
-      - 1005p
-      - 1008p
-    - - 1031p
-      - 1037p
-      - 1044p
-      - 1052p
-      - 1103p
-      - 1105p
-      - 1108p
-    time_points: 
-    - City Interchange - Platform 10
-    - Merici Braddon
-    - Dickson
-    - Australian Institute Sports Bruce
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    stop_times: [[632a, 639a, 646a, 654a, 705a, 707a, 711a], [701a, 708a, 715a, 723a, 735a, 737a, 741a], [731a, 739a, 746a, 754a, 807a, 809a, 813a], [801a, 809a, 816a, 824a, 837a, 839a, 843a], [829a, 837a, 844a, 852a, 905a, 907a, 911a], [858a, 906a, 913a, 921a, 933a, 935a, 939a], [930a, 937a, 944a, 952a, 1003a, 1005a, 1009a], [1000a, 1007a, 1014a, 1022a, 1033a, 1035a, 1039a], [1030a, 1037a, 1044a, 1052a, 1103a, 1105a, 1109a], [1100a, 1107a, 1114a, 1122a, 1133a, 1135a, 1139a], [1130a, 1137a, 1144a, 1152a, 1203p, 1205p, 1209p], [1200p, 1207p, 1214p, 1222p, 1233p, 1235p, 1239p], [1230p, 1237p, 1244p, 1252p, 103p, 105p, 109p], [100p, 107p, 114p, 122p, 133p, 135p, 139p], [130p, 137p, 144p, 152p, 203p, 205p, 209p], [200p, 207p, 214p, 222p, 233p, 235p, 239p], [230p, 237p, 244p, 252p, 304p, 306p, 310p], [259p, 307p, 314p, 323p, 336p, 338p, 342p], [331p, 339p, 346p, 355p, 408p, 410p, 414p], [401p, 409p, 416p, 425p, 438p, 440p, 444p], [431p, 439p, 446p, 455p, 508p, 510p, 514p], [501p, 509p, 516p, 525p, 538p, 540p, 544p], [531p, 539p, 546p, 555p, 608p, 610p, 614p], [631p, 637p, 644p, 652p, 703p, 705p, 708p], [731p, 737p, 744p, 752p, 803p, 805p, 808p], [831p, 837p, 844p, 852p, 903p, 905p, 908p], [931p, 937p, 944p, 952p, 1003p, 1005p, 1008p], [1031p, 1037p, 1044p, 1052p, 1103p, 1105p, 1108p]]
+    time_points: [City Interchange - Platform 10, Merici Braddon, Dickson, Australian Institute Sports Bruce, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     short_name: "80"
     stop_times: [[547a, 602a, 611a, 616a, 625a, 632a, 634a, 638a, 642a, 650a], [606a, 621a, 630a, 635a, 644a, 651a, 653a, 657a, 701a, 709a], [633a, 648a, 657a, 702a, 711a, 718a, 720a, 724a, 728a, 738a], [700a, 715a, 724a, 729a, 740a, 748a, 752a, 759a, 803a, 814a], [731a, 747a, 756a, 803a, 814a, 822a, 826a, 833a, 837a, 848a], [801a, 817a, 826a, 833a, 844a, 852a, 856a, 903a, 907a, 918a], [834a, 850a, 859a, 906a, 917a, 925a, 929a, 933a, 937a, 945a], [908a, 923a, 933a, 938a, 947a, 954a, 956a, 1000a, 1004a, 1012a], [938a, 953a, 1002a, 1007a, 1016a, 1023a, 1025a, 1029a, 1033a, 1041a], [1038a, 1053a, 1102a, 1107a, 1116a, 1123a, 1125a, 1129a, 1133a, 1141a], ["-", "-", "-", "-", "-", 1131a, 1133a, 1137a, 1141a, 1149a], [1138a, 1153a, 1202p, 1207p, 1216p, 1223p, 1225p, 1229p, 1233p, 1241p], [1238p, 1253p, 102p, 107p, 116p, 123p, 125p, 129p, 133p, 141p], [138p, 153p, 202p, 207p, 216p, 223p, 225p, 229p, 233p, 241p], [238p, 253p, 302p, 307p, 316p, 323p, 325p, 329p, 333p, 341p], [338p, 354p, 404p, 410p, 420p, 427p, 429p, 434p, 439p, 448p], [408p, 424p, 434p, 440p, 450p, 457p, 459p, 504p, 509p, 518p], [438p, 454p, 504p, 510p, 520p, 527p, 529p, 534p, 539p, 548p], [508p, 524p, 534p, 540p, 550p, 557p, 559p, 604p, 609p, 618p], [538p, 554p, 604p, 610p, 620p, 627p, 629p, 633p, 637p, 645p], [556p, 612p, 622p, 628p, 636p, 642p, 644p, 648p, 652p, 700p], ["-", "-", "-", "-", "-", 742p, 744p, 748p, 752p, 800p], ["-", "-", "-", "-", "-", 842p, 844p, 848p, 852p, 900p], ["-", "-", "-", "-", "-", 942p, 944p, 948p, 952p, 1000p], ["-", "-", "-", "-", "-", 1042p, 1044p, 1048p, 1052p, 1100p]]
     time_points: [Woden Interchange - Platform 4, Geoscience Australia, Eye Hospital, Fyshwick Direct Factory Outlet, Canberra Times, Railway Station Kingston, Causeway, Kings Ave/National Crt, Russell Offices, City Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
     
     short_name: "80"
-    stop_times: 
-    - - 550a
-      - 558a
-      - 602a
-      - 606a
-      - 609a
-      - 617a
-      - 626a
-      - 631a
-      - 640a
-      - 656a
-    - - 617a
-      - 625a
-      - 629a
-      - 633a
-      - 636a
-      - 644a
-      - 653a
-      - 658a
-      - 707a
-      - 723a
-    - - 648a
-      - 656a
-      - 700a
-      - 704a
-      - 707a
-      - 715a
-      - 724a
-      - 729a
-      - 737a
-      - 753a
-    - - 719a
-      - 727a
-      - 731a
-      - 738a
-      - 741a
-      - 750a
-      - 804a
-      - 810a
-      - 818a
-      - 834a
-    - - 751a
-      - 800a
-      - 803a
-      - 810a
-      - 813a
-      - 822a
-      - 836a
-      - 842a
-      - 850a
-      - 906a
-    - - 828a
-      - 837a
-      - 840a
-      - 847a
-      - 850a
-      - 859a
-      - 913a
-      - 919a
-      - 927a
-      - 944a
-    - - 859a
-      - 907a
-      - 911a
-      - 915a
-      - 918a
-      - 930a
-      - 939a
-      - 944a
-      - 952a
-      - 1010a
-    - - 927a
-      - 935a
-      - 939a
-      - 943a
-      - 946a
-      - 954a
-      - 1003a
-      - 1008a
-      - 1016a
-      - 1034a
-    - - 1027a
-      - 1035a
-      - 1039a
-      - 1043a
-      - 1046a
-      - 1054a
-      - 1103a
-      - 1108a
-      - 1116a
-      - 1134a
-    - - 1127a
-      - 1135a
-      - 1139a
-      - 1143a
-      - 1146a
-      - 1154a
-      - 1203p
-      - 1208p
-      - 1216p
-      - 1234p
-    - - 1227p
-      - 1235p
-      - 1239p
-      - 1243p
-      - 1246p
-      - 1254p
-      - 103p
-      - 108p
-      - 116p
-      - 134p
-    - - 127p
-      - 135p
-      - 139p
-      - 143p
-      - 146p
-      - 154p
-      - 203p
-      - 208p
-      - 216p
-      - 234p
-    - - 227p
-      - 235p
-      - 239p
-      - 243p
-      - 246p
-      - 254p
-      - 303p
-      - 308p
-      - 317p
-      - 333p
-    - - 330p
-      - 339p
-      - 344p
-      - 349p
-      - 352p
-      - 400p
-      - 410p
-      - 416p
-      - 426p
-      - 444p
-    - - 400p
-      - 409p
-      - 414p
-      - 419p
-      - 422p
-      - 430p
-      - 440p
-      - 446p
-      - 456p
-      - 514p
-    - - 434p
-      - 443p
-      - 448p
-      - 453p
-      - 456p
-      - 504p
-      - 514p
-      - 520p
-      - 530p
-      - 548p
-    - - 504p
-      - 513p
-      - 518p
-      - 523p
-      - 526p
-      - 534p
-      - 544p
-      - 550p
-      - 600p
-      - 618p
-    - - 534p
-      - 543p
-      - 548p
-      - 553p
-      - 556p
-      - 604p
-      - 614p
-      - 620p
-      - 630p
-      - 645p
-    - - 604p
-      - 613p
-      - 618p
-      - 623p
-      - 626p
-      - 633p
-      - 641p
-      - 646p
-      - 654p
-      - 709p
-    - - 704p
-      - 712p
-      - 716p
-      - 720p
-      - 722p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 804p
-      - 812p
-      - 816p
-      - 820p
-      - 822p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 904p
-      - 912p
-      - 916p
-      - 920p
-      - 922p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1004p
-      - 1012p
-      - 1016p
-      - 1020p
-      - 1022p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1104p
-      - 1112p
-      - 1116p
-      - 1120p
-      - 1122p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    time_points: 
-    - City Interchange - Platform 7
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Causeway
-    - Railway Station Kingston
-    - Newcastle / Isa Street Fyshwick
-    - Fyshwick Direct Factory Outlet
-    - Eye Hospital
-    - Geoscience Australia
-    - Woden Interchange
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    stop_times: [[550a, 558a, 602a, 606a, 609a, 617a, 626a, 631a, 640a, 656a], [617a, 625a, 629a, 633a, 636a, 644a, 653a, 658a, 707a, 723a], [648a, 656a, 700a, 704a, 707a, 715a, 724a, 729a, 737a, 753a], [719a, 727a, 731a, 738a, 741a, 750a, 804a, 810a, 818a, 834a], [751a, 800a, 803a, 810a, 813a, 822a, 836a, 842a, 850a, 906a], [828a, 837a, 840a, 847a, 850a, 859a, 913a, 919a, 927a, 944a], [859a, 907a, 911a, 915a, 918a, 930a, 939a, 944a, 952a, 1010a], [927a, 935a, 939a, 943a, 946a, 954a, 1003a, 1008a, 1016a, 1034a], [1027a, 1035a, 1039a, 1043a, 1046a, 1054a, 1103a, 1108a, 1116a, 1134a], [1127a, 1135a, 1139a, 1143a, 1146a, 1154a, 1203p, 1208p, 1216p, 1234p], [1227p, 1235p, 1239p, 1243p, 1246p, 1254p, 103p, 108p, 116p, 134p], [127p, 135p, 139p, 143p, 146p, 154p, 203p, 208p, 216p, 234p], [227p, 235p, 239p, 243p, 246p, 254p, 303p, 308p, 317p, 333p], [330p, 339p, 344p, 349p, 352p, 400p, 410p, 416p, 426p, 444p], [400p, 409p, 414p, 419p, 422p, 430p, 440p, 446p, 456p, 514p], [434p, 443p, 448p, 453p, 456p, 504p, 514p, 520p, 530p, 548p], [504p, 513p, 518p, 523p, 526p, 534p, 544p, 550p, 600p, 618p], [534p, 543p, 548p, 553p, 556p, 604p, 614p, 620p, 630p, 645p], [604p, 613p, 618p, 623p, 626p, 633p, 641p, 646p, 654p, 709p], [704p, 712p, 716p, 720p, 722p, "-", "-", "-", "-", "-"], [804p, 812p, 816p, 820p, 822p, "-", "-", "-", "-", "-"], [904p, 912p, 916p, 920p, 922p, "-", "-", "-", "-", "-"], [1004p, 1012p, 1016p, 1020p, 1022p, "-", "-", "-", "-", "-"], [1104p, 1112p, 1116p, 1120p, 1122p, "-", "-", "-", "-", "-"]]
+    time_points: [City Interchange - Platform 7, Russell Offices, Kings Ave/National Crt, Causeway, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Fyshwick Direct Factory Outlet, Eye Hospital, Geoscience Australia, Woden Interchange]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     short_name: "81"
     stop_times: [[920a, 934a, 942a, 948a, 955a], [1020a, 1034a, 1042a, 1048a, 1055a], [1120a, 1134a, 1142a, 1148a, 1155a], [1220p, 1234p, 1242p, 1248p, 1255p], [120p, 134p, 142p, 148p, 155p], [220p, 234p, 242p, 248p, 255p], [320p, 334p, 342p, 348p, 355p], [420p, 434p, 442p, 448p, 455p]]
     time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
   -  
     long_name: To Bimberi Centre
-    between_stops: []
+    between_stops: {}
+    
     short_name: "82"
     stop_times: [[632a, 638a, 640a, 650a], [342p, 348p, 350p, 400p]]
     time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "82"
     stop_times: [[715p, 724p, 726p, 733p]]
     time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Alexander Maconochie Centre Hume
-    between_stops: []
+    between_stops: {}
+    
     short_name: "88"
     stop_times: [[826a, 846a], [1240p, 100p], [510p, 530p]]
     time_points: [Woden Interchange - Platform 4, Alexander Maconochie Centre Hume]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "88"
     stop_times: [[1150a, 1210p], [450p, 510p], [805p, 825p]]
     time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "8"
     stop_times: [[626a, 632a, 637a, 644a], [657a, 703a, 708a, 715a], [724a, 730a, 737a, 746a], [757a, 804a, 811a, 820a], [831a, 838a, 845a, 854a], [859a, 906a, 913a, 922a], [1004a, 1010a, 1015a, 1022a], [1104a, 1110a, 1115a, 1122a], [1204p, 1210p, 1215p, 1222p], [104p, 110p, 115p, 122p], [159p, 205p, 210p, 217p], [302p, 309p, 316p, 325p], [332p, 339p, 346p, 355p], [407p, 414p, 421p, 430p], [437p, 444p, 451p, 500p], [507p, 514p, 521p, 530p], [537p, 544p, 551p, 600p], [642p, 648p, 653p, 658p], [742p, 748p, 753p, 758p], [842p, 848p, 853p, 858p], [942p, 948p, 953p, 958p], [1042p, 1048p, 1053p, 1058p]]
     time_points: [Dickson Cowper St, Lyneham, Macarthur / Miller O'Connor, City Interchange]
   -  
     long_name: To Dickson Cowper St
-    between_stops: []
+    between_stops: {}
+    
     short_name: "8"
     stop_times: [[655a, 702a, 707a, 713a], [714a, 721a, 726a, 732a], [741a, 750a, 757a, 804a], [811a, 820a, 827a, 834a], [841a, 850a, 857a, 904a], [915a, 924a, 931a, 937a], [947a, 954a, 959a, 1005a], [1018a, 1025a, 1030a, 1036a], [1046a, 1053a, 1058a, 1104a], [1146a, 1153a, 1158a, 1204p], [1246p, 1253p, 1258p, 104p], [146p, 153p, 158p, 204p], [246p, 253p, 258p, 305p], [311p, 320p, 327p, 334p], [346p, 355p, 402p, 409p], [411p, 420p, 427p, 434p], [444p, 453p, 500p, 507p], [523p, 532p, 539p, 546p], [553p, 602p, 609p, 616p], [623p, 631p, 636p, 642p], [650p, 655p, 700p, 706p], [705p, 710p, 715p, 721p], [805p, 810p, 815p, 821p], [905p, 910p, 915p, 921p], [1005p, 1010p, 1015p, 1021p], [1105p, 1110p, 1115p, 1121p]]
     time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, Dickson Cowper St]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      City Interchange - Platform 5-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
     stop_times_saturday: [[630a, 641a, 657a, 714a, 731a, 733a, 737a], [645a, 656a, 712a, 729a, 746a, 748a, 752a], [700a, 711a, 727a, 744a, 801a, 803a, 807a], [715a, 726a, 742a, 759a, 816a, 818a, 822a], [730a, 741a, 757a, 814a, 831a, 833a, 837a], [745a, 756a, 812a, 829a, 846a, 848a, 852a], [800a, 811a, 827a, 844a, 901a, 903a, 907a], [815a, 826a, 842a, 859a, 916a, 918a, 922a], [830a, 841a, 857a, 914a, 931a, 933a, 937a], [845a, 856a, 912a, 929a, 946a, 948a, 952a], [900a, 911a, 927a, 944a, 1001a, 1003a, 1007a], [915a, 926a, 942a, 959a, 1016a, 1018a, 1022a], [930a, 941a, 957a, 1014a, 1031a, 1033a, 1037a], [945a, 956a, 1012a, 1029a, 1046a, 1048a, 1052a], [1000a, 1011a, 1027a, 1044a, 1101a, 1103a, 1107a], [1015a, 1026a, 1042a, 1059a, 1116a, 1118a, 1122a], [1030a, 1041a, 1057a, 1114a, 1131a, 1133a, 1137a], [1045a, 1056a, 1112a, 1129a, 1146a, 1148a, 1152a], [1100a, 1111a, 1127a, 1144a, 1201p, 1203p, 1207p], [1115a, 1126a, 1142a, 1159a, 1216p, 1218p, 1222p], ["-", "-", 1149a, 1206p, 1223p, 1225p, 1229p], [1130a, 1141a, 1157a, 1214p, 1231p, 1233p, 1237p], [1145a, 1156a, 1212p, 1229p, 1246p, 1248p, 1252p], ["-", "-", 1219p, 1236p, 1253p, 1255p, 1259p], [1200p, 1211p, 1227p, 1244p, 101p, 103p, 107p], [1215p, 1226p, 1242p, 1259p, 116p, 118p, 122p], ["-", "-", 1249p, 106p, 123p, 125p, 129p], [1230p, 1241p, 1257p, 114p, 131p, 133p, 137p], [1245p, 1256p, 112p, 129p, 146p, 148p, 152p], ["-", "-", 119p, 136p, 153p, 155p, 159p], [100p, 111p, 127p, 144p, 201p, 203p, 207p], [115p, 126p, 142p, 159p, 216p, 218p, 222p], ["-", "-", 149p, 206p, 223p, 225p, 229p], [130p, 141p, 157p, 214p, 231p, 233p, 237p], [145p, 156p, 212p, 229p, 246p, 248p, 252p], ["-", "-", 219p, 236p, 253p, 255p, 259p], [200p, 211p, 227p, 244p, 301p, 303p, 307p], [215p, 226p, 242p, 259p, 316p, 318p, 322p], ["-", "-", 249p, 306p, 323p, 325p, 329p], [230p, 241p, 257p, 314p, 331p, 333p, 337p], [245p, 256p, 312p, 329p, 346p, 348p, 352p], ["-", "-", 319p, 336p, 353p, 355p, 359p], [300p, 311p, 327p, 344p, 401p, 403p, 407p], [315p, 326p, 342p, 359p, 416p, 418p, 422p], ["-", "-", 349p, 406p, 423p, 425p, 429p], [330p, 341p, 357p, 414p, 431p, 433p, 437p], [345p, 356p, 412p, 429p, 446p, 448p, 452p], ["-", "-", 419p, 436p, 453p, 455p, 459p], [400p, 411p, 427p, 444p, 501p, 503p, 507p], [415p, 426p, 442p, 459p, 516p, 518p, 522p], ["-", "-", 449p, 506p, 523p, 525p, 529p], [430p, 441p, 457p, 514p, 531p, 533p, 537p], [445p, 456p, 512p, 529p, 546p, 548p, 552p], [500p, 511p, 527p, 544p, 601p, 603p, 607p], [515p, 526p, 542p, 559p, 616p, 618p, 622p], [530p, 541p, 557p, 614p, 631p, 633p, 636p], [545p, 556p, 612p, 629p, 646p, 648p, 651p], [600p, 611p, 627p, 642p, 659p, 701p, 704p], [615p, 626p, 641p, 656p, 713p, 715p, 718p], [630p, 640p, 655p, 710p, 727p, 729p, 732p], [645p, 655p, 710p, 725p, 742p, 744p, 747p], [700p, 710p, 725p, 740p, 757p, 759p, 802p], [715p, 725p, 740p, 755p, 812p, 814p, 817p], [730p, 740p, 755p, 810p, 827p, 829p, 832p], [745p, 755p, 810p, 825p, 842p, 844p, 847p], [800p, 810p, 825p, 840p, 857p, 859p, 902p], [815p, 825p, 840p, 855p, 912p, 914p, 917p], [830p, 840p, 855p, 910p, 927p, 929p, 932p], [845p, 855p, 910p, 925p, 942p, 944p, 947p], [900p, 910p, 925p, 940p, 957p, 959p, 1002p], [915p, 925p, 940p, 955p, 1012p, 1014p, 1017p], [930p, 940p, 955p, 1010p, 1027p, 1029p, 1032p], [945p, 955p, 1010p, 1025p, 1042p, 1044p, 1047p], [1000p, 1010p, 1025p, 1040p, 1057p, 1059p, 1102p], [1015p, 1025p, 1040p, 1055p, 1112p, 1114p, 1117p], [1030p, 1040p, 1055p, 1110p, 1127p, 1129p, 1132p], [1045p, 1055p, 1110p, 1125p, 1142p, 1144p, 1147p], [1100p, 1110p, 1125p, 1140p, 1157p, 1159p, 1202a], [1115p, 1125p, 1140p, 1155p, 1212a, 1214a, 1217a]]
-    between_stops: []
     short_name: "900"
     time_points: [Tuggeranong Interchange - Platform 8, Erindale Centre, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
+      City Interchange - Platform 5-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
     short_name: "900"
+    time_points: [Tuggeranong Interchange - Platform 8, Erindale Centre, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[730a, 741a, 757a, 814a, 831a, 835a, 837a], [745a, 756a, 812a, 829a, 846a, 850a, 852a], [800a, 811a, 827a, 844a, 901a, 905a, 907a], [815a, 826a, 842a, 859a, 916a, 920a, 922a], [830a, 841a, 857a, 914a, 931a, 935a, 937a], [845a, 856a, 912a, 929a, 946a, 950a, 952a], [900a, 911a, 927a, 944a, 1001a, 1005a, 1007a], [915a, 926a, 942a, 959a, 1016a, 1020a, 1022a], [930a, 941a, 957a, 1014a, 1031a, 1035a, 1037a], [945a, 956a, 1012a, 1029a, 1046a, 1050a, 1052a], [1000a, 1011a, 1027a, 1044a, 1101a, 1105a, 1107a], [1015a, 1026a, 1042a, 1059a, 1116a, 1120a, 1122a], [1030a, 1041a, 1057a, 1114a, 1131a, 1135a, 1137a], [1045a, 1056a, 1112a, 1129a, 1146a, 1150a, 1152a], [1100a, 1111a, 1127a, 1144a, 1201p, 1205p, 1207p], [1115a, 1126a, 1142a, 1159a, 1216p, 1220p, 1222p], [1130a, 1141a, 1157a, 1214p, 1231p, 1235p, 1237p], [1145a, 1156a, 1212p, 1229p, 1246p, 1250p, 1252p], [1200p, 1211p, 1227p, 1244p, 101p, 105p, 107p], [1215p, 1226p, 1242p, 1259p, 116p, 120p, 122p], [1230p, 1241p, 1257p, 114p, 131p, 135p, 137p], [1245p, 1256p, 112p, 129p, 146p, 150p, 152p], [100p, 111p, 127p, 144p, 201p, 205p, 207p], [115p, 126p, 142p, 159p, 216p, 220p, 222p], [130p, 141p, 157p, 214p, 231p, 235p, 237p], [145p, 156p, 212p, 229p, 246p, 250p, 252p], [200p, 211p, 227p, 244p, 301p, 305p, 307p], [215p, 226p, 242p, 259p, 316p, 320p, 322p], [230p, 241p, 257p, 314p, 331p, 335p, 337p], [245p, 256p, 312p, 329p, 346p, 350p, 352p], [300p, 311p, 327p, 344p, 401p, 405p, 407p], [315p, 326p, 342p, 359p, 416p, 420p, 422p], [330p, 341p, 357p, 414p, 431p, 435p, 437p], [345p, 356p, 412p, 429p, 446p, 450p, 452p], [400p, 411p, 427p, 444p, 501p, 505p, 507p], [415p, 426p, 442p, 459p, 516p, 520p, 522p], [430p, 441p, 457p, 514p, 531p, 535p, 537p], [445p, 456p, 512p, 529p, 546p, 550p, 552p], [500p, 511p, 527p, 544p, 601p, 605p, 607p], [515p, 526p, 542p, 559p, 616p, 620p, 622p], [530p, 541p, 557p, 614p, 631p, 634p, 636p], [545p, 556p, 612p, 629p, 646p, 649p, 651p], [600p, 611p, 627p, 642p, 659p, 702p, 704p], [615p, 626p, 641p, 656p, 713p, 716p, 718p], [630p, 640p, 655p, 710p, 727p, 730p, 732p], [645p, 655p, 710p, 725p, 742p, 745p, 747p], [706p, 716p, 731p, 746p, 803p, 806p, 808p]]
-    time_points: [Tuggeranong Interchange - Platform 8, Erindale Centre, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: 
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 1: []
     stop_times_saturday: [[634a, 636a, 640a, 657a, 714a, 729a, 735a], [649a, 651a, 655a, 712a, 729a, 744a, 750a], [704a, 706a, 710a, 727a, 744a, 759a, 805a], [719a, 721a, 725a, 742a, 759a, 814a, 820a], [734a, 736a, 740a, 757a, 814a, 829a, 835a], [749a, 751a, 755a, 812a, 829a, 844a, 850a], [804a, 806a, 810a, 827a, 844a, 859a, 905a], [819a, 821a, 825a, 842a, 859a, 914a, 920a], [834a, 836a, 840a, 857a, 914a, 929a, 935a], [849a, 851a, 855a, 912a, 929a, 944a, 950a], [904a, 906a, 910a, 927a, 944a, 959a, 1005a], [919a, 921a, 925a, 942a, 959a, 1014a, 1020a], [934a, 936a, 940a, 957a, 1014a, 1029a, 1035a], [949a, 951a, 955a, 1012a, 1029a, 1044a, 1050a], [1004a, 1006a, 1010a, 1027a, 1044a, 1059a, 1105a], [1019a, 1021a, 1025a, 1042a, 1059a, 1114a, 1120a], [1034a, 1036a, 1040a, 1057a, 1114a, 1129a, 1135a], [1049a, 1051a, 1055a, 1112a, 1129a, 1144a, 1150a], [1056a, 1058a, 1102a, 1119a, "-", "-", "-"], [1104a, 1106a, 1110a, 1127a, 1144a, 1159a, 1205p], [1119a, 1121a, 1125a, 1142a, 1159a, 1214p, 1220p], [1126a, 1128a, 1132a, 1149a, "-", "-", "-"], [1134a, 1136a, 1140a, 1157a, 1214p, 1229p, 1235p], [1149a, 1151a, 1155a, 1212p, 1229p, 1244p, 1250p], [1156a, 1158a, 1202p, 1219p, "-", "-", "-"], [1204p, 1206p, 1210p, 1227p, 1244p, 1259p, 105p], [1219p, 1221p, 1225p, 1242p, 1259p, 114p, 120p], [1226p, 1228p, 1232p, 1249p, "-", "-", "-"], [1234p, 1236p, 1240p, 1257p, 114p, 129p, 135p], [1249p, 1251p, 1255p, 112p, 129p, 144p, 150p], [1256p, 1258p, 102p, 119p, "-", "-", "-"], [104p, 106p, 110p, 127p, 144p, 159p, 205p], [119p, 121p, 125p, 142p, 159p, 214p, 220p], [126p, 128p, 132p, 149p, "-", "-", "-"], [134p, 136p, 140p, 157p, 214p, 229p, 235p], [149p, 151p, 155p, 212p, 229p, 244p, 250p], [156p, 158p, 202p, 219p, "-", "-", "-"], [204p, 206p, 210p, 227p, 244p, 259p, 305p], [219p, 221p, 225p, 242p, 259p, 314p, 320p], [226p, 228p, 232p, 249p, "-", "-", "-"], [234p, 236p, 240p, 257p, 314p, 329p, 335p], [249p, 251p, 255p, 312p, 329p, 344p, 350p], [256p, 258p, 302p, 319p, "-", "-", "-"], [304p, 306p, 310p, 327p, 344p, 359p, 405p], [319p, 321p, 325p, 342p, 359p, 414p, 420p], [326p, 328p, 332p, 349p, "-", "-", "-"], [334p, 336p, 340p, 357p, 414p, 429p, 435p], [349p, 351p, 355p, 412p, 429p, 444p, 450p], [356p, 358p, 402p, 419p, "-", "-", "-"], [404p, 406p, 410p, 427p, 444p, 459p, 505p], [419p, 421p, 425p, 442p, 459p, 514p, 520p], [434p, 436p, 440p, 457p, 514p, 529p, 535p], [449p, 451p, 455p, 512p, 529p, 544p, 550p], [504p, 506p, 510p, 527p, 544p, 559p, 605p], [519p, 521p, 525p, 542p, 559p, 614p, 620p], [534p, 536p, 540p, 557p, 614p, 629p, 635p], [549p, 551p, 555p, 612p, 629p, 643p, 649p], [604p, 606p, 610p, 627p, 642p, 656p, 702p], [619p, 621p, 625p, 640p, 655p, 709p, 715p], [635p, 637p, 640p, 655p, 710p, 724p, 730p], [650p, 652p, 655p, 710p, 725p, 739p, 745p], [705p, 707p, 710p, 725p, 740p, 754p, 800p], [720p, 722p, 725p, 740p, 755p, 809p, 815p], [735p, 737p, 740p, 755p, 810p, 824p, 830p], [750p, 752p, 755p, 810p, 825p, 839p, 845p], [805p, 807p, 810p, 825p, 840p, 854p, 900p], [820p, 822p, 825p, 840p, 855p, 909p, 915p], [835p, 837p, 840p, 855p, 910p, 924p, 930p], [850p, 852p, 855p, 910p, 925p, 939p, 945p], [905p, 907p, 910p, 925p, 940p, 954p, 1000p], [920p, 922p, 925p, 940p, 955p, 1009p, 1015p], [935p, 937p, 940p, 955p, 1010p, 1024p, 1030p], [950p, 952p, 955p, 1010p, 1025p, 1039p, 1045p], [1005p, 1007p, 1010p, 1025p, 1040p, 1054p, 1100p], [1020p, 1022p, 1025p, 1040p, 1055p, 1109p, 1115p], [1035p, 1037p, 1040p, 1055p, 1110p, 1124p, 1130p], [1050p, 1052p, 1055p, 1110p, 1125p, 1139p, 1145p], [1105p, 1107p, 1110p, 1125p, 1140p, 1154p, 1200a]]
-    between_stops: []
     short_name: "900"
     time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: 
+      Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+      Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+      City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 1: []
     short_name: "900"
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Erindale Centre, Tuggeranong Interchange]
     stop_times_sunday: [[734a, 736a, 740a, 757a, 814a, 829a, 835a], [749a, 751a, 755a, 812a, 829a, 844a, 850a], [804a, 806a, 810a, 827a, 844a, 859a, 905a], [819a, 821a, 825a, 842a, 859a, 914a, 920a], [834a, 836a, 840a, 857a, 914a, 929a, 935a], [849a, 851a, 855a, 912a, 929a, 944a, 950a], [904a, 906a, 910a, 927a, 944a, 959a, 1005a], [919a, 921a, 925a, 942a, 959a, 1014a, 1020a], [934a, 936a, 940a, 957a, 1014a, 1029a, 1035a], [949a, 951a, 955a, 1012a, 1029a, 1044a, 1050a], [1004a, 1006a, 1010a, 1027a, 1044a, 1059a, 1105a], [1019a, 1021a, 1025a, 1042a, 1059a, 1114a, 1120a], [1034a, 1036a, 1040a, 1057a, 1114a, 1129a, 1135a], [1049a, 1051a, 1055a, 1112a, 1129a, 1144a, 1150a], [1104a, 1106a, 1110a, 1127a, 1144a, 1159a, 1205p], [1119a, 1121a, 1125a, 1142a, 1159a, 1214p, 1220p], [1134a, 1136a, 1140a, 1157a, 1214p, 1229p, 1235p], [1149a, 1151a, 1155a, 1212p, 1229p, 1244p, 1250p], [1204p, 1206p, 1210p, 1227p, 1244p, 1259p, 105p], [1219p, 1221p, 1225p, 1242p, 1259p, 114p, 120p], [1234p, 1236p, 1240p, 1257p, 114p, 129p, 135p], [1249p, 1251p, 1255p, 112p, 129p, 144p, 150p], [104p, 106p, 110p, 127p, 144p, 159p, 205p], [119p, 121p, 125p, 142p, 159p, 214p, 220p], [134p, 136p, 140p, 157p, 214p, 229p, 235p], [149p, 151p, 155p, 212p, 229p, 244p, 250p], [204p, 206p, 210p, 227p, 244p, 259p, 305p], [219p, 221p, 225p, 242p, 259p, 314p, 320p], [234p, 236p, 240p, 257p, 314p, 329p, 335p], [249p, 251p, 255p, 312p, 329p, 344p, 350p], [304p, 306p, 310p, 327p, 344p, 359p, 405p], [319p, 321p, 325p, 342p, 359p, 414p, 420p], [334p, 336p, 340p, 357p, 414p, 429p, 435p], [349p, 351p, 355p, 412p, 429p, 444p, 450p], [404p, 406p, 410p, 427p, 444p, 459p, 505p], [419p, 421p, 425p, 442p, 459p, 514p, 520p], [434p, 436p, 440p, 457p, 514p, 529p, 535p], [449p, 451p, 455p, 512p, 529p, 544p, 550p], [504p, 506p, 510p, 527p, 544p, 559p, 605p], [519p, 521p, 525p, 542p, 559p, 614p, 620p], [534p, 536p, 540p, 557p, 614p, 629p, 635p], [549p, 551p, 555p, 612p, 629p, 643p, 649p], [604p, 606p, 610p, 627p, 642p, 656p, 702p], [619p, 621p, 625p, 640p, 655p, 709p, 715p], [634p, 636p, 639p, 654p, 709p, 723p, 729p], [649p, 651p, 654p, 709p, 724p, 738p, 744p], [704p, 706p, 709p, 724p, 739p, 753p, 759p]]
-    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     stop_times_saturday: [["-", "-", "-", "-", "-", 718a, 723a, 731a, 739a, 741a, 745a], ["-", "-", "-", "-", "-", 818a, 823a, 831a, 839a, 841a, 845a], [852a, 856a, 858a, 905a, 913a, 918a, 923a, 931a, 939a, 941a, 945a], [952a, 956a, 958a, 1005a, 1013a, 1018a, 1023a, 1031a, 1039a, 1041a, 1045a], [1052a, 1056a, 1058a, 1105a, 1113a, 1118a, 1123a, 1131a, 1139a, 1141a, 1145a], [1152a, 1156a, 1158a, 1205p, 1213p, 1218p, 1223p, 1231p, 1239p, 1241p, 1245p], [1252p, 1256p, 1258p, 105p, 113p, 118p, 123p, 131p, 139p, 141p, 145p], [152p, 156p, 158p, 205p, 213p, 218p, 223p, 231p, 239p, 241p, 245p], [252p, 256p, 258p, 305p, 313p, 318p, 323p, 331p, 339p, 341p, 345p], [352p, 356p, 358p, 405p, 413p, 418p, 423p, 431p, 439p, 441p, 445p], [452p, 456p, 458p, 505p, 513p, 518p, 523p, 531p, 539p, 541p, 545p], [552p, 556p, 558p, 605p, 613p, 618p, 623p, 631p, 638p, 640p, 643p], [652p, 655p, 657p, 703p, 710p, 715p, 720p, 728p, 735p, 737p, 740p], [752p, 755p, 757p, 803p, 810p, 815p, 820p, 828p, 835p, 837p, 840p], [852p, 855p, 857p, 903p, 910p, 915p, 920p, 928p, 935p, 937p, 940p], [952p, 955p, 957p, 1003p, 1010p, 1015p, 1020p, 1028p, 1035p, 1037p, 1040p], [1052p, 1055p, 1057p, 1103p, 1110p, 1115p, 1120p, 1128p, 1135p, 1137p, 1140p]]
-    between_stops: []
     short_name: "902"
     time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     short_name: "902"
+    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [[], [852a, 854a, 858a, 905a, 913a, 918a, 923a, 931a, 939a, 941a, 945a], [952a, 954a, 958a, 1005a, 1013a, 1018a, 1023a, 1031a, 1039a, 1041a, 1045a], [1052a, 1054a, 1058a, 1105a, 1113a, 1118a, 1123a, 1131a, 1139a, 1141a, 1145a], [1152a, 1154a, 1158a, 1205p, 1213p, 1218p, 1223p, 1231p, 1239p, 1241p, 1245p], [1252p, 1254p, 1258p, 105p, 113p, 118p, 123p, 131p, 139p, 141p, 145p], [152p, 154p, 158p, 205p, 213p, 218p, 223p, 231p, 239p, 241p, 245p], [252p, 254p, 258p, 305p, 313p, 318p, 323p, 331p, 339p, 341p, 345p], [352p, 354p, 358p, 405p, 413p, 418p, 423p, 431p, 439p, 441p, 445p], [452p, 454p, 458p, 505p, 513p, 518p, 523p, 531p, 539p, 541p, 545p], [552p, 554p, 558p, 605p, 613p, 618p, 623p, 631p, 638p, 640p, 643p], [652p, 654p, 657p, 703p, 710p, 715p, 720p, 728p, 735p, 737p, 740p]]
-    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 4: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     stop_times_saturday: [["-", "-", "-", "-", 734a, 748a, 802a, 804a, 808a], [800a, 802a, 806a, 820a, 834a, 848a, 902a, 904a, 908a], [900a, 902a, 906a, 920a, 934a, 948a, 1002a, 1004a, 1008a], [1000a, 1002a, 1006a, 1020a, 1034a, 1048a, 1102a, 1104a, 1108a], [1100a, 1102a, 1106a, 1120a, 1134a, 1148a, 1202p, 1204p, 1208p], [1200p, 1202p, 1206p, 1220p, 1234p, 1248p, 102p, 104p, 108p], [100p, 102p, 106p, 120p, 134p, 148p, 202p, 204p, 208p], [200p, 202p, 206p, 220p, 234p, 248p, 302p, 304p, 308p], [300p, 302p, 306p, 320p, 334p, 348p, 402p, 404p, 408p], [400p, 402p, 406p, 420p, 434p, 448p, 502p, 504p, 508p], [500p, 502p, 506p, 520p, 534p, 548p, 602p, 604p, 608p], [600p, 602p, 606p, 620p, 634p, 648p, 701p, 703p, 706p], [700p, 702p, 705p, 718p, 732p, 746p, 759p, 801p, 804p], [800p, 802p, 805p, 818p, 832p, 846p, 859p, 901p, 904p], [900p, 902p, 905p, 918p, 932p, 946p, 959p, 1001p, 1004p], [1000p, 1002p, 1005p, 1018p, 1032p, 1046p, 1059p, 1101p, 1104p], [1100p, 1102p, 1105p, 1118p, 1132p, "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "903"
     time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 4, Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     short_name: "903"
+    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [[], [900a, 902a, 906a, 920a, 934a, 948a, 1002a, 1004a, 1008a], [1000a, 1002a, 1006a, 1020a, 1034a, 1048a, 1102a, 1104a, 1108a], [1100a, 1102a, 1106a, 1120a, 1134a, 1148a, 1202p, 1204p, 1208p], [1200p, 1202p, 1206p, 1220p, 1234p, 1248p, 102p, 104p, 108p], [100p, 102p, 106p, 120p, 134p, 148p, 202p, 204p, 208p], [200p, 202p, 206p, 220p, 234p, 248p, 302p, 304p, 308p], [300p, 302p, 306p, 320p, 334p, 348p, 402p, 404p, 408p], [400p, 402p, 406p, 420p, 434p, 448p, 502p, 504p, 508p], [500p, 502p, 506p, 520p, 534p, 548p, 602p, 604p, 608p], [600p, 602p, 606p, 620p, 634p, 648p, 701p, 703p, 706p]]
-    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     stop_times_saturday: [["-", "-", "-", "-", 757a, 807a, 828a, 830a, 834a], [820a, 822a, 826a, 847a, 857a, 907a, 928a, 930a, 934a], [920a, 922a, 926a, 947a, 957a, 1007a, 1028a, 1030a, 1034a], [1020a, 1022a, 1026a, 1047a, 1057a, 1107a, 1128a, 1130a, 1134a], [1120a, 1122a, 1126a, 1147a, 1157a, 1207p, 1228p, 1230p, 1234p], [1220p, 1222p, 1226p, 1247p, 1257p, 107p, 128p, 130p, 134p], [120p, 122p, 126p, 147p, 157p, 207p, 228p, 230p, 234p], [220p, 222p, 226p, 247p, 257p, 307p, 328p, 330p, 334p], [320p, 322p, 326p, 347p, 357p, 407p, 428p, 430p, 434p], [420p, 422p, 426p, 447p, 457p, 507p, 528p, 530p, 534p], [520p, 522p, 526p, 547p, 557p, 607p, 628p, 630p, 633p], [620p, 622p, 626p, 646p, 656p, 706p, 726p, 728p, 731p], [720p, 722p, 725p, 745p, 755p, 805p, 825p, 827p, 830p], [820p, 822p, 825p, 845p, 855p, 905p, 925p, 927p, 930p], [920p, 922p, 925p, 945p, 955p, 1005p, 1025p, 1027p, 1030p], [1020p, 1022p, 1025p, 1045p, 1055p, 1105p, 1125p, 1127p, 1130p], [1120p, 1122p, 1125p, 1145p, 1155p, "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "904"
     time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     short_name: "904"
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [[820a, 822a, 826a, 847a, 857a, 907a, 928a, 930a, 934a], [920a, 922a, 926a, 947a, 957a, 1007a, 1028a, 1030a, 1034a], [1020a, 1022a, 1026a, 1047a, 1057a, 1107a, 1128a, 1130a, 1134a], [1120a, 1122a, 1126a, 1147a, 1157a, 1207p, 1228p, 1230p, 1234p], [1220p, 1222p, 1226p, 1247p, 1257p, 107p, 128p, 130p, 134p], [120p, 122p, 126p, 147p, 157p, 207p, 228p, 230p, 234p], [220p, 222p, 226p, 247p, 257p, 307p, 328p, 330p, 334p], [320p, 322p, 326p, 347p, 357p, 407p, 428p, 430p, 434p], [420p, 422p, 426p, 447p, 457p, 507p, 528p, 530p, 534p], [520p, 522p, 526p, 547p, 557p, 607p, 628p, 630p, 633p], [620p, 622p, 626p, 646p, 656p, 706p, 726p, 728p, 731p]]
-    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     stop_times_saturday: [["-", "-", "-", "-", "-", "-", 757a, 809a, 816a, 823a, 836a, 838a, 842a], [815a, 817a, 821a, 834a, 840a, 847a, 857a, 909a, 916a, 923a, 936a, 938a, 942a], [915a, 917a, 921a, 934a, 940a, 947a, 957a, 1009a, 1016a, 1023a, 1036a, 1038a, 1042a], [1015a, 1017a, 1021a, 1034a, 1040a, 1047a, 1057a, 1109a, 1116a, 1123a, 1136a, 1138a, 1142a], [1115a, 1117a, 1121a, 1134a, 1140a, 1147a, 1157a, 1209p, 1216p, 1223p, 1236p, 1238p, 1242p], [1215p, 1217p, 1221p, 1234p, 1240p, 1247p, 1257p, 109p, 116p, 123p, 136p, 138p, 142p], [115p, 117p, 121p, 134p, 140p, 147p, 157p, 209p, 216p, 223p, 236p, 238p, 242p], [215p, 217p, 221p, 234p, 240p, 247p, 257p, 309p, 316p, 323p, 336p, 338p, 342p], [315p, 317p, 321p, 334p, 340p, 347p, 357p, 409p, 416p, 423p, 436p, 438p, 442p], [415p, 417p, 421p, 434p, 440p, 447p, 457p, 509p, 516p, 523p, 536p, 538p, 542p], [515p, 517p, 521p, 534p, 540p, 547p, 557p, 609p, 616p, 623p, 636p, 638p, 641p], [615p, 617p, 621p, 634p, 640p, 647p, 656p, 707p, 714p, 721p, 733p, 735p, 738p], [715p, 717p, 720p, 732p, 738p, 745p, 754p, 805p, 812p, 819p, 831p, 833p, 836p], [815p, 817p, 820p, 832p, 838p, 845p, 854p, 905p, 912p, 919p, 931p, 933p, 936p], [915p, 917p, 920p, 932p, 938p, 945p, 954p, 1005p, 1012p, 1019p, 1031p, 1033p, 1036p], [1015p, 1017p, 1020p, 1032p, 1038p, 1045p, 1054p, "-", "-", "-", "-", "-", "-"], [1115p, 1117p, 1120p, 1132p, 1138p, 1145p, 1154p, "-", "-", "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "905"
     time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     short_name: "905"
+    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [["-", "-", "-", "-", "-", "-", 857a, 909a, 916a, 923a, 936a, 938a, 942a], [915a, 917a, 921a, 934a, 940a, 947a, 957a, 1009a, 1016a, 1023a, 1036a, 1038a, 1042a], [1015a, 1017a, 1021a, 1034a, 1040a, 1047a, 1057a, 1109a, 1116a, 1123a, 1136a, 1138a, 1142a], [1115a, 1117a, 1121a, 1134a, 1140a, 1147a, 1157a, 1209p, 1216p, 1223p, 1236p, 1238p, 1242p], [1215p, 1217p, 1221p, 1234p, 1240p, 1247p, 1257p, 109p, 116p, 123p, 136p, 138p, 142p], [115p, 117p, 121p, 134p, 140p, 147p, 157p, 209p, 216p, 223p, 236p, 238p, 242p], [215p, 217p, 221p, 234p, 240p, 247p, 257p, 309p, 316p, 323p, 336p, 338p, 342p], [315p, 317p, 321p, 334p, 340p, 347p, 357p, 409p, 416p, 423p, 436p, 438p, 442p], [415p, 417p, 421p, 434p, 440p, 447p, 457p, 509p, 516p, 523p, 536p, 538p, 542p], [515p, 517p, 521p, 534p, 540p, 547p, 557p, 609p, 616p, 623p, 636p, 638p, 641p], [615p, 617p, 621p, 634p, 640p, 647p, 656p, "-", "-", "-", "-", "-", "-"]]
-    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     stop_times_saturday: [["-", "-", "-", "-", 725a, 738a, 753a, 755a, 759a], [753a, 755a, 759a, 812a, 825a, 838a, 853a, 855a, 859a], [853a, 855a, 859a, 912a, 925a, 938a, 953a, 955a, 959a], [953a, 955a, 959a, 1012a, 1025a, 1038a, 1053a, 1055a, 1059a], [1053a, 1055a, 1059a, 1112a, 1125a, 1138a, 1153a, 1155a, 1159a], [1153a, 1155a, 1159a, 1212p, 1225p, 1238p, 1253p, 1255p, 1259p], [1253p, 1255p, 1259p, 112p, 125p, 138p, 153p, 155p, 159p], [153p, 155p, 159p, 212p, 225p, 238p, 253p, 255p, 259p], [253p, 255p, 259p, 312p, 325p, 338p, 353p, 355p, 359p], [353p, 355p, 359p, 412p, 425p, 438p, 453p, 455p, 459p], [453p, 455p, 459p, 512p, 525p, 538p, 553p, 555p, 559p], [553p, 555p, 559p, 612p, 625p, 638p, 652p, 654p, 657p], [653p, 655p, 658p, 710p, 723p, 736p, 750p, 752p, 755p], [753p, 755p, 758p, 810p, 823p, 836p, 850p, 852p, 855p], [857p, 859p, 902p, 914p, 927p, 940p, 954p, 956p, 959p], [957p, 959p, 1002p, 1014p, 1027p, 1040p, 1054p, 1056p, 1059p], [1057p, 1059p, 1102p, 1114p, 1127p, 1140p, 1154p, 1156p, 1159p]]
-    between_stops: []
     short_name: "906"
     time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
     short_name: "906"
+    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [[853a, 855a, 859a, 912a, 925a, 938a, 953a, 955a, 959a], [953a, 955a, 959a, 1012a, 1025a, 1038a, 1053a, 1055a, 1059a], [1053a, 1055a, 1059a, 1112a, 1125a, 1138a, 1153a, 1155a, 1159a], [1153a, 1155a, 1159a, 1212p, 1225p, 1238p, 1253p, 1255p, 1259p], [1253p, 1255p, 1259p, 112p, 125p, 138p, 153p, 155p, 159p], [153p, 155p, 159p, 212p, 225p, 238p, 253p, 255p, 259p], [253p, 255p, 259p, 312p, 325p, 338p, 353p, 355p, 359p], [353p, 355p, 359p, 412p, 425p, 438p, 453p, 455p, 459p], [453p, 455p, 459p, 512p, 525p, 538p, 553p, 555p, 559p], [553p, 555p, 559p, 612p, 625p, 638p, 652p, 654p, 657p]]
-    time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     stop_times_saturday: [["-", "-", "-", 708a, 715a, 722a, 736a, 738a, 742a], ["-", "-", "-", 808a, 815a, 822a, 836a, 838a, 842a], [848a, 850a, 854a, 908a, 915a, 922a, 936a, 938a, 942a], [948a, 950a, 954a, 1008a, 1015a, 1022a, 1036a, 1038a, 1042a], [1048a, 1050a, 1054a, 1108a, 1115a, 1122a, 1136a, 1138a, 1142a], [1148a, 1150a, 1154a, 1208p, 1215p, 1222p, 1236p, 1238p, 1242p], [1248p, 1250p, 1254p, 108p, 115p, 122p, 136p, 138p, 142p], [148p, 150p, 154p, 208p, 215p, 222p, 236p, 238p, 242p], [248p, 250p, 254p, 308p, 315p, 322p, 336p, 338p, 342p], [348p, 350p, 354p, 408p, 415p, 422p, 436p, 438p, 442p], [448p, 450p, 454p, 508p, 515p, 522p, 536p, 538p, 542p], [548p, 550p, 554p, 608p, 615p, 622p, 636p, 638p, 641p], [648p, 650p, 653p, 706p, 713p, 720p, 733p, 735p, 738p], [748p, 750p, 753p, 806p, 813p, 820p, 833p, 835p, 838p], [848p, 850p, 853p, 906p, 913p, 920p, 933p, 935p, 938p], [948p, 950p, 953p, 1006p, 1013p, 1020p, 1033p, 1035p, 1038p], [1048p, 1050p, 1053p, 1106p, 1113p, 1120p, 1133p, 1135p, 1138p]]
-    between_stops: []
     short_name: "907"
     time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Cameron Ave Bus Station
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station-Lathlain St Bus Station: []
+      Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+      Lathlain St Bus Station-Cameron Ave Bus Station: []
+      Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
     short_name: "907"
+    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
     stop_times_sunday: [[848a, 850a, 854a, 908a, 915a, 922a, 936a, 938a, 942a], [948a, 950a, 954a, 1008a, 1015a, 1022a, 1036a, 1038a, 1042a], [1048a, 1050a, 1054a, 1108a, 1115a, 1122a, 1136a, 1138a, 1142a], [1148a, 1150a, 1154a, 1208p, 1215p, 1222p, 1236p, 1238p, 1242p], [1248p, 1250p, 1254p, 108p, 115p, 122p, 136p, 138p, 142p], [148p, 150p, 154p, 208p, 215p, 222p, 236p, 238p, 242p], [248p, 250p, 254p, 308p, 315p, 322p, 336p, 338p, 342p], [348p, 350p, 354p, 408p, 415p, 422p, 436p, 438p, 442p], [448p, 450p, 454p, 508p, 515p, 522p, 536p, 538p, 542p], [548p, 550p, 554p, 608p, 615p, 622p, 636p, 638p, 641p], [648p, 650p, 653p, 706p, 713p, 720p, 733p, 735p, 738p]]
-    time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 815a
-      - 825a
-      - 830a
-      - 839a
-      - 846a
-      - 855a
-    - - 1015a
-      - 1025a
-      - 1030a
-      - 1039a
-      - 1046a
-      - 1055a
-    - - 1215p
-      - 1225p
-      - 1230p
-      - 1239p
-      - 1246p
-      - 1255p
-    - - 215p
-      - 225p
-      - 230p
-      - 239p
-      - 246p
-      - 255p
-    - - 415p
-      - 425p
-      - 430p
-      - 439p
-      - 446p
-      - 455p
-    - - 615p
-      - 625p
-      - 630p
-      - 639p
-      - 646p
-      - 655p
-    - - 818p
-      - 828p
-      - 833p
-      - 842p
-      - 849p
-      - 858p
-    - - 1018p
-      - 1028p
-      - 1033p
-      - 1042p
-      - 1049p
-      - 1058p
+    stop_times_saturday: [[815a, 825a, 830a, 839a, 846a, 855a], [1015a, 1025a, 1030a, 1039a, 1046a, 1055a], [1215p, 1225p, 1230p, 1239p, 1246p, 1255p], [215p, 225p, 230p, 239p, 246p, 255p], [415p, 425p, 430p, 439p, 446p, 455p], [615p, 625p, 630p, 639p, 646p, 655p], [818p, 828p, 833p, 842p, 849p, 858p], [1018p, 1028p, 1033p, 1042p, 1049p, 1058p]]
+    between_stops: {}
+    
     short_name: "912"
-    time_points: 
-    - Tuggeranong Interchange - Platform 4
-    - Isabella Shops
-    - Calwell Shops
-    - Theodore
-    - Outtrim / Duggan
-    - Tuggeranong Interchange
+    time_points: [Tuggeranong Interchange - Platform 4, Isabella Shops, Calwell Shops, Theodore, Outtrim / Duggan, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
     
     short_name: "912"
-    time_points: 
-    - Tuggeranong Interchange - Platform 4
-    - Isabella Shops
-    - Calwell Shops
-    - Theodore
-    - Outtrim / Duggan
-    - Tuggeranong Interchange
-    stop_times_sunday: 
-    - - 1015a
-      - 1025a
-      - 1030a
-      - 1039a
-      - 1046a
-      - 1055a
-    - - 1215p
-      - 1225p
-      - 1230p
-      - 1239p
-      - 1246p
-      - 1255p
-    - - 215p
-      - 225p
-      - 230p
-      - 239p
-      - 246p
-      - 255p
-    - - 415p
-      - 425p
-      - 430p
-      - 439p
-      - 446p
-      - 455p
-    - - 615p
-      - 625p
-      - 630p
-      - 639p
-      - 646p
-      - 655p
+    stop_times_sunday: [[1015a, 1025a, 1030a, 1039a, 1046a, 1055a], [1215p, 1225p, 1230p, 1239p, 1246p, 1255p], [215p, 225p, 230p, 239p, 246p, 255p], [415p, 425p, 430p, 439p, 446p, 455p], [615p, 625p, 630p, 639p, 646p, 655p]]
+    time_points: [Tuggeranong Interchange - Platform 4, Isabella Shops, Calwell Shops, Theodore, Outtrim / Duggan, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[725a, 734a, 738a, 742a, 745a, 748a, 754a, 758a, 804a], [925a, 934a, 938a, 942a, 945a, 948a, 954a, 958a, 1004a], [1125a, 1134a, 1138a, 1142a, 1145a, 1148a, 1154a, 1158a, 1204p], [125p, 134p, 138p, 142p, 145p, 148p, 154p, 158p, 204p], [325p, 334p, 338p, 342p, 345p, 348p, 354p, 358p, 404p], [525p, 534p, 538p, 542p, 545p, 548p, 554p, 558p, 604p], [725p, 734p, 738p, 742p, 745p, 748p, 754p, 758p, 804p], [928p, 937p, 941p, 945p, 948p, 951p, 957p, 1001p, 1007p], [1128p, 1137p, 1141p, 1145p, 1148p, 1151p, 1157p, "-", "-"]]
-    between_stops: []
     short_name: "913"
     time_points: [Tuggeranong Interchange - Platform 7, Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "913"
+    time_points: [Tuggeranong Interchange - Platform 7, Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
     stop_times_sunday: [[925a, 934a, 938a, 942a, 945a, 948a, 954a, 958a, 1004a], [1125a, 1134a, 1138a, 1142a, 1145a, 1148a, 1154a, 1158a, 1204p], [125p, 134p, 138p, 142p, 145p, 148p, 154p, 158p, 204p], [325p, 334p, 338p, 342p, 345p, 348p, 354p, 358p, 404p], [525p, 534p, 538p, 542p, 545p, 548p, 554p, 558p, 604p], [725p, 734p, 738p, 742p, 745p, 748p, 754p, 758p, 804p]]
-    time_points: [Tuggeranong Interchange - Platform 7, Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 625a
-      - 634a
-      - 638a
-      - 644a
-      - 647a
-      - 650a
-      - 654a
-      - 658a
-      - 704a
-    - - 825a
-      - 834a
-      - 838a
-      - 844a
-      - 847a
-      - 850a
-      - 854a
-      - 858a
-      - 904a
-    - - 1025a
-      - 1034a
-      - 1038a
-      - 1044a
-      - 1047a
-      - 1050a
-      - 1054a
-      - 1058a
-      - 1104a
-    - - 1225p
-      - 1234p
-      - 1238p
-      - 1244p
-      - 1247p
-      - 1250p
-      - 1254p
-      - 1258p
-      - 104p
-    - - 225p
-      - 234p
-      - 238p
-      - 244p
-      - 247p
-      - 250p
-      - 254p
-      - 258p
-      - 304p
-    - - 425p
-      - 434p
-      - 438p
-      - 444p
-      - 447p
-      - 450p
-      - 454p
-      - 458p
-      - 504p
-    - - 625p
-      - 634p
-      - 638p
-      - 644p
-      - 647p
-      - 650p
-      - 654p
-      - 658p
-      - 704p
-    - - 828p
-      - 837p
-      - 841p
-      - 847p
-      - 850p
-      - 853p
-      - 857p
-      - 901p
-      - 907p
-    - - 1028p
-      - 1037p
-      - 1041p
-      - 1047p
-      - 1050p
-      - 1053p
-      - 1057p
-      - 1101p
-      - 1107p
+    stop_times_saturday: [[625a, 634a, 638a, 644a, 647a, 650a, 654a, 658a, 704a], [825a, 834a, 838a, 844a, 847a, 850a, 854a, 858a, 904a], [1025a, 1034a, 1038a, 1044a, 1047a, 1050a, 1054a, 1058a, 1104a], [1225p, 1234p, 1238p, 1244p, 1247p, 1250p, 1254p, 1258p, 104p], [225p, 234p, 238p, 244p, 247p, 250p, 254p, 258p, 304p], [425p, 434p, 438p, 444p, 447p, 450p, 454p, 458p, 504p], [625p, 634p, 638p, 644p, 647p, 650p, 654p, 658p, 704p], [828p, 837p, 841p, 847p, 850p, 853p, 857p, 901p, 907p], [1028p, 1037p, 1041p, 1047p, 1050p, 1053p, 1057p, 1101p, 1107p]]
+    between_stops: {}
+    
     short_name: "914"
-    time_points: 
-    - Tuggeranong Interchange - Platform 7
-    - Bonython Primary
-    - Lanyon Market Place
-    - Conder Primary
-    - Tharwa/Pockett
-    - Gordon Primary
-    - Woodcock/Clare Dennis
-    - Bonython Primary
-    - Tuggeranong Interchange
+    time_points: [Tuggeranong Interchange - Platform 7, Bonython Primary, Lanyon Market Place, Conder Primary, Tharwa/Pockett, Gordon Primary, Woodcock/Clare Dennis, Bonython Primary, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
     
     short_name: "914"
-    time_points: 
-    - Tuggeranong Interchange - Platform 7
-    - Bonython Primary
-    - Lanyon Market Place
-    - Conder Primary
-    - Tharwa/Pockett
-    - Gordon Primary
-    - Woodcock/Clare Dennis
-    - Bonython Primary
-    - Tuggeranong Interchange
-    stop_times_sunday: 
-    - - 1025a
-      - 1034a
-      - 1038a
-      - 1044a
-      - 1047a
-      - 1050a
-      - 1054a
-      - 1058a
-      - 1104a
-    - - 1225p
-      - 1234p
-      - 1238p
-      - 1244p
-      - 1247p
-      - 1250p
-      - 1254p
-      - 1258p
-      - 104p
-    - - 225p
-      - 234p
-      - 238p
-      - 244p
-      - 247p
-      - 250p
-      - 254p
-      - 258p
-      - 304p
-    - - 425p
-      - 434p
-      - 438p
-      - 444p
-      - 447p
-      - 450p
-      - 454p
-      - 458p
-      - 504p
-    - - 625p
-      - 634p
-      - 638p
-      - 644p
-      - 647p
-      - 650p
-      - 654p
-      - 658p
-      - 704p
+    stop_times_sunday: [[1025a, 1034a, 1038a, 1044a, 1047a, 1050a, 1054a, 1058a, 1104a], [1225p, 1234p, 1238p, 1244p, 1247p, 1250p, 1254p, 1258p, 104p], [225p, 234p, 238p, 244p, 247p, 250p, 254p, 258p, 304p], [425p, 434p, 438p, 444p, 447p, 450p, 454p, 458p, 504p], [625p, 634p, 638p, 644p, 647p, 650p, 654p, 658p, 704p]]
+    time_points: [Tuggeranong Interchange - Platform 7, Bonython Primary, Lanyon Market Place, Conder Primary, Tharwa/Pockett, Gordon Primary, Woodcock/Clare Dennis, Bonython Primary, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 715a
-      - 725a
-      - 734a
-      - 743a
-      - 746a
-      - 755a
-    - - 915a
-      - 925a
-      - 934a
-      - 943a
-      - 946a
-      - 955a
-    - - 1115a
-      - 1125a
-      - 1134a
-      - 1143a
-      - 1146a
-      - 1155a
-    - - 115p
-      - 125p
-      - 134p
-      - 143p
-      - 146p
-      - 155p
-    - - 315p
-      - 325p
-      - 334p
-      - 343p
-      - 346p
-      - 355p
-    - - 515p
-      - 525p
-      - 534p
-      - 543p
-      - 546p
-      - 555p
-    - - 715p
-      - 725p
-      - 734p
-      - 743p
-      - 746p
-      - 755p
-    - - 918p
-      - 928p
-      - 937p
-      - 946p
-      - 949p
-      - 958p
-    - - 1118p
-      - 1128p
-      - 1137p
-      - 1146p
-      - 1149p
-      - "-"
+    stop_times_saturday: [[715a, 725a, 734a, 743a, 746a, 755a], [915a, 925a, 934a, 943a, 946a, 955a], [1115a, 1125a, 1134a, 1143a, 1146a, 1155a], [115p, 125p, 134p, 143p, 146p, 155p], [315p, 325p, 334p, 343p, 346p, 355p], [515p, 525p, 534p, 543p, 546p, 555p], [715p, 725p, 734p, 743p, 746p, 755p], [918p, 928p, 937p, 946p, 949p, 958p], [1118p, 1128p, 1137p, 1146p, 1149p, "-"]]
+    between_stops: {}
+    
     short_name: "915"
-    time_points: 
-    - Tuggeranong Interchange - Platform 4
-    - Isabella Shops
-    - Theodore
-    - Calwell Shops
-    - Outtrim / Duggan
-    - Tuggeranong Interchange
+    time_points: [Tuggeranong Interchange - Platform 4, Isabella Shops, Theodore, Calwell Shops, Outtrim / Duggan, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
     
     short_name: "915"
-    time_points: 
-    - Tuggeranong Interchange - Platform 4
-    - Isabella Shops
-    - Theodore
-    - Calwell Shops
-    - Outtrim / Duggan
-    - Tuggeranong Interchange
-    stop_times_sunday: 
-    - - 915a
-      - 925a
-      - 934a
-      - 943a
-      - 946a
-      - 955a
-    - - 1115a
-      - 1125a
-      - 1134a
-      - 1143a
-      - 1146a
-      - 1155a
-    - - 115p
-      - 125p
-      - 134p
-      - 143p
-      - 146p
-      - 155p
-    - - 315p
-      - 325p
-      - 334p
-      - 343p
-      - 346p
-      - 355p
-    - - 515p
-      - 525p
-      - 534p
-      - 543p
-      - 546p
-      - 555p
-    - - 717p
-      - 727p
-      - 736p
-      - 745p
-      - 748p
-      - 757p
-  -  
-    long_name: To Woden Interchange
+    stop_times_sunday: [[915a, 925a, 934a, 943a, 946a, 955a], [1115a, 1125a, 1134a, 1143a, 1146a, 1155a], [115p, 125p, 134p, 143p, 146p, 155p], [315p, 325p, 334p, 343p, 346p, 355p], [515p, 525p, 534p, 543p, 546p, 555p], [717p, 727p, 736p, 745p, 748p, 757p]]
+    time_points: [Tuggeranong Interchange - Platform 4, Isabella Shops, Theodore, Calwell Shops, Outtrim / Duggan, Tuggeranong Interchange]
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[933a, 936a, 940a, 945a, 951a, 955a, 1001a], [1133a, 1136a, 1140a, 1145a, 1151a, 1155a, 1201p], [133p, 136p, 140p, 145p, 151p, 155p, 201p], [333p, 336p, 340p, 345p, 351p, 355p, 401p], [533p, 536p, 540p, 545p, 551p, 555p, 601p], [733p, 736p, 740p, 745p, 751p, 755p, 801p], [933p, 936p, 940p, 945p, 951p, 955p, 1001p], [1133p, 1136p, 1140p, 1145p, 1151p, 1155p, "-"]]
-    between_stops: []
     short_name: "921"
     time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "921"
+    time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
     stop_times_sunday: [[933a, 936a, 940a, 945a, 951a, 955a, 1001a], [1133a, 1136a, 1140a, 1145a, 1151a, 1155a, 1201p], [133p, 136p, 140p, 145p, 151p, 155p, 201p], [333p, 336p, 340p, 345p, 351p, 355p, 401p], [533p, 536p, 540p, 545p, 551p, 555p, 601p]]
-    time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[833a, 839a, 843a, 849a, 854a, 858a, 901a], [1033a, 1039a, 1043a, 1049a, 1054a, 1058a, 1101a], [1233p, 1239p, 1243p, 1249p, 1254p, 1258p, 101p], [233p, 239p, 243p, 249p, 254p, 258p, 301p], [433p, 439p, 443p, 449p, 454p, 458p, 501p], [633p, 639p, 643p, 649p, 654p, 658p, 701p], [833p, 839p, 843p, 849p, 854p, 858p, 901p], [1033p, 1039p, 1043p, 1049p, 1054p, 1058p, 1101p]]
-    between_stops: []
     short_name: "922"
     time_points: [Woden Interchange - Platform 15, Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "922"
+    time_points: [Woden Interchange - Platform 15, Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
     stop_times_sunday: [[1033a, 1039a, 1043a, 1049a, 1054a, 1058a, 1101a], [1233p, 1239p, 1243p, 1249p, 1254p, 1258p, 101p], [233p, 239p, 243p, 249p, 254p, 258p, 301p], [433p, 439p, 443p, 449p, 454p, 458p, 501p], [633p, 639p, 643p, 649p, 654p, 658p, 701p]]
-    time_points: [Woden Interchange - Platform 15, Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[910a, 916a, 921a, 927a, 933a, 943a], [1110a, 1116a, 1121a, 1127a, 1133a, 1143a], [110p, 116p, 121p, 127p, 133p, 143p], [310p, 316p, 321p, 327p, 333p, 343p], [510p, 516p, 521p, 527p, 533p, 543p], [713p, 718p, 723p, 728p, 734p, 743p], [913p, 918p, 923p, 928p, 934p, 943p], [1113p, 1118p, 1123p, 1128p, 1134p, 1143p]]
-    between_stops: []
     short_name: "923"
     time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "923"
+    time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
     stop_times_sunday: [[910a, 916a, 921a, 927a, 933a, 943a], [1110a, 1116a, 1121a, 1127a, 1133a, 1143a], [110p, 116p, 121p, 127p, 133p, 143p], [310p, 316p, 321p, 327p, 333p, 343p], [510p, 516p, 521p, 527p, 533p, 543p]]
-    time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[810a, 819a, 824a, 829a, 833a, 841a], [1010a, 1019a, 1024a, 1029a, 1033a, 1041a], [1210p, 1219p, 1224p, 1229p, 1233p, 1241p], [210p, 219p, 224p, 229p, 233p, 241p], [410p, 419p, 424p, 429p, 433p, 441p], [610p, 619p, 624p, 629p, 633p, 641p], [813p, 821p, 826p, 830p, 834p, 841p], [1013p, 1021p, 1026p, 1030p, 1034p, 1041p]]
-    between_stops: []
     short_name: "924"
     time_points: [Woden Interchange - Platform 15, Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "924"
+    time_points: [Woden Interchange - Platform 15, Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
     stop_times_sunday: [[1010a, 1019a, 1024a, 1029a, 1033a, 1041a], [1210p, 1219p, 1224p, 1229p, 1233p, 1241p], [210p, 219p, 224p, 229p, 233p, 241p], [410p, 419p, 424p, 429p, 433p, 441p], [610p, 619p, 624p, 629p, 633p, 641p]]
-    time_points: [Woden Interchange - Platform 15, Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
   -  
     long_name: To Cooleman Court
+    between_stops: {}
+    
     stop_times_saturday: [[857a, 907a, 909a, 911a, 919a], [957a, 1007a, 1009a, 1011a, 1019a], [1057a, 1107a, 1109a, 1111a, 1119a], [1157a, 1207p, 1209p, 1211p, 1219p], [1257p, 107p, 109p, 111p, 119p], [157p, 207p, 209p, 211p, 219p], [257p, 307p, 309p, 311p, 319p], [357p, 407p, 409p, 411p, 419p], [457p, 507p, 509p, 511p, 519p], [557p, 607p, 609p, 611p, 619p], [657p, 707p, 709p, 711p, 719p], [757p, 807p, 809p, 811p, 819p], [857p, 907p, 909p, 911p, 919p], [957p, 1007p, 1009p, 1011p, 1019p], [1057p, 1107p, 1109p, 1111p, 1119p]]
-    between_stops: []
     short_name: "925"
     time_points: [Woden Interchange - Platform 16, Weston Primary, Holder, Duffy, Cooleman Court]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: "925"
+    time_points: [Woden Interchange - Platform 16, Weston Primary, Holder, Duffy, Cooleman Court]
     stop_times_sunday: [[957a, 1007a, 1009a, 1011a, 1019a], [1057a, 1107a, 1109a, 1111a, 1119a], [1157a, 1207p, 1209p, 1211p, 1219p], [1257p, 107p, 109p, 111p, 119p], [157p, 207p, 209p, 211p, 219p], [257p, 307p, 309p, 311p, 319p], [357p, 407p, 409p, 411p, 419p], [457p, 507p, 509p, 511p, 519p], [557p, 607p, 609p, 611p, 619p], [657p, 707p, 709p, 711p, 719p]]
-    time_points: [Woden Interchange - Platform 16, Weston Primary, Holder, Duffy, Cooleman Court]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[824a, 831a, 834a, 837a, 846a], [924a, 931a, 934a, 937a, 946a], [1024a, 1031a, 1034a, 1037a, 1046a], [1124a, 1131a, 1134a, 1137a, 1146a], [1224p, 1231p, 1234p, 1237p, 1246p], [124p, 131p, 134p, 137p, 146p], [224p, 231p, 234p, 237p, 246p], [324p, 331p, 334p, 337p, 346p], [424p, 431p, 434p, 437p, 446p], [524p, 531p, 534p, 537p, 546p], [624p, 631p, 634p, 637p, 646p], [724p, 731p, 734p, 737p, 746p], [824p, 831p, 834p, 837p, 846p], [924p, 931p, 934p, 937p, 946p], [1024p, 1031p, 1034p, 1037p, 1046p]]
-    between_stops: []
     short_name: "925"
     time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "925"
+    time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
     stop_times_sunday: [[924a, 931a, 934a, 937a, 946a], [1024a, 1031a, 1034a, 1037a, 1046a], [1124a, 1131a, 1134a, 1137a, 1146a], [1224p, 1231p, 1234p, 1237p, 1246p], [124p, 131p, 134p, 137p, 146p], [224p, 231p, 234p, 237p, 246p], [324p, 331p, 334p, 337p, 346p], [424p, 431p, 434p, 437p, 446p], [524p, 531p, 534p, 537p, 546p], [624p, 631p, 634p, 637p, 646p]]
-    time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
   -  
     long_name: To Cooleman Court
+    between_stops: {}
+    
     stop_times_saturday: [[920a, 929a, 932a, 942a, 945a, 950a], [1020a, 1029a, 1032a, 1042a, 1045a, 1050a], [1120a, 1129a, 1132a, 1142a, 1145a, 1150a], [1220p, 1229p, 1232p, 1242p, 1245p, 1250p], [120p, 129p, 132p, 142p, 145p, 150p], [220p, 229p, 232p, 242p, 245p, 250p], [320p, 329p, 332p, 342p, 345p, 350p], [420p, 429p, 432p, 442p, 445p, 450p], [520p, 529p, 532p, 542p, 545p, 550p], [620p, 629p, 632p, 642p, 645p, 650p], [720p, 729p, 732p, 742p, 745p, 750p], [820p, 829p, 832p, 842p, 845p, 850p], [920p, 929p, 932p, 942p, 945p, 950p], [1020p, 1029p, 1032p, 1042p, 1045p, 1050p], [1120p, 1129p, 1132p, 1142p, 1145p, 1150p]]
-    between_stops: []
     short_name: "927"
     time_points: [Woden Interchange - Platform 3, Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
   -  
     long_name: To Cooleman Court
-    between_stops: []
+    between_stops: {}
+    
     short_name: "927"
+    time_points: [Woden Interchange - Platform 3, Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
     stop_times_sunday: [[920a, 929a, 932a, 942a, 945a, 950a], [1020a, 1029a, 1032a, 1042a, 1045a, 1050a], [1120a, 1129a, 1132a, 1142a, 1145a, 1150a], [1220p, 1229p, 1232p, 1242p, 1245p, 1250p], [120p, 129p, 132p, 142p, 145p, 150p], [220p, 229p, 232p, 242p, 245p, 250p], [320p, 329p, 332p, 342p, 345p, 350p], [420p, 429p, 432p, 442p, 445p, 450p], [520p, 529p, 532p, 542p, 545p, 550p], [620p, 629p, 632p, 642p, 645p, 650p]]
-    time_points: [Woden Interchange - Platform 3, Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[755a, 803a, 806a, 816a, 819a, 826a], [855a, 903a, 906a, 916a, 919a, 926a], [955a, 1003a, 1006a, 1016a, 1019a, 1026a], [1055a, 1103a, 1106a, 1116a, 1119a, 1126a], [1155a, 1203p, 1206p, 1216p, 1219p, 1226p], [1255p, 103p, 106p, 116p, 119p, 126p], [155p, 203p, 206p, 216p, 219p, 226p], [255p, 303p, 306p, 316p, 319p, 326p], [355p, 403p, 406p, 416p, 419p, 426p], [455p, 503p, 506p, 516p, 519p, 526p], [555p, 603p, 606p, 616p, 619p, 626p], [655p, 703p, 706p, 716p, 719p, 726p], [755p, 803p, 806p, 816p, 819p, 826p], [855p, 903p, 906p, 916p, 919p, 926p], [955p, 1003p, 1006p, 1016p, 1019p, 1026p], [1055p, 1103p, 1106p, 1116p, 1119p, 1126p]]
-    between_stops: []
     short_name: "927"
     time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "927"
+    time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
     stop_times_sunday: [[855a, 903a, 906a, 916a, 919a, 926a], [955a, 1003a, 1006a, 1016a, 1019a, 1026a], [1055a, 1103a, 1106a, 1116a, 1119a, 1126a], [1155a, 1203p, 1206p, 1216p, 1219p, 1226p], [1255p, 103p, 106p, 116p, 119p, 126p], [155p, 203p, 206p, 216p, 219p, 226p], [255p, 303p, 306p, 316p, 319p, 326p], [355p, 403p, 406p, 416p, 419p, 426p], [455p, 503p, 506p, 516p, 519p, 526p], [555p, 603p, 606p, 616p, 619p, 626p], [655p, 703p, 706p, 716p, 719p, 726p]]
-    time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
-  -  
-    long_name: To City Interchange
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[1001a, 1013a, 1020a, 1027a, 1041a], [1201p, 1213p, 1220p, 1227p, 1241p], [201p, 213p, 220p, 227p, 241p], [401p, 413p, 420p, 427p, 441p], [601p, 613p, 620p, 627p, 641p], [801p, 813p, 820p, 827p, 841p], [901p, 913p, 920p, 927p, 941p], [1001p, 1013p, 1020p, 1027p, 1041p], [1101p, 1113p, 1120p, 1127p, 1141p]]
-    between_stops: []
     short_name: "930"
     time_points: [City Interchange - Platform 8, St Thomas More Campbell, Hospice, ADFA, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "930"
+    time_points: [City Interchange - Platform 8, St Thomas More Campbell, Hospice, ADFA, City Interchange]
     stop_times_sunday: [[1001a, 1013a, 1020a, 1027a, 1041a], [1201p, 1213p, 1220p, 1227p, 1241p], [201p, 213p, 220p, 227p, 241p], [401p, 413p, 420p, 427p, 441p], [601p, 613p, 620p, 627p, 641p]]
-    time_points: [City Interchange - Platform 8, St Thomas More Campbell, Hospice, ADFA, City Interchange]
-  -  
-    long_name: To City Interchange
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[801a, 815a, 822a, 829a, 841a], [901a, 915a, 922a, 929a, 941a], [1101a, 1115a, 1122a, 1129a, 1141a], [101p, 115p, 122p, 129p, 141p], [301p, 315p, 322p, 329p, 341p], [501p, 515p, 522p, 529p, 541p], [701p, 715p, 722p, 729p, 741p]]
-    between_stops: []
     short_name: "931"
     time_points: [City Interchange - Platform 8, ADFA, Hospice, St Thomas More Campbell, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "931"
+    time_points: [City Interchange - Platform 8, ADFA, Hospice, St Thomas More Campbell, City Interchange]
     stop_times_sunday: [[901a, 915a, 922a, 929a, 941a], [1101a, 1115a, 1122a, 1129a, 1141a], [101p, 115p, 122p, 129p, 141p], [301p, 315p, 322p, 329p, 341p], [501p, 515p, 522p, 529p, 541p], [701p, 715p, 722p, 729p, 741p]]
-    time_points: [City Interchange - Platform 8, ADFA, Hospice, St Thomas More Campbell, City Interchange]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [[739a, 750a, 753a, 756a, 809a, 815a, 819a, 828a, 836a, 841a, 847a, 850a, 852a, 856a], [839a, 850a, 853a, 856a, 909a, 915a, 919a, 928a, 936a, 941a, 947a, 950a, 952a, 956a], [939a, 950a, 953a, 956a, 1009a, 1015a, 1019a, 1028a, 1036a, 1041a, 1047a, 1050a, 1052a, 1056a], [1039a, 1050a, 1053a, 1056a, 1109a, 1115a, 1119a, 1128a, 1136a, 1141a, 1147a, 1150a, 1152a, 1156a], [1139a, 1150a, 1153a, 1156a, 1209p, 1215p, 1219p, 1228p, 1236p, 1241p, 1247p, 1250p, 1252p, 1256p], [1239p, 1250p, 1253p, 1256p, 109p, 115p, 119p, 128p, 136p, 141p, 147p, 150p, 152p, 156p], [139p, 150p, 153p, 156p, 209p, 215p, 219p, 228p, 236p, 241p, 247p, 250p, 252p, 256p], [239p, 250p, 253p, 256p, 309p, 315p, 319p, 328p, 336p, 341p, 347p, 350p, 352p, 356p], [339p, 350p, 353p, 356p, 409p, 415p, 419p, 428p, 436p, 441p, 447p, 450p, 452p, 456p], [439p, 450p, 453p, 456p, 509p, 515p, 519p, 528p, 536p, 541p, 547p, 550p, 552p, 556p], [539p, 550p, 553p, 556p, 609p, 615p, 619p, 628p, 635p, 640p, 645p, 647p, 649p, 652p], [639p, 648p, 651p, 654p, 707p, 712p, 716p, 725p, 732p, 737p, 742p, 744p, 746p, 749p], [739p, 748p, 751p, 754p, 807p, 812p, 816p, 825p, 832p, 837p, 842p, 844p, 846p, 849p], [839p, 848p, 851p, 854p, 907p, 912p, 916p, 925p, 932p, 937p, 942p, 944p, 946p, 949p], [939p, 948p, 951p, 954p, 1007p, 1012p, 1016p, 1025p, 1032p, 1037p, 1042p, 1044p, 1046p, 1049p], [1039p, 1048p, 1051p, 1054p, 1107p, 1112p, 1116p, 1125p, 1132p, 1137p, 1142p, 1144p, 1146p, 1149p], [1139p, 1150p, 1153p, 1156p, 1208a, "-", "-", "-", "-", "-", "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "932"
     time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, City Interchange - Platform 8, Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "932"
+    time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, City Interchange - Platform 8, Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[839a, 850a, 853a, 856a, 909a, 915a, 919a, 928a, 936a, 941a, 947a, 950a, 952a, 956a], [939a, 950a, 953a, 956a, 1009a, 1015a, 1019a, 1028a, 1036a, 1041a, 1047a, 1050a, 1052a, 1056a], [1039a, 1050a, 1053a, 1056a, 1109a, 1115a, 1119a, 1128a, 1136a, 1141a, 1147a, 1150a, 1152a, 1156a], [1139a, 1150a, 1153a, 1156a, 1209p, 1215p, 1219p, 1228p, 1236p, 1241p, 1247p, 1250p, 1252p, 1256p], [1239p, 1250p, 1253p, 1256p, 109p, 115p, 119p, 128p, 136p, 141p, 147p, 150p, 152p, 156p], [139p, 150p, 153p, 156p, 209p, 215p, 219p, 228p, 236p, 241p, 247p, 250p, 252p, 256p], [239p, 250p, 253p, 256p, 309p, 315p, 319p, 328p, 336p, 341p, 347p, 350p, 352p, 356p], [339p, 350p, 353p, 356p, 409p, 415p, 419p, 428p, 436p, 441p, 447p, 450p, 452p, 456p], [439p, 450p, 453p, 456p, 509p, 515p, 519p, 528p, 536p, 541p, 547p, 550p, 552p, 556p], [539p, 550p, 553p, 556p, 609p, 615p, 619p, 628p, 635p, 640p, 645p, 647p, 649p, 652p], [639p, 648p, 651p, 654p, 707p, 712p, 716p, 725p, 732p, 737p, 742p, 744p, 746p, 749p]]
-    time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, City Interchange - Platform 8, Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     stop_times_saturday: [[749a, 751a, 755a, 758a, 804a, 809a, 811a, 826a, 831a, 838a, 850a, 853a, 857a, 908a], [849a, 851a, 855a, 858a, 904a, 909a, 911a, 926a, 931a, 938a, 950a, 953a, 957a, 1008a], [949a, 951a, 955a, 958a, 1004a, 1009a, 1011a, 1026a, 1031a, 1038a, 1050a, 1053a, 1057a, 1108a], [1049a, 1051a, 1055a, 1058a, 1104a, 1109a, 1111a, 1126a, 1131a, 1138a, 1150a, 1153a, 1157a, 1208p], [1149a, 1151a, 1155a, 1158a, 1204p, 1209p, 1211p, 1226p, 1231p, 1238p, 1250p, 1253p, 1257p, 108p], [1249p, 1251p, 1255p, 1258p, 104p, 109p, 111p, 126p, 131p, 138p, 150p, 153p, 157p, 208p], [149p, 151p, 155p, 158p, 204p, 209p, 211p, 226p, 231p, 238p, 250p, 253p, 257p, 308p], [249p, 251p, 255p, 258p, 304p, 309p, 311p, 326p, 331p, 338p, 350p, 353p, 357p, 408p], [349p, 351p, 355p, 358p, 404p, 409p, 411p, 426p, 431p, 438p, 450p, 453p, 457p, 508p], [449p, 451p, 455p, 458p, 504p, 509p, 511p, 526p, 531p, 538p, 550p, 553p, 557p, 608p], [549p, 551p, 555p, 558p, 604p, 609p, 611p, 626p, 631p, 637p, 649p, 652p, 655p, 705p], [650p, 652p, 655p, 657p, 702p, 707p, 709p, 724p, 729p, 735p, 747p, 750p, 753p, 803p], [750p, 752p, 755p, 757p, 802p, 807p, 809p, 824p, 829p, 835p, 847p, 850p, 853p, 903p], [850p, 852p, 855p, 857p, 902p, 907p, 909p, 924p, 929p, 935p, 947p, 950p, 953p, 1003p], [950p, 952p, 955p, 957p, 1002p, 1007p, 1009p, 1024p, 1029p, 1035p, 1047p, 1050p, 1053p, 1103p], [1050p, 1052p, 1055p, 1057p, 1102p, 1107p, 1109p, 1124p, 1129p, 1134p, "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "932"
     time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange - Platform 9, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "932"
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange - Platform 9, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
     stop_times_sunday: [[749a, 751a, 755a, 758a, 804a, 809a, 811a, 826a, 831a, 838a, 850a, 853a, 857a, 908a], [849a, 851a, 855a, 858a, 904a, 909a, 911a, 926a, 931a, 938a, 950a, 953a, 957a, 1008a], [949a, 951a, 955a, 958a, 1004a, 1009a, 1011a, 1026a, 1031a, 1038a, 1050a, 1053a, 1057a, 1108a], [1049a, 1051a, 1055a, 1058a, 1104a, 1109a, 1111a, 1126a, 1131a, 1138a, 1150a, 1153a, 1157a, 1208p], [1149a, 1151a, 1155a, 1158a, 1204p, 1209p, 1211p, 1226p, 1231p, 1238p, 1250p, 1253p, 1257p, 108p], [1249p, 1251p, 1255p, 1258p, 104p, 109p, 111p, 126p, 131p, 138p, 150p, 153p, 157p, 208p], [149p, 151p, 155p, 158p, 204p, 209p, 211p, 226p, 231p, 238p, 250p, 253p, 257p, 308p], [249p, 251p, 255p, 258p, 304p, 309p, 311p, 326p, 331p, 338p, 350p, 353p, 357p, 408p], [349p, 351p, 355p, 358p, 404p, 409p, 411p, 426p, 431p, 438p, 450p, 453p, 457p, 508p], [449p, 451p, 455p, 458p, 504p, 509p, 511p, 526p, 531p, 538p, 550p, 553p, 557p, 608p], [549p, 551p, 555p, 558p, 604p, 609p, 611p, 626p, 631p, 637p, 649p, 652p, 655p, 705p]]
-    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange - Platform 9, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 752a
-      - 759a
-      - 804a
-      - 809a
-      - 816a
-      - 832a
-      - 834a
-      - 838a
-    - - 813a
-      - 822a
-      - 826a
-      - 831a
-      - 840a
-      - 852a
-      - 859a
-      - 904a
-      - 909a
-      - 916a
-      - 932a
-      - 934a
-      - 938a
-    - - 913a
-      - 922a
-      - 926a
-      - 931a
-      - 940a
-      - 952a
-      - 959a
-      - 1004a
-      - 1009a
-      - 1016a
-      - 1032a
-      - 1034a
-      - 1038a
-    - - 1013a
-      - 1022a
-      - 1026a
-      - 1031a
-      - 1040a
-      - 1052a
-      - 1059a
-      - 1104a
-      - 1109a
-      - 1116a
-      - 1132a
-      - 1134a
-      - 1138a
-    - - 1113a
-      - 1122a
-      - 1126a
-      - 1131a
-      - 1140a
-      - 1152a
-      - 1159a
-      - 1204p
-      - 1209p
-      - 1216p
-      - 1232p
-      - 1234p
-      - 1238p
-    - - 1213p
-      - 1222p
-      - 1226p
-      - 1231p
-      - 1240p
-      - 1252p
-      - 1259p
-      - 104p
-      - 109p
-      - 116p
-      - 132p
-      - 134p
-      - 138p
-    - - 113p
-      - 122p
-      - 126p
-      - 131p
-      - 140p
-      - 152p
-      - 159p
-      - 204p
-      - 209p
-      - 216p
-      - 232p
-      - 234p
-      - 238p
-    - - 213p
-      - 222p
-      - 226p
-      - 231p
-      - 240p
-      - 252p
-      - 259p
-      - 304p
-      - 309p
-      - 316p
-      - 332p
-      - 334p
-      - 338p
-    - - 313p
-      - 322p
-      - 326p
-      - 331p
-      - 340p
-      - 352p
-      - 359p
-      - 404p
-      - 409p
-      - 416p
-      - 432p
-      - 434p
-      - 438p
-    - - 413p
-      - 422p
-      - 426p
-      - 431p
-      - 440p
-      - 452p
-      - 459p
-      - 504p
-      - 509p
-      - 516p
-      - 532p
-      - 534p
-      - 538p
-    - - 513p
-      - 522p
-      - 526p
-      - 531p
-      - 540p
-      - 552p
-      - 559p
-      - 604p
-      - 609p
-      - 616p
-      - 632p
-      - 634p
-      - 637p
-    - - 613p
-      - 622p
-      - 626p
-      - 631p
-      - 640p
-      - 652p
-      - 659p
-      - 704p
-      - 709p
-      - 716p
-      - 732p
-      - 734p
-      - 737p
-    - - 713p
-      - 722p
-      - 726p
-      - 731p
-      - 740p
-      - 752p
-      - 759p
-      - 804p
-      - 809p
-      - 816p
-      - 832p
-      - 834p
-      - 837p
-    - - 813p
-      - 822p
-      - 826p
-      - 831p
-      - 840p
-      - 852p
-      - 859p
-      - 904p
-      - 909p
-      - 916p
-      - 932p
-      - 934p
-      - 937p
-    - - 913p
-      - 922p
-      - 926p
-      - 931p
-      - 940p
-      - 952p
-      - 959p
-      - 1004p
-      - 1009p
-      - 1016p
-      - 1032p
-      - 1034p
-      - 1037p
-    - - 1013p
-      - 1022p
-      - 1026p
-      - 1031p
-      - 1040p
-      - 1052p
-      - 1059p
-      - 1104p
-      - 1109p
-      - 1116p
-      - 1132p
-      - 1134p
-      - 1137p
-    - - 1113p
-      - 1122p
-      - 1126p
-      - 1131p
-      - 1140p
-      - 1150p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
+    stop_times_saturday: [["-", "-", "-", "-", "-", 752a, 759a, 804a, 809a, 816a, 832a, 834a, 838a], [813a, 822a, 826a, 831a, 840a, 852a, 859a, 904a, 909a, 916a, 932a, 934a, 938a], [913a, 922a, 926a, 931a, 940a, 952a, 959a, 1004a, 1009a, 1016a, 1032a, 1034a, 1038a], [1013a, 1022a, 1026a, 1031a, 1040a, 1052a, 1059a, 1104a, 1109a, 1116a, 1132a, 1134a, 1138a], [1113a, 1122a, 1126a, 1131a, 1140a, 1152a, 1159a, 1204p, 1209p, 1216p, 1232p, 1234p, 1238p], [1213p, 1222p, 1226p, 1231p, 1240p, 1252p, 1259p, 104p, 109p, 116p, 132p, 134p, 138p], [113p, 122p, 126p, 131p, 140p, 152p, 159p, 204p, 209p, 216p, 232p, 234p, 238p], [213p, 222p, 226p, 231p, 240p, 252p, 259p, 304p, 309p, 316p, 332p, 334p, 338p], [313p, 322p, 326p, 331p, 340p, 352p, 359p, 404p, 409p, 416p, 432p, 434p, 438p], [413p, 422p, 426p, 431p, 440p, 452p, 459p, 504p, 509p, 516p, 532p, 534p, 538p], [513p, 522p, 526p, 531p, 540p, 552p, 559p, 604p, 609p, 616p, 632p, 634p, 637p], [613p, 622p, 626p, 631p, 640p, 652p, 659p, 704p, 709p, 716p, 732p, 734p, 737p], [713p, 722p, 726p, 731p, 740p, 752p, 759p, 804p, 809p, 816p, 832p, 834p, 837p], [813p, 822p, 826p, 831p, 840p, 852p, 859p, 904p, 909p, 916p, 932p, 934p, 937p], [913p, 922p, 926p, 931p, 940p, 952p, 959p, 1004p, 1009p, 1016p, 1032p, 1034p, 1037p], [1013p, 1022p, 1026p, 1031p, 1040p, 1052p, 1059p, 1104p, 1109p, 1116p, 1132p, 1134p, 1137p], [1113p, 1122p, 1126p, 1131p, 1140p, 1150p, "-", "-", "-", "-", "-", "-", "-"]]
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "934"
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Garran
-    - Hughes
-    - Deakin
-    - Kings Ave/National Crt
-    - City Interchange - Platform 4
-    - National Museum
-    - Burton & Garran Hall/Daley Road ANU
-    - O'Connor
-    - Calvary Hospital
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
+    time_points: [Woden Interchange - Platform 14, Garran, Hughes, Deakin, Kings Ave/National Crt, City Interchange - Platform 4, National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
-    
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "934"
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Garran
-    - Hughes
-    - Deakin
-    - Kings Ave/National Crt
-    - City Interchange - Platform 4
-    - National Museum
-    - Burton & Garran Hall/Daley Road ANU
-    - O'Connor
-    - Calvary Hospital
-    - Cameron Ave Bus Station
-    - Lathlain St Bus Station
-    - Cohen St Bus Station
-    stop_times_sunday: 
-    - - 813a
-      - 822a
-      - 826a
-      - 831a
-      - 840a
-      - 852a
-      - 859a
-      - 904a
-      - 909a
-      - 916a
-      - 932a
-      - 934a
-      - 938a
-    - - 913a
-      - 922a
-      - 926a
-      - 931a
-      - 940a
-      - 952a
-      - 959a
-      - 1004a
-      - 1009a
-      - 1016a
-      - 1032a
-      - 1034a
-      - 1038a
-    - - 1013a
-      - 1022a
-      - 1026a
-      - 1031a
-      - 1040a
-      - 1052a
-      - 1059a
-      - 1104a
-      - 1109a
-      - 1116a
-      - 1132a
-      - 1134a
-      - 1138a
-    - - 1113a
-      - 1122a
-      - 1126a
-      - 1131a
-      - 1140a
-      - 1152a
-      - 1159a
-      - 1204p
-      - 1209p
-      - 1216p
-      - 1232p
-      - 1234p
-      - 1238p
-    - - 1213p
-      - 1222p
-      - 1226p
-      - 1231p
-      - 1240p
-      - 1252p
-      - 1259p
-      - 104p
-      - 109p
-      - 116p
-      - 132p
-      - 134p
-      - 138p
-    - - 113p
-      - 122p
-      - 126p
-      - 131p
-      - 140p
-      - 152p
-      - 159p
-      - 204p
-      - 209p
-      - 216p
-      - 232p
-      - 234p
-      - 238p
-    - - 213p
-      - 222p
-      - 226p
-      - 231p
-      - 240p
-      - 252p
-      - 259p
-      - 304p
-      - 309p
-      - 316p
-      - 332p
-      - 334p
-      - 338p
-    - - 313p
-      - 322p
-      - 326p
-      - 331p
-      - 340p
-      - 352p
-      - 359p
-      - 404p
-      - 409p
-      - 416p
-      - 432p
-      - 434p
-      - 438p
-    - - 413p
-      - 422p
-      - 426p
-      - 431p
-      - 440p
-      - 452p
-      - 459p
-      - 504p
-      - 509p
-      - 516p
-      - 532p
-      - 534p
-      - 538p
-    - - 513p
-      - 522p
-      - 526p
-      - 531p
-      - 540p
-      - 552p
-      - 559p
-      - 604p
-      - 609p
-      - 616p
-      - 632p
-      - 634p
-      - 637p
-    - - 613p
-      - 622p
-      - 626p
-      - 631p
-      - 640p
-      - 652p
-      - 659p
-      - 704p
-      - 709p
-      - 716p
-      - 732p
-      - 734p
-      - 737p
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 731a
-      - 733a
-      - 737a
-      - 753a
-      - 800a
-      - 805a
-      - 810a
-      - 819a
-      - 828a
-      - 837a
-      - 842a
-      - 846a
-      - 855a
-    - - 831a
-      - 833a
-      - 837a
-      - 853a
-      - 900a
-      - 905a
-      - 910a
-      - 919a
-      - 928a
-      - 937a
-      - 942a
-      - 946a
-      - 955a
-    - - 931a
-      - 933a
-      - 937a
-      - 953a
-      - 1000a
-      - 1005a
-      - 1010a
-      - 1019a
-      - 1028a
-      - 1037a
-      - 1042a
-      - 1046a
-      - 1055a
-    - - 1031a
-      - 1033a
-      - 1037a
-      - 1053a
-      - 1100a
-      - 1105a
-      - 1110a
-      - 1119a
-      - 1128a
-      - 1137a
-      - 1142a
-      - 1146a
-      - 1155a
-    - - 1131a
-      - 1133a
-      - 1137a
-      - 1153a
-      - 1200p
-      - 1205p
-      - 1210p
-      - 1219p
-      - 1228p
-      - 1237p
-      - 1242p
-      - 1246p
-      - 1255p
-    - - 1231p
-      - 1233p
-      - 1237p
-      - 1253p
-      - 100p
-      - 105p
-      - 110p
-      - 119p
-      - 128p
-      - 137p
-      - 142p
-      - 146p
-      - 155p
-    - - 131p
-      - 133p
-      - 137p
-      - 153p
-      - 200p
-      - 205p
-      - 210p
-      - 219p
-      - 228p
-      - 237p
-      - 242p
-      - 246p
-      - 255p
-    - - 231p
-      - 233p
-      - 237p
-      - 253p
-      - 300p
-      - 305p
-      - 310p
-      - 319p
-      - 328p
-      - 337p
-      - 342p
-      - 346p
-      - 355p
-    - - 331p
-      - 333p
-      - 337p
-      - 353p
-      - 400p
-      - 405p
-      - 410p
-      - 419p
-      - 428p
-      - 437p
-      - 442p
-      - 446p
-      - 455p
-    - - 431p
-      - 433p
-      - 437p
-      - 453p
-      - 500p
-      - 505p
-      - 510p
-      - 519p
-      - 528p
-      - 537p
-      - 542p
-      - 546p
-      - 555p
-    - - 531p
-      - 533p
-      - 537p
-      - 553p
-      - 600p
-      - 605p
-      - 610p
-      - 619p
-      - 628p
-      - 637p
-      - 642p
-      - 646p
-      - 655p
-    - - 632p
-      - 634p
-      - 637p
-      - 653p
-      - 700p
-      - 705p
-      - 710p
-      - 719p
-      - 728p
-      - 737p
-      - 742p
-      - 746p
-      - 755p
-    - - 732p
-      - 734p
-      - 737p
-      - 753p
-      - 800p
-      - 805p
-      - 810p
-      - 819p
-      - 828p
-      - 837p
-      - 842p
-      - 846p
-      - 855p
-    - - 832p
-      - 834p
-      - 837p
-      - 853p
-      - 900p
-      - 905p
-      - 910p
-      - 919p
-      - 928p
-      - 937p
-      - 942p
-      - 946p
-      - 955p
-    - - 932p
-      - 934p
-      - 937p
-      - 953p
-      - 1000p
-      - 1005p
-      - 1010p
-      - 1019p
-      - 1028p
-      - 1037p
-      - 1042p
-      - 1046p
-      - 1055p
-    - - 1032p
-      - 1034p
-      - 1037p
-      - 1053p
-      - 1100p
-      - 1105p
-      - 1110p
-      - 1117p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
+    stop_times_sunday: [[813a, 822a, 826a, 831a, 840a, 852a, 859a, 904a, 909a, 916a, 932a, 934a, 938a], [913a, 922a, 926a, 931a, 940a, 952a, 959a, 1004a, 1009a, 1016a, 1032a, 1034a, 1038a], [1013a, 1022a, 1026a, 1031a, 1040a, 1052a, 1059a, 1104a, 1109a, 1116a, 1132a, 1134a, 1138a], [1113a, 1122a, 1126a, 1131a, 1140a, 1152a, 1159a, 1204p, 1209p, 1216p, 1232p, 1234p, 1238p], [1213p, 1222p, 1226p, 1231p, 1240p, 1252p, 1259p, 104p, 109p, 116p, 132p, 134p, 138p], [113p, 122p, 126p, 131p, 140p, 152p, 159p, 204p, 209p, 216p, 232p, 234p, 238p], [213p, 222p, 226p, 231p, 240p, 252p, 259p, 304p, 309p, 316p, 332p, 334p, 338p], [313p, 322p, 326p, 331p, 340p, 352p, 359p, 404p, 409p, 416p, 432p, 434p, 438p], [413p, 422p, 426p, 431p, 440p, 452p, 459p, 504p, 509p, 516p, 532p, 534p, 538p], [513p, 522p, 526p, 531p, 540p, 552p, 559p, 604p, 609p, 616p, 632p, 634p, 637p], [613p, 622p, 626p, 631p, 640p, 652p, 659p, 704p, 709p, 716p, 732p, 734p, 737p]]
+    time_points: [Woden Interchange - Platform 14, Garran, Hughes, Deakin, Kings Ave/National Crt, City Interchange - Platform 4, National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+  -  
+    long_name: To Woden Interchange
+    stop_times_saturday: [[731a, 733a, 737a, 753a, 800a, 805a, 810a, 819a, 828a, 837a, 842a, 846a, 855a], [831a, 833a, 837a, 853a, 900a, 905a, 910a, 919a, 928a, 937a, 942a, 946a, 955a], [931a, 933a, 937a, 953a, 1000a, 1005a, 1010a, 1019a, 1028a, 1037a, 1042a, 1046a, 1055a], [1031a, 1033a, 1037a, 1053a, 1100a, 1105a, 1110a, 1119a, 1128a, 1137a, 1142a, 1146a, 1155a], [1131a, 1133a, 1137a, 1153a, 1200p, 1205p, 1210p, 1219p, 1228p, 1237p, 1242p, 1246p, 1255p], [1231p, 1233p, 1237p, 1253p, 100p, 105p, 110p, 119p, 128p, 137p, 142p, 146p, 155p], [131p, 133p, 137p, 153p, 200p, 205p, 210p, 219p, 228p, 237p, 242p, 246p, 255p], [231p, 233p, 237p, 253p, 300p, 305p, 310p, 319p, 328p, 337p, 342p, 346p, 355p], [331p, 333p, 337p, 353p, 400p, 405p, 410p, 419p, 428p, 437p, 442p, 446p, 455p], [431p, 433p, 437p, 453p, 500p, 505p, 510p, 519p, 528p, 537p, 542p, 546p, 555p], [531p, 533p, 537p, 553p, 600p, 605p, 610p, 619p, 628p, 637p, 642p, 646p, 655p], [632p, 634p, 637p, 653p, 700p, 705p, 710p, 719p, 728p, 737p, 742p, 746p, 755p], [732p, 734p, 737p, 753p, 800p, 805p, 810p, 819p, 828p, 837p, 842p, 846p, 855p], [832p, 834p, 837p, 853p, 900p, 905p, 910p, 919p, 928p, 937p, 942p, 946p, 955p], [932p, 934p, 937p, 953p, 1000p, 1005p, 1010p, 1019p, 1028p, 1037p, 1042p, 1046p, 1055p], [1032p, 1034p, 1037p, 1053p, 1100p, 1105p, 1110p, 1117p, "-", "-", "-", "-", "-"]]
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "934"
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Calvary Hospital
-    - O'Connor
-    - Burton & Garran Hall/Daley Road ANU
-    - National Museum
-    - City Interchange - Platform 7
-    - Kings Ave/National Crt
-    - Deakin
-    - Hughes
-    - Garran
-    - Woden Interchange
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
-    
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange - Platform 7, Kings Ave/National Crt, Deakin, Hughes, Garran, Woden Interchange]
+  -  
+    long_name: To Woden Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "934"
-    time_points: 
-    - Cohen St Bus Station - Platform 2
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - Calvary Hospital
-    - O'Connor
-    - Burton & Garran Hall/Daley Road ANU
-    - National Museum
-    - City Interchange - Platform 7
-    - Kings Ave/National Crt
-    - Deakin
-    - Hughes
-    - Garran
-    - Woden Interchange
-    stop_times_sunday: 
-    - - 831a
-      - 833a
-      - 837a
-      - 853a
-      - 900a
-      - 905a
-      - 910a
-      - 919a
-      - 928a
-      - 937a
-      - 942a
-      - 946a
-      - 955a
-    - - 931a
-      - 933a
-      - 937a
-      - 953a
-      - 1000a
-      - 1005a
-      - 1010a
-      - 1019a
-      - 1028a
-      - 1037a
-      - 1042a
-      - 1046a
-      - 1055a
-    - - 1031a
-      - 1033a
-      - 1037a
-      - 1053a
-      - 1100a
-      - 1105a
-      - 1110a
-      - 1119a
-      - 1128a
-      - 1137a
-      - 1142a
-      - 1146a
-      - 1155a
-    - - 1131a
-      - 1133a
-      - 1137a
-      - 1153a
-      - 1200p
-      - 1205p
-      - 1210p
-      - 1219p
-      - 1228p
-      - 1237p
-      - 1242p
-      - 1246p
-      - 1255p
-    - - 1231p
-      - 1233p
-      - 1237p
-      - 1253p
-      - 100p
-      - 105p
-      - 110p
-      - 119p
-      - 128p
-      - 137p
-      - 142p
-      - 146p
-      - 155p
-    - - 131p
-      - 133p
-      - 137p
-      - 153p
-      - 200p
-      - 205p
-      - 210p
-      - 219p
-      - 228p
-      - 237p
-      - 242p
-      - 246p
-      - 255p
-    - - 231p
-      - 233p
-      - 237p
-      - 253p
-      - 300p
-      - 305p
-      - 310p
-      - 319p
-      - 328p
-      - 337p
-      - 342p
-      - 346p
-      - 355p
-    - - 331p
-      - 333p
-      - 337p
-      - 353p
-      - 400p
-      - 405p
-      - 410p
-      - 419p
-      - 428p
-      - 437p
-      - 442p
-      - 446p
-      - 455p
-    - - 431p
-      - 433p
-      - 437p
-      - 453p
-      - 500p
-      - 505p
-      - 510p
-      - 519p
-      - 528p
-      - 537p
-      - 542p
-      - 546p
-      - 555p
-    - - 531p
-      - 533p
-      - 537p
-      - 553p
-      - 600p
-      - 605p
-      - 610p
-      - 619p
-      - 628p
-      - 637p
-      - 642p
-      - 646p
-      - 655p
-    - - 632p
-      - 634p
-      - 637p
-      - 653p
-      - 700p
-      - 705p
-      - 710p
-      - 719p
-      - 728p
-      - 737p
-      - 742p
-      - 746p
-      - 755p
-  -  
-    long_name: To City Interchange
+    stop_times_sunday: [[831a, 833a, 837a, 853a, 900a, 905a, 910a, 919a, 928a, 937a, 942a, 946a, 955a], [931a, 933a, 937a, 953a, 1000a, 1005a, 1010a, 1019a, 1028a, 1037a, 1042a, 1046a, 1055a], [1031a, 1033a, 1037a, 1053a, 1100a, 1105a, 1110a, 1119a, 1128a, 1137a, 1142a, 1146a, 1155a], [1131a, 1133a, 1137a, 1153a, 1200p, 1205p, 1210p, 1219p, 1228p, 1237p, 1242p, 1246p, 1255p], [1231p, 1233p, 1237p, 1253p, 100p, 105p, 110p, 119p, 128p, 137p, 142p, 146p, 155p], [131p, 133p, 137p, 153p, 200p, 205p, 210p, 219p, 228p, 237p, 242p, 246p, 255p], [231p, 233p, 237p, 253p, 300p, 305p, 310p, 319p, 328p, 337p, 342p, 346p, 355p], [331p, 333p, 337p, 353p, 400p, 405p, 410p, 419p, 428p, 437p, 442p, 446p, 455p], [431p, 433p, 437p, 453p, 500p, 505p, 510p, 519p, 528p, 537p, 542p, 546p, 555p], [531p, 533p, 537p, 553p, 600p, 605p, 610p, 619p, 628p, 637p, 642p, 646p, 655p], [632p, 634p, 637p, 653p, 700p, 705p, 710p, 719p, 728p, 737p, 742p, 746p, 755p]]
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange - Platform 7, Kings Ave/National Crt, Deakin, Hughes, Garran, Woden Interchange]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[756a, 803a, 807a, 814a, 824a, 833a, 839a, 843a, 852a], [856a, 903a, 907a, 914a, 924a, 933a, 939a, 943a, 952a], [956a, 1003a, 1007a, 1014a, 1024a, 1033a, 1039a, 1043a, 1051a], [1056a, 1103a, 1107a, 1114a, 1124a, 1133a, 1139a, 1143a, 1152a], [1156a, 1203p, 1207p, 1214p, 1224p, 1233p, 1239p, 1243p, 1251p], [1256p, 103p, 107p, 114p, 124p, 133p, 139p, 143p, 151p], [156p, 203p, 207p, 214p, 224p, 233p, 239p, 243p, 252p], [256p, 303p, 307p, 314p, 324p, 333p, 339p, 343p, 351p], [356p, 403p, 407p, 414p, 424p, 433p, 439p, 443p, 451p], [456p, 503p, 507p, 514p, 524p, 533p, 539p, 543p, 552p], [556p, 603p, 607p, 614p, 624p, 633p, 639p, 643p, 652p], [656p, 703p, 707p, 714p, 724p, 733p, 739p, 743p, 752p], [756p, 803p, 807p, 814p, 824p, 833p, 839p, 843p, 852p], [856p, 903p, 907p, 914p, 924p, 933p, 939p, 943p, 952p], [956p, 1003p, 1007p, 1014p, 1024p, 1033p, 1039p, 1043p, 1052p], [1056p, 1103p, 1107p, 1114p, 1124p, "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "935"
     time_points: [City Interchange - Platform 7, Kings Ave/National Crt, Manuka, Red Hill, Narrabundah Terminus, Red Hill, Manuka, Kings Ave/National Crt, City Interchange]
   -  
     long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[718a, 727a, 730a, 735a, 744a, 749a, 757a, 809a], [818a, 827a, 830a, 835a, 844a, 849a, 857a, 909a], [918a, 927a, 930a, 935a, 944a, 949a, 957a, 1009a], [1018a, 1027a, 1030a, 1035a, 1044a, 1049a, 1057a, 1109a], [1118a, 1127a, 1130a, 1135a, 1144a, 1149a, 1157a, 1209p], [1218p, 1227p, 1230p, 1235p, 1244p, 1249p, 1257p, 109p], [118p, 127p, 130p, 135p, 144p, 149p, 157p, 209p], [218p, 227p, 230p, 235p, 244p, 249p, 257p, 309p], [318p, 327p, 330p, 335p, 344p, 349p, 357p, 409p], [418p, 427p, 430p, 435p, 444p, 449p, 457p, 509p], [518p, 527p, 530p, 535p, 544p, 549p, 557p, 609p], [618p, 627p, 630p, 635p, 644p, 649p, 657p, 709p], [718p, 727p, 730p, 735p, 744p, 749p, 757p, 809p], [818p, 827p, 830p, 835p, 844p, 849p, 857p, 909p], [918p, 927p, 930p, 935p, 944p, 949p, 957p, 1009p], [1018p, 1027p, 1030p, 1035p, 1044p, 1049p, 1057p, 1109p], [1118p, 1127p, 1130p, 1135p, 1144p, "-", "-", "-"]]
-    between_stops: []
     short_name: "936"
     time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "936"
+    time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
     stop_times_sunday: [[818a, 827a, 830a, 835a, 844a, 849a, 857a, 909a], [918a, 927a, 930a, 935a, 944a, 949a, 957a, 1009a], [1018a, 1027a, 1030a, 1035a, 1044a, 1049a, 1057a, 1109a], [1118a, 1127a, 1130a, 1135a, 1144a, 1149a, 1157a, 1209p], [1218p, 1227p, 1230p, 1235p, 1244p, 1249p, 1257p, 109p], [118p, 127p, 130p, 135p, 144p, 149p, 157p, 209p], [218p, 227p, 230p, 235p, 244p, 249p, 257p, 309p], [318p, 327p, 330p, 335p, 344p, 349p, 357p, 409p], [418p, 427p, 430p, 435p, 444p, 449p, 457p, 509p], [518p, 527p, 530p, 535p, 544p, 549p, 557p, 609p], [618p, 627p, 630p, 635p, 644p, 649p, 657p, 709p], [718p, 727p, 730p, 735p, 744p, 749p, 757p, 809p]]
-    time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 759a
-      - 811a
-      - 819a
-      - 825a
-      - 834a
-      - 839a
-      - 842a
-      - 851a
-    - - 859a
-      - 911a
-      - 919a
-      - 925a
-      - 934a
-      - 939a
-      - 942a
-      - 951a
-    - - 959a
-      - 1011a
-      - 1019a
-      - 1025a
-      - 1034a
-      - 1039a
-      - 1042a
-      - 1051a
-    - - 1059a
-      - 1111a
-      - 1119a
-      - 1125a
-      - 1134a
-      - 1139a
-      - 1142a
-      - 1151a
-    - - 1159a
-      - 1211p
-      - 1219p
-      - 1225p
-      - 1234p
-      - 1239p
-      - 1242p
-      - 1251p
-    - - 1259p
-      - 111p
-      - 119p
-      - 125p
-      - 134p
-      - 139p
-      - 142p
-      - 151p
-    - - 159p
-      - 211p
-      - 219p
-      - 225p
-      - 234p
-      - 239p
-      - 242p
-      - 251p
-    - - 259p
-      - 311p
-      - 319p
-      - 325p
-      - 334p
-      - 339p
-      - 342p
-      - 351p
-    - - 359p
-      - 411p
-      - 419p
-      - 425p
-      - 434p
-      - 439p
-      - 442p
-      - 451p
-    - - 500p
-      - 512p
-      - 520p
-      - 526p
-      - 535p
-      - 540p
-      - 543p
-      - 552p
-    - - 559p
-      - 611p
-      - 619p
-      - 625p
-      - 634p
-      - 639p
-      - 642p
-      - 651p
-    - - 659p
-      - 711p
-      - 719p
-      - 725p
-      - 734p
-      - 739p
-      - 742p
-      - 751p
-    - - 749p
-      - 801p
-      - 809p
-      - 815p
-      - 824p
-      - 829p
-      - 832p
-      - 841p
-    - - 849p
-      - 901p
-      - 909p
-      - 915p
-      - 924p
-      - 929p
-      - 932p
-      - 941p
-    - - 949p
-      - 1001p
-      - 1009p
-      - 1015p
-      - 1024p
-      - 1029p
-      - 1032p
-      - 1041p
-    - - 1049p
-      - 1101p
-      - 1109p
-      - 1115p
-      - 1124p
-      - 1129p
-      - 1132p
-      - 1141p
+  -  
+    long_name: To City Interchange
+    stop_times_saturday: [[759a, 811a, 819a, 825a, 834a, 839a, 842a, 851a], [859a, 911a, 919a, 925a, 934a, 939a, 942a, 951a], [959a, 1011a, 1019a, 1025a, 1034a, 1039a, 1042a, 1051a], [1059a, 1111a, 1119a, 1125a, 1134a, 1139a, 1142a, 1151a], [1159a, 1211p, 1219p, 1225p, 1234p, 1239p, 1242p, 1251p], [1259p, 111p, 119p, 125p, 134p, 139p, 142p, 151p], [159p, 211p, 219p, 225p, 234p, 239p, 242p, 251p], [259p, 311p, 319p, 325p, 334p, 339p, 342p, 351p], [359p, 411p, 419p, 425p, 434p, 439p, 442p, 451p], [500p, 512p, 520p, 526p, 535p, 540p, 543p, 552p], [559p, 611p, 619p, 625p, 634p, 639p, 642p, 651p], [659p, 711p, 719p, 725p, 734p, 739p, 742p, 751p], [749p, 801p, 809p, 815p, 824p, 829p, 832p, 841p], [849p, 901p, 909p, 915p, 924p, 929p, 932p, 941p], [949p, 1001p, 1009p, 1015p, 1024p, 1029p, 1032p, 1041p], [1049p, 1101p, 1109p, 1115p, 1124p, 1129p, 1132p, 1141p]]
+    between_stops: {}
+    
     short_name: "937"
-    time_points: 
-    - City Interchange - Platform 8
-    - Ainslie
-    - Hackett
-    - Dickson
-    - North Lyneham
-    - Lyneham
-    - Macarthur / Miller O'Connor
-    - City Interchange
-  -  
-    long_name: To City Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 800a
-      - 808a
-      - 818a
-      - 833a
-      - 837a
-      - 841a
-      - 849a
-    - - 900a
-      - 908a
-      - 918a
-      - 933a
-      - 937a
-      - 941a
-      - 949a
-    - - 1000a
-      - 1008a
-      - 1018a
-      - 1033a
-      - 1037a
-      - 1041a
-      - 1049a
-    - - 1100a
-      - 1108a
-      - 1118a
-      - 1133a
-      - 1137a
-      - 1141a
-      - 1149a
-    - - 1200p
-      - 1208p
-      - 1218p
-      - 1233p
-      - 1237p
-      - 1241p
-      - 1249p
-    - - 100p
-      - 108p
-      - 118p
-      - 133p
-      - 137p
-      - 141p
-      - 149p
-    - - 200p
-      - 208p
-      - 218p
-      - 233p
-      - 237p
-      - 241p
-      - 249p
-    - - 300p
-      - 308p
-      - 318p
-      - 333p
-      - 337p
-      - 341p
-      - 349p
-    - - 400p
-      - 408p
-      - 418p
-      - 433p
-      - 437p
-      - 441p
-      - 449p
-    - - 500p
-      - 508p
-      - 518p
-      - 533p
-      - 537p
-      - 541p
-      - 549p
-    - - 600p
-      - 608p
-      - 618p
-      - 633p
-      - 637p
-      - 641p
-      - 649p
-    - - 700p
-      - 707p
-      - 716p
-      - 729p
-      - 733p
-      - 737p
-      - 744p
-    - - 800p
-      - 807p
-      - 816p
-      - 829p
-      - 833p
-      - 837p
-      - 844p
-    - - 900p
-      - 907p
-      - 916p
-      - 929p
-      - 933p
-      - 937p
-      - 944p
-    - - 1000p
-      - 1007p
-      - 1016p
-      - 1029p
-      - 1033p
-      - 1037p
-      - 1044p
-    - - 1100p
-      - 1107p
-      - 1116p
-      - 1129p
-      - 1133p
-      - 1137p
-      - 1144p
+    time_points: [City Interchange - Platform 8, Ainslie, Hackett, Dickson, North Lyneham, Lyneham, Macarthur / Miller O'Connor, City Interchange]
+  -  
+    long_name: To City Interchange
+    stop_times_saturday: [[800a, 808a, 818a, 833a, 837a, 841a, 849a], [900a, 908a, 918a, 933a, 937a, 941a, 949a], [1000a, 1008a, 1018a, 1033a, 1037a, 1041a, 1049a], [1100a, 1108a, 1118a, 1133a, 1137a, 1141a, 1149a], [1200p, 1208p, 1218p, 1233p, 1237p, 1241p, 1249p], [100p, 108p, 118p, 133p, 137p, 141p, 149p], [200p, 208p, 218p, 233p, 237p, 241p, 249p], [300p, 308p, 318p, 333p, 337p, 341p, 349p], [400p, 408p, 418p, 433p, 437p, 441p, 449p], [500p, 508p, 518p, 533p, 537p, 541p, 549p], [600p, 608p, 618p, 633p, 637p, 641p, 649p], [700p, 707p, 716p, 729p, 733p, 737p, 744p], [800p, 807p, 816p, 829p, 833p, 837p, 844p], [900p, 907p, 916p, 929p, 933p, 937p, 944p], [1000p, 1007p, 1016p, 1029p, 1033p, 1037p, 1044p], [1100p, 1107p, 1116p, 1129p, 1133p, 1137p, 1144p]]
+    between_stops: {}
+    
     short_name: "938"
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Canberra Hospital
-    - Narrabundah College
-    - Kingston
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    time_points: [Woden Interchange - Platform 14, Canberra Hospital, Narrabundah College, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
     
     short_name: "938"
-    time_points: 
-    - Woden Interchange - Platform 14
-    - Canberra Hospital
-    - Narrabundah College
-    - Kingston
-    - Kings Ave/National Crt
-    - Russell Offices
-    - City Interchange
-    stop_times_sunday: 
-    - - 800a
-      - 808a
-      - 818a
-      - 833a
-      - 837a
-      - 841a
-      - 849a
-    - - 900a
-      - 908a
-      - 918a
-      - 933a
-      - 937a
-      - 941a
-      - 949a
-    - - 1000a
-      - 1008a
-      - 1018a
-      - 1033a
-      - 1037a
-      - 1041a
-      - 1049a
-    - - 1100a
-      - 1108a
-      - 1118a
-      - 1133a
-      - 1137a
-      - 1141a
-      - 1149a
-    - - 1200p
-      - 1208p
-      - 1218p
-      - 1233p
-      - 1237p
-      - 1241p
-      - 1249p
-    - - 100p
-      - 108p
-      - 118p
-      - 133p
-      - 137p
-      - 141p
-      - 149p
-    - - 200p
-      - 208p
-      - 218p
-      - 233p
-      - 237p
-      - 241p
-      - 249p
-    - - 300p
-      - 308p
-      - 318p
-      - 333p
-      - 337p
-      - 341p
-      - 349p
-    - - 400p
-      - 408p
-      - 418p
-      - 433p
-      - 437p
-      - 441p
-      - 449p
-    - - 500p
-      - 508p
-      - 518p
-      - 533p
-      - 537p
-      - 541p
-      - 549p
-    - - 600p
-      - 608p
-      - 618p
-      - 633p
-      - 637p
-      - 641p
-      - 649p
-    - - 700p
-      - 707p
-      - 714p
-      - 727p
-      - 731p
-      - 735p
-      - 741p
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 746a
-      - 754a
-      - 758a
-      - 802a
-      - 817a
-      - 827a
-      - 834a
-    - - 846a
-      - 854a
-      - 858a
-      - 902a
-      - 917a
-      - 927a
-      - 934a
-    - - 946a
-      - 954a
-      - 958a
-      - 1002a
-      - 1017a
-      - 1027a
-      - 1034a
-    - - 1046a
-      - 1054a
-      - 1058a
-      - 1102a
-      - 1117a
-      - 1127a
-      - 1134a
-    - - 1146a
-      - 1154a
-      - 1158a
-      - 1202p
-      - 1217p
-      - 1227p
-      - 1234p
-    - - 1246p
-      - 1254p
-      - 1258p
-      - 102p
-      - 117p
-      - 127p
-      - 134p
-    - - 146p
-      - 154p
-      - 158p
-      - 202p
-      - 217p
-      - 227p
-      - 234p
-    - - 246p
-      - 254p
-      - 258p
-      - 302p
-      - 317p
-      - 327p
-      - 334p
-    - - 346p
-      - 354p
-      - 358p
-      - 402p
-      - 417p
-      - 427p
-      - 434p
-    - - 446p
-      - 454p
-      - 458p
-      - 502p
-      - 517p
-      - 527p
-      - 534p
-    - - 546p
-      - 554p
-      - 558p
-      - 602p
-      - 617p
-      - 627p
-      - 634p
-    - - 646p
-      - 654p
-      - 658p
-      - 702p
-      - 715p
-      - 724p
-      - 731p
-    - - 746p
-      - 753p
-      - 757p
-      - 801p
-      - 814p
-      - 823p
-      - 830p
-    - - 846p
-      - 853p
-      - 857p
-      - 901p
-      - 914p
-      - 923p
-      - 930p
-    - - 946p
-      - 953p
-      - 957p
-      - 1001p
-      - 1014p
-      - 1023p
-      - 1030p
-    - - 1046p
-      - 1053p
-      - 1057p
-      - 1101p
-      - 1114p
-      - 1123p
-      - 1130p
+    stop_times_sunday: [[800a, 808a, 818a, 833a, 837a, 841a, 849a], [900a, 908a, 918a, 933a, 937a, 941a, 949a], [1000a, 1008a, 1018a, 1033a, 1037a, 1041a, 1049a], [1100a, 1108a, 1118a, 1133a, 1137a, 1141a, 1149a], [1200p, 1208p, 1218p, 1233p, 1237p, 1241p, 1249p], [100p, 108p, 118p, 133p, 137p, 141p, 149p], [200p, 208p, 218p, 233p, 237p, 241p, 249p], [300p, 308p, 318p, 333p, 337p, 341p, 349p], [400p, 408p, 418p, 433p, 437p, 441p, 449p], [500p, 508p, 518p, 533p, 537p, 541p, 549p], [600p, 608p, 618p, 633p, 637p, 641p, 649p], [700p, 707p, 714p, 727p, 731p, 735p, 741p]]
+    time_points: [Woden Interchange - Platform 14, Canberra Hospital, Narrabundah College, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
+  -  
+    long_name: To Woden Interchange
+    stop_times_saturday: [[746a, 754a, 758a, 802a, 817a, 827a, 834a], [846a, 854a, 858a, 902a, 917a, 927a, 934a], [946a, 954a, 958a, 1002a, 1017a, 1027a, 1034a], [1046a, 1054a, 1058a, 1102a, 1117a, 1127a, 1134a], [1146a, 1154a, 1158a, 1202p, 1217p, 1227p, 1234p], [1246p, 1254p, 1258p, 102p, 117p, 127p, 134p], [146p, 154p, 158p, 202p, 217p, 227p, 234p], [246p, 254p, 258p, 302p, 317p, 327p, 334p], [346p, 354p, 358p, 402p, 417p, 427p, 434p], [446p, 454p, 458p, 502p, 517p, 527p, 534p], [546p, 554p, 558p, 602p, 617p, 627p, 634p], [646p, 654p, 658p, 702p, 715p, 724p, 731p], [746p, 753p, 757p, 801p, 814p, 823p, 830p], [846p, 853p, 857p, 901p, 914p, 923p, 930p], [946p, 953p, 957p, 1001p, 1014p, 1023p, 1030p], [1046p, 1053p, 1057p, 1101p, 1114p, 1123p, 1130p]]
+    between_stops: {}
+    
     short_name: "938"
-    time_points: 
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Kingston
-    - Narrabundah College
-    - Canberra Hospital
-    - Woden Interchange
-  -  
-    long_name: To Woden Interchange
-    between_stops: []
+    time_points: [City Interchange - Platform 9, Russell Offices, Kings Ave/National Crt, Kingston, Narrabundah College, Canberra Hospital, Woden Interchange]
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
     
     short_name: "938"
-    time_points: 
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Kings Ave/National Crt
-    - Kingston
-    - Narrabundah College
-    - Canberra Hospital
-    - Woden Interchange
-    stop_times_sunday: 
-    - - 846a
-      - 854a
-      - 858a
-      - 902a
-      - 917a
-      - 927a
-      - 934a
-    - - 946a
-      - 954a
-      - 958a
-      - 1002a
-      - 1017a
-      - 1027a
-      - 1034a
-    - - 1046a
-      - 1054a
-      - 1058a
-      - 1102a
-      - 1117a
-      - 1127a
-      - 1134a
-    - - 1146a
-      - 1154a
-      - 1158a
-      - 1202p
-      - 1217p
-      - 1227p
-      - 1234p
-    - - 1246p
-      - 1254p
-      - 1258p
-      - 102p
-      - 117p
-      - 127p
-      - 134p
-    - - 146p
-      - 154p
-      - 158p
-      - 202p
-      - 217p
-      - 227p
-      - 234p
-    - - 246p
-      - 254p
-      - 258p
-      - 302p
-      - 317p
-      - 327p
-      - 334p
-    - - 346p
-      - 354p
-      - 358p
-      - 402p
-      - 417p
-      - 427p
-      - 434p
-    - - 446p
-      - 454p
-      - 458p
-      - 502p
-      - 517p
-      - 527p
-      - 534p
-    - - 546p
-      - 554p
-      - 558p
-      - 602p
-      - 617p
-      - 627p
-      - 634p
-    - - 646p
-      - 654p
-      - 658p
-      - 702p
-      - 714p
-      - 722p
-      - 728p
-  -  
-    long_name: To City Interchange
+    stop_times_sunday: [[846a, 854a, 858a, 902a, 917a, 927a, 934a], [946a, 954a, 958a, 1002a, 1017a, 1027a, 1034a], [1046a, 1054a, 1058a, 1102a, 1117a, 1127a, 1134a], [1146a, 1154a, 1158a, 1202p, 1217p, 1227p, 1234p], [1246p, 1254p, 1258p, 102p, 117p, 127p, 134p], [146p, 154p, 158p, 202p, 217p, 227p, 234p], [246p, 254p, 258p, 302p, 317p, 327p, 334p], [346p, 354p, 358p, 402p, 417p, 427p, 434p], [446p, 454p, 458p, 502p, 517p, 527p, 534p], [546p, 554p, 558p, 602p, 617p, 627p, 634p], [646p, 654p, 658p, 702p, 714p, 722p, 728p]]
+    time_points: [City Interchange - Platform 9, Russell Offices, Kings Ave/National Crt, Kingston, Narrabundah College, Canberra Hospital, Woden Interchange]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [["-", "-", "-", 708a, 714a, 719a, 733a], ["-", "-", "-", 808a, 814a, 819a, 833a], [846a, 859a, 904a, 908a, 914a, 919a, 933a], [946a, 959a, 1004a, 1008a, 1014a, 1019a, 1033a], [1046a, 1100a, 1105a, 1110a, 1118a, 1125a, 1139a], [1146a, 1159a, 1204p, 1208p, 1214p, 1219p, 1233p], [1246p, 1259p, 104p, 108p, 114p, 119p, 133p], [146p, 159p, 204p, 208p, 214p, 219p, 233p], [246p, 259p, 304p, 308p, 314p, 319p, 333p], [346p, 359p, 404p, 408p, 414p, 419p, 433p], [446p, 459p, 504p, 508p, 514p, 519p, 533p], [546p, 559p, 604p, 608p, 614p, 619p, 633p], [646p, 659p, 704p, 708p, 714p, 719p, 733p], [746p, 759p, 804p, 808p, 814p, 819p, 833p], [846p, 859p, 904p, 908p, 914p, 919p, 933p], [946p, 959p, 1004p, 1008p, 1014p, 1019p, 1033p], [1046p, 1059p, 1104p, 1108p, 1114p, 1119p, 1133p]]
-    between_stops: []
     short_name: "939"
     time_points: [City Interchange - Platform 8, Dickson, Watson, Watson Terminus, Watson, Dickson, City Interchange]
   -  
     long_name: To City Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     stop_times_saturday: [[819a, 821a, 825a, 831a, 840a, 844a, 845a, 855a], [919a, 921a, 925a, 931a, 940a, 944a, 945a, 955a], [1019a, 1021a, 1025a, 1031a, 1040a, 1044a, 1045a, 1055a], [1119a, 1121a, 1125a, 1131a, 1140a, 1144a, 1145a, 1155a], [1219p, 1221p, 1225p, 1231p, 1240p, 1244p, 1245p, 1255p], [119p, 121p, 125p, 131p, 140p, 144p, 145p, 155p], [219p, 221p, 225p, 231p, 240p, 244p, 245p, 255p], [319p, 321p, 325p, 331p, 340p, 344p, 345p, 355p], [419p, 421p, 425p, 431p, 440p, 444p, 445p, 455p], [519p, 521p, 525p, 531p, 540p, 544p, 545p, 555p], [619p, 621p, 625p, 631p, 640p, 644p, 645p, 655p], [720p, 722p, 725p, 731p, 740p, 744p, 745p, 755p], [820p, 822p, 825p, 831p, 840p, 844p, 845p, 855p], [920p, 922p, 925p, 931p, 940p, 944p, 945p, 955p], [1020p, 1022p, 1025p, 1031p, 1040p, 1044p, 1045p, 1055p]]
-    between_stops: []
     short_name: "942"
     time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "942"
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
     stop_times_sunday: [[819a, 821a, 825a, 831a, 840a, 844a, 845a, 855a], [919a, 921a, 925a, 931a, 940a, 944a, 945a, 955a], [1019a, 1021a, 1025a, 1031a, 1040a, 1044a, 1045a, 1055a], [1119a, 1121a, 1125a, 1131a, 1140a, 1144a, 1145a, 1155a], [1219p, 1221p, 1225p, 1231p, 1240p, 1244p, 1245p, 1255p], [119p, 121p, 125p, 131p, 140p, 144p, 145p, 155p], [219p, 221p, 225p, 231p, 240p, 244p, 245p, 255p], [319p, 321p, 325p, 331p, 340p, 344p, 345p, 355p], [419p, 421p, 425p, 431p, 440p, 444p, 445p, 455p], [519p, 521p, 525p, 531p, 540p, 544p, 545p, 555p], [619p, 621p, 625p, 631p, 640p, 644p, 645p, 655p]]
-    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [[814a, 823a, 824a, 827a, 836a, 843a, 845a, 849a], [914a, 923a, 924a, 927a, 936a, 943a, 945a, 949a], [1014a, 1023a, 1024a, 1027a, 1036a, 1043a, 1045a, 1049a], [1114a, 1123a, 1124a, 1127a, 1136a, 1143a, 1145a, 1149a], [1214p, 1223p, 1224p, 1227p, 1236p, 1243p, 1245p, 1249p], [114p, 123p, 124p, 127p, 136p, 143p, 145p, 149p], [214p, 223p, 224p, 227p, 236p, 243p, 245p, 249p], [314p, 323p, 324p, 327p, 336p, 343p, 345p, 349p], [414p, 423p, 424p, 427p, 436p, 443p, 445p, 449p], [514p, 523p, 524p, 527p, 536p, 543p, 545p, 549p], [614p, 623p, 624p, 627p, 636p, 643p, 645p, 648p], [714p, 723p, 724p, 727p, 736p, 743p, 745p, 748p], [814p, 823p, 824p, 827p, 836p, 843p, 845p, 848p], [914p, 923p, 924p, 927p, 936p, 943p, 945p, 948p], [1014p, 1023p, 1024p, 1027p, 1036p, 1043p, 1045p, 1048p], [1114p, 1123p, 1124p, 1127p, 1136p, 1143p, 1145p, 1148p]]
-    between_stops: []
     short_name: "942"
     time_points: [City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "942"
+    time_points: [City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[914a, 923a, 924a, 927a, 936a, 943a, 945a, 949a], [1014a, 1023a, 1024a, 1027a, 1036a, 1043a, 1045a, 1049a], [1114a, 1123a, 1124a, 1127a, 1136a, 1143a, 1145a, 1149a], [1214p, 1223p, 1224p, 1227p, 1236p, 1243p, 1245p, 1249p], [114p, 123p, 124p, 127p, 136p, 143p, 145p, 149p], [214p, 223p, 224p, 227p, 236p, 243p, 245p, 249p], [314p, 323p, 324p, 327p, 336p, 343p, 345p, 349p], [414p, 423p, 424p, 427p, 436p, 443p, 445p, 449p], [514p, 523p, 524p, 527p, 536p, 543p, 545p, 549p], [614p, 623p, 624p, 627p, 636p, 643p, 645p, 648p]]
-    time_points: [City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [[812a, 821a, 831a, 837a, 842a, 849a, 851a, 855a], [912a, 921a, 931a, 937a, 942a, 949a, 951a, 955a], [1012a, 1021a, 1031a, 1037a, 1042a, 1049a, 1051a, 1055a], [1112a, 1121a, 1131a, 1137a, 1142a, 1149a, 1151a, 1155a], [1212p, 1221p, 1231p, 1237p, 1242p, 1249p, 1251p, 1255p], [112p, 121p, 131p, 137p, 142p, 149p, 151p, 155p], [212p, 221p, 231p, 237p, 242p, 249p, 251p, 255p], [312p, 321p, 331p, 337p, 342p, 349p, 351p, 355p], [412p, 421p, 431p, 437p, 442p, 449p, 451p, 455p], [512p, 521p, 531p, 537p, 542p, 549p, 551p, 555p], [612p, 621p, 631p, 637p, 642p, 649p, 651p, 654p], [712p, 721p, 731p, 737p, 742p, 749p, 751p, 754p], [812p, 821p, 831p, 837p, 842p, 849p, 851p, 854p], [912p, 921p, 931p, 937p, 942p, 949p, 951p, 954p], [1012p, 1021p, 1031p, 1037p, 1042p, 1049p, 1051p, 1054p], [1112p, 1121p, 1131p, 1137p, 1142p, 1149p, 1151p, 1154p]]
-    between_stops: []
     short_name: "951"
     time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "951"
+    time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[912a, 921a, 931a, 937a, 942a, 949a, 951a, 955a], [1012a, 1021a, 1031a, 1037a, 1042a, 1049a, 1051a, 1055a], [1112a, 1121a, 1131a, 1137a, 1142a, 1149a, 1151a, 1155a], [1212p, 1221p, 1231p, 1237p, 1242p, 1249p, 1251p, 1255p], [112p, 121p, 131p, 137p, 142p, 149p, 151p, 155p], [212p, 221p, 231p, 237p, 242p, 249p, 251p, 255p], [312p, 321p, 331p, 337p, 342p, 349p, 351p, 355p], [412p, 421p, 431p, 437p, 442p, 449p, 451p, 455p], [512p, 521p, 531p, 537p, 542p, 549p, 551p, 555p], [612p, 621p, 631p, 637p, 642p, 649p, 651p, 654p]]
-    time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Gungahlin Market Place
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     stop_times_saturday: [[824a, 826a, 830a, 837a, 842a, 847a, 857a, 906a], [924a, 926a, 930a, 937a, 942a, 947a, 957a, 1006a], [1024a, 1026a, 1030a, 1037a, 1042a, 1047a, 1057a, 1106a], [1124a, 1126a, 1130a, 1137a, 1142a, 1147a, 1157a, 1206p], [1224p, 1226p, 1230p, 1237p, 1242p, 1247p, 1257p, 106p], [124p, 126p, 130p, 137p, 142p, 147p, 157p, 206p], [224p, 226p, 230p, 237p, 242p, 247p, 257p, 306p], [324p, 326p, 330p, 337p, 342p, 347p, 357p, 406p], [424p, 426p, 430p, 437p, 442p, 447p, 457p, 506p], [524p, 526p, 530p, 537p, 542p, 547p, 557p, 606p], [624p, 626p, 630p, 637p, 642p, 647p, 657p, 706p], [725p, 727p, 730p, 737p, 742p, 747p, 757p, 806p], [825p, 827p, 830p, 837p, 842p, 847p, 857p, 906p], [925p, 927p, 930p, 937p, 942p, 947p, 957p, 1006p], [1025p, 1027p, 1030p, 1037p, 1042p, 1047p, 1057p, 1106p]]
-    between_stops: []
     short_name: "951"
     time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
   -  
     long_name: To Gungahlin Market Place
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "951"
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
     stop_times_sunday: [[924a, 926a, 930a, 937a, 942a, 947a, 957a, 1006a], [1024a, 1026a, 1030a, 1037a, 1042a, 1047a, 1057a, 1106a], [1124a, 1126a, 1130a, 1137a, 1142a, 1147a, 1157a, 1206p], [1224p, 1226p, 1230p, 1237p, 1242p, 1247p, 1257p, 106p], [124p, 126p, 130p, 137p, 142p, 147p, 157p, 206p], [224p, 226p, 230p, 237p, 242p, 247p, 257p, 306p], [324p, 326p, 330p, 337p, 342p, 347p, 357p, 406p], [424p, 426p, 430p, 437p, 442p, 447p, 457p, 506p], [524p, 526p, 530p, 537p, 542p, 547p, 557p, 606p], [624p, 626p, 630p, 637p, 642p, 647p, 657p, 706p]]
-    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [[739a, 747a, 800a, 805a, 817a, 819a, 823a], [839a, 847a, 900a, 905a, 917a, 919a, 923a], [939a, 947a, 1000a, 1005a, 1017a, 1019a, 1023a], [1039a, 1047a, 1100a, 1105a, 1117a, 1119a, 1123a], [1139a, 1147a, 1200p, 1205p, 1217p, 1219p, 1223p], [1239p, 1247p, 100p, 105p, 117p, 119p, 123p], [139p, 147p, 200p, 205p, 217p, 219p, 223p], [239p, 247p, 300p, 305p, 317p, 319p, 323p], [339p, 347p, 400p, 405p, 417p, 419p, 423p], [439p, 447p, 500p, 505p, 517p, 519p, 523p], [539p, 547p, 600p, 605p, 617p, 619p, 623p], [639p, 647p, 700p, 705p, 717p, 719p, 722p], [739p, 747p, 800p, 805p, 817p, 819p, 822p], [839p, 847p, 900p, 905p, 917p, 919p, 922p], [939p, 947p, 1000p, 1005p, 1017p, 1019p, 1022p], [1039p, 1047p, 1100p, 1105p, 1117p, 1119p, 1122p]]
-    between_stops: []
     short_name: "952"
     time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "952"
+    time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[839a, 847a, 900a, 905a, 917a, 919a, 923a], [939a, 947a, 1000a, 1005a, 1017a, 1019a, 1023a], [1039a, 1047a, 1100a, 1105a, 1117a, 1119a, 1123a], [1139a, 1147a, 1200p, 1205p, 1217p, 1219p, 1223p], [1239p, 1247p, 100p, 105p, 117p, 119p, 123p], [139p, 147p, 200p, 205p, 217p, 219p, 223p], [239p, 247p, 300p, 305p, 317p, 319p, 323p], [339p, 347p, 400p, 405p, 417p, 419p, 423p], [439p, 447p, 500p, 505p, 517p, 519p, 523p], [539p, 547p, 600p, 605p, 617p, 619p, 623p], [639p, 647p, 700p, 705p, 717p, 719p, 722p]]
-    time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Gungahlin Market Place
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     stop_times_saturday: [["-", "-", "-", "-", 812a, 825a, 833a], [849a, 851a, 855a, 907a, 912a, 925a, 933a], [949a, 951a, 955a, 1007a, 1012a, 1025a, 1033a], [1049a, 1051a, 1055a, 1107a, 1112a, 1125a, 1133a], [1149a, 1151a, 1155a, 1207p, 1212p, 1225p, 1233p], [1249p, 1251p, 1255p, 107p, 112p, 125p, 133p], [149p, 151p, 155p, 207p, 212p, 225p, 233p], [249p, 251p, 255p, 307p, 312p, 325p, 333p], [349p, 351p, 355p, 407p, 412p, 425p, 433p], [449p, 451p, 455p, 507p, 512p, 525p, 533p], [549p, 551p, 555p, 607p, 612p, 625p, 633p], [650p, 652p, 655p, 707p, 712p, 725p, 733p], [750p, 752p, 755p, 807p, 812p, 825p, 833p], [850p, 852p, 855p, 907p, 912p, 925p, 933p], [950p, 952p, 955p, 1007p, 1012p, 1025p, 1033p], [1050p, 1052p, 1055p, 1107p, 1112p, 1125p, 1133p]]
-    between_stops: []
     short_name: "952"
     time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
   -  
     long_name: To Gungahlin Market Place
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "952"
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
     stop_times_sunday: [[949a, 951a, 955a, 1007a, 1012a, 1025a, 1033a], [1049a, 1051a, 1055a, 1107a, 1112a, 1125a, 1133a], [1149a, 1151a, 1155a, 1207p, 1212p, 1225p, 1233p], [1249p, 1251p, 1255p, 107p, 112p, 125p, 133p], [149p, 151p, 155p, 207p, 212p, 225p, 233p], [249p, 251p, 255p, 307p, 312p, 325p, 333p], [349p, 351p, 355p, 407p, 412p, 425p, 433p], [449p, 451p, 455p, 507p, 512p, 525p, 533p], [549p, 551p, 555p, 607p, 612p, 625p, 633p], [650p, 652p, 655p, 707p, 712p, 725p, 733p]]
-    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
-  -  
-    long_name: To City Interchange
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 2: []
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 1: []
     stop_times_saturday: [[743a, 745a, 749a, 754a, 759a, 809a, 819a, 826a, 834a, 840a], [843a, 845a, 849a, 854a, 859a, 909a, 919a, 926a, 934a, 940a], [943a, 945a, 949a, 954a, 959a, 1009a, 1019a, 1026a, 1034a, 1040a], [1043a, 1045a, 1049a, 1054a, 1059a, 1109a, 1119a, 1126a, 1134a, 1140a], [1143a, 1145a, 1149a, 1154a, 1159a, 1209p, 1219p, 1226p, 1234p, 1240p], [1243p, 1245p, 1249p, 1254p, 1259p, 109p, 119p, 126p, 134p, 140p], [143p, 145p, 149p, 154p, 159p, 209p, 219p, 226p, 234p, 240p], [243p, 245p, 249p, 254p, 259p, 309p, 319p, 326p, 334p, 340p], [343p, 345p, 349p, 354p, 359p, 409p, 419p, 426p, 434p, 440p], [443p, 445p, 449p, 454p, 459p, 509p, 519p, 526p, 534p, 540p], [543p, 545p, 549p, 554p, 559p, 609p, 619p, 626p, 634p, 640p], [644p, 646p, 649p, 654p, 659p, 709p, 719p, 726p, 734p, 740p], [744p, 746p, 749p, 754p, 759p, 809p, 819p, 826p, 834p, 840p], [844p, 846p, 849p, 854p, 859p, 909p, 919p, 926p, 934p, 940p], [944p, 946p, 949p, 954p, 959p, 1009p, 1019p, 1026p, 1034p, 1040p], [1044p, 1046p, 1049p, 1054p, 1059p, 1109p, 1119p, 1126p, 1134p, 1140p]]
-    between_stops: []
     short_name: "956"
     time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 1, William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: 
+      Cohen St Bus Station - Platform 2-Lathlain St Bus Station - Platform 2: []
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 1: []
     short_name: "956"
+    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 1, William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
     stop_times_sunday: [[843a, 845a, 849a, 854a, 859a, 909a, 919a, 926a, 934a, 940a], [943a, 945a, 949a, 954a, 959a, 1009a, 1019a, 1026a, 1034a, 1040a], [1043a, 1045a, 1049a, 1054a, 1059a, 1109a, 1119a, 1126a, 1134a, 1140a], [1143a, 1145a, 1149a, 1154a, 1159a, 1209p, 1219p, 1226p, 1234p, 1240p], [1243p, 1245p, 1249p, 1254p, 1259p, 109p, 119p, 126p, 134p, 140p], [143p, 145p, 149p, 154p, 159p, 209p, 219p, 226p, 234p, 240p], [243p, 245p, 249p, 254p, 259p, 309p, 319p, 326p, 334p, 340p], [343p, 345p, 349p, 354p, 359p, 409p, 419p, 426p, 434p, 440p], [443p, 445p, 449p, 454p, 459p, 509p, 519p, 526p, 534p, 540p], [543p, 545p, 549p, 554p, 559p, 609p, 619p, 626p, 634p, 640p], [644p, 646p, 649p, 654p, 659p, 709p, 719p, 726p, 734p, 740p]]
-    time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 1, William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [[738a, 744a, 752a, 759a, 809a, 819a, 824a, 829a, 831a, 835a], [838a, 844a, 852a, 859a, 909a, 919a, 924a, 929a, 931a, 935a], [938a, 944a, 952a, 959a, 1009a, 1019a, 1024a, 1029a, 1031a, 1035a], [1038a, 1044a, 1052a, 1059a, 1109a, 1119a, 1124a, 1129a, 1131a, 1135a], [1138a, 1144a, 1152a, 1159a, 1209p, 1219p, 1224p, 1229p, 1231p, 1235p], [1238p, 1244p, 1252p, 1259p, 109p, 119p, 124p, 129p, 131p, 135p], [138p, 144p, 152p, 159p, 209p, 219p, 224p, 229p, 231p, 235p], [238p, 244p, 252p, 259p, 309p, 319p, 324p, 329p, 331p, 335p], [338p, 344p, 352p, 359p, 409p, 419p, 424p, 429p, 431p, 435p], [438p, 444p, 452p, 459p, 509p, 519p, 524p, 529p, 531p, 535p], [538p, 544p, 552p, 559p, 609p, 619p, 624p, 629p, 631p, 634p], [638p, 644p, 652p, 659p, 709p, 719p, 724p, 729p, 731p, 734p], [738p, 744p, 752p, 759p, 809p, 819p, 824p, 829p, 831p, 834p], [838p, 844p, 852p, 859p, 909p, 919p, 924p, 929p, 931p, 934p], [938p, 944p, 952p, 959p, 1009p, 1019p, 1024p, 1029p, 1031p, 1034p], [1038p, 1044p, 1052p, 1059p, 1109p, 1119p, 1124p, 1129p, 1131p, 1134p]]
-    between_stops: []
     short_name: "956"
     time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "956"
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[838a, 844a, 852a, 859a, 909a, 919a, 924a, 929a, 931a, 935a], [938a, 944a, 952a, 959a, 1009a, 1019a, 1024a, 1029a, 1031a, 1035a], [1038a, 1044a, 1052a, 1059a, 1109a, 1119a, 1124a, 1129a, 1131a, 1135a], [1138a, 1144a, 1152a, 1159a, 1209p, 1219p, 1224p, 1229p, 1231p, 1235p], [1238p, 1244p, 1252p, 1259p, 109p, 119p, 124p, 129p, 131p, 135p], [138p, 144p, 152p, 159p, 209p, 219p, 224p, 229p, 231p, 235p], [238p, 244p, 252p, 259p, 309p, 319p, 324p, 329p, 331p, 335p], [338p, 344p, 352p, 359p, 409p, 419p, 424p, 429p, 431p, 435p], [438p, 444p, 452p, 459p, 509p, 519p, 524p, 529p, 531p, 535p], [538p, 544p, 552p, 559p, 609p, 619p, 624p, 629p, 631p, 634p], [638p, 644p, 652p, 659p, 709p, 719p, 724p, 729p, 731p, 734p]]
-    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
-  -  
-    long_name: To City Interchange
+  -  
+    long_name: To City Interchange
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     stop_times_saturday: [["-", "-", "-", 709a, 720a, 728a, 736a, 745a, 752a, 759a, 807a, 813a], [753a, 755a, 759a, 809a, 820a, 828a, 836a, 845a, 852a, 859a, 907a, 913a], [853a, 855a, 859a, 909a, 920a, 928a, 936a, 945a, 952a, 959a, 1007a, 1013a], [953a, 955a, 959a, 1009a, 1020a, 1028a, 1036a, 1045a, 1052a, 1059a, 1107a, 1113a], [1053a, 1055a, 1059a, 1109a, 1120a, 1128a, 1136a, 1145a, 1152a, 1159a, 1207p, 1213p], [1153a, 1155a, 1159a, 1209p, 1220p, 1228p, 1236p, 1245p, 1252p, 1259p, 107p, 113p], [1253p, 1255p, 1259p, 109p, 120p, 128p, 136p, 145p, 152p, 159p, 207p, 213p], [153p, 155p, 159p, 209p, 220p, 228p, 236p, 245p, 252p, 259p, 307p, 313p], [253p, 255p, 259p, 309p, 320p, 328p, 336p, 345p, 352p, 359p, 407p, 413p], [353p, 355p, 359p, 409p, 420p, 428p, 436p, 445p, 452p, 459p, 507p, 513p], [453p, 455p, 459p, 509p, 520p, 528p, 536p, 545p, 552p, 559p, 607p, 613p], [553p, 555p, 559p, 609p, 620p, 628p, 636p, 645p, 652p, 659p, 707p, 713p], [654p, 656p, 659p, 709p, 720p, 728p, 736p, 745p, 752p, 759p, 807p, 813p], [754p, 756p, 759p, 809p, 820p, 828p, 836p, 845p, 852p, 859p, 907p, 913p], [854p, 856p, 859p, 909p, 920p, 928p, 936p, 945p, 952p, 959p, 1007p, 1013p], [954p, 956p, 959p, 1009p, 1020p, 1028p, 1036p, 1045p, 1052p, 1059p, 1107p, 1113p], [1054p, 1056p, 1059p, 1109p, 1120p, 1128p, 1136p, 1145p, 1152p, "-", "-", "-"]]
-    between_stops: []
     short_name: "958"
     time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station - Platform 2-Cameron Ave Bus Station - Platform 2: []
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 2: []
     short_name: "958"
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
     stop_times_sunday: [[853a, 855a, 859a, 909a, 920a, 928a, 936a, 945a, 952a, 959a, 1007a, 1013a], [953a, 955a, 959a, 1009a, 1020a, 1028a, 1036a, 1045a, 1052a, 1059a, 1107a, 1113a], [1053a, 1055a, 1059a, 1109a, 1120a, 1128a, 1136a, 1145a, 1152a, 1159a, 1207p, 1213p], [1153a, 1155a, 1159a, 1209p, 1220p, 1228p, 1236p, 1245p, 1252p, 1259p, 107p, 113p], [1253p, 1255p, 1259p, 109p, 120p, 128p, 136p, 145p, 152p, 159p, 207p, 213p], [153p, 155p, 159p, 209p, 220p, 228p, 236p, 245p, 252p, 259p, 307p, 313p], [253p, 255p, 259p, 309p, 320p, 328p, 336p, 345p, 352p, 359p, 407p, 413p], [353p, 355p, 359p, 409p, 420p, 428p, 436p, 445p, 452p, 459p, 507p, 513p], [453p, 455p, 459p, 509p, 520p, 528p, 536p, 545p, 552p, 559p, 607p, 613p], [553p, 555p, 559p, 609p, 620p, 628p, 636p, 645p, 652p, 659p, 707p, 713p], [654p, 656p, 659p, 709p, 720p, 728p, 736p, 745p, 752p, 759p, 807p, 813p]]
-    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [["-", "-", "-", 723a, 730a, 739a, 747a, 755a, 806a, 816a, 818a, 822a], [759a, 805a, 813a, 820a, 827a, 836a, 844a, 852a, 903a, 913a, 915a, 919a], [859a, 905a, 913a, 920a, 927a, 936a, 944a, 952a, 1003a, 1013a, 1015a, 1019a], [959a, 1005a, 1013a, 1020a, 1027a, 1036a, 1044a, 1052a, 1103a, 1113a, 1115a, 1119a], [1059a, 1105a, 1113a, 1120a, 1127a, 1136a, 1144a, 1152a, 1203p, 1213p, 1215p, 1219p], [1159a, 1205p, 1213p, 1220p, 1227p, 1236p, 1244p, 1252p, 103p, 113p, 115p, 119p], [1259p, 105p, 113p, 120p, 127p, 136p, 144p, 152p, 203p, 213p, 215p, 219p], [159p, 205p, 213p, 220p, 227p, 236p, 244p, 252p, 303p, 313p, 315p, 319p], [259p, 305p, 313p, 320p, 327p, 336p, 344p, 352p, 403p, 413p, 415p, 419p], [359p, 405p, 413p, 420p, 427p, 436p, 444p, 452p, 503p, 513p, 515p, 519p], [459p, 505p, 513p, 520p, 527p, 536p, 544p, 552p, 603p, 613p, 615p, 619p], [559p, 605p, 613p, 620p, 627p, 636p, 644p, 652p, 703p, 713p, 715p, 718p], [659p, 705p, 713p, 720p, 727p, 736p, 744p, 752p, 803p, 813p, 815p, 818p], [759p, 805p, 813p, 820p, 827p, 836p, 844p, 852p, 903p, 913p, 915p, 918p], [859p, 905p, 913p, 920p, 927p, 936p, 944p, 952p, 1003p, 1013p, 1015p, 1018p], [959p, 1005p, 1013p, 1020p, 1027p, 1036p, 1044p, 1052p, 1103p, 1113p, 1115p, 1118p], [1059p, 1105p, 1113p, 1120p, 1127p, 1136p, "-", "-", "-", "-", "-", "-"]]
-    between_stops: []
     short_name: "958"
     time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "958"
+    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[859a, 905a, 913a, 920a, 927a, 936a, 944a, 952a, 1003a, 1013a, 1015a, 1019a], [959a, 1005a, 1013a, 1020a, 1027a, 1036a, 1044a, 1052a, 1103a, 1113a, 1115a, 1119a], [1059a, 1105a, 1113a, 1120a, 1127a, 1136a, 1144a, 1152a, 1203p, 1213p, 1215p, 1219p], [1159a, 1205p, 1213p, 1220p, 1227p, 1236p, 1244p, 1252p, 103p, 113p, 115p, 119p], [1259p, 105p, 113p, 120p, 127p, 136p, 144p, 152p, 203p, 213p, 215p, 219p], [159p, 205p, 213p, 220p, 227p, 236p, 244p, 252p, 303p, 313p, 315p, 319p], [259p, 305p, 313p, 320p, 327p, 336p, 344p, 352p, 403p, 413p, 415p, 419p], [359p, 405p, 413p, 420p, 427p, 436p, 444p, 452p, 503p, 513p, 515p, 519p], [459p, 505p, 513p, 520p, 527p, 536p, 544p, 552p, 603p, 613p, 615p, 619p], [559p, 605p, 613p, 620p, 627p, 636p, 644p, 652p, 703p, 713p, 715p, 718p], [659p, 705p, 713p, 720p, 727p, 736p, 744p, 752p, 803p, 813p, 815p, 818p]]
-    time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[850a, 902a, 908a, 918a], [950a, 1002a, 1008a, 1018a], [1050a, 1102a, 1108a, 1118a], [1150a, 1202p, 1208p, 1218p], [1250p, 102p, 108p, 118p], [150p, 202p, 208p, 218p], [250p, 302p, 308p, 318p], [350p, 402p, 408p, 418p], [450p, 502p, 508p, 518p], [550p, 602p, 608p, 618p], [650p, 702p, 708p, 717p], [750p, 800p, 806p, 815p], [850p, 900p, 906p, 915p], [950p, 1000p, 1006p, 1015p], [1050p, 1100p, 1106p, 1115p]]
-    between_stops: []
     short_name: "960"
     time_points: [Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "960"
+    time_points: [Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange]
     stop_times_sunday: [[850a, 902a, 908a, 918a], [950a, 1002a, 1008a, 1018a], [1050a, 1102a, 1108a, 1118a], [1150a, 1202p, 1208p, 1218p], [1250p, 102p, 108p, 118p], [150p, 202p, 208p, 218p], [250p, 302p, 308p, 318p], [350p, 402p, 408p, 418p], [450p, 502p, 508p, 518p], [550p, 602p, 608p, 618p], [650p, 702p, 708p, 718p]]
-    time_points: [Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[755a, 805a, 811a, 823a], [855a, 905a, 911a, 923a], [955a, 1005a, 1011a, 1023a], [1055a, 1105a, 1111a, 1123a], [1155a, 1205p, 1211p, 1223p], [1255p, 105p, 111p, 123p], [155p, 205p, 211p, 223p], [255p, 305p, 311p, 323p], [355p, 405p, 411p, 423p], [455p, 505p, 511p, 523p], [555p, 605p, 611p, 623p], [655p, 705p, 711p, 721p], [755p, 804p, 810p, 820p], [855p, 904p, 910p, 920p], [955p, 1004p, 1010p, 1020p], [1055p, 1104p, 1110p, 1120p]]
-    between_stops: []
     short_name: "960"
     time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "960"
+    time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange]
     stop_times_sunday: [[755a, 805a, 811a, 823a], [855a, 905a, 911a, 923a], [955a, 1005a, 1011a, 1023a], [1055a, 1105a, 1111a, 1123a], [1155a, 1205p, 1211p, 1223p], [1255p, 105p, 111p, 123p], [155p, 205p, 211p, 223p], [255p, 305p, 311p, 323p], [355p, 405p, 411p, 423p], [455p, 505p, 511p, 523p], [555p, 605p, 611p, 623p], [655p, 705p, 711p, 723p]]
-    time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[831a, 840a, 850a, 903a], [931a, 940a, 950a, 1003a], [1031a, 1040a, 1050a, 1103a], [1131a, 1140a, 1150a, 1203p], [1231p, 1240p, 1250p, 103p], [131p, 140p, 150p, 203p], [231p, 240p, 250p, 303p], [331p, 340p, 350p, 403p], [431p, 440p, 450p, 503p], [531p, 540p, 550p, 603p], [626p, 635p, 645p, 658p], [726p, 735p, 745p, 758p], [826p, 835p, 845p, 858p], [926p, 935p, 945p, 958p], [1026p, 1035p, 1045p, 1058p], [1126p, 1135p, 1145p, 1158p]]
-    between_stops: []
     short_name: "961"
     time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "961"
+    time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
     stop_times_sunday: [[931a, 940a, 950a, 1003a], [1031a, 1040a, 1050a, 1103a], [1131a, 1140a, 1150a, 1203p], [1231p, 1240p, 1250p, 103p], [131p, 140p, 150p, 203p], [231p, 240p, 250p, 303p], [331p, 340p, 350p, 403p], [431p, 440p, 450p, 503p], [531p, 540p, 550p, 603p], [631p, 640p, 650p, 703p]]
-    time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[842a, 856a, 906a, 915a], [942a, 956a, 1006a, 1015a], [1042a, 1056a, 1106a, 1115a], [1142a, 1156a, 1206p, 1215p], [1242p, 1256p, 106p, 115p], [142p, 156p, 206p, 215p], [242p, 256p, 306p, 315p], [342p, 356p, 406p, 415p], [442p, 456p, 506p, 515p], [542p, 556p, 606p, 615p], [642p, 656p, 706p, 715p], [742p, 756p, 806p, 815p], [842p, 856p, 906p, 915p], [942p, 956p, 1006p, 1015p], [1042p, 1056p, 1106p, 1115p]]
-    between_stops: []
     short_name: "961"
     time_points: [Tuggeranong Interchange - Platform 3, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "961"
+    time_points: [Tuggeranong Interchange - Platform 3, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
     stop_times_sunday: [[942a, 956a, 1006a, 1015a], [1042a, 1056a, 1106a, 1115a], [1142a, 1156a, 1206p, 1215p], [1242p, 1256p, 106p, 115p], [142p, 156p, 206p, 215p], [242p, 256p, 306p, 315p], [342p, 356p, 406p, 415p], [442p, 456p, 506p, 515p], [542p, 556p, 606p, 615p]]
-    time_points: [Tuggeranong Interchange - Platform 3, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[851a, 902a, 910a, 917a], [951a, 1002a, 1010a, 1017a], [1051a, 1102a, 1110a, 1117a], [1151a, 1202p, 1210p, 1217p], [1251p, 102p, 110p, 117p], [151p, 202p, 210p, 217p], [251p, 302p, 310p, 317p], [351p, 402p, 410p, 417p], [451p, 502p, 510p, 517p], [551p, 602p, 610p, 617p], [651p, 702p, 710p, 717p], [751p, 802p, 810p, 817p], [851p, 902p, 910p, 917p], [951p, 1002p, 1010p, 1017p], [1051p, 1102p, 1110p, 1117p]]
-    between_stops: []
     short_name: "962"
     time_points: [Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "962"
+    time_points: [Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
     stop_times_sunday: [[951a, 1002a, 1010a, 1017a], [1051a, 1102a, 1110a, 1117a], [1151a, 1202p, 1210p, 1217p], [1251p, 102p, 110p, 117p], [151p, 202p, 210p, 217p], [251p, 302p, 310p, 317p], [351p, 402p, 410p, 417p], [451p, 502p, 510p, 517p], [551p, 602p, 610p, 617p], [651p, 702p, 710p, 717p]]
-    time_points: [Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[824a, 831a, 839a, 852a], [925a, 932a, 940a, 953a], [1025a, 1032a, 1040a, 1053a], [1125a, 1132a, 1140a, 1153a], [1225p, 1232p, 1240p, 1253p], [125p, 132p, 140p, 153p], [225p, 232p, 240p, 253p], [325p, 332p, 340p, 353p], [424p, 431p, 439p, 452p], [524p, 531p, 539p, 552p], [625p, 632p, 639p, 650p], [725p, 731p, 738p, 749p], [825p, 831p, 838p, 849p], [925p, 931p, 938p, 949p], [1025p, 1031p, 1038p, 1049p], [1125p, 1131p, 1138p, 1149p]]
-    between_stops: []
     short_name: "962"
     time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "962"
+    time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange]
     stop_times_sunday: [[925a, 932a, 940a, 953a], [1025a, 1032a, 1040a, 1053a], [1125a, 1132a, 1140a, 1153a], [1225p, 1232p, 1240p, 1253p], [125p, 132p, 140p, 153p], [225p, 232p, 240p, 253p], [325p, 332p, 340p, 353p], [425p, 432p, 440p, 453p], [525p, 532p, 540p, 553p], [625p, 632p, 639p, 650p]]
-    time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[905a, 914a, 926a, 937a], [1005a, 1014a, 1026a, 1037a], [1105a, 1114a, 1126a, 1137a], [1205p, 1214p, 1226p, 1237p], [105p, 114p, 126p, 137p], [205p, 214p, 226p, 237p], [305p, 314p, 326p, 337p], [405p, 414p, 426p, 437p], [505p, 514p, 526p, 537p], [605p, 614p, 626p, 637p], [705p, 714p, 726p, 737p], [805p, 814p, 826p, 837p], [905p, 914p, 926p, 937p], [1005p, 1014p, 1026p, 1037p], [1105p, 1114p, 1126p, 1137p]]
-    between_stops: []
     short_name: "964"
     time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "964"
+    time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
     stop_times_sunday: [[905a, 914a, 926a, 937a], [1005a, 1014a, 1026a, 1037a], [1105a, 1114a, 1126a, 1137a], [1205p, 1214p, 1226p, 1237p], [105p, 114p, 126p, 137p], [205p, 214p, 226p, 237p], [305p, 314p, 326p, 337p], [405p, 414p, 426p, 437p], [505p, 514p, 526p, 537p], [605p, 614p, 626p, 637p], [705p, 714p, 726p, 737p]]
-    time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[825a, 837a, 849a, 858a], [925a, 937a, 949a, 958a], [1025a, 1037a, 1049a, 1058a], [1125a, 1137a, 1149a, 1158a], [1225p, 1237p, 1249p, 1258p], [125p, 137p, 149p, 158p], [225p, 237p, 249p, 258p], [325p, 337p, 349p, 358p], [425p, 437p, 449p, 458p], [525p, 537p, 549p, 558p], [625p, 637p, 649p, 658p], [725p, 737p, 749p, 758p], [825p, 837p, 849p, 858p], [925p, 937p, 949p, 958p], [1025p, 1037p, 1049p, 1058p], [1125p, 1137p, 1149p, "-"]]
-    between_stops: []
     short_name: "964"
     time_points: [Tuggeranong Interchange - Platform 5, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "964"
+    time_points: [Tuggeranong Interchange - Platform 5, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
     stop_times_sunday: [[925a, 937a, 949a, 958a], [1025a, 1037a, 1049a, 1058a], [1125a, 1137a, 1149a, 1158a], [1225p, 1237p, 1249p, 1258p], [125p, 137p, 149p, 158p], [225p, 237p, 249p, 258p], [325p, 337p, 349p, 358p], [425p, 437p, 449p, 458p], [525p, 537p, 549p, 558p], [625p, 637p, 649p, 658p]]
-    time_points: [Tuggeranong Interchange - Platform 5, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [["-", "-", "-", 742a, 755a, 804a, 816a], [808a, 821a, 830a, 842a, 855a, 904a, 916a], [908a, 921a, 930a, 942a, 955a, 1004a, 1016a], [1008a, 1021a, 1030a, 1042a, 1055a, 1104a, 1116a], [1108a, 1121a, 1130a, 1142a, 1155a, 1204p, 1216p], [1208p, 1221p, 1230p, 1242p, 1255p, 104p, 116p], [108p, 121p, 130p, 142p, 155p, 204p, 216p], [208p, 221p, 230p, 242p, 255p, 304p, 316p], [308p, 321p, 330p, 342p, 355p, 404p, 416p], [408p, 421p, 430p, 442p, 455p, 504p, 516p], [508p, 521p, 530p, 542p, 555p, 604p, 616p], [608p, 621p, 630p, 642p, 655p, 704p, 716p], [703p, 716p, 725p, 737p, 750p, 759p, 811p], [803p, 816p, 825p, 837p, 850p, 859p, 911p], [903p, 916p, 925p, 937p, 950p, 959p, 1011p], [1003p, 1016p, 1025p, 1037p, 1050p, 1059p, 1111p], [1103p, 1116p, 1125p, 1137p, "-", "-", "-"]]
-    between_stops: []
     short_name: "966"
     time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "966"
+    time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
     stop_times_sunday: [[908a, 921a, 930a, 942a, 955a, 1004a, 1016a], [1008a, 1021a, 1030a, 1042a, 1055a, 1104a, 1116a], [1108a, 1121a, 1130a, 1142a, 1155a, 1204p, 1216p], [1208p, 1221p, 1230p, 1242p, 1255p, 104p, 116p], [108p, 121p, 130p, 142p, 155p, 204p, 216p], [208p, 221p, 230p, 242p, 255p, 304p, 316p], [308p, 321p, 330p, 342p, 355p, 404p, 416p], [408p, 421p, 430p, 442p, 455p, 504p, 516p], [508p, 521p, 530p, 542p, 555p, 604p, 616p], [608p, 621p, 630p, 642p, 655p, 704p, 716p], [708p, 721p, 730p, 742p, 755p, 804p, 816p]]
-    time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[903a, 914a, 928a, 937a, 950a], [1103a, 1114a, 1128a, 1137a, 1150a], [103p, 114p, 128p, 137p, 150p], [303p, 314p, 328p, 337p, 350p], [503p, 514p, 528p, 537p, 550p], [703p, 714p, 728p, 737p, 750p], [903p, 914p, 928p, 937p, 950p], [1103p, 1114p, 1128p, 1137p, 1150p]]
-    between_stops: []
     short_name: "967"
     time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "967"
+    time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
     stop_times_sunday: [[903a, 914a, 928a, 937a, 950a], [1103a, 1114a, 1128a, 1137a, 1150a], [103p, 114p, 128p, 137p, 150p], [303p, 314p, 328p, 337p, 350p], [503p, 514p, 528p, 537p, 550p], [703p, 714p, 728p, 737p, 750p]]
-    time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[803a, 816a, 824a, 838a, 848a], [1003a, 1016a, 1024a, 1038a, 1048a], [1203p, 1216p, 1224p, 1238p, 1248p], [203p, 216p, 224p, 238p, 248p], [403p, 416p, 424p, 438p, 448p], [603p, 616p, 624p, 638p, 648p], [803p, 816p, 824p, 838p, 848p], [1003p, 1016p, 1024p, 1038p, 1048p]]
-    between_stops: []
     short_name: "968"
     time_points: [Tuggeranong Interchange - Platform 7, Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Tuggeranong Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "968"
+    time_points: [Tuggeranong Interchange - Platform 7, Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
     stop_times_sunday: [[1003a, 1016a, 1024a, 1038a, 1048a], [1203p, 1216p, 1224p, 1238p, 1248p], [203p, 216p, 224p, 238p, 248p], [403p, 416p, 424p, 438p, 448p], [603p, 616p, 624p, 638p, 648p]]
-    time_points: [Tuggeranong Interchange - Platform 7, Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
   -  
     long_name: To Cohen St Bus Station
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     stop_times_saturday: [["-", "-", "-", "-", 809a, 815a, 820a, 824a, 830a, 837a, 839a, 843a], [845a, 904a, 911a, 917a, 928a, 934a, 939a, 943a, 949a, 956a, 958a, 1002a], [945a, 1004a, 1011a, 1017a, 1028a, 1034a, 1039a, 1043a, 1049a, 1056a, 1058a, 1102a], [1045a, 1104a, 1111a, 1117a, 1128a, 1134a, 1139a, 1143a, 1149a, 1156a, 1158a, 1202p], ["-", "-", 1130a, 1136a, 1146p, "-", "-", "-", "-", "-", "-", "-"], [1145a, 1204p, 1211p, 1217p, 1228p, 1234p, 1239p, 1243p, 1249p, 1256p, 1258p, 102p], [1245p, 104p, 111p, 117p, 128p, 134p, 139p, 143p, 149p, 156p, 158p, 202p], [145p, 204p, 211p, 217p, 228p, 234p, 239p, 243p, 249p, 256p, 258p, 302p], [245p, 304p, 311p, 317p, 328p, 334p, 339p, 343p, 349p, 356p, 358p, 402p], [345p, 404p, 411p, 417p, 428p, 434p, 439p, 443p, 449p, 456p, 458p, 502p], ["-", "-", 440p, 446p, 456p, "-", "-", "-", "-", "-", "-", "-"], [445p, 504p, 511p, 517p, 528p, 534p, 539p, 543p, 549p, 556p, 558p, 602p], [545p, 604p, 611p, 617p, 628p, 634p, 639p, 643p, 649p, 656p, 658p, 701p], ["-", "-", "-", "-", 655p, 701p, 706p, 710p, 716p, 723p, 725p, 728p], ["-", "-", "-", "-", 805p, 811p, 816p, 820p, 826p, 833p, 835p, 838p], ["-", "-", "-", "-", 916p, 922p, 927p, 931p, 937p, 944p, 946p, 949p], ["-", "-", "-", "-", 1027p, 1033p, 1038p, 1042p, 1048p, 1055p, 1057p, 1100p], ["-", "-", "-", "-", 1139p, 1145p, 1150p, 1154p, 1200a, 1207a, 1209a, 1212a]]
-    between_stops: []
     short_name: "980"
     time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Cohen St Bus Station
-    between_stops: []
+    between_stops: 
+      Lathlain St Bus Station-Cohen St Bus Station: []
+      Cameron Ave Bus Station-Lathlain St Bus Station: []
     short_name: "980"
+    time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
     stop_times_sunday: [[845a, 904a, 911a, 917a, 928a, 934a, 939a, 943a, 949a, 956a, 958a, 1002a], [945a, 1004a, 1011a, 1017a, 1028a, 1034a, 1039a, 1043a, 1049a, 1056a, 1058a, 1102a], [1045a, 1104a, 1111a, 1117a, 1128a, 1134a, 1139a, 1143a, 1149a, 1156a, 1158a, 1202p], [1145a, 1204p, 1211p, 1217p, 1228p, 1234p, 1239p, 1243p, 1249p, 1256p, 1258p, 102p], [1245p, 104p, 111p, 117p, 128p, 134p, 139p, 143p, 149p, 156p, 158p, 202p], [145p, 204p, 211p, 217p, 228p, 234p, 239p, 243p, 249p, 256p, 258p, 302p], [245p, 304p, 311p, 317p, 328p, 334p, 339p, 343p, 349p, 356p, 358p, 402p], [345p, 404p, 411p, 417p, 428p, 434p, 439p, 443p, 449p, 456p, 458p, 502p], ["-", "-", 440p, 446p, 456p, "-", "-", "-", "-", "-", "-", "-"], [445p, 504p, 511p, 517p, 528p, 534p, 539p, 543p, 549p, 556p, 558p, 602p], [545p, 604p, 611p, 617p, 628p, 634p, 639p, 643p, 649p, 656p, 658p, 701p]]
-    time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
   -  
     long_name: To Lithgow St Terminus Fyshwick
-    between_stops: []
-    
-    stop_times_saturday: 
-    - - 721a
-      - 723a
-      - 727a
-      - 735a
-      - 741a
-      - 746a
-      - 752a
-      - 759a
-      - 808a
-      - 814a
-      - 822a
-      - 840a
-    - - 821a
-      - 823a
-      - 827a
-      - 835a
-      - 841a
-      - 846a
-      - 852a
-      - 859a
-      - 908a
-      - 914a
-      - 922a
-      - 940a
-    - - 921a
-      - 923a
-      - 927a
-      - 935a
-      - 941a
-      - 946a
-      - 952a
-      - 959a
-      - 1008a
-      - 1014a
-      - 1022a
-      - 1040a
-    - - 1021a
-      - 1023a
-      - 1027a
-      - 1035a
-      - 1041a
-      - 1046a
-      - 1052a
-      - 1059a
-      - 1108a
-      - 1114a
-      - 1122a
-      - 1140a
-    - - 1121a
-      - 1123a
-      - 1127a
-      - 1135a
-      - 1141a
-      - 1146a
-      - 1152a
-      - 1159a
-      - 1208p
-      - 1214p
-      - 1222p
-      - 1240p
-    - - 1221p
-      - 1223p
-      - 1227p
-      - 1235p
-      - 1241p
-      - 1246p
-      - 1252p
-      - 1259p
-      - 108p
-      - 114p
-      - 122p
-      - 140p
-    - - 121p
-      - 123p
-      - 127p
-      - 135p
-      - 141p
-      - 146p
-      - 152p
-      - 159p
-      - 208p
-      - 214p
-      - 222p
-      - 240p
-    - - 221p
-      - 223p
-      - 227p
-      - 235p
-      - 241p
-      - 246p
-      - 252p
-      - 259p
-      - 308p
-      - 314p
-      - 322p
-      - 340p
-    - - 321p
-      - 323p
-      - 327p
-      - 335p
-      - 341p
-      - 346p
-      - 352p
-      - 359p
-      - 408p
-      - 414p
-      - 422p
-      - 440p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 415p
-      - 424p
-      - 430p
-      - "-"
-      - "-"
-    - - 421p
-      - 423p
-      - 427p
-      - 435p
-      - 441p
-      - 446p
-      - 452p
-      - 459p
-      - 508p
-      - 514p
-      - 522p
-      - 540p
-    - - 521p
-      - 523p
-      - 527p
-      - 535p
-      - 541p
-      - 546p
-      - 552p
-      - 558p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 616p
-      - 618p
-      - 622p
-      - 630p
-      - 636p
-      - 641p
-      - 646p
-      - 652p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 727p
-      - 729p
-      - 732p
-      - 739p
-      - 745p
-      - 750p
-      - 755p
-      - 801p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 836p
-      - 838p
-      - 841p
-      - 848p
-      - 854p
-      - 859p
-      - 904p
-      - 910p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 947p
-      - 949p
-      - 952p
-      - 959p
-      - 1005p
-      - 1010p
-      - 1015p
-      - 1021p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 1059p
-      - 1101p
-      - 1104p
-      - 1111p
-      - 1117p
-      - 1122p
-      - 1127p
-      - 1133p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
+    stop_times_saturday: [[721a, 723a, 727a, 735a, 741a, 746a, 752a, 759a, 808a, 814a, 822a, 840a], [821a, 823a, 827a, 835a, 841a, 846a, 852a, 859a, 908a, 914a, 922a, 940a], [921a, 923a, 927a, 935a, 941a, 946a, 952a, 959a, 1008a, 1014a, 1022a, 1040a], [1021a, 1023a, 1027a, 1035a, 1041a, 1046a, 1052a, 1059a, 1108a, 1114a, 1122a, 1140a], [1121a, 1123a, 1127a, 1135a, 1141a, 1146a, 1152a, 1159a, 1208p, 1214p, 1222p, 1240p], [1221p, 1223p, 1227p, 1235p, 1241p, 1246p, 1252p, 1259p, 108p, 114p, 122p, 140p], [121p, 123p, 127p, 135p, 141p, 146p, 152p, 159p, 208p, 214p, 222p, 240p], [221p, 223p, 227p, 235p, 241p, 246p, 252p, 259p, 308p, 314p, 322p, 340p], [321p, 323p, 327p, 335p, 341p, 346p, 352p, 359p, 408p, 414p, 422p, 440p], ["-", "-", "-", "-", "-", "-", "-", 415p, 424p, 430p, "-", "-"], [421p, 423p, 427p, 435p, 441p, 446p, 452p, 459p, 508p, 514p, 522p, 540p], [521p, 523p, 527p, 535p, 541p, 546p, 552p, 558p, "-", "-", "-", "-"], [616p, 618p, 622p, 630p, 636p, 641p, 646p, 652p, "-", "-", "-", "-"], [727p, 729p, 732p, 739p, 745p, 750p, 755p, 801p, "-", "-", "-", "-"], [836p, 838p, 841p, 848p, 854p, 859p, 904p, 910p, "-", "-", "-", "-"], [947p, 949p, 952p, 959p, 1005p, 1010p, 1015p, 1021p, "-", "-", "-", "-"], [1059p, 1101p, 1104p, 1111p, 1117p, 1122p, 1127p, 1133p, "-", "-", "-", "-"]]
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "980"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - University of Canberra
-    - Australian Institute Sports Bruce
-    - National Hockey Centre Lyneham
-    - Macarthur / Northbourne
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Railway Station Kingston
-    - Newcastle / Isa Street Fyshwick
-    - Lithgow St Terminus Fyshwick
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Australian Institute Sports Bruce, National Hockey Centre Lyneham, Macarthur / Northbourne, City Interchange - Platform 9, Russell Offices, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Lithgow St Terminus Fyshwick]
   -  
     long_name: To Lithgow St Terminus Fyshwick
-    between_stops: []
-    
+    between_stops: 
+      Cohen St Bus Station - Platform 1-Lathlain St Bus Station - Platform 3: []
+      Lathlain St Bus Station - Platform 3-Cameron Ave Bus Station - Platform 3: []
     short_name: "980"
-    time_points: 
-    - Cohen St Bus Station - Platform 1
-    - Lathlain St Bus Station - Platform 3
-    - Cameron Ave Bus Station - Platform 3
-    - University of Canberra
-    - Australian Institute Sports Bruce
-    - National Hockey Centre Lyneham
-    - Macarthur / Northbourne
-    - City Interchange - Platform 9
-    - Russell Offices
-    - Railway Station Kingston
-    - Newcastle / Isa Street Fyshwick
-    - Lithgow St Terminus Fyshwick
-    stop_times_sunday: 
-    - - 821a
-      - 823a
-      - 827a
-      - 835a
-      - 841a
-      - 846a
-      - 852a
-      - 859a
-      - 908a
-      - 914a
-      - 922a
-      - 940a
-    - - 921a
-      - 923a
-      - 927a
-      - 935a
-      - 941a
-      - 946a
-      - 952a
-      - 959a
-      - 1008a
-      - 1014a
-      - 1022a
-      - 1040a
-    - - 1021a
-      - 1023a
-      - 1027a
-      - 1035a
-      - 1041a
-      - 1046a
-      - 1052a
-      - 1059a
-      - 1108a
-      - 1114a
-      - 1122a
-      - 1140a
-    - - 1121a
-      - 1123a
-      - 1127a
-      - 1135a
-      - 1141a
-      - 1146a
-      - 1152a
-      - 1159a
-      - 1208p
-      - 1214p
-      - 1222p
-      - 1240p
-    - - 1221p
-      - 1223p
-      - 1227p
-      - 1235p
-      - 1241p
-      - 1246p
-      - 1252p
-      - 1259p
-      - 108p
-      - 114p
-      - 122p
-      - 140p
-    - - 121p
-      - 123p
-      - 127p
-      - 135p
-      - 141p
-      - 146p
-      - 152p
-      - 159p
-      - 208p
-      - 214p
-      - 222p
-      - 240p
-    - - 221p
-      - 223p
-      - 227p
-      - 235p
-      - 241p
-      - 246p
-      - 252p
-      - 259p
-      - 308p
-      - 314p
-      - 322p
-      - 340p
-    - - 321p
-      - 323p
-      - 327p
-      - 335p
-      - 341p
-      - 346p
-      - 352p
-      - 359p
-      - 408p
-      - 414p
-      - 422p
-      - 440p
-    - - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-      - 415p
-      - 424p
-      - 430p
-      - "-"
-      - "-"
-    - - 421p
-      - 423p
-      - 427p
-      - 435p
-      - 441p
-      - 446p
-      - 452p
-      - 459p
-      - 508p
-      - 514p
-      - 522p
-      - 540p
-    - - 521p
-      - 523p
-      - 527p
-      - 535p
-      - 541p
-      - 546p
-      - 552p
-      - 558p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-    - - 616p
-      - 618p
-      - 622p
-      - 630p
-      - 636p
-      - 641p
-      - 646p
-      - 652p
-      - "-"
-      - "-"
-      - "-"
-      - "-"
-  -  
-    long_name: To City Interchange
+    stop_times_sunday: [[821a, 823a, 827a, 835a, 841a, 846a, 852a, 859a, 908a, 914a, 922a, 940a], [921a, 923a, 927a, 935a, 941a, 946a, 952a, 959a, 1008a, 1014a, 1022a, 1040a], [1021a, 1023a, 1027a, 1035a, 1041a, 1046a, 1052a, 1059a, 1108a, 1114a, 1122a, 1140a], [1121a, 1123a, 1127a, 1135a, 1141a, 1146a, 1152a, 1159a, 1208p, 1214p, 1222p, 1240p], [1221p, 1223p, 1227p, 1235p, 1241p, 1246p, 1252p, 1259p, 108p, 114p, 122p, 140p], [121p, 123p, 127p, 135p, 141p, 146p, 152p, 159p, 208p, 214p, 222p, 240p], [221p, 223p, 227p, 235p, 241p, 246p, 252p, 259p, 308p, 314p, 322p, 340p], [321p, 323p, 327p, 335p, 341p, 346p, 352p, 359p, 408p, 414p, 422p, 440p], ["-", "-", "-", "-", "-", "-", "-", 415p, 424p, 430p, "-", "-"], [421p, 423p, 427p, 435p, 441p, 446p, 452p, 459p, 508p, 514p, 522p, 540p], [521p, 523p, 527p, 535p, 541p, 546p, 552p, 558p, "-", "-", "-", "-"], [616p, 618p, 622p, 630p, 636p, 641p, 646p, 652p, "-", "-", "-", "-"]]
+    time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Australian Institute Sports Bruce, National Hockey Centre Lyneham, Macarthur / Northbourne, City Interchange - Platform 9, Russell Offices, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Lithgow St Terminus Fyshwick]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[1020a, 1034a, 1042a, 1048a, 1055a], [1150a, 1204p, 1212p, 1218p, 1225p], [120p, 134p, 142p, 148p, 155p], [250p, 304p, 312p, 318p, 325p], [420p, 434p, 442p, 448p, 455p]]
-    between_stops: []
     short_name: "981"
     time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "981"
+    time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
     stop_times_sunday: [[1020a, 1034a, 1042a, 1048a, 1055a], [1150a, 1204p, 1212p, 1218p, 1225p], [120p, 134p, 142p, 148p, 155p], [250p, 304p, 312p, 318p, 325p], [420p, 434p, 442p, 448p, 455p]]
-    time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
   -  
     long_name: To Bimberi Centre
+    between_stops: {}
+    
     stop_times_saturday: [[632a, 638a, 640a, 650a], [342p, 348p, 350p, 400p]]
-    between_stops: []
     short_name: "982"
     time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
   -  
     long_name: To Bimberi Centre
-    between_stops: []
+    between_stops: {}
+    
     short_name: "982"
+    time_points: [City Interchange, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
     stop_times_sunday: [[342p, 348p, 350p, 400p]]
-    time_points: [City Interchange, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
-  -  
-    long_name: To City Interchange
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[715p, 724p, 726p, 733p]]
-    between_stops: []
     short_name: "982"
     time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To City Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "982"
+    time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
     stop_times_sunday: [[715p, 724p, 726p, 733p]]
-    time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
   -  
     long_name: To Alexander Maconochie Centre Hume
+    between_stops: {}
+    
     stop_times_saturday: [[840a, 900a], [1225p, 1245p], [510p, 530p]]
-    between_stops: []
     short_name: "988"
     time_points: [Woden Interchange - Platform 4, Alexander Maconochie Centre Hume]
   -  
     long_name: To Alexander Maconochie Centre Hume
-    between_stops: []
+    between_stops: {}
+    
     short_name: "988"
+    time_points: [Woden Interchange, Alexander Maconochie Centre Hume]
     stop_times_sunday: [[840a, 900a], [1225p, 1245p], [510p, 530p]]
-    time_points: [Woden Interchange, Alexander Maconochie Centre Hume]
-  -  
-    long_name: To Woden Interchange
+  -  
+    long_name: To Woden Interchange
+    between_stops: {}
+    
     stop_times_saturday: [[1135a, 1155a], [435p, 455p], [735p, 755p]]
-    between_stops: []
     short_name: "988"
     time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
   -  
     long_name: To Woden Interchange
-    between_stops: []
+    between_stops: {}
+    
     short_name: "988"
+    time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
     stop_times_sunday: [[1135a, 1155a], [435p, 455p], [735p, 755p]]
-    time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
   -  
     long_name: To Campbell Park Offices
-    between_stops: []
+    between_stops: {}
     
     short_name: "9"
-    stop_times: 
-    - - 714a
-      - 726a
-      - 731a
-      - 733a
-      - 741a
-      - 745a
-    - - 814a
-      - 829a
-      - 834a
-      - 836a
-      - 844a
-      - 848a
-    - - 857a
-      - 911a
-      - 916a
-      - 918a
-      - 926a
-      - 931a
-    - - 957a
-      - 1011a
-      - 1016a
-      - 1018a
-      - 1026a
-      - 1029a
-    - - 1057a
-      - 1111a
-      - 1116a
-      - 1118a
-      - 1126a
-      - 1129a
-    - - 1157a
-      - 1211p
-      - 1216p
-      - 1218p
-      - 1226p
-      - 1229p
-    - - 1257p
-      - 111p
-      - 116p
-      - 118p
-      - 126p
-      - 129p
-    - - 157p
-      - 211p
-      - 216p
-      - 218p
-      - 226p
-      - 229p
-    - - 257p
-      - 312p
-      - 317p
-      - 319p
-      - 327p
-      - 331p
-    - - 344p
-      - 359p
-      - 404p
-      - 406p
-      - 414p
-      - 418p
-    - - 414p
-      - 429p
-      - 434p
-      - 436p
-      - 444p
-      - 448p
-    - - 444p
-      - 459p
-      - 504p
-      - 506p
-      - 514p
-      - 518p
-    - - 514p
-      - 529p
-      - 534p
-      - 536p
-      - 544p
-      - 548p
-    - - 557p
-      - 612p
-      - 617p
-      - 619p
-      - 627p
-      - 631p
-    - - 657p
-      - 708p
-      - 712p
-      - 714p
-      - 720p
-      - 723p
-    - - 757p
-      - 808p
-      - 812p
-      - 814p
-      - 820p
-      - 823p
-    - - 857p
-      - 908p
-      - 912p
-      - 914p
-      - 920p
-      - 923p
-    - - 957p
-      - 1008p
-      - 1012p
-      - 1014p
-      - 1020p
-      - 1023p
-    - - 1057p
-      - 1108p
-      - 1112p
-      - 1114p
-      - 1120p
-      - 1123p
-    time_points: 
-    - City Interchange - Platform 7
-    - St Thomas More Campbell
-    - Russell Offices
-    - Hospice
-    - ADFA
-    - Campbell Park Offices
-  -  
-    long_name: To City Interchange
-    between_stops: []
+    stop_times: [[714a, 726a, 731a, 733a, 741a, 745a], [814a, 829a, 834a, 836a, 844a, 848a], [857a, 911a, 916a, 918a, 926a, 931a], [957a, 1011a, 1016a, 1018a, 1026a, 1029a], [1057a, 1111a, 1116a, 1118a, 1126a, 1129a], [1157a, 1211p, 1216p, 1218p, 1226p, 1229p], [1257p, 111p, 116p, 118p, 126p, 129p], [157p, 211p, 216p, 218p, 226p, 229p], [257p, 312p, 317p, 319p, 327p, 331p], [344p, 359p, 404p, 406p, 414p, 418p], [414p, 429p, 434p, 436p, 444p, 448p], [444p, 459p, 504p, 506p, 514p, 518p], [514p, 529p, 534p, 536p, 544p, 548p], [557p, 612p, 617p, 619p, 627p, 631p], [657p, 708p, 712p, 714p, 720p, 723p], [757p, 808p, 812p, 814p, 820p, 823p], [857p, 908p, 912p, 914p, 920p, 923p], [957p, 1008p, 1012p, 1014p, 1020p, 1023p], [1057p, 1108p, 1112p, 1114p, 1120p, 1123p]]
+    time_points: [City Interchange - Platform 7, St Thomas More Campbell, Russell Offices, Hospice, ADFA, Campbell Park Offices]
+  -  
+    long_name: To City Interchange
+    between_stops: {}
+    
     short_name: "9"
     stop_times: [["-", 655a, 701a, 703a, 708a, 720a], [720a, 723a, 729a, 731a, 736a, 751a], [752a, 756a, 804a, 806a, 811a, 826a], [822a, 826a, 834a, 836a, 841a, 856a], [852a, 856a, 904a, 906a, 911a, 926a], [934a, 937a, 945a, 947a, 952a, 1006a], [1034a, 1037a, 1045a, 1047a, 1052a, 1106a], [1134a, 1137a, 1145a, 1147a, 1152a, 1206p], [1234p, 1237p, 1245p, 1247p, 1252p, 106p], [134p, 137p, 145p, 147p, 152p, 206p], [234p, 237p, 245p, 247p, 252p, 306p], [335p, 339p, 347p, 349p, 354p, 409p], [352p, 356p, 404p, 406p, 411p, 426p], [422p, 426p, 434p, 436p, 441p, 456p], [452p, 456p, 504p, 506p, 511p, 526p], [522p, 526p, 534p, 536p, 541p, 556p], [552p, 556p, 604p, 606p, 611p, 626p], [628p, 632p, 638p, 640p, 645p, 656p], [728p, 731p, 737p, 739p, 744p, 755p], [828p, 831p, 837p, 839p, 844p, 855p], [928p, 931p, 937p, 939p, 944p, 955p], [1028p, 1031p, 1037p, 1039p, 1044p, 1055p]]
     time_points: [Campbell Park Offices, ADFA, Menindee Drive - Hospice, Russell Offices, St Thomas More Campbell, City Interchange]

--- a/maxious-canberra-transit-feed/cbrtable.yml.in
+++ b/maxious-canberra-transit-feed/cbrtable.yml.in
@@ -238,5 +238,1429 @@
   - { name: Woden Interchange - Platform 9,stop_code: Woden Interchange - Platform 9, lat: -35.3442083, lng: 149.0877771}
   - { name: Woodcock/Clare Dennis,stop_code: Woodcock/Clare Dennis, lat: -35.4422566, lng: 149.0854375}
   - { name: Yarralumla Shops,stop_code: Yarralumla Shops, lat: -35.30725, lng: 149.0972}
+  - { name: Wjz2mTK,stop_code: Wjz2mTK, lat: -35.3815863, lng: 149.0936139}
+  - { name: Wjz6kCT,stop_code: Wjz6kCT, lat: -35.217402, lng: 149.0910262}
+  - { name: Wjz6keB,stop_code: Wjz6keB, lat: -35.2175697, lng: 149.0866478}
+  - { name: Wjr-TRM,stop_code: Wjr-TRM, lat: -35.2021703, lng: 149.0498418}
+  - { name: Wjr_MMi,stop_code: Wjr_MMi, lat: -35.200018, lng: 149.0491234}
+  - { name: Wjr_Mxy,stop_code: Wjr_Mxy, lat: -35.1992913, lng: 149.0468658}
+  - { name: Wjr-IeY,stop_code: Wjr-IeY, lat: -35.2176259, lng: 149.032238}
+  - { name: Wjr-J8t,stop_code: Wjr-J8t, lat: -35.2161747, lng: 149.0315719}
+  - { name: Wjr-InZ,stop_code: Wjr-InZ, lat: -35.2169003, lng: 149.0335258}
+  - { name: Wjr-Jm9,stop_code: Wjr-Jm9, lat: -35.2124379, lng: 149.0325045}
+  - { name: Wjr-J44,stop_code: Wjr-J44, lat: -35.2135626, lng: 149.0296181}
+  - { name: Wjr-BB3,stop_code: Wjr-BB3, lat: -35.2129096, lng: 149.0241561}
+  - { name: Wjr-Alc,stop_code: Wjr-Alc, lat: -35.2183514, lng: 149.021625}
+  - { name: Wjr-AY4,stop_code: Wjr-AY4, lat: -35.2190044, lng: 149.0282415}
+  - { name: Wjr-I4P,stop_code: Wjr-I4P, lat: -35.2191133, lng: 149.0306838}
+  - { name: Wjr-IcO,stop_code: Wjr-IcO, lat: -35.2191858, lng: 149.0319716}
+  - { name: Wjr-IqS,stop_code: Wjr-IqS, lat: -35.2202741, lng: 149.034858}
+  - { name: Wjr-IGJ,stop_code: Wjr-IGJ, lat: -35.2203467, lng: 149.0373003}
+  - { name: Wjr-IMR,stop_code: Wjr-IMR, lat: -35.2216889, lng: 149.0389433}
+  - { name: Wjr-H-a,stop_code: Wjr-H-a, lat: -35.2232851, lng: 149.039343}
+  - { name: Wjr-Q4G,stop_code: Wjr-Q4G, lat: -35.2192221, lng: 149.0415189}
+  - { name: Wjz6zth,stop_code: Wjz6zth, lat: -35.2241129, lng: 149.1109391}
+  - { name: Wjz6zon,stop_code: Wjz6zon, lat: -35.2269858, lng: 149.1109391}
+  - { name: Wjz6ytu,stop_code: Wjz6ytu, lat: -35.2291622, lng: 149.1110812}
+  - { name: Wjz6yir,stop_code: Wjz6yir, lat: -35.2314837, lng: 149.1098378}
+  - { name: Wjz5mpm,stop_code: Wjz5mpm, lat: -35.2538531, lng: 149.0889493}
+  - { name: Wjz5mxf,stop_code: Wjz5mxf, lat: -35.2538241, lng: 149.0902637}
+  - { name: Wjzd0oD,stop_code: Wjzd0oD, lat: -35.2874406, lng: 149.1552177}
+  - { name: Wjr-MNh,stop_code: Wjr-MNh, lat: -35.2433401, lng: 149.0492618}
+  - { name: Wjr-Mqd,stop_code: Wjr-Mqd, lat: -35.2422956, lng: 149.0448568}
+  - { name: Wjr-N9a,stop_code: Wjr-N9a, lat: -35.2377693, lng: 149.0421213}
+  - { name: Wjr-EYe,stop_code: Wjr-EYe, lat: -35.2408449, lng: 149.0394925}
+  - { name: Wjr-EA_,stop_code: Wjr-EA_, lat: -35.2407288, lng: 149.0362953}
+  - { name: Wjr-EuB,stop_code: Wjr-EuB, lat: -35.2395683, lng: 149.034448}
+  - { name: Wjr-Fw4,stop_code: Wjr-Fw4, lat: -35.2382916, lng: 149.035194}
+  - { name: Wjr-VdI,stop_code: Wjr-VdI, lat: -35.2348097, lng: 149.0539156}
+  - { name: Wjr-Vnf,stop_code: Wjr-Vnf, lat: -35.2331848, lng: 149.054555}
+  - { name: Wjr-Ws2,stop_code: Wjr-Ws2, lat: -35.230167, lng: 149.0557628}
+  - { name: Wjr-PWf,stop_code: Wjr-PWf, lat: -35.225611, lng: 149.0504341}
+  - { name: Wjr-PyX,stop_code: Wjr-PyX, lat: -35.2259882, lng: 149.0472724}
+  - { name: WjrZKZn,stop_code: WjrZKZn, lat: -35.2510294, lng: 149.0396391}
+  - { name: WjrZKnY,stop_code: WjrZKnY, lat: -35.2498968, lng: 149.0336595}
+  - { name: Wjz4S1U,stop_code: Wjz4S1U, lat: -35.2983385, lng: 149.1296979}
+  - { name: Wjz4RbQ,stop_code: Wjz4RbQ, lat: -35.3021238, lng: 149.1308574}
+  - { name: Wjz4IrL,stop_code: Wjz4IrL, lat: -35.307326, lng: 149.1225503}
+  - { name: Wjz4INj,stop_code: Wjz4INj, lat: -35.3091118, lng: 149.1261312}
+  - { name: Wjz3fO2,stop_code: Wjz3fO2, lat: -35.3359729, lng: 149.0817737}
+  - { name: Wjz3fCx,stop_code: Wjz3fCx, lat: -35.333256, lng: 149.0798309}
+  - { name: Wjz4peM,stop_code: Wjz4peM, lat: -35.322342, lng: 149.0979263}
+  - { name: Wjz4qgy,stop_code: Wjz4qgy, lat: -35.3208475, lng: 149.098981}
+  - { name: Wjz4qTw,stop_code: Wjz4qTw, lat: -35.3162151, lng: 149.1045086}
+  - { name: Wjz4qtY,stop_code: Wjz4qtY, lat: -35.3172423, lng: 149.100878}
+  - { name: Wjz4qs0,stop_code: Wjz4qs0, lat: -35.3182278, lng: 149.09964}
+  - { name: Wjz4y7z,stop_code: Wjz4y7z, lat: -35.3159129, lng: 149.1072689}
+  - { name: Wjz4yng,stop_code: Wjz4yng, lat: -35.316172, lng: 149.1095953}
+  - { name: Wjz4yzk,stop_code: Wjz4yzk, lat: -35.3186155, lng: 149.1123352}
+  - { name: Wjz4yGG,stop_code: Wjz4yGG, lat: -35.3194308, lng: 149.1142224}
+  - { name: Wjz4yQ-,stop_code: Wjz4yQ-, lat: -35.3177825, lng: 149.1159796}
+  - { name: Wjz4H0P,stop_code: Wjz4H0P, lat: -35.3152936, lng: 149.1185178}
+  - { name: Wjz4Hbx,stop_code: Wjz4Hbx, lat: -35.3133913, lng: 149.1195724}
+  - { name: Wjz4A7o,stop_code: Wjz4A7o, lat: -35.3052441, lng: 149.107042}
+  - { name: Wjz4z67,stop_code: Wjz4z67, lat: -35.3107704, lng: 149.1065979}
+  - { name: Wjz4A2c,stop_code: Wjz4A2c, lat: -35.3082791, lng: 149.1066534}
+  - { name: Wjz4tUp,stop_code: Wjz4tUp, lat: -35.3044055, lng: 149.1056974}
+  - { name: Wjz4tpE,stop_code: Wjz4tpE, lat: -35.3038329, lng: 149.1005569}
+  - { name: Wjz1HTi,stop_code: Wjz1HTi, lat: -35.4423392, lng: 149.1260397}
+  - { name: Wjz1HOf,stop_code: Wjz1HOf, lat: -35.4453654, lng: 149.1258946}
+  - { name: Wjz1HEb,stop_code: Wjz1HEb, lat: -35.4471149, lng: 149.1245306}
+  - { name: Wjz1GsO,stop_code: Wjz1GsO, lat: -35.4499519, lng: 149.1226442}
+  - { name: Wjz1Gjj,stop_code: Wjz1Gjj, lat: -35.4504956, lng: 149.1205257}
+  - { name: Wjz1rQ6,stop_code: Wjz1rQ6, lat: -35.4440887, lng: 149.1038388}
+  - { name: Wjz1zWz,stop_code: Wjz1zWz, lat: -35.4457437, lng: 149.1168111}
+  - { name: Wjz1zN3,stop_code: Wjz1zN3, lat: -35.4464057, lng: 149.1147796}
+  - { name: Wjz1ySn,stop_code: Wjz1ySn, lat: -35.4481315, lng: 149.1151569}
+  - { name: Wjz1G32,stop_code: Wjz1G32, lat: -35.4506139, lng: 149.1174495}
+  - { name: Wjz1xRC,stop_code: Wjz1xRC, lat: -35.4544199, lng: 149.1154761}
+  - { name: Wjz1xWZ,stop_code: Wjz1xWZ, lat: -35.4565002, lng: 149.1174205}
+  - { name: Wjz1F5W,stop_code: Wjz1F5W, lat: -35.4547272, lng: 149.1186974}
+  - { name: Wjz1G89,stop_code: Wjz1G89, lat: -35.4527651, lng: 149.1190457}
+  - { name: Wjz1CdY,stop_code: Wjz1CdY, lat: -35.4270927, lng: 149.1090734}
+  - { name: Wjz1CD8,stop_code: Wjz1CD8, lat: -35.4260286, lng: 149.1122294}
+  - { name: Wjz1CRl,stop_code: Wjz1CRl, lat: -35.4269745, lng: 149.1151677}
+  - { name: Wjz1K49,stop_code: Wjz1K49, lat: -35.428009, lng: 149.1176708}
+  - { name: Wjz1J4T,stop_code: Wjz1J4T, lat: -35.4330044, lng: 149.1185777}
+  - { name: Wjz1K89,stop_code: Wjz1K89, lat: -35.4308171, lng: 149.1191218}
+  - { name: Wjz1Kiu,stop_code: Wjz1Kiu, lat: -35.4289549, lng: 149.1207905}
+  - { name: Wjz1JD7,stop_code: Wjz1JD7, lat: -35.4309354, lng: 149.1230759}
+  - { name: Wjz1JTP,stop_code: Wjz1JTP, lat: -35.4312901, lng: 149.126776}
+  - { name: Wjz1S2v,stop_code: Wjz1S2v, lat: -35.4289254, lng: 149.1290251}
+  - { name: Wjz1S5I,stop_code: Wjz1S5I, lat: -35.4271223, lng: 149.1292791}
+  - { name: Wjz1SfM,stop_code: Wjz1SfM, lat: -35.4260286, lng: 149.1309478}
+  - { name: Wjz1TgM,stop_code: Wjz1TgM, lat: -35.4253782, lng: 149.1323625}
+  - { name: Wjz1TLL,stop_code: Wjz1TLL, lat: -35.4199685, lng: 149.1361715}
+  - { name: Wjz1LBV,stop_code: Wjz1LBV, lat: -35.4218605, lng: 149.1241279}
+  - { name: Wjz1Lxu,stop_code: Wjz1Lxu, lat: -35.4241367, lng: 149.1234749}
+  - { name: Wjz1Liw,stop_code: Wjz1Liw, lat: -35.4239889, lng: 149.1208993}
+  - { name: Wjz1DWq,stop_code: Wjz1DWq, lat: -35.4238411, lng: 149.1166188}
+  - { name: Wjz1DLm,stop_code: Wjz1DLm, lat: -35.4200572, lng: 149.1136804}
+  - { name: Wjz2wGU,stop_code: Wjz2wGU, lat: -35.4184904, lng: 149.1145873}
+  - { name: Wjz2wY-,stop_code: Wjz2wY-, lat: -35.4166279, lng: 149.1173443}
+  - { name: Wjz2EdX,stop_code: Wjz2EdX, lat: -35.416214, lng: 149.120065}
+  - { name: Wjz2EL2,stop_code: Wjz2EL2, lat: -35.4149132, lng: 149.1244544}
+  - { name: Wjz2EXs,stop_code: Wjz2EXs, lat: -35.4174557, lng: 149.1275741}
+  - { name: Wjz2M5R,stop_code: Wjz2M5R, lat: -35.4160071, lng: 149.129533}
+  - { name: Wjz2MYC,stop_code: Wjz2MYC, lat: -35.4166279, lng: 149.1388559}
+  - { name: Wjz2V0k,stop_code: Wjz2V0k, lat: -35.4140263, lng: 149.1397991}
+  - { name: Wjz2NPZ,stop_code: Wjz2NPZ, lat: -35.4118681, lng: 149.1378765}
+  - { name: Wjz2NH0,stop_code: Wjz2NH0, lat: -35.4123115, lng: 149.1353734}
+  - { name: Wjz2Npv,stop_code: Wjz2Npv, lat: -35.4131394, lng: 149.1331606}
+  - { name: WjrXZz3,stop_code: WjrXZz3, lat: -35.3461161, lng: 149.0570563}
+  - { name: WjrXZiM,stop_code: WjrXZiM, lat: -35.3470777, lng: 149.0553331}
+  - { name: WjrXRW0,stop_code: WjrXRW0, lat: -35.3471147, lng: 149.0502999}
+  - { name: Wjz3nLq,stop_code: Wjz3nLq, lat: -35.3325054, lng: 149.0919265}
+  - { name: Wjz4shf,stop_code: Wjz4shf, lat: -35.3086912, lng: 149.0984092}
+  - { name: Wjz4rk2,stop_code: Wjz4rk2, lat: -35.3126013, lng: 149.0982349}
+  - { name: Wjz4hPC,stop_code: Wjz4hPC, lat: -35.323921, lng: 149.0935136}
+  - { name: Wjz4gou,stop_code: Wjz4gou, lat: -35.3314972, lng: 149.0892541}
+  - { name: Wjz4hMe,stop_code: Wjz4hMe, lat: -35.3259558, lng: 149.0929241}
+  - { name: Wjz4gt5,stop_code: Wjz4gt5, lat: -35.3281248, lng: 149.0887511}
+  - { name: Wjz4h1X,stop_code: Wjz4h1X, lat: -35.3255489, lng: 149.0857143}
+  - { name: Wjz48Q1,stop_code: Wjz48Q1, lat: -35.3291744, lng: 149.0818599}
+  - { name: Wjz49Ui,stop_code: Wjz49Ui, lat: -35.3262888, lng: 149.0835377}
+  - { name: Wjz49Wd,stop_code: Wjz49Wd, lat: -35.324698, lng: 149.0833563}
+  - { name: Wjz49Y5,stop_code: Wjz49Y5, lat: -35.3233291, lng: 149.0831296}
+  - { name: Wjz4aMo,stop_code: Wjz4aMo, lat: -35.3209613, lng: 149.082268}
+  - { name: Wjz4aH6,stop_code: Wjz4aH6, lat: -35.3184453, lng: 149.0804542}
+  - { name: Wjz4arc,stop_code: Wjz4arc, lat: -35.3185933, lng: 149.0779149}
+  - { name: Wjz4a9o,stop_code: Wjz4a9o, lat: -35.3203323, lng: 149.0754663}
+  - { name: Wjz49dp,stop_code: Wjz49dp, lat: -35.3229961, lng: 149.075421}
+  - { name: Wjz499S,stop_code: Wjz499S, lat: -35.3252899, lng: 149.0759651}
+  - { name: Wjz48dZ,stop_code: Wjz48dZ, lat: -35.3281016, lng: 149.0761465}
+  - { name: Wjz48qI,stop_code: Wjz48qI, lat: -35.3302472, lng: 149.0785498}
+  - { name: WjrYUj0,stop_code: WjrYUj0, lat: -35.3299526, lng: 149.0543559}
+  - { name: WjrYUG8,stop_code: WjrYUG8, lat: -35.3306155, lng: 149.058622}
+  - { name: WjrX_SL,stop_code: WjrX_SL, lat: -35.3327937, lng: 149.0607695}
+  - { name: Wjz37Lm,stop_code: Wjz37Lm, lat: -35.3321544, lng: 149.0697369}
+  - { name: Wjz3d3K,stop_code: Wjz3d3K, lat: -35.3459087, lng: 149.0743512}
+  - { name: Wjz3e8l,stop_code: Wjz3e8l, lat: -35.3425473, lng: 149.0752509}
+  - { name: Wjz3ee-,stop_code: Wjz3ee-, lat: -35.3383098, lng: 149.0761505}
+  - { name: Wjz37Zc,stop_code: Wjz37Zc, lat: -35.3337407, lng: 149.0723488}
+  - { name: Wjz3fa8,stop_code: Wjz3fa8, lat: -35.3360845, lng: 149.0750477}
+  - { name: WjrX-Lw,stop_code: WjrX-Lw, lat: -35.3381915, lng: 149.0592024}
+  - { name: WjrX_xY,stop_code: WjrX_xY, lat: -35.3364869, lng: 149.0583028}
+  - { name: WjrX_bF,stop_code: WjrX_bF, lat: -35.3353506, lng: 149.0538045}
+  - { name: WjrX_iU,stop_code: WjrX_iU, lat: -35.3361318, lng: 149.0556038}
+  - { name: WjrX-m2,stop_code: WjrX-m2, lat: -35.3386886, lng: 149.0543559}
+  - { name: WjrX-oT,stop_code: WjrX-oT, lat: -35.3424053, lng: 149.0567937}
+  - { name: WjrX-sE,stop_code: WjrX-sE, lat: -35.3402511, lng: 149.0565615}
+  - { name: WjrX-zT,stop_code: WjrX-zT, lat: -35.3402984, lng: 149.0581286}
+  - { name: Wjz354b,stop_code: Wjz354b, lat: -35.345459, lng: 149.062772}
+  - { name: Wjz1edz,stop_code: Wjz1edz, lat: -35.4271482, lng: 149.0757082}
+  - { name: Wjz1et6,stop_code: Wjz1et6, lat: -35.4269117, lng: 149.0777759}
+  - { name: Wjz1nxQ,stop_code: Wjz1nxQ, lat: -35.4243695, lng: 149.0911255}
+  - { name: Wjz1nzY,stop_code: Wjz1nzY, lat: -35.4229506, lng: 149.0912343}
+  - { name: Wjz1f8Y,stop_code: Wjz1f8Y, lat: -35.4250198, lng: 149.076216}
+  - { name: Wjz1f2H,stop_code: Wjz1f2H, lat: -35.4237487, lng: 149.0744748}
+  - { name: Wjz20Eo,stop_code: Wjz20Eo, lat: -35.4198466, lng: 149.0699766}
+  - { name: Wjz1f7q,stop_code: Wjz1f7q, lat: -35.4203787, lng: 149.0740032}
+  - { name: Wjz20Vv,stop_code: Wjz20Vv, lat: -35.4185754, lng: 149.072661}
+  - { name: Wjz2bHS,stop_code: Wjz2bHS, lat: -35.400824, lng: 149.0814035}
+  - { name: Wjz2aLs,stop_code: Wjz2aLs, lat: -35.4037395, lng: 149.081019}
+  - { name: Wjz2b8J,stop_code: Wjz2b8J, lat: -35.4029944, lng: 149.0757807}
+  - { name: Wjz2a26,stop_code: Wjz2a26, lat: -35.4069683, lng: 149.0736259}
+  - { name: Wjz29Ya,stop_code: Wjz29Ya, lat: -35.4114741, lng: 149.0833189}
+  - { name: Wjz29-5,stop_code: Wjz29-5, lat: -35.4098244, lng: 149.083123}
+  - { name: Wjz2i3o,stop_code: Wjz2i3o, lat: -35.4068322, lng: 149.0850166}
+  - { name: Wjz2aVu,stop_code: Wjz2aVu, lat: -35.4076897, lng: 149.0836236}
+  - { name: Wjz2aGG,stop_code: Wjz2aGG, lat: -35.4073408, lng: 149.0812511}
+  - { name: Wjz2azE,stop_code: Wjz2azE, lat: -35.4068027, lng: 149.0799162}
+  - { name: Wjz2arg,stop_code: Wjz2arg, lat: -35.4068086, lng: 149.0779936}
+  - { name: Wjz2aaw,stop_code: Wjz2aaw, lat: -35.4075241, lng: 149.0756429}
+  - { name: Wjz29ea,stop_code: Wjz29ea, lat: -35.4101319, lng: 149.0751278}
+  - { name: Wjz29yh,stop_code: Wjz29yh, lat: -35.4129642, lng: 149.0794301}
+  - { name: Wjz28DH,stop_code: Wjz28DH, lat: -35.4148504, lng: 149.0799887}
+  - { name: Wjz28Yv,stop_code: Wjz28Yv, lat: -35.4165651, lng: 149.0836163}
+  - { name: Wjz2g6U,stop_code: Wjz2g6U, lat: -35.4157965, lng: 149.0857566}
+  - { name: Wjz2gvd,stop_code: Wjz2gvd, lat: -35.4146612, lng: 149.0888256}
+  - { name: Wjz2haF,stop_code: Wjz2haF, lat: -35.4129406, lng: 149.0867361}
+  - { name: Wjz2hlp,stop_code: Wjz2hlp, lat: -35.4109006, lng: 149.0878896}
+  - { name: Wjz2hBQ,stop_code: Wjz2hBQ, lat: -35.4106404, lng: 149.0911182}
+  - { name: Wjz2iEO,stop_code: Wjz2iEO, lat: -35.40876, lng: 149.0925039}
+  - { name: Wjz2iPv,stop_code: Wjz2iPv, lat: -35.4062172, lng: 149.093302}
+  - { name: Wjz2izK,stop_code: Wjz2izK, lat: -35.4062764, lng: 149.0909078}
+  - { name: Wjz34Gq,stop_code: Wjz34Gq, lat: -35.352423, lng: 149.0699271}
+  - { name: Wjz33LB,stop_code: Wjz33LB, lat: -35.3542352, lng: 149.0701992}
+  - { name: Wjz33CI,stop_code: Wjz33CI, lat: -35.3549749, lng: 149.0689295}
+  - { name: Wjz33KX,stop_code: Wjz33KX, lat: -35.3550858, lng: 149.070698}
+  - { name: Wjz33GY,stop_code: Wjz33GY, lat: -35.3577485, lng: 149.0706526}
+  - { name: Wjz33EK,stop_code: Wjz33EK, lat: -35.3589689, lng: 149.0702445}
+  - { name: WjrXXFn,stop_code: WjrXXFn, lat: -35.3581997, lng: 149.0587995}
+  - { name: WjrXXMe,stop_code: WjrXXMe, lat: -35.3589023, lng: 149.0599784}
+  - { name: WjrXWQ8,stop_code: WjrXWQ8, lat: -35.3621767, lng: 149.0600261}
+  - { name: WjrXWsn,stop_code: WjrXWsn, lat: -35.3616093, lng: 149.055979}
+  - { name: WjrXW7A,stop_code: WjrXW7A, lat: -35.3597972, lng: 149.0523061}
+  - { name: WjrXGDF,stop_code: WjrXGDF, lat: -35.3600413, lng: 149.0360091}
+  - { name: WjrXXb4,stop_code: WjrXXb4, lat: -35.3570754, lng: 149.0530316}
+  - { name: WjrX-FV,stop_code: WjrX-FV, lat: -35.3422149, lng: 149.0596338}
+  - { name: Wjz356k,stop_code: Wjz356k, lat: -35.3440169, lng: 149.0629513}
+  - { name: Wjz35av,stop_code: Wjz35av, lat: -35.3464684, lng: 149.064395}
+  - { name: Wjz358l,stop_code: Wjz358l, lat: -35.3480588, lng: 149.0643043}
+  - { name: Wjz34c4,stop_code: Wjz34c4, lat: -35.3508697, lng: 149.0639869}
+  - { name: Wjz348u,stop_code: Wjz348u, lat: -35.3534586, lng: 149.0644857}
+  - { name: Wjz33nk,stop_code: Wjz33nk, lat: -35.3543462, lng: 149.0657554}
+  - { name: Wjz337w,stop_code: Wjz337w, lat: -35.354642, lng: 149.0633068}
+  - { name: WjrXXK9,stop_code: WjrXXK9, lat: -35.355219, lng: 149.0585637}
+  - { name: WjrXXI2,stop_code: WjrXXI2, lat: -35.3565059, lng: 149.058473}
+  - { name: WjrXXyQ,stop_code: WjrXXyQ, lat: -35.3576967, lng: 149.0580467}
+  - { name: WjrXXq3,stop_code: WjrXXq3, lat: -35.3578077, lng: 149.0557251}
+  - { name: WjrXXd0,stop_code: WjrXXd0, lat: -35.3559956, lng: 149.0529772}
+  - { name: WjrXYL4,stop_code: WjrXYL4, lat: -35.3488355, lng: 149.0584095}
+  - { name: WjrXYtm,stop_code: WjrXYtm, lat: -35.3499821, lng: 149.0560969}
+  - { name: WjrXQZX,stop_code: WjrXQZX, lat: -35.3502779, lng: 149.0514717}
+  - { name: WjrXRks,stop_code: WjrXRks, lat: -35.3453958, lng: 149.0438991}
+  - { name: WjrXR3f,stop_code: WjrXR3f, lat: -35.3458397, lng: 149.040861}
+  - { name: WjrXIDX,stop_code: WjrXIDX, lat: -35.348916, lng: 149.0363428}
+  - { name: WjrXIKK,stop_code: WjrXIKK, lat: -35.3493279, lng: 149.0374035}
+  - { name: WjrXQ65,stop_code: WjrXQ65, lat: -35.349419, lng: 149.040696}
+  - { name: WjrXJfw,stop_code: WjrXJfw, lat: -35.3436463, lng: 149.031771}
+  - { name: WjrXKoe,stop_code: WjrXKoe, lat: -35.3424911, lng: 149.0339533}
+  - { name: WjrXLR-,stop_code: WjrXLR-, lat: -35.3335487, lng: 149.0390846}
+  - { name: WjrXLtK,stop_code: WjrXLtK, lat: -35.3335671, lng: 149.0346289}
+  - { name: WjrXLaD,stop_code: WjrXLaD, lat: -35.3355436, lng: 149.0316183}
+  - { name: WjrYEg0,stop_code: WjrYEg0, lat: -35.3320285, lng: 149.0323493}
+  - { name: WjrYEpn,stop_code: WjrYEpn, lat: -35.3306598, lng: 149.0341649}
+  - { name: WjrYEWc,stop_code: WjrYEWc, lat: -35.3302839, lng: 149.0394086}
+  - { name: WjrYMbF,stop_code: WjrYMbF, lat: -35.3298385, lng: 149.0428712}
+  - { name: WjrYMrj,stop_code: WjrYMrj, lat: -35.3296313, lng: 149.0450622}
+  - { name: WjrYMHm,stop_code: WjrYMHm, lat: -35.3294538, lng: 149.0477466}
+  - { name: WjrYMGB,stop_code: WjrYMGB, lat: -35.3301626, lng: 149.0481758}
+  - { name: WjrXTSe,stop_code: WjrXTSe, lat: -35.3328347, lng: 149.0489873}
+  - { name: WjrX_1g,stop_code: WjrX_1g, lat: -35.336799, lng: 149.0519909}
+  - { name: WjrXTIp,stop_code: WjrXTIp, lat: -35.3346742, lng: 149.0480789}
+  - { name: WjrXTqY,stop_code: WjrXTqY, lat: -35.3357893, lng: 149.0460156}
+  - { name: WjrXTgl,stop_code: WjrXTgl, lat: -35.3370298, lng: 149.0436997}
+  - { name: WjrXKBE,stop_code: WjrXKBE, lat: -35.3395611, lng: 149.0360582}
+  - { name: WjrXLY1,stop_code: WjrXLY1, lat: -35.3346674, lng: 149.0391656}
+  - { name: WjrXLEL,stop_code: WjrXLEL, lat: -35.3369076, lng: 149.0374236}
+  - { name: WjrXLgs,stop_code: WjrXLgs, lat: -35.3371612, lng: 149.0328459}
+  - { name: WjrXKfG,stop_code: WjrXKfG, lat: -35.338018, lng: 149.0318393}
+  - { name: Wjz2ve3,stop_code: Wjz2ve3, lat: -35.3770117, lng: 149.0968721}
+  - { name: Wjz3aaB,stop_code: Wjz3aaB, lat: -35.3631322, lng: 149.0756066}
+  - { name: Wjz39sA,stop_code: Wjz39sA, lat: -35.3673329, lng: 149.0783636}
+  - { name: Wjz39GV,stop_code: Wjz39GV, lat: -35.369019, lng: 149.0816284}
+  - { name: Wjz39PE,stop_code: Wjz39PE, lat: -35.3683683, lng: 149.0827167}
+  - { name: Wjz3h5c,stop_code: Wjz3h5c, lat: -35.3666525, lng: 149.0847118}
+  - { name: Wjz3hu6,stop_code: Wjz3hu6, lat: -35.3658261, lng: 149.0887408}
+  - { name: Wjz3j2F,stop_code: Wjz3j2F, lat: -35.3580142, lng: 149.0853648}
+  - { name: Wjz3it1,stop_code: Wjz3it1, lat: -35.3614164, lng: 149.0886297}
+  - { name: Wjz3iuk,stop_code: Wjz3iuk, lat: -35.3604697, lng: 149.0889561}
+  - { name: Wjzcrp_,stop_code: Wjzcrp_, lat: -35.3142011, lng: 149.1887666}
+  - { name: WjzcrK3,stop_code: WjzcrK3, lat: -35.3111478, lng: 149.190364}
+  - { name: Wjzcuop,stop_code: Wjzcuop, lat: -35.2989647, lng: 149.1881172}
+  - { name: Wjzcuw1,stop_code: Wjzcuw1, lat: -35.2989793, lng: 149.188937}
+  - { name: WjzcBHZ,stop_code: WjzcBHZ, lat: -35.3020154, lng: 149.2024041}
+  - { name: WjzcJ38,stop_code: WjzcJ38, lat: -35.3024713, lng: 149.2056109}
+  - { name: WjzcJ0K,stop_code: WjzcJ0K, lat: -35.3040486, lng: 149.2062653}
+  - { name: Wjzf3oM,stop_code: Wjzf3oM, lat: -35.1836894, lng: 149.1556666}
+  - { name: Wjz7smv,stop_code: Wjz7smv, lat: -35.1734671, lng: 149.0988597}
+  - { name: Wjr_Gxf,stop_code: Wjr_Gxf, lat: -35.1878657, lng: 149.0352296}
+  - { name: Wjr_Es4,stop_code: Wjr_Es4, lat: -35.1970405, lng: 149.0338265}
+  - { name: Wjr_xY9,stop_code: Wjr_xY9, lat: -35.1918291, lng: 149.028508}
+  - { name: Wjr_FTN,stop_code: Wjr_FTN, lat: -35.1897508, lng: 149.038952}
+  - { name: Wjr_xLL,stop_code: Wjr_xLL, lat: -35.1892698, lng: 149.0264062}
+  - { name: Wjr_Ej0,stop_code: Wjr_Ej0, lat: -35.1981116, lng: 149.0323079}
+  - { name: Wjr_xnT,stop_code: Wjr_xnT, lat: -35.1892671, lng: 149.0223682}
+  - { name: Wjr_FXR,stop_code: Wjr_FXR, lat: -35.1922038, lng: 149.0402464}
+  - { name: Wjr_GVA,stop_code: Wjr_GVA, lat: -35.188117, lng: 149.0399446}
+  - { name: Wjr_E1y,stop_code: Wjr_E1y, lat: -35.1992571, lng: 149.0303603}
+  - { name: Wjr_NDY,stop_code: Wjr_NDY, lat: -35.1895167, lng: 149.04724}
+  - { name: Wjr_N-q,stop_code: Wjr_N-q, lat: -35.1903433, lng: 149.0507803}
+  - { name: Wjr_V6V,stop_code: Wjr_V6V, lat: -35.1904467, lng: 149.0528033}
+  - { name: Wjr_Vt9,stop_code: Wjr_Vt9, lat: -35.191134, lng: 149.055871}
+  - { name: Wjr_Vbj,stop_code: Wjr_Vbj, lat: -35.1923583, lng: 149.0533723}
+  - { name: Wjr_V2c,stop_code: Wjr_V2c, lat: -35.192985, lng: 149.0517177}
+  - { name: Wjr_NFt,stop_code: Wjr_NFt, lat: -35.1935465, lng: 149.0479464}
+  - { name: Wjr_NpJ,stop_code: Wjr_NpJ, lat: -35.1935127, lng: 149.0455536}
+  - { name: Wjr_McO,stop_code: Wjr_McO, lat: -35.1972013, lng: 149.0429389}
+  - { name: Wjr_MjV,stop_code: Wjr_MjV, lat: -35.1979805, lng: 149.0445264}
+  - { name: Wjr_MhY,stop_code: Wjr_MhY, lat: -35.1991196, lng: 149.0445095}
+  - { name: Wjr-Tf_,stop_code: Wjr-Tf_, lat: -35.2002734, lng: 149.0432168}
+  - { name: Wjr-Lzm,stop_code: Wjr-Lzm, lat: -35.2030997, lng: 149.0354829}
+  - { name: Wjr-L1H,stop_code: Wjr-L1H, lat: -35.2046871, lng: 149.0304447}
+  - { name: Wjr-DNK,stop_code: Wjr-DNK, lat: -35.2044788, lng: 149.0277602}
+  - { name: Wjr-DQE,stop_code: Wjr-DQE, lat: -35.2029293, lng: 149.0277662}
+  - { name: Wjr-DTC,stop_code: Wjr-DTC, lat: -35.2002855, lng: 149.0276101}
+  - { name: Wjr_wf4,stop_code: Wjr_wf4, lat: -35.1950004, lng: 149.0199737}
+  - { name: Wjr_wm3,stop_code: Wjr_wm3, lat: -35.195762, lng: 149.0214528}
+  - { name: Wjr_wjn,stop_code: Wjr_wjn, lat: -35.1975263, lng: 149.0216638}
+  - { name: Wjr_pVW,stop_code: Wjr_pVW, lat: -35.1938099, lng: 149.0184155}
+  - { name: Wjr_o_j,stop_code: Wjr_o_j, lat: -35.1950629, lng: 149.0175978}
+  - { name: Wjr_oJA,stop_code: Wjr_oJA, lat: -35.1964177, lng: 149.0152805}
+  - { name: Wjr_oP1,stop_code: Wjr_oP1, lat: -35.1980445, lng: 149.0158736}
+  - { name: Wjr-CS2,stop_code: Wjr-CS2, lat: -35.2068071, lng: 149.0268212}
+  - { name: Wjr-vNL,stop_code: Wjr-vNL, lat: -35.2043835, lng: 149.0167621}
+  - { name: Wjr-Df8,stop_code: Wjr-Df8, lat: -35.2008175, lng: 149.0201835}
+  - { name: Wjr-vJY,stop_code: Wjr-vJY, lat: -35.2019113, lng: 149.0157184}
+  - { name: Wjr-uUL,stop_code: Wjr-uUL, lat: -35.210513, lng: 149.0180445}
+  - { name: Wjr-te3,stop_code: Wjr-te3, lat: -35.2122382, lng: 149.0090273}
+  - { name: Wjr-tbm,stop_code: Wjr-tbm, lat: -35.2140927, lng: 149.0093105}
+  - { name: Wjr-thp,stop_code: Wjr-thp, lat: -35.2158247, lng: 149.0109263}
+  - { name: Wjr-smi,stop_code: Wjr-smi, lat: -35.2178617, lng: 149.0106876}
+  - { name: Wjr-sKW,stop_code: Wjr-sKW, lat: -35.2178207, lng: 149.0156953}
+  - { name: Wjr-s_F,stop_code: Wjr-s_F, lat: -35.2172009, lng: 149.0180976}
+  - { name: Wjr-CsO,stop_code: Wjr-CsO, lat: -35.2082115, lng: 149.0237453}
+  - { name: Wjr-BL8,stop_code: Wjr-BL8, lat: -35.2118565, lng: 149.025622}
+  - { name: Wjr-KJQ,stop_code: Wjr-KJQ, lat: -35.2073355, lng: 149.037506}
+  - { name: Wjr-S6B,stop_code: Wjr-S6B, lat: -35.2066123, lng: 149.0412991}
+  - { name: Wjr-S9y,stop_code: Wjr-S9y, lat: -35.2102797, lng: 149.0426899}
+  - { name: Wjr-RnT,stop_code: Wjr-RnT, lat: -35.2112095, lng: 149.0444601}
+  - { name: Wjr-Rs8,stop_code: Wjr-Rs8, lat: -35.2139046, lng: 149.0449606}
+  - { name: Wjr-Q8c,stop_code: Wjr-Q8c, lat: -35.2217975, lng: 149.042121}
+  - { name: Wjr-Pk6,stop_code: Wjr-Pk6, lat: -35.2243699, lng: 149.0432872}
+  - { name: Wjr-AHx,stop_code: Wjr-AHx, lat: -35.2199899, lng: 149.0262529}
+  - { name: Wjr-z_L,stop_code: Wjr-z_L, lat: -35.222191, lng: 149.0291286}
+  - { name: Wjr-zOn,stop_code: Wjr-zOn, lat: -35.2256125, lng: 149.0272189}
+  - { name: Wjr-HbC,stop_code: Wjr-HbC, lat: -35.2250302, lng: 149.0316399}
+  - { name: Wjr-sV3,stop_code: Wjr-sV3, lat: -35.2212162, lng: 149.0172455}
+  - { name: Wjr-sQ8,stop_code: Wjr-sQ8, lat: -35.2193706, lng: 149.0159919}
+  - { name: Wjr-st9,stop_code: Wjr-st9, lat: -35.2186471, lng: 149.0119654}
+  - { name: Wjr-rv7,stop_code: Wjr-rv7, lat: -35.2221818, lng: 149.0117611}
+  - { name: Wjr-kVk,stop_code: Wjr-kVk, lat: -35.2210905, lng: 149.0066193}
+  - { name: Wjr-jRn,stop_code: Wjr-jRn, lat: -35.2235756, lng: 149.0053113}
+  - { name: Wjr-rjD,stop_code: Wjr-rjD, lat: -35.2249706, lng: 149.0111289}
+  - { name: Wjr-rQJ,stop_code: Wjr-rQJ, lat: -35.2244007, lng: 149.0167658}
+  - { name: Wjr-syd,stop_code: Wjr-syd, lat: -35.2203046, lng: 149.0133355}
+  - { name: Wjr-rxG,stop_code: Wjr-rxG, lat: -35.2267918, lng: 149.0140227}
+  - { name: Wjr-jNB,stop_code: Wjr-jNB, lat: -35.2265208, lng: 149.0056756}
+  - { name: Wjr-qcc,stop_code: Wjr-qcc, lat: -35.230013, lng: 149.0092125}
+  - { name: Wjr-qyr,stop_code: Wjr-qyr, lat: -35.2315106, lng: 149.0137011}
+  - { name: Wjr-qZg,stop_code: Wjr-qZg, lat: -35.2296561, lng: 149.0176617}
+  - { name: Wjr-rUs,stop_code: Wjr-rUs, lat: -35.2272548, lng: 149.0178319}
+  - { name: Wjr-rNr,stop_code: Wjr-rNr, lat: -35.226697, lng: 149.016389}
+  - { name: Wjr-zom,stop_code: Wjr-zom, lat: -35.2270626, lng: 149.0231771}
+  - { name: Wjr-zcC,stop_code: Wjr-zcC, lat: -35.2243517, lng: 149.0207165}
+  - { name: Wjr-yni,stop_code: Wjr-yni, lat: -35.2281496, lng: 149.0217011}
+  - { name: Wjr-yrh,stop_code: Wjr-yrh, lat: -35.2309899, lng: 149.0230231}
+  - { name: Wjr-ywh,stop_code: Wjr-ywh, lat: -35.2330631, lng: 149.0245222}
+  - { name: Wjr-yJZ,stop_code: Wjr-yJZ, lat: -35.2292857, lng: 149.0266955}
+  - { name: Wjr-ySy,stop_code: Wjr-ySy, lat: -35.228821, lng: 149.0276438}
+  - { name: Wjr-zWb,stop_code: Wjr-zWb, lat: -35.2259772, lng: 149.0283569}
+  - { name: Wjr-zC9,stop_code: Wjr-zC9, lat: -35.2234474, lng: 149.0242983}
+  - { name: Wjr-G5f,stop_code: Wjr-G5f, lat: -35.2290792, lng: 149.0298564}
+  - { name: Wjr-GeX,stop_code: Wjr-GeX, lat: -35.2287693, lng: 149.0321955}
+  - { name: Wjr-xLK,stop_code: Wjr-xLK, lat: -35.2332476, lng: 149.0263679}
+  - { name: Wjr-xRd,stop_code: Wjr-xRd, lat: -35.2347078, lng: 149.0270748}
+  - { name: Wjr-xxu,stop_code: Wjr-xxu, lat: -35.2373929, lng: 149.0246092}
+  - { name: Wjr-wDP,stop_code: Wjr-wDP, lat: -35.2389936, lng: 149.0252414}
+  - { name: Wjr-Ekp,stop_code: Wjr-Ekp, lat: -35.2412759, lng: 149.032879}
+  - { name: Wjr-Gsq,stop_code: Wjr-Gsq, lat: -35.2301636, lng: 149.0342818}
+  - { name: Wjr-GyJ,stop_code: Wjr-GyJ, lat: -35.2312775, lng: 149.0359574}
+  - { name: Wjr-GFM,stop_code: Wjr-GFM, lat: -35.2324613, lng: 149.03753}
+  - { name: Wjr-F_m,stop_code: Wjr-F_m, lat: -35.233261, lng: 149.039515}
+  - { name: Wjr-FCU,stop_code: Wjr-FCU, lat: -35.2344506, lng: 149.0363984}
+  - { name: Wjr-Fzd,stop_code: Wjr-Fzd, lat: -35.2360739, lng: 149.0353153}
+  - { name: Wjr-E8A,stop_code: Wjr-E8A, lat: -35.2437543, lng: 149.031741}
+  - { name: WjrZLdA,stop_code: WjrZLdA, lat: -35.245805, lng: 149.0316615}
+  - { name: WjrZSKp,stop_code: WjrZSKp, lat: -35.2509203, lng: 149.0480636}
+  - { name: WjrZSWs,stop_code: WjrZSWs, lat: -35.2533983, lng: 149.050782}
+  - { name: Wjr-MCk,stop_code: Wjr-MCk, lat: -35.2396029, lng: 149.0464162}
+  - { name: Wjr-M-x,stop_code: Wjr-M-x, lat: -35.2399127, lng: 149.0508416}
+  - { name: WjrZ-aT,stop_code: WjrZ-aT, lat: -35.2531402, lng: 149.053943}
+  - { name: WjrZZeD,stop_code: WjrZZeD, lat: -35.2558247, lng: 149.0536901}
+  - { name: WjrZZlR,stop_code: WjrZZlR, lat: -35.2567539, lng: 149.055397}
+  - { name: WjrZZH3,stop_code: WjrZZH3, lat: -35.2583026, lng: 149.0584315}
+  - { name: Wjz54mj,stop_code: Wjz54mj, lat: -35.2617096, lng: 149.0656385}
+  - { name: Wjz55vN,stop_code: Wjz55vN, lat: -35.2557214, lng: 149.0677248}
+  - { name: Wjz557P,stop_code: Wjz557P, lat: -35.2555149, lng: 149.0636155}
+  - { name: WjrZ-WW,stop_code: WjrZ-WW, lat: -35.2535016, lng: 149.0623511}
+  - { name: WjrZ-GZ,stop_code: WjrZ-GZ, lat: -35.2532951, lng: 149.0596327}
+  - { name: WjrZ-Jc,stop_code: WjrZ-Jc, lat: -35.2513107, lng: 149.058664}
+  - { name: WjrZ_Fk,stop_code: WjrZ_Fk, lat: -35.2485228, lng: 149.0588536}
+  - { name: Wjz57tg,stop_code: Wjz57tg, lat: -35.2461188, lng: 149.0669661}
+  - { name: Wjz57Q7,stop_code: Wjz57Q7, lat: -35.2462221, lng: 149.0708857}
+  - { name: Wjz57T_,stop_code: Wjz57T_, lat: -35.2441569, lng: 149.0719751}
+  - { name: Wjz5f2j,stop_code: Wjz5f2j, lat: -35.2479775, lng: 149.0739202}
+  - { name: Wjz5fm2,stop_code: Wjz5fm2, lat: -35.2452775, lng: 149.0763507}
+  - { name: Wjz688N,stop_code: Wjz688N, lat: -35.2439868, lng: 149.0759082}
+  - { name: Wjz68g-,stop_code: Wjz68g-, lat: -35.2436119, lng: 149.0775571}
+  - { name: Wjz5nUz,stop_code: Wjz5nUz, lat: -35.2493715, lng: 149.094909}
+  - { name: Wjz5vjd,stop_code: Wjz5vjd, lat: -35.2470998, lng: 149.0983861}
+  - { name: Wjz5v68,stop_code: Wjz5v68, lat: -35.2454993, lng: 149.0956677}
+  - { name: Wjz6gUM,stop_code: Wjz6gUM, lat: -35.2441052, lng: 149.0951619}
+  - { name: Wjz6gQ0,stop_code: Wjz6gQ0, lat: -35.2413491, lng: 149.0928379}
+  - { name: Wjz6gJc,stop_code: Wjz6gJc, lat: -35.2402968, lng: 149.0916132}
+  - { name: Wjz5vrT,stop_code: Wjz5vrT, lat: -35.2469189, lng: 149.1007523}
+  - { name: Wjz6oEz,stop_code: Wjz6oEz, lat: -35.243821, lng: 149.1030282}
+  - { name: Wjz6oJz,stop_code: Wjz6oJz, lat: -35.2403705, lng: 149.1030403}
+  - { name: Wjz7pfP,stop_code: Wjz7pfP, lat: -35.189616, lng: 149.0978803}
+  - { name: Wjz7p2n,stop_code: Wjz7p2n, lat: -35.1926501, lng: 149.0958323}
+  - { name: Wjz7hZW,stop_code: Wjz7hZW, lat: -35.1910485, lng: 149.0953265}
+  - { name: Wjz7iV0,stop_code: Wjz7iV0, lat: -35.1885169, lng: 149.0941253}
+  - { name: Wjz7iG_,stop_code: Wjz7iG_, lat: -35.1872252, lng: 149.0926713}
+  - { name: Wjz7iKx,stop_code: Wjz7iKx, lat: -35.1849518, lng: 149.0920391}
+  - { name: Wjz7ilp,stop_code: Wjz7ilp, lat: -35.1856235, lng: 149.0877402}
+  - { name: Wjz7i7r,stop_code: Wjz7i7r, lat: -35.1841251, lng: 149.0850218}
+  - { name: Wjz7jaJ,stop_code: Wjz7jaJ, lat: -35.1819033, lng: 149.0868551}
+  - { name: Wjz7jsi,stop_code: Wjz7jsi, lat: -35.1807665, lng: 149.0890046}
+  - { name: Wjz7jW4,stop_code: Wjz7jW4, lat: -35.181955, lng: 149.0941886}
+  - { name: Wjz7qfu,stop_code: Wjz7qfu, lat: -35.1838151, lng: 149.0974127}
+  - { name: Wjz7qvq,stop_code: Wjz7qvq, lat: -35.1841768, lng: 149.1001944}
+  - { name: Wjz7rzg,stop_code: Wjz7rzg, lat: -35.1815933, lng: 149.1014588}
+  - { name: Wjz7qkM,stop_code: Wjz7qkM, lat: -35.1864502, lng: 149.0992461}
+  - { name: Wjz7qwq,stop_code: Wjz7qwq, lat: -35.1890336, lng: 149.101522}
+  - { name: Wjz7pkV,stop_code: Wjz7pkV, lat: -35.1918235, lng: 149.0995622}
+  - { name: Wjz7rOj,stop_code: Wjz7rOj, lat: -35.1820066, lng: 149.104114}
+  - { name: Wjz7rMm,stop_code: Wjz7rMm, lat: -35.1831434, lng: 149.104114}
+  - { name: Wjz7qSX,stop_code: Wjz7qSX, lat: -35.1847968, lng: 149.1050623}
+  - { name: Wjz7q-_,stop_code: Wjz7q-_, lat: -35.1844351, lng: 149.1063899}
+  - { name: Wjz7yfG,stop_code: Wjz7yfG, lat: -35.1841768, lng: 149.108729}
+  - { name: Wjz7r-a,stop_code: Wjz7r-a, lat: -35.1793714, lng: 149.1053784}
+  - { name: Wjz7rRa,stop_code: Wjz7rRa, lat: -35.1800948, lng: 149.1039243}
+  - { name: Wjz7Add,stop_code: Wjz7Add, lat: -35.1743073, lng: 149.10816}
+  - { name: Wjz7B0w,stop_code: Wjz7B0w, lat: -35.1727054, lng: 149.107275}
+  - { name: Wjz7tOr,stop_code: Wjz7tOr, lat: -35.1710517, lng: 149.1042404}
+  - { name: Wjz7txI,stop_code: Wjz7txI, lat: -35.1716718, lng: 149.1018381}
+  - { name: Wjz7thn,stop_code: Wjz7thn, lat: -35.1713618, lng: 149.0985507}
+  - { name: Wjz7tug,stop_code: Wjz7tug, lat: -35.1685711, lng: 149.0999415}
+  - { name: Wjz7tvK,stop_code: Wjz7tvK, lat: -35.1673308, lng: 149.1005105}
+  - { name: Wjz7uxi,stop_code: Wjz7uxi, lat: -35.1663489, lng: 149.1013956}
+  - { name: Wjz7tLG,stop_code: Wjz7tLG, lat: -35.1677443, lng: 149.1032921}
+  - { name: Wjz7tIt,stop_code: Wjz7tIt, lat: -35.169553, lng: 149.1029128}
+  - { name: Wjz7Bg7,stop_code: Wjz7Bg7, lat: -35.1720853, lng: 149.109298}
+  - { name: Wjz7BqG,stop_code: Wjz7BqG, lat: -35.1711551, lng: 149.1115106}
+  - { name: Wjz7BsE,stop_code: Wjz7BsE, lat: -35.1699148, lng: 149.1115106}
+  - { name: Wjz7BC3,stop_code: Wjz7BC3, lat: -35.1683127, lng: 149.1120164}
+  - { name: Wjz7BJK,stop_code: Wjz7BJK, lat: -35.1687262, lng: 149.1142923}
+  - { name: Wjz7BST,stop_code: Wjz7BST, lat: -35.167951, lng: 149.1157463}
+  - { name: Wjz7BED,stop_code: Wjz7BED, lat: -35.1720853, lng: 149.1141026}
+  - { name: Wjz7BWN,stop_code: Wjz7BWN, lat: -35.1712067, lng: 149.1171372}
+  - { name: Wjz7AJS,stop_code: Wjz7AJS, lat: -35.174204, lng: 149.1143555}
+  - { name: Wjz7AGv,stop_code: Wjz7AGv, lat: -35.1762193, lng: 149.113913}
+  - { name: Wjz7AEw,stop_code: Wjz7AEw, lat: -35.1781829, lng: 149.1141659}
+  - { name: Wjz7zzB,stop_code: Wjz7zzB, lat: -35.1811799, lng: 149.1126486}
+  - { name: Wjz7CqJ,stop_code: Wjz7CqJ, lat: -35.1654186, lng: 149.1114474}
+  - { name: Wjz7CA3,stop_code: Wjz7CA3, lat: -35.16423, lng: 149.1119532}
+  - { name: Wjz7CD7,stop_code: Wjz7CD7, lat: -35.1617492, lng: 149.1119532}
+  - { name: Wjz7CKg,stop_code: Wjz7CKg, lat: -35.1630413, lng: 149.1137233}
+  - { name: Wjz7IDY,stop_code: Wjz7IDY, lat: -35.1730154, lng: 149.1242809}
+  - { name: Wjz7If2,stop_code: Wjz7If2, lat: -35.1732221, lng: 149.1188441}
+  - { name: Wjz7Ikc,stop_code: Wjz7Ikc, lat: -35.1750825, lng: 149.1204878}
+  - { name: Wjz7Iax,stop_code: Wjz7Iax, lat: -35.1766844, lng: 149.1196027}
+  - { name: Wjz7HfF,stop_code: Wjz7HfF, lat: -35.178803, lng: 149.1197924}
+  - { name: Wjz7IoZ,stop_code: Wjz7IoZ, lat: -35.1777695, lng: 149.1227637}
+  - { name: Wjz7IFg,stop_code: Wjz7IFg, lat: -35.1774595, lng: 149.1246602}
+  - { name: Wjz7IuJ,stop_code: Wjz7IuJ, lat: -35.1736356, lng: 149.1225108}
+  - { name: Wjz7JP1,stop_code: Wjz7JP1, lat: -35.1705349, lng: 149.1257982}
+  - { name: Wjz7J-7,stop_code: Wjz7J-7, lat: -35.167951, lng: 149.1270626}
+  - { name: Wjz7R6d,stop_code: Wjz7R6d, lat: -35.1681577, lng: 149.1286431}
+  - { name: Wjz7R5z,stop_code: Wjz7R5z, lat: -35.1690363, lng: 149.1291488}
+  - { name: Wjz7RdE,stop_code: Wjz7RdE, lat: -35.169243, lng: 149.1307293}
+  - { name: Wjz7RHe,stop_code: Wjz7RHe, lat: -35.1700698, lng: 149.135534}
+  - { name: Wjz7SN-,stop_code: Wjz7SN-, lat: -35.1660013, lng: 149.1378981}
+  - { name: Wjz7Y0J,stop_code: Wjz7Y0J, lat: -35.177732, lng: 149.1403005}
+  - { name: Wjz7PIc,stop_code: Wjz7PIc, lat: -35.1805599, lng: 149.135534}
+  - { name: Wjz7Pjj,stop_code: Wjz7Pjj, lat: -35.1813349, lng: 149.1316144}
+  - { name: Wjz7GSc,stop_code: Wjz7GSc, lat: -35.1847451, lng: 149.1258614}
+  - { name: Wjz7yNW,stop_code: Wjz7yNW, lat: -35.1883262, lng: 149.1159763}
+  - { name: Wjz7Ppw,stop_code: Wjz7Ppw, lat: -35.1829884, lng: 149.1332581}
+  - { name: Wjz7OBc,stop_code: Wjz7OBc, lat: -35.1853732, lng: 149.1341431}
+  - { name: Wjz7PNV,stop_code: Wjz7PNV, lat: -35.1828992, lng: 149.1380246}
+  - { name: Wjz7X2n,stop_code: Wjz7X2n, lat: -35.1817108, lng: 149.1398579}
+  - { name: Wjz7X3O,stop_code: Wjz7X3O, lat: -35.1814007, lng: 149.1404901}
+  - { name: Wjz7Xiv,stop_code: Wjz7Xiv, lat: -35.1817108, lng: 149.1427028}
+  - { name: Wjz7XxD,stop_code: Wjz7XxD, lat: -35.1823825, lng: 149.1457373}
+  - { name: Wjzf31y,stop_code: Wjzf31y, lat: -35.1828475, lng: 149.151111}
+  - { name: Wjzf2hJ,stop_code: Wjzf2hJ, lat: -35.1880144, lng: 149.154019}
+  - { name: Wjzf2rm,stop_code: Wjzf2rm, lat: -35.1865677, lng: 149.1549041}
+  - { name: Wjzf1X3,stop_code: Wjzf1X3, lat: -35.1923543, lng: 149.1600249}
+  - { name: Wjzf91m,stop_code: Wjzf91m, lat: -35.1934909, lng: 149.1618582}
+  - { name: Wjzf0ZL,stop_code: Wjzf0ZL, lat: -35.1961257, lng: 149.1609099}
+  - { name: Wjzf0EJ,stop_code: Wjzf0EJ, lat: -35.1997419, lng: 149.1581283}
+  - { name: Wjze7Cp,stop_code: Wjze7Cp, lat: -35.2014466, lng: 149.1565478}
+  - { name: Wjz6_vY,stop_code: Wjz6_vY, lat: -35.2004651, lng: 149.1448522}
+  - { name: Wjz6_7M,stop_code: Wjz6_7M, lat: -35.2008784, lng: 149.1404901}
+  - { name: Wjz6TZN,stop_code: Wjz6TZN, lat: -35.2021182, lng: 149.1392257}
+  - { name: Wjz7Oal,stop_code: Wjz7Oal, lat: -35.1873286, lng: 149.1301603}
+  - { name: Wjz7GPB,stop_code: Wjz7GPB, lat: -35.1867085, lng: 149.1264936}
+  - { name: Wjz7Gxm,stop_code: Wjz7Gxm, lat: -35.188002, lng: 149.1234035}
+  - { name: Wjz7Fmf,stop_code: Wjz7Fmf, lat: -35.1899217, lng: 149.1203537}
+  - { name: Wjz7F5C,stop_code: Wjz7F5C, lat: -35.1906966, lng: 149.118141}
+  - { name: Wjz7xO6,stop_code: Wjz7xO6, lat: -35.1928051, lng: 149.1147348}
+  - { name: Wjz7xJz,stop_code: Wjz7xJz, lat: -35.191011, lng: 149.1141277}
+  - { name: Wjz7wZg,stop_code: Wjz7wZg, lat: -35.1967555, lng: 149.1165529}
+  - { name: Wjz7E3Z,stop_code: Wjz7E3Z, lat: -35.1976337, lng: 149.1187656}
+  - { name: Wjz7EjH,stop_code: Wjz7EjH, lat: -35.1978404, lng: 149.1211679}
+  - { name: Wjz7Ezf,stop_code: Wjz7Ezf, lat: -35.1975304, lng: 149.1231277}
+  - { name: Wjz7EJ7,stop_code: Wjz7EJ7, lat: -35.1960839, lng: 149.1244553}
+  - { name: Wjz7FNw,stop_code: Wjz7FNw, lat: -35.193955, lng: 149.126474}
+  - { name: Wjz6-16,stop_code: Wjz6-16, lat: -35.20994, lng: 149.1394383}
+  - { name: Wjz6RQW,stop_code: Wjz6RQW, lat: -35.2136848, lng: 149.1379368}
+  - { name: Wjz6Zb2,stop_code: Wjz6Zb2, lat: -35.214395, lng: 149.1408607}
+  - { name: Wjz6Z8D,stop_code: Wjz6Z8D, lat: -35.216009, lng: 149.1414929}
+  - { name: Wjz6QTd,stop_code: Wjz6QTd, lat: -35.2168483, lng: 149.1369095}
+  - { name: Wjz6QPM,stop_code: Wjz6QPM, lat: -35.2200763, lng: 149.1377788}
+  - { name: Wjz6Yc1,stop_code: Wjz6Yc1, lat: -35.2193016, lng: 149.1407817}
+  - { name: Wjz6Yaq,stop_code: Wjz6Yaq, lat: -35.2205928, lng: 149.1414139}
+  - { name: Wjz6YiM,stop_code: Wjz6YiM, lat: -35.2207864, lng: 149.1433105}
+  - { name: Wjz6XiO,stop_code: Wjz6XiO, lat: -35.226071, lng: 149.143256}
+  - { name: Wjz6Wse,stop_code: Wjz6Wse, lat: -35.2298796, lng: 149.1438091}
+  - { name: Wjze2eG,stop_code: Wjze2eG, lat: -35.2288072, lng: 149.1527323}
+  - { name: Wjze3gN,stop_code: Wjze3gN, lat: -35.2275265, lng: 149.154199}
+  - { name: Wjze3Fa,stop_code: Wjze3Fa, lat: -35.2267416, lng: 149.1575876}
+  - { name: Wjze3Vq,stop_code: Wjze3Vq, lat: -35.2267416, lng: 149.1606727}
+  - { name: Wjzebjj,stop_code: Wjzebjj, lat: -35.2253369, lng: 149.1645164}
+  - { name: Wjzeaq_,stop_code: Wjzeaq_, lat: -35.2311306, lng: 149.1668636}
+  - { name: Wjze8v0,stop_code: Wjze8v0, lat: -35.2393099, lng: 149.1654981}
+  - { name: Wjze8bf,stop_code: Wjze8bf, lat: -35.2414165, lng: 149.1630705}
+  - { name: Wjze0VY,stop_code: Wjze0VY, lat: -35.2430274, lng: 149.1613003}
+  - { name: Wjze0Pi,stop_code: Wjze0Pi, lat: -35.2418709, lng: 149.1591256}
+  - { name: Wjze0vR,stop_code: Wjze0vR, lat: -35.2388968, lng: 149.1555853}
+  - { name: Wjze1hB,stop_code: Wjze1hB, lat: -35.2374923, lng: 149.1539669}
+  - { name: Wjze1c2,stop_code: Wjze1c2, lat: -35.2356747, lng: 149.1518427}
+  - { name: Wjze17N,stop_code: Wjze17N, lat: -35.2336919, lng: 149.1515898}
+  - { name: Wjze1gi,stop_code: Wjze1gi, lat: -35.2384424, lng: 149.1535117}
+  - { name: Wjz6UYK,stop_code: Wjz6UYK, lat: -35.2407969, lng: 149.1499714}
+  - { name: Wjz6UQw,stop_code: Wjz6UQw, lat: -35.2413339, lng: 149.1484036}
+  - { name: Wjz6Upu,stop_code: Wjz6Upu, lat: -35.2429035, lng: 149.1442058}
+  - { name: Wjz6Ugw,stop_code: Wjz6Ugw, lat: -35.2441014, lng: 149.142992}
+  - { name: Wjz5_mg,stop_code: Wjz5_mg, lat: -35.2454644, lng: 149.1425874}
+  - { name: Wjz5_ie,stop_code: Wjz5_ie, lat: -35.2476948, lng: 149.1423851}
+  - { name: Wjz5_y0,stop_code: Wjz5_y0, lat: -35.2482318, lng: 149.1449139}
+  - { name: Wjz5_O4,stop_code: Wjz5_O4, lat: -35.24786, lng: 149.147645}
+  - { name: Wjzd73N,stop_code: Wjzd73N, lat: -35.2474057, lng: 149.1515393}
+  - { name: Wjzd7sL,stop_code: Wjzd7sL, lat: -35.2462079, lng: 149.1554841}
+  - { name: Wjzd7LX,stop_code: Wjzd7LX, lat: -35.2445144, lng: 149.1586198}
+  - { name: Wjzd7_6,stop_code: Wjzd7_6, lat: -35.2443079, lng: 149.1601371}
+  - { name: Wjzdfaz,stop_code: Wjzdfaz, lat: -35.2479426, lng: 149.1635256}
+  - { name: WjzdeeQ,stop_code: WjzdeeQ, lat: -35.2506237, lng: 149.1639253}
+  - { name: Wjzd6XP,stop_code: Wjzd6XP, lat: -35.2527713, lng: 149.1610527}
+  - { name: Wjzd6Pn,stop_code: Wjzd6Pn, lat: -35.2524079, lng: 149.1590701}
+  - { name: Wjzd6Cq,stop_code: Wjzd6Cq, lat: -35.2507889, lng: 149.1563997}
+  - { name: Wjzd6lW,stop_code: Wjzd6lW, lat: -35.2515158, lng: 149.1544172}
+  - { name: Wjzd6iW,stop_code: Wjzd6iW, lat: -35.2535643, lng: 149.1544576}
+  - { name: Wjzd68O,stop_code: Wjzd68O, lat: -35.254952, lng: 149.1528797}
+  - { name: Wjz5ZZQ,stop_code: Wjz5ZZQ, lat: -35.2567691, lng: 149.1500474}
+  - { name: Wjz5ZO1,stop_code: Wjz5ZO1, lat: -35.2591479, lng: 149.1477412}
+  - { name: Wjz5-5y,stop_code: Wjz5-5y, lat: -35.2514497, lng: 149.1400942}
+  - { name: Wjz5SWN,stop_code: Wjz5SWN, lat: -35.2535974, lng: 149.1390827}
+  - { name: Wjz5Z5c,stop_code: Wjz5Z5c, lat: -35.2568022, lng: 149.1396491}
+  - { name: Wjz5Za5,stop_code: Wjz5Za5, lat: -35.2588175, lng: 149.1409439}
+  - { name: Wjz5YfD,stop_code: Wjz5YfD, lat: -35.2606676, lng: 149.1416317}
+  - { name: Wjz5YKO,stop_code: Wjz5YKO, lat: -35.2618095, lng: 149.1473796}
+  - { name: Wjz5YAK,stop_code: Wjz5YAK, lat: -35.2627902, lng: 149.1458623}
+  - { name: Wjz5Yq4,stop_code: Wjz5Yq4, lat: -35.2643388, lng: 149.1435864}
+  - { name: Wjz5XnQ,stop_code: Wjz5XnQ, lat: -35.2664452, lng: 149.1432384}
+  - { name: Wjz5XrS,stop_code: Wjz5XrS, lat: -35.2689744, lng: 149.1446925}
+  - { name: Wjz5XwW,stop_code: Wjz5XwW, lat: -35.2714003, lng: 149.1461465}
+  - { name: Wjz5W3H,stop_code: Wjz5W3H, lat: -35.2747063, lng: 149.1403907}
+  - { name: Wjz5W8l,stop_code: Wjz5W8l, lat: -35.276623, lng: 149.1411209}
+  - { name: Wjz5Ycz,stop_code: Wjz5Ycz, lat: -35.2631, lng: 149.1415634}
+  - { name: Wjz5Y1_,stop_code: Wjz5Y1_, lat: -35.2648034, lng: 149.1406151}
+  - { name: Wjz5QUd,stop_code: Wjz5QUd, lat: -35.2656089, lng: 149.1383392}
+  - { name: Wjz5PLJ,stop_code: Wjz5PLJ, lat: -35.2663315, lng: 149.136253}
+  - { name: Wjz5PBC,stop_code: Wjz5PBC, lat: -35.2675907, lng: 149.1347357}
+  - { name: Wjz5Pwn,stop_code: Wjz5Pwn, lat: -35.2709457, lng: 149.1344196}
+  - { name: Wjz5OLh,stop_code: Wjz5OLh, lat: -35.2721844, lng: 149.135684}
+  - { name: Wjz5OIf,stop_code: Wjz5OIf, lat: -35.2737328, lng: 149.1354944}
+  - { name: Wjz5OOo,stop_code: Wjz5OOo, lat: -35.2757106, lng: 149.1372297}
+  - { name: Wjz5V64,stop_code: Wjz5V64, lat: -35.2780918, lng: 149.1394963}
+  - { name: Wjz5NRJ,stop_code: Wjz5NRJ, lat: -35.2787111, lng: 149.1375365}
+  - { name: Wjz5NHD,stop_code: Wjz5NHD, lat: -35.2798744, lng: 149.1361266}
+  - { name: Wjz5Vls,stop_code: Wjz5Vls, lat: -35.2787911, lng: 149.1427895}
+  - { name: Wjz5VAq,stop_code: Wjz5VAq, lat: -35.2796604, lng: 149.14553}
+  - { name: Wjz5VFA,stop_code: Wjz5VFA, lat: -35.2815441, lng: 149.146984}
+  - { name: Wjz5VUU,stop_code: Wjz5VUU, lat: -35.2825429, lng: 149.15037}
+  - { name: Wjzd0CK,stop_code: Wjzd0CK, lat: -35.283446, lng: 149.156771}
+  - { name: Wjzd8br,stop_code: Wjzd8br, lat: -35.2857037, lng: 149.16333}
+  - { name: Wjzd0yM,stop_code: Wjzd0yM, lat: -35.2866868, lng: 149.1570161}
+  - { name: Wjzc7nq,stop_code: Wjzc7nq, lat: -35.2885152, lng: 149.1537353}
+  - { name: Wjzd02s,stop_code: Wjzd02s, lat: -35.286331, lng: 149.1509776}
+  - { name: Wjz5UHK,stop_code: Wjz5UHK, lat: -35.2854924, lng: 149.1472635}
+  - { name: Wjz5Urj,stop_code: Wjz5Urj, lat: -35.285706, lng: 149.144029}
+  - { name: Wjz5Vg4,stop_code: Wjz5Vg4, lat: -35.2821666, lng: 149.1422877}
+  - { name: Wjzd0EU,stop_code: Wjzd0EU, lat: -35.2880133, lng: 149.158501}
+  - { name: Wjzc7Ay,stop_code: Wjzc7Ay, lat: -35.2905765, lng: 149.1566757}
+  - { name: Wjzc7si,stop_code: Wjzc7si, lat: -35.2905765, lng: 149.1549056}
+  - { name: Wjzc7bs,stop_code: Wjzc7bs, lat: -35.2911202, lng: 149.1523397}
+  - { name: Wjz4_Oj,stop_code: Wjz4_Oj, lat: -35.2918933, lng: 149.1481428}
+  - { name: Wjz4_wS,stop_code: Wjz4_wS, lat: -35.2930129, lng: 149.145973}
+  - { name: Wjz4_jm,stop_code: Wjz4_jm, lat: -35.2909901, lng: 149.1425844}
+  - { name: Wjz4T-X,stop_code: Wjz4T-X, lat: -35.2891325, lng: 149.1393476}
+  - { name: Wjz5MEL,stop_code: Wjz5MEL, lat: -35.2874399, lng: 149.1362625}
+  - { name: Wjzce4H,stop_code: Wjzce4H, lat: -35.2960675, lng: 149.1623594}
+  - { name: WjzceHt,stop_code: WjzceHt, lat: -35.2965216, lng: 149.168833}
+  - { name: WjzceFT,stop_code: WjzceFT, lat: -35.2977187, lng: 149.1693894}
+  - { name: WjzcdDs,stop_code: WjzcdDs, lat: -35.299411, lng: 149.1675181}
+  - { name: Wjzcdsn,stop_code: Wjzcdsn, lat: -35.3011446, lng: 149.1659502}
+  - { name: Wjzcdi7,stop_code: Wjzcdi7, lat: -35.3025893, lng: 149.1642813}
+  - { name: Wjzcd8D,stop_code: Wjzcd8D, lat: -35.3039101, lng: 149.1635732}
+  - { name: Wjzcd2U,stop_code: Wjzcd2U, lat: -35.3031671, lng: 149.1626628}
+  - { name: Wjzc59p,stop_code: Wjzc59p, lat: -35.3037863, lng: 149.1523455}
+  - { name: Wjzc45R,stop_code: Wjzc45R, lat: -35.3061389, lng: 149.1514351}
+  - { name: Wjz4WnH,stop_code: Wjz4WnH, lat: -35.3159201, lng: 149.1430396}
+  - { name: Wjz4VKr,stop_code: Wjz4VKr, lat: -35.3221513, lng: 149.1468833}
+  - { name: Wjz4VRQ,stop_code: Wjz4VRQ, lat: -35.3226878, lng: 149.148704}
+  - { name: Wjz4Ofi,stop_code: Wjz4Ofi, lat: -35.3160439, lng: 149.1301934}
+  - { name: Wjz4FEJ,stop_code: Wjz4FEJ, lat: -35.3260887, lng: 149.125286}
+  - { name: Wjz4ECF,stop_code: Wjz4ECF, lat: -35.3278218, lng: 149.1238193}
+  - { name: Wjz4EG2,stop_code: Wjz4EG2, lat: -35.3304213, lng: 149.1244262}
+  - { name: Wjz3LP9,stop_code: Wjz3LP9, lat: -35.3353724, lng: 149.1259941}
+  - { name: Wjz3LN9,stop_code: Wjz3LN9, lat: -35.3367339, lng: 149.1259435}
+  - { name: Wjz3KLn,stop_code: Wjz3KLn, lat: -35.3376003, lng: 149.1247297}
+  - { name: Wjz4MAz,stop_code: Wjz4MAz, lat: -35.3290192, lng: 149.1346333}
+  - { name: Wjz4NWF,stop_code: Wjz4NWF, lat: -35.3250038, lng: 149.138898}
+  - { name: Wjz4Ue5,stop_code: Wjz4Ue5, lat: -35.327397, lng: 149.140921}
+  - { name: Wjz4Ujk,stop_code: Wjz4Ujk, lat: -35.3295839, lng: 149.1425394}
+  - { name: Wjz3_sf,stop_code: Wjz3_sf, lat: -35.3341586, lng: 149.1437982}
+  - { name: Wjz3_Ji,stop_code: Wjz3_Ji, lat: -35.3339111, lng: 149.146681}
+  - { name: Wjz4UwD,stop_code: Wjz4UwD, lat: -35.3313913, lng: 149.1456952}
+  - { name: Wjz4UIv,stop_code: Wjz4UIv, lat: -35.328635, lng: 149.1467867}
+  - { name: Wjz4VEF,stop_code: Wjz4VEF, lat: -35.3264205, lng: 149.1472235}
+  - { name: Wjzc1n0,stop_code: Wjzc1n0, lat: -35.3216636, lng: 149.1532292}
+  - { name: Wjz4UYU,stop_code: Wjz4UYU, lat: -35.3292631, lng: 149.1503427}
+  - { name: Wjzc090,stop_code: Wjzc090, lat: -35.3312849, lng: 149.15186}
+  - { name: Wjzb7nW,stop_code: Wjzb7nW, lat: -35.3324815, lng: 149.1544899}
+  - { name: Wjz3KB0,stop_code: Wjz3KB0, lat: -35.3395291, lng: 149.1229469}
+  - { name: Wjz3Kxb,stop_code: Wjz3Kxb, lat: -35.342056, lng: 149.1231366}
+  - { name: Wjz3JDp,stop_code: Wjz3JDp, lat: -35.3435515, lng: 149.1235159}
+  - { name: Wjz3JJs,stop_code: Wjz3JJs, lat: -35.344686, lng: 149.1248435}
+  - { name: Wjz3JQO,stop_code: Wjz3JQO, lat: -35.3455626, lng: 149.1268033}
+  - { name: Wjz3Rdo,stop_code: Wjz3Rdo, lat: -35.3450469, lng: 149.1304068}
+  - { name: Wjz3ShE,stop_code: Wjz3ShE, lat: -35.3422498, lng: 149.1321257}
+  - { name: Wjz3Slx,stop_code: Wjz3Slx, lat: -35.3394651, lng: 149.131936}
+  - { name: Wjz3T8Z,stop_code: Wjz3T8Z, lat: -35.337043, lng: 149.1311337}
+  - { name: Wjz4MpW,stop_code: Wjz4MpW, lat: -35.3311406, lng: 149.1338209}
+  - { name: Wjz3TJe,stop_code: Wjz3TJe, lat: -35.3335378, lng: 149.135468}
+  - { name: Wjz3-Jb,stop_code: Wjz3-Jb, lat: -35.3392754, lng: 149.1466095}
+  - { name: Wjzb6cp,stop_code: Wjzb6cp, lat: -35.3401203, lng: 149.1523581}
+  - { name: Wjzb79X,stop_code: Wjzb79X, lat: -35.3365565, lng: 149.1529783}
+  - { name: Wjzb7wf,stop_code: Wjzb7wf, lat: -35.3368722, lng: 149.1561338}
+  - { name: Wjzb6EM,stop_code: Wjzb6EM, lat: -35.342941, lng: 149.1583643}
+  - { name: Wjzb7HN,stop_code: Wjzb7HN, lat: -35.335349, lng: 149.1583716}
+  - { name: Wjzb7S4,stop_code: Wjzb7S4, lat: -35.3330282, lng: 149.1586877}
+  - { name: Wjzb7Cp,stop_code: Wjzb7Cp, lat: -35.333286, lng: 149.156475}
+  - { name: Wjz3SUA,stop_code: Wjz3SUA, lat: -35.3426508, lng: 149.1388551}
+  - { name: Wjzb4vx,stop_code: Wjzb4vx, lat: -35.3490259, lng: 149.1553622}
+  - { name: Wjz3YW3,stop_code: Wjz3YW3, lat: -35.3523419, lng: 149.1490844}
+  - { name: Wjzc1tq,stop_code: Wjzc1tq, lat: -35.3228774, lng: 149.1550358}
+  - { name: Wjzbfnr,stop_code: Wjzbfnr, lat: -35.332383, lng: 149.1647873}
+  - { name: Wjzc9PB,stop_code: Wjzc9PB, lat: -35.3239975, lng: 149.1704393}
+  - { name: Wjzc9WV,stop_code: Wjzc9WV, lat: -35.3250576, lng: 149.1722805}
+  - { name: WjzchQP,stop_code: WjzchQP, lat: -35.3235189, lng: 149.1817987}
+  - { name: Wjzcp0F,stop_code: Wjzcp0F, lat: -35.3263698, lng: 149.1843675}
+  - { name: Wjzcod5,stop_code: Wjzcod5, lat: -35.3281204, lng: 149.1848684}
+  - { name: Wjzcoab,stop_code: Wjzcoab, lat: -35.3303968, lng: 149.1849583}
+  - { name: Wjzcg-_,stop_code: Wjzcg-_, lat: -35.3272591, lng: 149.1832438}
+  - { name: WjzcgX_,stop_code: WjzcgX_, lat: -35.3293219, lng: 149.1833416}
+  - { name: WjzcgSm,stop_code: WjzcgSm, lat: -35.3273624, lng: 149.1809901}
+  - { name: Wjz3r_u,stop_code: Wjz3r_u, lat: -35.3540946, lng: 149.1057023}
+  - { name: Wjz3rQi,stop_code: Wjz3rQi, lat: -35.3565695, lng: 149.104185}
+  - { name: Wjz3rML,stop_code: Wjz3rML, lat: -35.3588381, lng: 149.1045644}
+  - { name: Wjz3z0c,stop_code: Wjz3z0c, lat: -35.3591474, lng: 149.106777}
+  - { name: Wjz3y4z,stop_code: Wjz3y4z, lat: -35.3619315, lng: 149.1072828}
+  - { name: Wjz3y9z,stop_code: Wjz3y9z, lat: -35.3640453, lng: 149.1086104}
+  - { name: Wjz3pZQ,stop_code: Wjz3pZQ, lat: -35.366623, lng: 149.1062713}
+  - { name: Wjz3x3A,stop_code: Wjz3x3A, lat: -35.3680664, lng: 149.1072196}
+  - { name: Wjz3xi3,stop_code: Wjz3xi3, lat: -35.3688397, lng: 149.1093058}
+  - { name: Wjz3xwa,stop_code: Wjz3xwa, lat: -35.3702316, lng: 149.1122771}
+  - { name: Wjz3wrK,stop_code: Wjz3wrK, lat: -35.3733761, lng: 149.1115817}
+  - { name: Wjz3woC,stop_code: Wjz3woC, lat: -35.3754381, lng: 149.1112656}
+  - { name: Wjz2DK6,stop_code: Wjz2DK6, lat: -35.3767783, lng: 149.1134151}
+  - { name: Wjz2DPD,stop_code: Wjz2DPD, lat: -35.378737, lng: 149.1155013}
+  - { name: Wjz2DEs,stop_code: Wjz2DEs, lat: -35.3811081, lng: 149.1139208}
+  - { name: Wjz2Dgb,stop_code: Wjz2Dgb, lat: -35.381175, lng: 149.10938}
+  - { name: Wjz2C5I,stop_code: Wjz2C5I, lat: -35.3831852, lng: 149.1074202}
+  - { name: Wjz2uSZ,stop_code: Wjz2uSZ, lat: -35.3823742, lng: 149.1050643}
+  - { name: Wjz2vzR,stop_code: Wjz2vzR, lat: -35.3789646, lng: 149.1019944}
+  - { name: Wjz2vL4,stop_code: Wjz2vL4, lat: -35.3762782, lng: 149.1023627}
+  - { name: Wjz3ops,stop_code: Wjz3ops, lat: -35.3749061, lng: 149.1001427}
+  - { name: Wjz3oih,stop_code: Wjz3oih, lat: -35.3744422, lng: 149.0986886}
+  - { name: Wjz3oeM,stop_code: Wjz3oeM, lat: -35.3718451, lng: 149.0980006}
+  - { name: Wjz3hUs,stop_code: Wjz3hUs, lat: -35.370077, lng: 149.0946389}
+  - { name: Wjz3hXO,stop_code: Wjz3hXO, lat: -35.3681696, lng: 149.0952079}
+  - { name: Wjz3peD,stop_code: Wjz3peD, lat: -35.3657466, lng: 149.0976102}
+  - { name: Wjz3oge,stop_code: Wjz3oge, lat: -35.3754535, lng: 149.0983799}
+  - { name: Wjz3gUQ,stop_code: Wjz3gUQ, lat: -35.3755566, lng: 149.0951557}
+  - { name: Wjz2nLE,stop_code: Wjz2nLE, lat: -35.3766237, lng: 149.0922366}
+  - { name: Wjz2nug,stop_code: Wjz2nug, lat: -35.3773453, lng: 149.0890124}
+  - { name: Wjz2f_R,stop_code: Wjz2f_R, lat: -35.3761632, lng: 149.0842481}
+  - { name: Wjz3gcu,stop_code: Wjz3gcu, lat: -35.3726637, lng: 149.0864364}
+  - { name: Wjz3g7D,stop_code: Wjz3g7D, lat: -35.3705636, lng: 149.085208}
+  - { name: Wjz3gB5,stop_code: Wjz3gB5, lat: -35.3720623, lng: 149.0900243}
+  - { name: Wjz2k5E,stop_code: Wjz2k5E, lat: -35.3945084, lng: 149.0853457}
+  - { name: Wjz2c-r,stop_code: Wjz2c-r, lat: -35.3935292, lng: 149.0837652}
+  - { name: Wjz2cKo,stop_code: Wjz2cKo, lat: -35.3937869, lng: 149.0809204}
+  - { name: Wjz2crQ,stop_code: Wjz2crQ, lat: -35.3954875, lng: 149.0787077}
+  - { name: Wjz2civ,stop_code: Wjz2civ, lat: -35.3959622, lng: 149.0767882}
+  - { name: Wjz2kbO,stop_code: Wjz2kbO, lat: -35.3956421, lng: 149.0869894}
+  - { name: Wjz2lDC,stop_code: Wjz2lDC, lat: -35.3870716, lng: 149.090679}
+  - { name: Wjz2mGO,stop_code: Wjz2mGO, lat: -35.3853996, lng: 149.0925014}
+  - { name: Wjz2u2j,stop_code: Wjz2u2j, lat: -35.3853192, lng: 149.095863}
+  - { name: Wjz2ugd,stop_code: Wjz2ugd, lat: -35.3865047, lng: 149.0985182}
+  - { name: Wjz2ttB,stop_code: Wjz2ttB, lat: -35.3885662, lng: 149.1004148}
+  - { name: Wjz2tyn,stop_code: Wjz2tyn, lat: -35.3904732, lng: 149.1013631}
+  - { name: Wjz2sLr,stop_code: Wjz2sLr, lat: -35.3928439, lng: 149.1028803}
+  - { name: Wjz2rN0,stop_code: Wjz2rN0, lat: -35.4027536, lng: 149.1038057}
+  - { name: Wjz2qJ7,stop_code: Wjz2qJ7, lat: -35.4048663, lng: 149.1024781}
+  - { name: Wjz2r9X,stop_code: Wjz2r9X, lat: -35.4024569, lng: 149.098142}
+  - { name: Wjz2jPU,stop_code: Wjz2jPU, lat: -35.401368, lng: 149.0939538}
+  - { name: Wjz2jFF,stop_code: Wjz2jFF, lat: -35.4026479, lng: 149.0922959}
+  - { name: Wjz2isR,stop_code: Wjz2isR, lat: -35.4057431, lng: 149.0896883}
+  - { name: Wjz2iwA,stop_code: Wjz2iwA, lat: -35.4085873, lng: 149.0906768}
+  - { name: Wjz2iVd,stop_code: Wjz2iVd, lat: -35.4077519, lng: 149.0942596}
+  - { name: Wjz2q9z,stop_code: Wjz2q9z, lat: -35.4079064, lng: 149.0976735}
+  - { name: Wjz2pmy,stop_code: Wjz2pmy, lat: -35.4100705, lng: 149.0990011}
+  - { name: Wjz2F6d,stop_code: Wjz2F6d, lat: -35.4098598, lng: 149.1177053}
+  - { name: Wjz2xyM,stop_code: Wjz2xyM, lat: -35.4130074, lng: 149.113099}
+  - { name: Wjz2xq1,stop_code: Wjz2xq1, lat: -35.4129044, lng: 149.1106334}
+  - { name: Wjz2pVO,stop_code: Wjz2pVO, lat: -35.4135227, lng: 149.1062081}
+  - { name: Wjz2oQE,stop_code: Wjz2oQE, lat: -35.4171292, lng: 149.1046908}
+  - { name: Wjz2yQZ,stop_code: Wjz2yQZ, lat: -35.4057423, lng: 149.116007}
+  - { name: Wjz2Gff,stop_code: Wjz2Gff, lat: -35.403475, lng: 149.1191048}
+  - { name: Wjz2Gu5,stop_code: Wjz2Gu5, lat: -35.404351, lng: 149.1216336}
+  - { name: Wjz2G9R,stop_code: Wjz2G9R, lat: -35.4077654, lng: 149.1199409}
+  - { name: Wjz2FDo,stop_code: Wjz2FDo, lat: -35.4095553, lng: 149.1235301}
+  - { name: Wjz2F_q,stop_code: Wjz2F_q, lat: -35.4093651, lng: 149.1276548}
+  - { name: Wjz2N0r,stop_code: Wjz2N0r, lat: -35.4141264, lng: 149.128949}
+  - { name: Wjz2EB6,stop_code: Wjz2EB6, lat: -35.4159442, lng: 149.1230876}
+  - { name: Wjz1BFG,stop_code: Wjz1BFG, lat: -35.4354872, lng: 149.1142337}
+  - { name: Wjz1CS7,stop_code: Wjz1CS7, lat: -35.4261448, lng: 149.1147427}
+  - { name: Wjz1Dap,stop_code: Wjz1Dap, lat: -35.4239297, lng: 149.1084839}
+  - { name: Wjz1Dlj,stop_code: Wjz1Dlj, lat: -35.4217144, lng: 149.1096219}
+  - { name: Wjz1C75,stop_code: Wjz1C75, lat: -35.4256297, lng: 149.1065242}
+  - { name: Wjz1vMs,stop_code: Wjz1vMs, lat: -35.4250115, lng: 149.1042483}
+  - { name: Wjz1vJN,stop_code: Wjz1vJN, lat: -35.4218175, lng: 149.1034264}
+  - { name: Wjz2w0e,stop_code: Wjz2w0e, lat: -35.4193446, lng: 149.106777}
+  - { name: Wjz2osQ,stop_code: Wjz2osQ, lat: -35.4167685, lng: 149.1006448}
+  - { name: Wjz2o8V,stop_code: Wjz2o8V, lat: -35.4197567, lng: 149.0980528}
+  - { name: Wjz1v6h,stop_code: Wjz1v6h, lat: -35.4211477, lng: 149.0958401}
+  - { name: Wjz1v2R,stop_code: Wjz1v2R, lat: -35.423569, lng: 149.0965355}
+  - { name: Wjz1viP,stop_code: Wjz1viP, lat: -35.4237236, lng: 149.0993804}
+  - { name: Wjz1BrK,stop_code: Wjz1BrK, lat: -35.4337687, lng: 149.1114553}
+  - { name: Wjz1B9T,stop_code: Wjz1B9T, lat: -35.4350564, lng: 149.1089897}
+  - { name: Wjz1tYG,stop_code: Wjz1tYG, lat: -35.4334596, lng: 149.1060816}
+  - { name: Wjz1tR7,stop_code: Wjz1tR7, lat: -35.4323264, lng: 149.1038057}
+  - { name: Wjz1tE0,stop_code: Wjz1tE0, lat: -35.4363442, lng: 149.1024781}
+  - { name: Wjz1tok,stop_code: Wjz1tok, lat: -35.4359836, lng: 149.0999494}
+  - { name: Wjz1tbe,stop_code: Wjz1tbe, lat: -35.4337687, lng: 149.0971677}
+  - { name: Wjz1lQS,stop_code: Wjz1lQS, lat: -35.4330991, lng: 149.0938171}
+  - { name: Wjz1lyA,stop_code: Wjz1lyA, lat: -35.4346444, lng: 149.0907826}
+  - { name: Wjz1lB8,stop_code: Wjz1lB8, lat: -35.4329445, lng: 149.0902136}
+  - { name: Wjz1gBy,stop_code: Wjz1gBy, lat: -35.4601891, lng: 149.0907826}
+  - { name: Wjz0nS3,stop_code: Wjz0nS3, lat: -35.4649778, lng: 149.0928056}
+  - { name: Wjz0v3X,stop_code: Wjz0v3X, lat: -35.4670374, lng: 149.0967252}
+  - { name: Wjz0unz,stop_code: Wjz0unz, lat: -35.4697663, lng: 149.0990011}
+  - { name: Wjz0uuZ,stop_code: Wjz0uuZ, lat: -35.4702296, lng: 149.1008976}
+  - { name: Wjz0uQv,stop_code: Wjz0uQv, lat: -35.4714653, lng: 149.1043747}
+  - { name: Wjz0C4B,stop_code: Wjz0C4B, lat: -35.4716198, lng: 149.1071563}
+  - { name: Wjz0CcV,stop_code: Wjz0CcV, lat: -35.4719802, lng: 149.1091794}
+  - { name: Wjz0Cpn,stop_code: Wjz0Cpn, lat: -35.4735247, lng: 149.1110759}
+  - { name: Wjz0Bv9,stop_code: Wjz0Bv9, lat: -35.4753782, lng: 149.1107598}
+  - { name: Wjz0B6Y,stop_code: Wjz0B6Y, lat: -35.4758415, lng: 149.1077253}
+  - { name: Wjz0t_T,stop_code: Wjz0t_T, lat: -35.4749148, lng: 149.1061448}
+  - { name: Wjz0tB4,stop_code: Wjz0tB4, lat: -35.4765623, lng: 149.1010241}
+  - { name: Wjz0tno,stop_code: Wjz0tno, lat: -35.4754811, lng: 149.0988746}
+  - { name: Wjz0u92,stop_code: Wjz0u92, lat: -35.4739881, lng: 149.0969148}
+  - { name: Wjz0mMT,stop_code: Wjz0mMT, lat: -35.474194, lng: 149.0937539}
+  - { name: Wjz0lYC,stop_code: Wjz0lYC, lat: -35.4770256, lng: 149.0948286}
+  - { name: Wjz0t9g,stop_code: Wjz0t9g, lat: -35.4795997, lng: 149.0972309}
+  - { name: Wjz0kYJ,stop_code: Wjz0kYJ, lat: -35.482637, lng: 149.0950815}
+  - { name: Wjz0kHU,stop_code: Wjz0kHU, lat: -35.4837695, lng: 149.0925527}
+  - { name: Wjz0klX,stop_code: Wjz0klX, lat: -35.4821222, lng: 149.0884434}
+  - { name: Wjz0lhu,stop_code: Wjz0lhu, lat: -35.4790849, lng: 149.0878745}
+  - { name: Wjz0lcW,stop_code: Wjz0lcW, lat: -35.477386, lng: 149.0870526}
+  - { name: Wjz0eVg,stop_code: Wjz0eVg, lat: -35.4740911, lng: 149.0835756}
+  - { name: Wjz0eRx,stop_code: Wjz0eRx, lat: -35.4713109, lng: 149.0824376}
+  - { name: Wjz0m65,stop_code: Wjz0m65, lat: -35.4702811, lng: 149.0845871}
+  - { name: Wjz0n3A,stop_code: Wjz0n3A, lat: -35.4669344, lng: 149.0852193}
+  - { name: Wjz1gaC,stop_code: Wjz1gaC, lat: -35.4619398, lng: 149.0865469}
+  - { name: Wjz1gnx,stop_code: Wjz1gnx, lat: -35.4589532, lng: 149.0880641}
+  - { name: Wjz1h9y,stop_code: Wjz1h9y, lat: -35.4574599, lng: 149.0866733}
+  - { name: Wjz19V7,stop_code: Wjz19V7, lat: -35.4570479, lng: 149.0831962}
+  - { name: Wjz1h4G,stop_code: Wjz1h4G, lat: -35.4554516, lng: 149.0853457}
+  - { name: Wjz1heN,stop_code: Wjz1heN, lat: -35.4541126, lng: 149.0869262}
+  - { name: Wjz1i2p,stop_code: Wjz1i2p, lat: -35.4513833, lng: 149.0850928}
+  - { name: Wjz1ic5,stop_code: Wjz1ic5, lat: -35.4496838, lng: 149.0858515}
+  - { name: Wjz1jf0,stop_code: Wjz1jf0, lat: -35.442525, lng: 149.0859147}
+  - { name: Wjz1bTA,stop_code: Wjz1bTA, lat: -35.4422159, lng: 149.0824376}
+  - { name: Wjz1cI3,stop_code: Wjz1cI3, lat: -35.438868, lng: 149.0804778}
+  - { name: Wjz1cz3,stop_code: Wjz1cz3, lat: -35.4395376, lng: 149.079087}
+  - { name: Wjz1ceG,stop_code: Wjz1ceG, lat: -35.4375289, lng: 149.0757996}
+  - { name: Wjz1d0X,stop_code: Wjz1d0X, lat: -35.4360866, lng: 149.0748513}
+  - { name: Wjz15Xb,stop_code: Wjz15Xb, lat: -35.4340778, lng: 149.0723858}
+  - { name: Wjz1kvl,stop_code: Wjz1kvl, lat: -35.4366017, lng: 149.0890756}
+  - { name: Wjz1klr,stop_code: Wjz1klr, lat: -35.4381985, lng: 149.087748}
+  - { name: Wjz1kyn,stop_code: Wjz1kyn, lat: -35.4398982, lng: 149.0904032}
+  - { name: Wjz16U7,stop_code: Wjz16U7, lat: -35.4302659, lng: 149.0722593}
+  - { name: Wjz16Q9,stop_code: Wjz16Q9, lat: -35.4280509, lng: 149.0709317}
+  - { name: WjrWXL8,stop_code: WjrWXL8, lat: -35.3985958, lng: 149.0586576}
+  - { name: WjrWXIP,stop_code: WjrWXIP, lat: -35.4004264, lng: 149.0594265}
+  - { name: WjrWY3_,stop_code: WjrWY3_, lat: -35.3952466, lng: 149.0527528}
+  - { name: WjrWQRL,stop_code: WjrWQRL, lat: -35.3938608, lng: 149.049706}
+  - { name: WjrWRWi,stop_code: WjrWRWi, lat: -35.3908805, lng: 149.0506492}
+  - { name: WjrWSUa,stop_code: WjrWSUa, lat: -35.3867455, lng: 149.0504459}
+  - { name: WjrWSX9,stop_code: WjrWSX9, lat: -35.3847561, lng: 149.0504459}
+  - { name: WjrWSBZ,stop_code: WjrWSBZ, lat: -35.383041, lng: 149.0472484}
+  - { name: Wjz5LYB,stop_code: Wjz5LYB, lat: -35.2464052, lng: 149.1278592}
+  - { name: Wjz5LLF,stop_code: Wjz5LLF, lat: -35.2446872, lng: 149.1252507}
+  - { name: Wjz5LDv,stop_code: Wjz5LDv, lat: -35.2442061, lng: 149.1235678}
+  - { name: Wjz5LsC,stop_code: Wjz5LsC, lat: -35.2463364, lng: 149.1223897}
+  - { name: Wjz5Lh-,stop_code: Wjz5Lh-, lat: -35.248398, lng: 149.12138}
+  - { name: Wjz5Kve,stop_code: Wjz5Kve, lat: -35.2497723, lng: 149.1218849}
+  - { name: Wjz5Krx,stop_code: Wjz5Krx, lat: -35.2529666, lng: 149.1223781}
+  - { name: Wjz5CW3,stop_code: Wjz5CW3, lat: -35.2534813, lng: 149.1160707}
+  - { name: Wjz5BPB,stop_code: Wjz5BPB, lat: -35.2580866, lng: 149.1154899}
+  - { name: Wjz5BWh,stop_code: Wjz5BWh, lat: -35.2591172, lng: 149.1164155}
+  - { name: Wjz5BaH,stop_code: Wjz5BaH, lat: -35.2589798, lng: 149.1087583}
+  - { name: Wjz5ASf,stop_code: Wjz5ASf, lat: -35.2613846, lng: 149.1149009}
+  - { name: Wjz5AGB,stop_code: Wjz5AGB, lat: -35.2642702, lng: 149.1141435}
+  - { name: Wjz5zJi,stop_code: Wjz5zJi, lat: -35.2679801, lng: 149.113807}
+  - { name: Wjz5zOq,stop_code: Wjz5zOq, lat: -35.2700411, lng: 149.1153216}
+  - { name: Wjz5H0p,stop_code: Wjz5H0p, lat: -35.2714838, lng: 149.1180142}
+  - { name: Wjz5GeU,stop_code: Wjz5GeU, lat: -35.2729264, lng: 149.1200337}
+  - { name: Wjz6EBY,stop_code: Wjz6EBY, lat: -35.2403577, lng: 149.1242409}
+  - { name: Wjz6ElH,stop_code: Wjz6ElH, lat: -35.2404264, lng: 149.1210434}
+  - { name: Wjz6Myj,stop_code: Wjz6Myj, lat: -35.2424881, lng: 149.1344225}
+  - { name: Wjz6Vj2,stop_code: Wjz6Vj2, lat: -35.2363715, lng: 149.1421638}
+  - { name: Wjz6FEI,stop_code: Wjz6FEI, lat: -35.2382959, lng: 149.1252507}
+  - { name: Wjz6Fze,stop_code: Wjz6Fze, lat: -35.2360279, lng: 149.123147}
+  - { name: Wjz6cz2,stop_code: Wjz6cz2, lat: -35.2199304, lng: 149.0791416}
+  - { name: Wjz6cjg,stop_code: Wjz6cjg, lat: -35.2200412, lng: 149.0766172}
+  - { name: Wjz6c8c,stop_code: Wjz6c8c, lat: -35.2217598, lng: 149.0751026}
+  - { name: Wjz64OE,stop_code: Wjz64OE, lat: -35.2207286, lng: 149.0717368}
+  - { name: Wjz64Yc,stop_code: Wjz64Yc, lat: -35.2190101, lng: 149.0723258}
+  - { name: Wjz6c7A,stop_code: Wjz6c7A, lat: -35.2169478, lng: 149.074177}
+  - { name: Wjz6eWi,stop_code: Wjz6eWi, lat: -35.2096321, lng: 149.0835148}
+  - { name: Wjz6eGq,stop_code: Wjz6eGq, lat: -35.2096321, lng: 149.0809063}
+  - { name: Wjz6eoG,stop_code: Wjz6eoG, lat: -35.2110071, lng: 149.0784661}
+  - { name: Wjz6e8G,stop_code: Wjz6e8G, lat: -35.2110071, lng: 149.0758577}
+  - { name: Wjz65_2,stop_code: Wjz65_2, lat: -35.2116258, lng: 149.0722394}
+  - { name: Wjz64CB,stop_code: Wjz64CB, lat: -35.2176067, lng: 149.0687895}
+  - { name: Wjr_w0L,stop_code: Wjr_w0L, lat: -35.1995769, lng: 149.0194714}
+  - { name: Wjr_F9a,stop_code: Wjr_F9a, lat: -35.1938253, lng: 149.031231}
+  - { name: Wjr_NaX,stop_code: Wjr_NaX, lat: -35.1930428, lng: 149.043112}
+  - { name: Wjr_Ow3,stop_code: Wjr_Ow3, lat: -35.1889085, lng: 149.0461463}
+  - { name: Wjr_M6A,stop_code: Wjr_M6A, lat: -35.1956738, lng: 149.0413435}
+  - { name: Wjr_FV4,stop_code: Wjr_FV4, lat: -35.1935916, lng: 149.039268}
+  - { name: Wjr_GGq,stop_code: Wjr_GGq, lat: -35.1875953, lng: 149.0370811}
+  - { name: Wjr-CnE,stop_code: Wjr-CnE, lat: -35.206318, lng: 149.0223041}
+  - { name: Wjr-D1B,stop_code: Wjr-D1B, lat: -35.2045158, lng: 149.0193788}
+  - { name: Wjr-uUb,stop_code: Wjr-uUb, lat: -35.2108896, lng: 149.0174054}
+  - { name: Wjr-ux-,stop_code: Wjr-ux-, lat: -35.2099601, lng: 149.0143872}
+  - { name: Wjr-s5D,stop_code: Wjr-s5D, lat: -35.2180783, lng: 149.0083939}
+  - { name: Wjr-kZV,stop_code: Wjr-kZV, lat: -35.2186221, lng: 149.0075381}
+  - { name: Wjr-yDR,stop_code: Wjr-yDR, lat: -35.2278849, lng: 149.0252438}
+  - { name: Wjr-yOB,stop_code: Wjr-yOB, lat: -35.2313222, lng: 149.0276235}
+  - { name: Wjr-G49,stop_code: Wjr-G49, lat: -35.2302721, lng: 149.0298424}
+  - { name: Wjr-GcG,stop_code: Wjr-GcG, lat: -35.2301944, lng: 149.0319226}
+  - { name: Wjr-Hoi,stop_code: Wjr-Hoi, lat: -35.2274077, lng: 149.0341216}
+  - { name: Wjr-Hi1,stop_code: Wjr-Hi1, lat: -35.2261454, lng: 149.032398}
+  - { name: WjzcgLt,stop_code: WjzcgLt, lat: -35.3267279, lng: 149.1797667}
+  - { name: WjzcgD0,stop_code: WjzcgD0, lat: -35.3271927, lng: 149.1779495}
+  - { name: Wjzcgzn,stop_code: Wjzcgzn, lat: -35.3293028, lng: 149.178368}
+  - { name: WjzbfzE,stop_code: WjzbfzE, lat: -35.3354178, lng: 149.1678599}
+  - { name: Wjzbfpl,stop_code: Wjzbfpl, lat: -35.3363832, lng: 149.1658515}
+  - { name: Wjzbfr6,stop_code: Wjzbfr6, lat: -35.3349204, lng: 149.1655287}
+  - { name: Wjzc8im,stop_code: Wjzc8im, lat: -35.3300635, lng: 149.1644887}
+  - { name: Wjzc8l0,stop_code: Wjzc8l0, lat: -35.3285713, lng: 149.1642018}
+  - { name: Wjzc8c1,stop_code: Wjzc8c1, lat: -35.3291272, lng: 149.1628031}
+  - { name: Wjzbn5y,stop_code: Wjzbn5y, lat: -35.3338671, lng: 149.1730601}
+  - { name: Wjzbnmb,stop_code: Wjzbnmb, lat: -35.3331064, lng: 149.1753196}
+  - { name: Wjz3TZj,stop_code: Wjz3TZj, lat: -35.3338162, lng: 149.1384399}
+  - { name: Wjz3_3L,stop_code: Wjz3_3L, lat: -35.3347817, lng: 149.1404124}
+  - { name: Wjz3_o2,stop_code: Wjz3_o2, lat: -35.3372978, lng: 149.1435685}
+  - { name: Wjz3-r-,stop_code: Wjz3-r-, lat: -35.3403989, lng: 149.1448954}
+  - { name: Wjz3-aW,stop_code: Wjz3-aW, lat: -35.3414521, lng: 149.1420263}
+  - { name: Wjzb5vw,stop_code: Wjzb5vw, lat: -35.3436462, lng: 149.155296}
+  - { name: Wjz5N7c,stop_code: Wjz5N7c, lat: -35.2774279, lng: 149.1287001}
+  - { name: Wjza_-f,stop_code: Wjza_-f, lat: -35.3767042, lng: 149.237157}
+  - { name: WjzbYnD,stop_code: WjzbYnD, lat: -35.3485475, lng: 149.2307657}
+  - { name: WjzbZ3m,stop_code: WjzbZ3m, lat: -35.3459335, lng: 149.227726}
+  - { name: WjzbXms,stop_code: WjzbXms, lat: -35.3550134, lng: 149.2306199}
+  - { name: WjzbXmQ,stop_code: WjzbXmQ, lat: -35.3550126, lng: 149.2311068}
+  - { name: WjzbYzg,stop_code: WjzbYzg, lat: -35.3519226, lng: 149.2332104}
+  - { name: WjzbYue,stop_code: WjzbYue, lat: -35.3493054, lng: 149.2316145}
+  - { name: Wjzj5BH,stop_code: Wjzj5BH, lat: -35.3447463, lng: 149.2446946}
+  - { name: Wjzj6z9,stop_code: Wjzj6z9, lat: -35.3407864, lng: 149.2440483}
+  - { name: WjzbYD0,stop_code: WjzbYD0, lat: -35.3491814, lng: 149.232803}
+  - { name: WjzbZqS,stop_code: WjzbZqS, lat: -35.3465484, lng: 149.2325494}
+  - { name: Wjz5F-1,stop_code: Wjz5F-1, lat: -35.2783161, lng: 149.1271286}
+  - { name: Wjz5FSY,stop_code: Wjz5FSY, lat: -35.2780524, lng: 149.1269928}
+  - { name: WjzbZ77,stop_code: WjzbZ77, lat: -35.3430401, lng: 149.2274615}
+  - { name: Wjz5N6V,stop_code: Wjz5N6V, lat: -35.2783725, lng: 149.1297843}
+  - { name: WjzbRdA,stop_code: WjzbRdA, lat: -35.3446934, lng: 149.2184308}
+  - { name: WjzbRdl,stop_code: WjzbRdl, lat: -35.3446304, lng: 149.2181472}
+  - { name: WjzbJSj,stop_code: WjzbJSj, lat: -35.3441148, lng: 149.2140644}
+  - { name: Wjzj5cC,stop_code: Wjzj5cC, lat: -35.3451754, lng: 149.2404108}
+  - { name: WjzbZ3n,stop_code: WjzbZ3n, lat: -35.3458022, lng: 149.2277877}
+  - { name: WjzbRBs,stop_code: WjzbRBs, lat: -35.344722, lng: 149.2224303}
+  - { name: WjzbRBx,stop_code: WjzbRBx, lat: -35.3449879, lng: 149.2226535}
+  - { name: Wjz5N5_,stop_code: Wjz5N5_, lat: -35.2785242, lng: 149.1297348}
+  - { name: Wjz5Ndm,stop_code: Wjz5Ndm, lat: -35.2785658, lng: 149.1301727}
+  - { name: Wjz5Neo,stop_code: Wjz5Neo, lat: -35.27843, lng: 149.130345}
+  - { name: WjzaArS,stop_code: WjzaArS, lat: -35.3953167, lng: 149.1995002}
+  - { name: WjzaAXA,stop_code: WjzaAXA, lat: -35.3954806, lng: 149.2047447}
+  - { name: WjzaJ9a,stop_code: WjzaJ9a, lat: -35.391582, lng: 149.2069701}
+  - { name: WjzaAdv,stop_code: WjzaAdv, lat: -35.3938794, lng: 149.1962366}
+  - { name: WjzbBu_,stop_code: WjzbBu_, lat: -35.3437537, lng: 149.1997253}
+  - { name: WjzbPQW,stop_code: WjzbPQW, lat: -35.3565184, lng: 149.2259167}
+  - { name: WjzbPXf,stop_code: WjzbPXf, lat: -35.3567667, lng: 149.2261434}
+  - { name: WjzbPpi,stop_code: WjzbPpi, lat: -35.3586252, lng: 149.2208441}
+  - { name: WjzbVBj,stop_code: WjzbVBj, lat: -35.3667378, lng: 149.233235}
+  - { name: WjzbWDe,stop_code: WjzbWDe, lat: -35.3596366, lng: 149.2330229}
+  - { name: WjzbXwk,stop_code: WjzbXwk, lat: -35.3591416, lng: 149.2331706}
+  - { name: WjzbVCw,stop_code: WjzbVCw, lat: -35.3663608, lng: 149.2335824}
+  - { name: WjzbVxf,stop_code: WjzbVxf, lat: -35.369131, lng: 149.233084}
+  - { name: WjzbVy2,stop_code: WjzbVy2, lat: -35.3689098, lng: 149.232863}
+  - { name: Wjz9JIL,stop_code: Wjz9JIL, lat: -35.4330525, lng: 149.2131844}
+  - { name: Wjz9JdV,stop_code: Wjz9JdV, lat: -35.4328562, lng: 149.2080577}
+  - { name: WjzbXAb,stop_code: WjzbXAb, lat: -35.3564366, lng: 149.2330826}
+  - { name: WjzaK0g,stop_code: WjzaK0g, lat: -35.3868815, lng: 149.2056751}
+  - { name: WjzbwuF,stop_code: WjzbwuF, lat: -35.3717405, lng: 149.1994726}
+  - { name: WjzbwDR,stop_code: WjzbwDR, lat: -35.37069, lng: 149.2008683}
+  - { name: WjzaDIK,stop_code: WjzaDIK, lat: -35.3781802, lng: 149.2021825}
+  - { name: WjzbwMd,stop_code: WjzbwMd, lat: -35.3755316, lng: 149.2028602}
+  - { name: WjzbG5c,stop_code: WjzbG5c, lat: -35.3611934, lng: 149.2054955}
+  - { name: WjzbXBT,stop_code: WjzbXBT, lat: -35.3553953, lng: 149.2338714}
+  - { name: WjzbJRl,stop_code: WjzbJRl, lat: -35.3445935, lng: 149.2139248}
+  - { name: WjzbfPy,stop_code: WjzbfPy, lat: -35.3352335, lng: 149.1703836}
+  - { name: WjzcrrQ,stop_code: WjzcrrQ, lat: -35.3131274, lng: 149.188611}
+  - { name: Wjz4OqF,stop_code: Wjz4OqF, lat: -35.3195494, lng: 149.1335622}
+  - { name: Wjz4Pk_,stop_code: Wjz4Pk_, lat: -35.3121631, lng: 149.1324213}
+  - { name: Wjz4Pt5,stop_code: Wjz4Pt5, lat: -35.3116531, lng: 149.1326324}
+  - { name: Wjzc1qE,stop_code: Wjzc1qE, lat: -35.3251161, lng: 149.1555115}
+  - { name: Wjz5NeC,stop_code: Wjz5NeC, lat: -35.2778798, lng: 149.1305995}
+  - { name: Wjz5NeF,stop_code: Wjz5NeF, lat: -35.2783224, lng: 149.130726}
+  - { name: Wjz5Ndz,stop_code: Wjz5Ndz, lat: -35.2788601, lng: 149.130649}
+  - { name: Wjz5NcA,stop_code: Wjz5NcA, lat: -35.2794346, lng: 149.1305879}
+  - { name: Wjz5Nds,stop_code: Wjz5Nds, lat: -35.2787886, lng: 149.1304779}
+  - { name: Wjz3mWn,stop_code: Wjz3mWn, lat: -35.3409621, lng: 149.0945298}
+  - { name: Wjz3mPO,stop_code: Wjz3mPO, lat: -35.3407241, lng: 149.0937831}
+  - { name: Wjz3mI_,stop_code: Wjz3mI_, lat: -35.3396179, lng: 149.0925471}
+  - { name: Wjz3mQ4,stop_code: Wjz3mQ4, lat: -35.3398419, lng: 149.0928819}
+  - { name: Wjz3vrf,stop_code: Wjz3vrf, lat: -35.3348497, lng: 149.099817}
+  - { name: Wjz3vqN,stop_code: Wjz3vqN, lat: -35.3360119, lng: 149.1006409}
+  - { name: Wjz3C9Q,stop_code: Wjz3C9Q, lat: -35.3419855, lng: 149.108934}
+  - { name: Wjz3C4O,stop_code: Wjz3C4O, lat: -35.3400601, lng: 149.1074834}
+  - { name: Wjz3uQf,stop_code: Wjz3uQf, lat: -35.339661, lng: 149.1040329}
+  - { name: Wjz3uJV,stop_code: Wjz3uJV, lat: -35.339486, lng: 149.1035524}
+  - { name: Wjz3C4q,stop_code: Wjz3C4q, lat: -35.3400391, lng: 149.106977}
+  - { name: Wjz3C9J,stop_code: Wjz3C9J, lat: -35.3418945, lng: 149.1087966}
+  - { name: Wjz3B5o,stop_code: Wjz3B5o, lat: -35.344996, lng: 149.1070285}
+  - { name: Wjz3lVM,stop_code: Wjz3lVM, lat: -35.3477625, lng: 149.0952366}
+  - { name: Wjz3lVG,stop_code: Wjz3lVG, lat: -35.3476365, lng: 149.095065}
+  - { name: Wjz3n-4,stop_code: Wjz3n-4, lat: -35.3330183, lng: 149.0941258}
+  - { name: Wjz3n-H,stop_code: Wjz3n-H, lat: -35.3331304, lng: 149.0950356}
+  - { name: Wjz3mAg,stop_code: Wjz3mAg, lat: -35.3402021, lng: 149.0903851}
+  - { name: Wjz4qia,stop_code: Wjz4qia, lat: -35.3194535, lng: 149.0984183}
+  - { name: Wjz4q8_,stop_code: Wjz4q8_, lat: -35.3203709, lng: 149.0981179}
+  - { name: Wjz4p1K,stop_code: Wjz4p1K, lat: -35.325336, lng: 149.0963669}
+  - { name: Wjz4p2R,stop_code: Wjz4p2R, lat: -35.3247128, lng: 149.0966244}
+  - { name: Wjz4gXk,stop_code: Wjz4gXk, lat: -35.3296011, lng: 149.0945736}
+  - { name: Wjz4gYg,stop_code: Wjz4gYg, lat: -35.329258, lng: 149.0944878}
+  - { name: Wjz5G6U,stop_code: Wjz5G6U, lat: -35.2729086, lng: 149.1187429}
+  - { name: Wjz5Guy,stop_code: Wjz5Guy, lat: -35.2727878, lng: 149.1223747}
+  - { name: Wjz5Hw8,stop_code: Wjz5Hw8, lat: -35.2715996, lng: 149.1231371}
+  - { name: Wjz5HDd,stop_code: Wjz5HDd, lat: -35.2662951, lng: 149.1231711}
+  - { name: Wjz5Iw8,stop_code: Wjz5Iw8, lat: -35.2660466, lng: 149.1231132}
+  - { name: Wjz5Iqp,stop_code: Wjz5Iqp, lat: -35.2646152, lng: 149.1221727}
+  - { name: Wjz5IjX,stop_code: Wjz5IjX, lat: -35.2637604, lng: 149.1215219}
+  - { name: Wjz5Imu,stop_code: Wjz5Imu, lat: -35.2614148, lng: 149.1208459}
+  - { name: Wjz5Jpp,stop_code: Wjz5Jpp, lat: -35.2597672, lng: 149.1221194}
+  - { name: Wjz5Jpu,stop_code: Wjz5Jpu, lat: -35.2594072, lng: 149.1221624}
+  - { name: Wjz5Jyz,stop_code: Wjz5Jyz, lat: -35.258945, lng: 149.123718}
+  - { name: Wjz5JzP,stop_code: Wjz5JzP, lat: -35.2582197, lng: 149.123961}
+  - { name: Wjz5JuJ,stop_code: Wjz5JuJ, lat: -35.2560391, lng: 149.1225279}
+  - { name: Wjz5Juf,stop_code: Wjz5Juf, lat: -35.2558204, lng: 149.1217923}
+  - { name: Wjz5KgQ,stop_code: Wjz5KgQ, lat: -35.2547172, lng: 149.1212395}
+  - { name: Wjz5KgT,stop_code: Wjz5KgT, lat: -35.2544701, lng: 149.1213129}
+  - { name: Wjz5N5k,stop_code: Wjz5N5k, lat: -35.2787905, lng: 149.1288627}
+  - { name: Wjz5N4J,stop_code: Wjz5N4J, lat: -35.2793571, lng: 149.1293659}
+  - { name: Wjz5Nht,stop_code: Wjz5Nht, lat: -35.281465, lng: 149.131837}
+  - { name: Wjr-LNq,stop_code: Wjr-LNq, lat: -35.2048275, lng: 149.0383141}
+  - { name: Wjz68W5,stop_code: Wjz68W5, lat: -35.2423221, lng: 149.0831522}
+  - { name: Wjz6giR,stop_code: Wjz6giR, lat: -35.2422899, lng: 149.0883846}
+  - { name: Wjz6gia,stop_code: Wjz6gia, lat: -35.2425616, lng: 149.0874888}
+  - { name: Wjz5maK,stop_code: Wjz5maK, lat: -35.2532079, lng: 149.0867657}
+  - { name: Wjz5G6B,stop_code: Wjz5G6B, lat: -35.2724804, lng: 149.1181797}
+  - { name: Wjz5GMT,stop_code: Wjz5GMT, lat: -35.2764151, lng: 149.1267199}
+  - { name: Wjz4KO9,stop_code: Wjz4KO9, lat: -35.2975962, lng: 149.1259252}
+  - { name: Wjz4KNu,stop_code: Wjz4KNu, lat: -35.2978611, lng: 149.1263289}
+  - { name: WjzbnGh,stop_code: WjzbnGh, lat: -35.3359862, lng: 149.1796321}
+  - { name: Wjz5_0v,stop_code: Wjz5_0v, lat: -35.2490065, lng: 149.1400861}
+  - { name: Wjz4Ox0,stop_code: Wjz4Ox0, lat: -35.3203301, lng: 149.1339648}
+  - { name: Wjz4OpP,stop_code: Wjz4OpP, lat: -35.320064, lng: 149.1335699}
+  - { name: Wjz4NDo,stop_code: Wjz4NDo, lat: -35.3217168, lng: 149.1344712}
+  - { name: Wjz4NDP,stop_code: Wjz4NDP, lat: -35.3214366, lng: 149.1350462}
+  - { name: Wjz4Pa9,stop_code: Wjz4Pa9, lat: -35.314076, lng: 149.1301281}
+  - { name: Wjz5FIS,stop_code: Wjz5FIS, lat: -35.279312, lng: 149.1254166}
+  - { name: Wjz5qbi,stop_code: Wjz5qbi, lat: -35.2748058, lng: 149.0972461}
+  - { name: Wjr-_Ua,stop_code: Wjr-_Ua, lat: -35.2054509, lng: 149.0613315}
+  - { name: Wjz66kG,stop_code: Wjz66kG, lat: -35.2081931, lng: 149.0662542}
+  - { name: Wjz66kP,stop_code: Wjz66kP, lat: -35.2081588, lng: 149.066382}
+  - { name: Wjz66lY,stop_code: Wjz66lY, lat: -35.2073806, lng: 149.0665685}
+  - { name: Wjz66t3,stop_code: Wjz66t3, lat: -35.2074684, lng: 149.0667796}
+  - { name: Wjz664q,stop_code: Wjz664q, lat: -35.2082119, lng: 149.0631086}
+  - { name: Wjz664g,stop_code: Wjz664g, lat: -35.2083936, lng: 149.0629132}
+  - { name: Wjr-Xhh,stop_code: Wjr-Xhh, lat: -35.2268712, lng: 149.0546156}
+  - { name: Wjz4Rs-,stop_code: Wjz4Rs-, lat: -35.3012441, lng: 149.1338254}
+  - { name: Wjr-_Uj,stop_code: Wjr-_Uj, lat: -35.2054305, lng: 149.0615985}
+  - { name: Wjr--r_,stop_code: Wjr--r_, lat: -35.2084885, lng: 149.0569758}
+  - { name: Wjz4Lh5,stop_code: Wjz4Lh5, lat: -35.2924038, lng: 149.1201999}
+  - { name: Wjzc54R,stop_code: Wjzc54R, lat: -35.3013866, lng: 149.1515283}
+  - { name: Wjzc55s,stop_code: Wjzc55s, lat: -35.3007195, lng: 149.1509863}
+  - { name: Wjzc60A,stop_code: Wjzc60A, lat: -35.2986953, lng: 149.151155}
+  - { name: Wjz4-WZ,stop_code: Wjz4-WZ, lat: -35.2972194, lng: 149.1503113}
+  - { name: Wjz4-YV,stop_code: Wjz4-YV, lat: -35.2961803, lng: 149.1503194}
+  - { name: Wjz56Hh,stop_code: Wjz56Hh, lat: -35.25291, lng: 149.0697814}
+  - { name: Wjz4-WL,stop_code: Wjz4-WL, lat: -35.2970826, lng: 149.149927}
+  - { name: Wjzc60i,stop_code: Wjzc60i, lat: -35.2988201, lng: 149.1508684}
+  - { name: Wjz4RFJ,stop_code: Wjz4RFJ, lat: -35.3034224, lng: 149.1361467}
+  - { name: Wjz4RwH,stop_code: Wjz4RwH, lat: -35.3042846, lng: 149.1348585}
+  - { name: Wjz4Quk,stop_code: Wjz4Quk, lat: -35.3055692, lng: 149.1330442}
+  - { name: Wjz4PuC,stop_code: Wjz4PuC, lat: -35.3109115, lng: 149.1332413}
+  - { name: Wjz4P6x,stop_code: Wjz4P6x, lat: -35.3112617, lng: 149.1291119}
+  - { name: Wjz3eZ4,stop_code: Wjz3eZ4, lat: -35.3392098, lng: 149.0831308}
+  - { name: Wjz3bdj,stop_code: Wjz3bdj, lat: -35.3557447, lng: 149.0753424}
+  - { name: Wjz4-Rc,stop_code: Wjz4-Rc, lat: -35.2952651, lng: 149.1479687}
+  - { name: Wjz4-KO,stop_code: Wjz4-KO, lat: -35.2946955, lng: 149.147399}
+  - { name: Wjr--W0,stop_code: Wjr--W0, lat: -35.2097244, lng: 149.0611869}
+  - { name: Wjr--W9,stop_code: Wjr--W9, lat: -35.2096897, lng: 149.061394}
+  - { name: Wjz3caw,stop_code: Wjz3caw, lat: -35.3525528, lng: 149.0755688}
+  - { name: Wjz3cal,stop_code: Wjz3cal, lat: -35.3521568, lng: 149.0752845}
+  - { name: Wjz3bdl,stop_code: Wjz3bdl, lat: -35.3556201, lng: 149.075221}
+  - { name: Wjz3ceY,stop_code: Wjz3ceY, lat: -35.3495185, lng: 149.0761236}
+  - { name: Wjz3b9v,stop_code: Wjz3b9v, lat: -35.3581498, lng: 149.0754026}
+  - { name: Wjz3b9L,stop_code: Wjz3b9L, lat: -35.3581358, lng: 149.0757975}
+  - { name: Wjz39RI,stop_code: Wjz39RI, lat: -35.3666487, lng: 149.0827357}
+  - { name: Wjz3ceV,stop_code: Wjz3ceV, lat: -35.3497899, lng: 149.0761589}
+  - { name: Wjr-SHc,stop_code: Wjr-SHc, lat: -35.2086969, lng: 149.0476925}
+  - { name: Wjr-RKi,stop_code: Wjr-RKi, lat: -35.2123821, lng: 149.0478391}
+  - { name: Wjr-RZx,stop_code: Wjr-RZx, lat: -35.213153, lng: 149.050965}
+  - { name: Wjr-RZE,stop_code: Wjr-RZE, lat: -35.2132014, lng: 149.0511677}
+  - { name: Wjr-RT-,stop_code: Wjr-RT-, lat: -35.2113153, lng: 149.0500244}
+  - { name: Wjr-R_3,stop_code: Wjr-R_3, lat: -35.2115401, lng: 149.0502887}
+  - { name: Wjr-Zk3,stop_code: Wjr-Zk3, lat: -35.2136037, lng: 149.0543575}
+  - { name: Wjr-Zk5,stop_code: Wjr-Zk5, lat: -35.2134943, lng: 149.0543506}
+  - { name: Wjr-ZBY,stop_code: Wjr-ZBY, lat: -35.2128526, lng: 149.0583185}
+  - { name: Wjr-ZJc,stop_code: Wjr-ZJc, lat: -35.2128875, lng: 149.0586429}
+  - { name: Wjr-ZRJ,stop_code: Wjr-ZRJ, lat: -35.2127453, lng: 149.0607491}
+  - { name: Wjr-ZSE,stop_code: Wjr-ZSE, lat: -35.2124829, lng: 149.0606716}
+  - { name: Wjz66fw,stop_code: Wjz66fw, lat: -35.2063185, lng: 149.0646037}
+  - { name: Wjz66fx,stop_code: Wjz66fx, lat: -35.2062629, lng: 149.0647145}
+  - { name: Wjr--sV,stop_code: Wjr--sV, lat: -35.2083253, lng: 149.0568878}
+  - { name: Wjr--Lw,stop_code: Wjr--Lw, lat: -35.2063011, lng: 149.059093}
+  - { name: Wjr--Ki,stop_code: Wjr--Ki, lat: -35.2068427, lng: 149.0588291}
+  - { name: Wjr--m3,stop_code: Wjr--m3, lat: -35.2067416, lng: 149.0543264}
+  - { name: Wjr--md,stop_code: Wjr--md, lat: -35.2066211, lng: 149.0544526}
+  - { name: Wjr--6t,stop_code: Wjr--6t, lat: -35.2065912, lng: 149.0521439}
+  - { name: Wjr--6k,stop_code: Wjr--6k, lat: -35.2066759, lng: 149.0519744}
+  - { name: Wjr-SS5,stop_code: Wjr-SS5, lat: -35.2065999, lng: 149.0489353}
+  - { name: Wjz605N,stop_code: Wjz605N, lat: -35.2405467, lng: 149.0636668}
+  - { name: Wjz60d1,stop_code: Wjz60d1, lat: -35.2406019, lng: 149.0638958}
+  - { name: Wjz60c5,stop_code: Wjz60c5, lat: -35.2408972, lng: 149.0639885}
+  - { name: Wjz604Y,stop_code: Wjz604Y, lat: -35.2410486, lng: 149.0638326}
+  - { name: Wjz605_,stop_code: Wjz605_, lat: -35.2400517, lng: 149.0637152}
+  - { name: Wjz606I,stop_code: Wjz606I, lat: -35.2396656, lng: 149.0633992}
+  - { name: Wjz5xHC,stop_code: Wjz5xHC, lat: -35.2799871, lng: 149.1141335}
+  - { name: Wjz5yXo,stop_code: Wjz5yXo, lat: -35.2749982, lng: 149.1166312}
+  - { name: Wjz5Jaa,stop_code: Wjz5Jaa, lat: -35.2590481, lng: 149.1191164}
+  - { name: Wjz5J9d,stop_code: Wjz5J9d, lat: -35.2594616, lng: 149.1190821}
+  - { name: Wjz68Yy,stop_code: Wjz68Yy, lat: -35.2411603, lng: 149.0838439}
+  - { name: Wjr-_3A,stop_code: Wjr-_3A, lat: -35.2032823, lng: 149.0522538}
+  - { name: Wjr-_kG,stop_code: Wjr-_kG, lat: -35.2027328, lng: 149.0551853}
+  - { name: Wjr-_Hp,stop_code: Wjr-_Hp, lat: -35.2034703, lng: 149.0589653}
+  - { name: Wjr-_Nn,stop_code: Wjr-_Nn, lat: -35.2043934, lng: 149.0601598}
+  - { name: Wjr-_Og,stop_code: Wjr-_Og, lat: -35.2042571, lng: 149.0602273}
+  - { name: Wjz670_,stop_code: Wjz670_, lat: -35.205061, lng: 149.0637667}
+  - { name: Wjz671V,stop_code: Wjz671V, lat: -35.204864, lng: 149.0637204}
+  - { name: Wjz67k1,stop_code: Wjz67k1, lat: -35.2028461, lng: 149.0653269}
+  - { name: Wjz67kk,stop_code: Wjz67kk, lat: -35.2025967, lng: 149.0657125}
+  - { name: Wjr-_zv,stop_code: Wjr-_zv, lat: -35.2030129, lng: 149.0575605}
+  - { name: Wjr-YdU,stop_code: Wjr-YdU, lat: -35.2186771, lng: 149.0542242}
+  - { name: Wjr-YcT,stop_code: Wjr-YcT, lat: -35.2187393, lng: 149.0539932}
+  - { name: Wjr-Yg7,stop_code: Wjr-Yg7, lat: -35.2215188, lng: 149.0543538}
+  - { name: Wjr-Xno,stop_code: Wjr-Xno, lat: -35.2227935, lng: 149.0548844}
+  - { name: Wjr-Xky,stop_code: Wjr-Xky, lat: -35.2247107, lng: 149.0549856}
+  - { name: Wjr-XyN,stop_code: Wjr-XyN, lat: -35.226202, lng: 149.0581637}
+  - { name: WjrZ_tn,stop_code: WjrZ_tn, lat: -35.2455787, lng: 149.0560808}
+  - { name: WjrZ_so,stop_code: WjrZ_so, lat: -35.2468109, lng: 149.0562979}
+  - { name: Wjz56Xu,stop_code: Wjz56Xu, lat: -35.2524925, lng: 149.0726439}
+  - { name: Wjz56XB,stop_code: Wjz56XB, lat: -35.2526099, lng: 149.0728793}
+  - { name: Wjz5711,stop_code: Wjz5711, lat: -35.2488233, lng: 149.0625779}
+  - { name: Wjz571j,stop_code: Wjz571j, lat: -35.2486364, lng: 149.0628845}
+  - { name: Wjz3eRR,stop_code: Wjz3eRR, lat: -35.3390911, lng: 149.082759}
+  - { name: Wjz3m31,stop_code: Wjz3m31, lat: -35.3408061, lng: 149.0844784}
+  - { name: Wjz3m3b,stop_code: Wjz3m3b, lat: -35.3406241, lng: 149.0847703}
+  - { name: Wjz79-a,stop_code: Wjz79-a, lat: -35.1903384, lng: 149.0833628}
+  - { name: Wjz79ZQ,stop_code: Wjz79ZQ, lat: -35.190906, lng: 149.0842116}
+  - { name: Wjz7hb5,stop_code: Wjz7hb5, lat: -35.1921368, lng: 149.0859491}
+  - { name: Wjz7hbe,stop_code: Wjz7hbe, lat: -35.1921183, lng: 149.0860955}
+  - { name: Wjz5dCr,stop_code: Wjz5dCr, lat: -35.2561978, lng: 149.0795805}
+  - { name: Wjz54_B,stop_code: Wjz54_B, lat: -35.2608235, lng: 149.0728514}
+  - { name: Wjz54_n,stop_code: Wjz54_n, lat: -35.2606623, lng: 149.072551}
+  - { name: Wjz54CS,stop_code: Wjz54CS, lat: -35.2614333, lng: 149.0690577}
+  - { name: Wjz551Q,stop_code: Wjz551Q, lat: -35.2595831, lng: 149.0636761}
+  - { name: Wjz5592,stop_code: Wjz5592, lat: -35.2596812, lng: 149.0639679}
+  - { name: WjrZZB7,stop_code: WjrZZB7, lat: -35.2565133, lng: 149.0570071}
+  - { name: WjrZ_o2,stop_code: WjrZ_o2, lat: -35.2493991, lng: 149.055711}
+  - { name: WjrZ_o4,stop_code: WjrZ_o4, lat: -35.2492379, lng: 149.0556338}
+  - { name: WjrZTMv,stop_code: WjrZTMv, lat: -35.2489575, lng: 149.0493939}
+  - { name: WjrZTua,stop_code: WjrZTua, lat: -35.2452775, lng: 149.0448362}
+  - { name: WjrZTu1,stop_code: WjrZTu1, lat: -35.2453967, lng: 149.044759}
+  - { name: Wjr-Mg6,stop_code: Wjr-Mg6, lat: -35.2436162, lng: 149.0432913}
+  - { name: Wjr-Mgt,stop_code: Wjr-Mgt, lat: -35.2436863, lng: 149.0438835}
+  - { name: WjrZT5e,stop_code: WjrZT5e, lat: -35.245649, lng: 149.0408365}
+  - { name: WjrZLXY,stop_code: WjrZLXY, lat: -35.2471491, lng: 149.0403988}
+  - { name: WjrZT6b,stop_code: WjrZT6b, lat: -35.2452004, lng: 149.0407936}
+  - { name: Wjz3mI-,stop_code: Wjz3mI-, lat: -35.3396854, lng: 149.092654}
+  - { name: Wjz3mQ5,stop_code: Wjz3mQ5, lat: -35.339761, lng: 149.0927558}
+  - { name: Wjr-z7J,stop_code: Wjr-z7J, lat: -35.2223574, lng: 149.0195037}
+  - { name: Wjr-ZXo,stop_code: Wjr-ZXo, lat: -35.214551, lng: 149.0617978}
+  - { name: Wjz652H,stop_code: Wjz652H, lat: -35.2150139, lng: 149.0634241}
+  - { name: Wjz65aB,stop_code: Wjz65aB, lat: -35.2148653, lng: 149.0646456}
+  - { name: Wjz65ik,stop_code: Wjz65ik, lat: -35.2149321, lng: 149.0656677}
+  - { name: Wjz65rA,stop_code: Wjz65rA, lat: -35.2142446, lng: 149.0673143}
+  - { name: Wjz65rQ,stop_code: Wjz65rQ, lat: -35.2142653, lng: 149.0676927}
+  - { name: Wjz65Hy,stop_code: Wjz65Hy, lat: -35.2143691, lng: 149.0701627}
+  - { name: Wjz65GS,stop_code: Wjz65GS, lat: -35.2147682, lng: 149.0705542}
+  - { name: Wjz66oJ,stop_code: Wjz66oJ, lat: -35.2107077, lng: 149.0674989}
+  - { name: Wjz66oO,stop_code: Wjz66oO, lat: -35.2109547, lng: 149.067737}
+  - { name: Wjz66Fg,stop_code: Wjz66Fg, lat: -35.2104421, lng: 149.0698018}
+  - { name: Wjz66WS,stop_code: Wjz66WS, lat: -35.2092634, lng: 149.0731992}
+  - { name: Wjz66XM,stop_code: Wjz66XM, lat: -35.2090851, lng: 149.0732672}
+  - { name: Wjz6ec7,stop_code: Wjz6ec7, lat: -35.2077712, lng: 149.0749969}
+  - { name: WjrW_zu,stop_code: WjrW_zu, lat: -35.3788924, lng: 149.0576496}
+  - { name: WjrW_zy,stop_code: WjrW_zy, lat: -35.3792073, lng: 149.0577944}
+  - { name: WjrW_Qk,stop_code: WjrW_Qk, lat: -35.3783254, lng: 149.0600973}
+  - { name: WjrW_RH,stop_code: WjrW_RH, lat: -35.3777568, lng: 149.0607135}
+  - { name: Wjz27d3,stop_code: Wjz27d3, lat: -35.3777767, lng: 149.064033}
+  - { name: Wjz27dd,stop_code: Wjz27dd, lat: -35.3775909, lng: 149.0640777}
+  - { name: Wjz27k0,stop_code: Wjz27k0, lat: -35.3786939, lng: 149.0653235}
+  - { name: Wjz27k8,stop_code: Wjz27k8, lat: -35.3787048, lng: 149.065524}
+  - { name: Wjz27gg,stop_code: Wjz27gg, lat: -35.3814094, lng: 149.0656219}
+  - { name: Wjz26n5,stop_code: Wjz26n5, lat: -35.3816653, lng: 149.0653041}
+  - { name: Wjz26tG,stop_code: Wjz26tG, lat: -35.3833338, lng: 149.0674908}
+  - { name: Wjz26tw,stop_code: Wjz26tw, lat: -35.38347, lng: 149.0674733}
+  - { name: Wjz26P8,stop_code: Wjz26P8, lat: -35.3848854, lng: 149.0709314}
+  - { name: Wjz26Om,stop_code: Wjz26Om, lat: -35.385045, lng: 149.0711386}
+  - { name: Wjz26WW,stop_code: Wjz26WW, lat: -35.3853577, lng: 149.0733293}
+  - { name: Wjz26WN,stop_code: Wjz26WN, lat: -35.3854988, lng: 149.073226}
+  - { name: Wjz2df1,stop_code: Wjz2df1, lat: -35.3875049, lng: 149.0748933}
+  - { name: Wjz2def,stop_code: Wjz2def, lat: -35.3876959, lng: 149.0750942}
+  - { name: Wjz2d34,stop_code: Wjz2d34, lat: -35.3900029, lng: 149.0734943}
+  - { name: Wjz2d32,stop_code: Wjz2d32, lat: -35.3901917, lng: 149.0734943}
+  - { name: Wjz25Ox,stop_code: Wjz25Ox, lat: -35.3909341, lng: 149.0714764}
+  - { name: Wjz25NL,stop_code: Wjz25NL, lat: -35.3911118, lng: 149.0716052}
+  - { name: Wjz24uT,stop_code: Wjz24uT, lat: -35.3931517, lng: 149.0676751}
+  - { name: Wjz24vP,stop_code: Wjz24vP, lat: -35.3928088, lng: 149.0677265}
+  - { name: Wjz24lA,stop_code: Wjz24lA, lat: -35.3941231, lng: 149.0659575}
+  - { name: Wjz24lu,stop_code: Wjz24lu, lat: -35.3939542, lng: 149.0657865}
+  - { name: Wjz24cK,stop_code: Wjz24cK, lat: -35.3946419, lng: 149.0647484}
+  - { name: Wjz2498,stop_code: Wjz2498, lat: -35.3972167, lng: 149.0640703}
+  - { name: Wjz248n,stop_code: Wjz248n, lat: -35.3972727, lng: 149.064345}
+  - { name: Wjz2347,stop_code: Wjz2347, lat: -35.4000362, lng: 149.0625}
+  - { name: Wjz234e,stop_code: Wjz234e, lat: -35.4001412, lng: 149.0627055}
+  - { name: WjrWXON,stop_code: WjrWXON, lat: -35.4019182, lng: 149.060886}
+  - { name: WjrWXNL,stop_code: WjrWXNL, lat: -35.4020721, lng: 149.0607315}
+  - { name: Wjz230Q,stop_code: Wjz230Q, lat: -35.4030936, lng: 149.0635466}
+  - { name: Wjz230G,stop_code: Wjz230G, lat: -35.4032475, lng: 149.0634951}
+  - { name: Wjz66Cd,stop_code: Wjz66Cd, lat: -35.2065831, lng: 149.0682105}
+  - { name: Wjz66C2,stop_code: Wjz66C2, lat: -35.2068343, lng: 149.0681005}
+  - { name: Wjz67xQ,stop_code: Wjz67xQ, lat: -35.2046532, lng: 149.0691406}
+  - { name: Wjz66KO,stop_code: Wjz66KO, lat: -35.2068138, lng: 149.0704302}
+  - { name: Wjz66Lx,stop_code: Wjz66Lx, lat: -35.2062279, lng: 149.0700922}
+  - { name: Wjz67yW,stop_code: Wjz67yW, lat: -35.2040813, lng: 149.0692143}
+  - { name: Wjz67nz,stop_code: Wjz67nz, lat: -35.2006201, lng: 149.0659965}
+  - { name: Wjz70go,stop_code: Wjz70go, lat: -35.2001419, lng: 149.0658463}
+  - { name: Wjz701y,stop_code: Wjz701y, lat: -35.1992909, lng: 149.0633518}
+  - { name: Wjz701a,stop_code: Wjz701a, lat: -35.1992794, lng: 149.0628172}
+  - { name: Wjr_UUM,stop_code: Wjr_UUM, lat: -35.2001188, lng: 149.062303}
+  - { name: Wjr_UUU,stop_code: Wjr_UUU, lat: -35.2001327, lng: 149.0624944}
+  - { name: Wjz3_z-,stop_code: Wjz3_z-, lat: -35.3349223, lng: 149.1461306}
+  - { name: Wjzb705,stop_code: Wjzb705, lat: -35.3370433, lng: 149.1505109}
+  - { name: Wjr_UPA,stop_code: Wjr_UPA, lat: -35.1977713, lng: 149.0605874}
+  - { name: Wjr_UPL,stop_code: Wjr_UPL, lat: -35.1975228, lng: 149.0606273}
+  - { name: Wjr_UTL,stop_code: Wjr_UTL, lat: -35.1947749, lng: 149.060646}
+  - { name: Wjr_UTJ,stop_code: Wjr_UTJ, lat: -35.1949558, lng: 149.0607434}
+  - { name: Wjz707-,stop_code: Wjz707-, lat: -35.1947883, lng: 149.0637942}
+  - { name: Wjz707Z,stop_code: Wjz707Z, lat: -35.1948745, lng: 149.0637273}
+  - { name: Wjz70lp,stop_code: Wjz70lp, lat: -35.1966753, lng: 149.0658519}
+  - { name: Wjz70kD,stop_code: Wjz70kD, lat: -35.196836, lng: 149.0659887}
+  - { name: Wjz70zB,stop_code: Wjz70zB, lat: -35.1976784, lng: 149.0688026}
+  - { name: Wjz70zz,stop_code: Wjz70zz, lat: -35.1978567, lng: 149.0687555}
+  - { name: Wjz70IW,stop_code: Wjz70IW, lat: -35.197242, lng: 149.0706277}
+  - { name: Wjz70IY,stop_code: Wjz70IY, lat: -35.1970964, lng: 149.0706179}
+  - { name: Wjz70Wi,stop_code: Wjz70Wi, lat: -35.1986355, lng: 149.0725952}
+  - { name: Wjz70Wx,stop_code: Wjz70Wx, lat: -35.1986717, lng: 149.0728065}
+  - { name: Wjz67_t,stop_code: Wjz67_t, lat: -35.200411, lng: 149.0727116}
+  - { name: Wjz67_v,stop_code: Wjz67_v, lat: -35.2002563, lng: 149.0727607}
+  - { name: Wjz67BD,stop_code: Wjz67BD, lat: -35.2015929, lng: 149.0686908}
+  - { name: Wjz67Dq,stop_code: Wjz67Dq, lat: -35.2006561, lng: 149.0686086}
+  - { name: Wjzcend,stop_code: Wjzcend, lat: -35.2937972, lng: 149.1643403}
+  - { name: Wjzce7O,stop_code: Wjzce7O, lat: -35.2940494, lng: 149.162512}
+  - { name: Wjz68Y0,stop_code: Wjz68Y0, lat: -35.2413091, lng: 149.0832098}
+  - { name: Wjz68W3,stop_code: Wjz68W3, lat: -35.2425008, lng: 149.0831669}
+  - { name: Wjz68IH,stop_code: Wjz68IH, lat: -35.2411129, lng: 149.0812786}
+  - { name: Wjz68Ip,stop_code: Wjz68Ip, lat: -35.2412881, lng: 149.0809439}
+  - { name: WjrW_uo,stop_code: WjrW_uo, lat: -35.3773291, lng: 149.056161}
+  - { name: WjrXUoV,stop_code: WjrXUoV, lat: -35.3758661, lng: 149.0568376}
+  - { name: WjrXUAm,stop_code: WjrXUAm, lat: -35.3726375, lng: 149.0574471}
+  - { name: WjrXUsW,stop_code: WjrXUsW, lat: -35.3730527, lng: 149.0568719}
+  - { name: Wjz5dQt,stop_code: Wjz5dQt, lat: -35.2573605, lng: 149.0822652}
+  - { name: Wjz5l2U,stop_code: Wjz5l2U, lat: -35.2592266, lng: 149.0857332}
+  - { name: Wjz5dcJ,stop_code: Wjz5dcJ, lat: -35.2573868, lng: 149.075852}
+  - { name: Wjz5d81,stop_code: Wjz5d81, lat: -35.2605056, lng: 149.0749293}
+  - { name: Wjz5e8Y,stop_code: Wjz5e8Y, lat: -35.2547235, lng: 149.0761202}
+  - { name: Wjz5NAQ,stop_code: Wjz5NAQ, lat: -35.2794375, lng: 149.1349942}
+  - { name: WjrXMN9,stop_code: WjrXMN9, lat: -35.3751239, lng: 149.0489789}
+  - { name: WjrXMFM,stop_code: WjrXMFM, lat: -35.3752866, lng: 149.0485475}
+  - { name: WjrX-3w,stop_code: WjrX-3w, lat: -35.340876, lng: 149.0522964}
+  - { name: Wjzj4ju,stop_code: Wjzj4ju, lat: -35.351369, lng: 149.2416919}
+  - { name: WjrXJZ6,stop_code: WjrXJZ6, lat: -35.3445279, lng: 149.0392999}
+  - { name: WjrXJ-g,stop_code: WjrXJ-g, lat: -35.3443528, lng: 149.0396647}
+  - { name: Wjz2qnG,stop_code: Wjz2qnG, lat: -35.4038881, lng: 149.0992283}
+  - { name: Wjz3jaF,stop_code: Wjz3jaF, lat: -35.3579826, lng: 149.0867102}
+  - { name: Wjz3i6e,stop_code: Wjz3i6e, lat: -35.3603188, lng: 149.084779}
+  - { name: Wjz3jei,stop_code: Wjz3jei, lat: -35.3551755, lng: 149.0862349}
+  - { name: Wjz3k1J,stop_code: Wjz3k1J, lat: -35.3528521, lng: 149.0854118}
+  - { name: Wjz3kcA,stop_code: Wjz3kcA, lat: -35.3508773, lng: 149.0866243}
+  - { name: Wjz69uI,stop_code: Wjz69uI, lat: -35.2341477, lng: 149.0784965}
+  - { name: Wjz7ZaH,stop_code: Wjz7ZaH, lat: -35.171087, lng: 149.1418054}
+  - { name: Wjz7ZaP,stop_code: Wjz7ZaP, lat: -35.1710474, lng: 149.141884}
+  - { name: Wjz7-oI,stop_code: Wjz7-oI, lat: -35.1668191, lng: 149.1443901}
+  - { name: Wjz7-xb,stop_code: Wjz7-xb, lat: -35.1662448, lng: 149.1450965}
+  - { name: WjzcrEu,stop_code: WjzcrEu, lat: -35.3150059, lng: 149.190788}
+  - { name: WjzbUGB,stop_code: WjzbUGB, lat: -35.3740947, lng: 149.2349556}
+  - { name: WjzbUQX,stop_code: WjzbUQX, lat: -35.3729581, lng: 149.2368028}
+  - { name: Wjzi7mf,stop_code: Wjzi7mf, lat: -35.3766831, lng: 149.2412565}
+  - { name: Wjzj0yX,stop_code: Wjzj0yX, lat: -35.3742978, lng: 149.2450265}
+  - { name: WjzbUCp,stop_code: WjzbUCp, lat: -35.3717241, lng: 149.2334526}
+  - { name: WjzbWBs,stop_code: WjzbWBs, lat: -35.3611492, lng: 149.2334303}
+  - { name: Wjz5FOn,stop_code: Wjz5FOn, lat: -35.2806054, lng: 149.1260452}
+  - { name: WjzbWzE,stop_code: WjzbWzE, lat: -35.3628765, lng: 149.2337473}
+  - { name: WjzbWyW,stop_code: WjzbWyW, lat: -35.363411, lng: 149.2340547}
+  - { name: Wjz7oYv,stop_code: Wjz7oYv, lat: -35.196789, lng: 149.1057064}
+  - { name: Wjz7oZp,stop_code: Wjz7oZp, lat: -35.1966204, lng: 149.1057315}
+  - { name: Wjz7xp9,stop_code: Wjz7xp9, lat: -35.193896, lng: 149.1108506}
+  - { name: Wjz7xpa,stop_code: Wjz7xpa, lat: -35.1938349, lng: 149.1107761}
+  - { name: Wjz5-6R,stop_code: Wjz5-6R, lat: -35.2505265, lng: 149.1404751}
+  - { name: Wjz7YIc,stop_code: Wjz7YIc, lat: -35.1751298, lng: 149.1466086}
+  - { name: WjrW_1f,stop_code: WjrW_1f, lat: -35.3801683, lng: 149.051853}
+  - { name: WjrWTWO,stop_code: WjrWTWO, lat: -35.3798917, lng: 149.0512179}
+  - { name: WjrWTJo,stop_code: WjrWTJo, lat: -35.3779591, lng: 149.0479511}
+  - { name: WjrWTJq,stop_code: WjrWTJq, lat: -35.3778081, lng: 149.0480034}
+  - { name: Wjz5MsT,stop_code: Wjz5MsT, lat: -35.2846782, lng: 149.133671}
+  - { name: Wjz5MsD,stop_code: Wjz5MsD, lat: -35.2847121, lng: 149.1333531}
+  - { name: WjrXBSS,stop_code: WjrXBSS, lat: -35.3438051, lng: 149.0278253}
+  - { name: WjrXBSJ,stop_code: WjrXBSJ, lat: -35.3439387, lng: 149.0276931}
+  - { name: Wjz5Oj2,stop_code: Wjz5Oj2, lat: -35.2748472, lng: 149.131256}
+  - { name: Wjz5Ok1,stop_code: Wjz5Ok1, lat: -35.2742265, lng: 149.1312268}
+  - { name: Wjz5P8K,stop_code: Wjz5P8K, lat: -35.2710632, lng: 149.1307122}
+  - { name: Wjz5SDc,stop_code: Wjz5SDc, lat: -35.2499285, lng: 149.1341368}
+  - { name: Wjz5SrO,stop_code: Wjz5SrO, lat: -35.2528485, lng: 149.1336705}
+  - { name: Wjz5RvC,stop_code: Wjz5RvC, lat: -35.2552151, lng: 149.1332875}
+  - { name: Wjz5Rsi,stop_code: Wjz5Rsi, lat: -35.2576771, lng: 149.132889}
+  - { name: Wjz5QmR,stop_code: Wjz5QmR, lat: -35.2615172, lng: 149.1322602}
+  - { name: Wjz5Qgn,stop_code: Wjz5Qgn, lat: -35.2655006, lng: 149.1316277}
+  - { name: Wjz5Pl0,stop_code: Wjz5Pl0, lat: -35.2681201, lng: 149.1312}
+  - { name: Wjz5Oci,stop_code: Wjz5Oci, lat: -35.2741724, lng: 149.1302168}
+  - { name: Wjz5N4m,stop_code: Wjz5N4m, lat: -35.279266, lng: 149.1287817}
+  - { name: Wjz5N5h,stop_code: Wjz5N5h, lat: -35.2790396, lng: 149.1288222}
+  - { name: Wjz5O3Q,stop_code: Wjz5O3Q, lat: -35.274617, lng: 149.1295599}
+  - { name: Wjz5P8n,stop_code: Wjz5P8n, lat: -35.2710038, lng: 149.1301486}
+  - { name: Wjz5PdJ,stop_code: Wjz5PdJ, lat: -35.2676612, lng: 149.1306865}
+  - { name: Wjz5Qi2,stop_code: Wjz5Qi2, lat: -35.2645608, lng: 149.1311834}
+  - { name: Wjz5Qmu,stop_code: Wjz5Qmu, lat: -35.2613932, lng: 149.1316889}
+  - { name: Wjz5RkN,stop_code: Wjz5RkN, lat: -35.2577065, lng: 149.1322899}
+  - { name: Wjz5Sqk,stop_code: Wjz5Sqk, lat: -35.2533948, lng: 149.1329835}
+  - { name: Wjz5Sux,stop_code: Wjz5Sux, lat: -35.2509191, lng: 149.1333899}
+  - { name: Wjz5MI3,stop_code: Wjz5MI3, lat: -35.2850249, lng: 149.1353935}
+  - { name: WjzbYAM,stop_code: WjzbYAM, lat: -35.3512052, lng: 149.2339748}
+  - { name: Wjz3uDU,stop_code: Wjz3uDU, lat: -35.338154, lng: 149.1022456}
+  - { name: Wjz3uK7,stop_code: Wjz3uK7, lat: -35.3382669, lng: 149.1024969}
+  - { name: Wjz5xl6,stop_code: Wjz5xl6, lat: -35.278643, lng: 149.1093237}
+  - { name: Wjz3eje,stop_code: Wjz3eje, lat: -35.3403963, lng: 149.0765097}
+  - { name: WjrXQ2W,stop_code: WjrXQ2W, lat: -35.3523853, lng: 149.0417814}
+  - { name: WjrXQeH,stop_code: WjrXQeH, lat: -35.3495777, lng: 149.0428125}
+  - { name: WjrXHZU,stop_code: WjrXHZU, lat: -35.3560382, lng: 149.0404158}
+  - { name: Wjz60QI,stop_code: Wjz60QI, lat: -35.2410106, lng: 149.0717141}
+  - { name: Wjz60Y4,stop_code: Wjz60Y4, lat: -35.2410195, lng: 149.0722506}
+  - { name: Wjz60QW,stop_code: Wjz60QW, lat: -35.241186, lng: 149.0720789}
+  - { name: Wjz60Qa,stop_code: Wjz60Qa, lat: -35.2411772, lng: 149.0709792}
+  - { name: Wjz60Qc,stop_code: Wjz60Qc, lat: -35.2410063, lng: 149.0710758}
+  - { name: Wjz6u3h,stop_code: Wjz6u3h, lat: -35.2089622, lng: 149.095889}
+  - { name: Wjz6u32,stop_code: Wjz6u32, lat: -35.2088899, lng: 149.09552}
+  - { name: Wjz6mOx,stop_code: Wjz6mOx, lat: -35.20966, lng: 149.0935299}
+  - { name: Wjz6sHv,stop_code: Wjz6sHv, lat: -35.21947, lng: 149.10295}
+  - { name: Wjz6sZ1,stop_code: Wjz6sZ1, lat: -35.21859, lng: 149.10511}
+  - { name: Wjz6uhX,stop_code: Wjz6uhX, lat: -35.2101981, lng: 149.0994957}
+  - { name: Wjz6uwF,stop_code: Wjz6uwF, lat: -35.2110747, lng: 149.1018989}
+  - { name: WjrWYHH,stop_code: WjrWYHH, lat: -35.3956133, lng: 149.0592665}
+  - { name: WjrWYDE,stop_code: WjrWYDE, lat: -35.3931009, lng: 149.0580053}
+  - { name: WjrWYDO,stop_code: WjrWYDO, lat: -35.3929049, lng: 149.058196}
+  - { name: WjrWYHE,stop_code: WjrWYHE, lat: -35.3958129, lng: 149.0592983}
+  - { name: Wjz6sdP,stop_code: Wjz6sdP, lat: -35.21844, lng: 149.0979199}
+  - { name: Wjz6sdJ,stop_code: Wjz6sdJ, lat: -35.21822, lng: 149.09782}
+  - { name: Wjz6t8_,stop_code: Wjz6t8_, lat: -35.21601, lng: 149.09817}
+  - { name: Wjz6t9w,stop_code: Wjz6t9w, lat: -35.21597, lng: 149.09763}
+  - { name: Wjz6t3F,stop_code: Wjz6t3F, lat: -35.21451, lng: 149.09646}
+  - { name: Wjz6t4U,stop_code: Wjz6t4U, lat: -35.21388, lng: 149.09676}
+  - { name: Wjz5nw6,stop_code: Wjz5nw6, lat: -35.2491082, lng: 149.0900504}
+  - { name: Wjz5nwb,stop_code: Wjz5nwb, lat: -35.2493711, lng: 149.0901523}
+  - { name: Wjz6hxB,stop_code: Wjz6hxB, lat: -35.2374959, lng: 149.0907853}
+  - { name: Wjz6rsL,stop_code: Wjz6rsL, lat: -35.2242562, lng: 149.1005043}
+  - { name: Wjz6rrI,stop_code: Wjz6rrI, lat: -35.2252509, lng: 149.1005016}
+  - { name: Wjz5mbS,stop_code: Wjz5mbS, lat: -35.2525252, lng: 149.0869819}
+  - { name: Wjz5eb2,stop_code: Wjz5eb2, lat: -35.252833, lng: 149.0749872}
+  - { name: Wjz5ec7,stop_code: Wjz5ec7, lat: -35.2517641, lng: 149.0750194}
+  - { name: Wjz5e0m,stop_code: Wjz5e0m, lat: -35.2546115, lng: 149.0739747}
+  - { name: Wjz5d57,stop_code: Wjz5d57, lat: -35.256585, lng: 149.0734919}
+  - { name: Wjz55V-,stop_code: Wjz55V-, lat: -35.2594169, lng: 149.0733684}
+  - { name: Wjz681S,stop_code: Wjz681S, lat: -35.2428905, lng: 149.0745728}
+  - { name: Wjz689c,stop_code: Wjz689c, lat: -35.2430767, lng: 149.0750449}
+  - { name: Wjz6pLi,stop_code: Wjz6pLi, lat: -35.2336222, lng: 149.1026958}
+  - { name: Wjz6pLk,stop_code: Wjz6pLk, lat: -35.2334807, lng: 149.1028323}
+  - { name: Wjz6y90,stop_code: Wjz6y90, lat: -35.2324006, lng: 149.1079069}
+  - { name: Wjz6mip,stop_code: Wjz6mip, lat: -35.2096535, lng: 149.0878294}
+  - { name: Wjz6Apq,stop_code: Wjz6Apq, lat: -35.2212504, lng: 149.1111434}
+  - { name: Wjz6yzQ,stop_code: Wjz6yzQ, lat: -35.2307289, lng: 149.1130906}
+  - { name: Wjz6yzH,stop_code: Wjz6yzH, lat: -35.2308034, lng: 149.1129136}
+  - { name: Wjz5L_c,stop_code: Wjz5L_c, lat: -35.2444385, lng: 149.1272473}
+  - { name: Wjz5Ti2,stop_code: Wjz5Ti2, lat: -35.2480353, lng: 149.1313351}
+  - { name: Wjz6Apy,stop_code: Wjz6Apy, lat: -35.2213073, lng: 149.1113204}
+  - { name: Wjz69ht,stop_code: Wjz69ht, lat: -35.2375061, lng: 149.0768646}
+  - { name: Wjz69gA,stop_code: Wjz69gA, lat: -35.2382334, lng: 149.0769344}
+  - { name: Wjz69vO,stop_code: Wjz69vO, lat: -35.2336108, lng: 149.0786617}
+  - { name: WjrWZsS,stop_code: WjrWZsS, lat: -35.3891768, lng: 149.0567055}
+  - { name: WjrWZA3,stop_code: WjrWZA3, lat: -35.3893963, lng: 149.0571767}
+  - { name: Wjz6iN7,stop_code: Wjz6iN7, lat: -35.2318153, lng: 149.0928498}
+  - { name: Wjz6iNm,stop_code: Wjz6iNm, lat: -35.2318811, lng: 149.0930643}
+  - { name: Wjz6iYm,stop_code: Wjz6iYm, lat: -35.2298806, lng: 149.0944438}
+  - { name: Wjz6iYk,stop_code: Wjz6iYk, lat: -35.2300583, lng: 149.0945448}
+  - { name: Wjz239F,stop_code: Wjz239F, lat: -35.4026063, lng: 149.0647649}
+  - { name: Wjz213w,stop_code: Wjz213w, lat: -35.4123171, lng: 149.0633299}
+  - { name: Wjz213q,stop_code: Wjz213q, lat: -35.4121336, lng: 149.063177}
+  - { name: Wjz20ut,stop_code: Wjz20ut, lat: -35.415325, lng: 149.0672593}
+  - { name: Wjz3hL_,stop_code: Wjz3hL_, lat: -35.3650156, lng: 149.0926464}
+  - { name: Wjz3gK-,stop_code: Wjz3gK-, lat: -35.3712753, lng: 149.0926679}
+  - { name: Wjz3gQn,stop_code: Wjz3gQn, lat: -35.3725942, lng: 149.0931105}
+  - { name: Wjz3gMq,stop_code: Wjz3gMq, lat: -35.3757982, lng: 149.0932419}
+  - { name: Wjz238T,stop_code: Wjz238T, lat: -35.4027681, lng: 149.0650277}
+  - { name: Wjz3kAx,stop_code: Wjz3kAx, lat: -35.3511369, lng: 149.0906806}
+  - { name: Wjz3kwU,stop_code: Wjz3kwU, lat: -35.3539843, lng: 149.0913052}
+  - { name: Wjz3iFK,stop_code: Wjz3iFK, lat: -35.3637163, lng: 149.0922629}
+  - { name: Wjz6rp1,stop_code: Wjz6rp1, lat: -35.2268254, lng: 149.0996755}
+  - { name: Wjz6rhW,stop_code: Wjz6rhW, lat: -35.2267553, lng: 149.0994502}
+  - { name: Wjz6qe4,stop_code: Wjz6qe4, lat: -35.2286658, lng: 149.0969557}
+  - { name: Wjz6qea,stop_code: Wjz6qea, lat: -35.2288148, lng: 149.0970523}
+  - { name: Wjz6zAP,stop_code: Wjz6zAP, lat: -35.2246234, lng: 149.113116}
+  - { name: Wjz5GNG,stop_code: Wjz5GNG, lat: -35.2762093, lng: 149.1265723}
+  - { name: Wjz5E4O,stop_code: Wjz5E4O, lat: -35.2851023, lng: 149.1186022}
+  - { name: Wjz5w_S,stop_code: Wjz5w_S, lat: -35.2827048, lng: 149.117182}
+  - { name: Wjz5yYV,stop_code: Wjz5yYV, lat: -35.2742188, lng: 149.1173067}
+  - { name: Wjz3leq,stop_code: Wjz3leq, lat: -35.344135, lng: 149.0864401}
+  - { name: Wjz3ldS,stop_code: Wjz3ldS, lat: -35.3445222, lng: 149.0870435}
+  - { name: Wjz3ldj,stop_code: Wjz3ldj, lat: -35.3447574, lng: 149.0862912}
+  - { name: Wjz3ldh,stop_code: Wjz3ldh, lat: -35.3449697, lng: 149.0863328}
+  - { name: Wjz3ldC,stop_code: Wjz3ldC, lat: -35.344484, lng: 149.0866144}
+  - { name: Wjz3ldT,stop_code: Wjz3ldT, lat: -35.3444271, lng: 149.0869631}
+  - { name: Wjz3lm0,stop_code: Wjz3lm0, lat: -35.34438, lng: 149.0872661}
+  - { name: Wjz3ldJ,stop_code: Wjz3ldJ, lat: -35.344566, lng: 149.086774}
+  - { name: Wjz3ll7,stop_code: Wjz3ll7, lat: -35.3444741, lng: 149.0873533}
+  - { name: Wjz3lmt,stop_code: Wjz3lmt, lat: -35.3439501, lng: 149.0877369}
+  - { name: Wjz3lml,stop_code: Wjz3lml, lat: -35.3439129, lng: 149.0876216}
+  - { name: Wjz3lmi,stop_code: Wjz3lmi, lat: -35.3442093, lng: 149.0876443}
+  - { name: Wjz3llf,stop_code: Wjz3llf, lat: -35.34445, lng: 149.0875371}
+  - { name: Wjz3leo,stop_code: Wjz3leo, lat: -35.344368, lng: 149.0864991}
+  - { name: Wjz3kyX,stop_code: Wjz3kyX, lat: -35.3523555, lng: 149.0913002}
+  - { name: Wjz3lmq,stop_code: Wjz3lmq, lat: -35.3442083, lng: 149.0877771}
+  - { name: Wjz20nf,stop_code: Wjz20nf, lat: -35.4144924, lng: 149.0655423}
+  - { name: Wjz21g2,stop_code: Wjz21g2, lat: -35.414217, lng: 149.0653492}
+  - { name: Wjz218U,stop_code: Wjz218U, lat: -35.4143897, lng: 149.0652364}
+  - { name: Wjz20nd,stop_code: Wjz20nd, lat: -35.4146761, lng: 149.0654565}
+  - { name: Wjz20ni,stop_code: Wjz20ni, lat: -35.4149428, lng: 149.0656523}
+  - { name: Wjz20nk,stop_code: Wjz20nk, lat: -35.4147569, lng: 149.0657435}
+  - { name: Wjr-UJ-,stop_code: Wjr-UJ-, lat: -35.240121, lng: 149.0597101}
+  - { name: Wjr-USo,stop_code: Wjr-USo, lat: -35.2400027, lng: 149.0603149}
+  - { name: Wjr-USy,stop_code: Wjr-USy, lat: -35.2397639, lng: 149.0604531}
+  - { name: Wjr-USa,stop_code: Wjr-USa, lat: -35.2398454, lng: 149.0600442}
+  - { name: Wjz7YzW,stop_code: Wjz7YzW, lat: -35.1759253, lng: 149.1462691}
+  - { name: Wjr-SAW,stop_code: Wjr-SAW, lat: -35.2081966, lng: 149.0473834}
+  - { name: Wjzc24u,stop_code: Wjzc24u, lat: -35.317722, lng: 149.1510115}
+  - { name: Wjz4WZo,stop_code: Wjz4WZo, lat: -35.3175809, lng: 149.1496027}
+  - { name: Wjz4WY7,stop_code: Wjz4WY7, lat: -35.3176372, lng: 149.1491419}
+  - { name: WjrXPbu,stop_code: WjrXPbu, lat: -35.3568919, lng: 149.0424224}
+  - { name: WjrXPbD,stop_code: WjrXPbD, lat: -35.356823, lng: 149.0426424}
+  - { name: WjrXBWn,stop_code: WjrXBWn, lat: -35.3465295, lng: 149.0286032}
+  - { name: WjrXBWu,stop_code: WjrXBWu, lat: -35.3466197, lng: 149.0287455}
+  - { name: WjrXI5u,stop_code: WjrXI5u, lat: -35.3499839, lng: 149.0301495}
+  - { name: WjrXI5s,stop_code: WjrXI5s, lat: -35.3501807, lng: 149.0301549}
+  - { name: WjrXIbK,stop_code: WjrXIbK, lat: -35.3514081, lng: 149.0319332}
+  - { name: WjrXIbT,stop_code: WjrXIbT, lat: -35.351342, lng: 149.0321099}
+  - { name: WjrXIqk,stop_code: WjrXIqk, lat: -35.3522608, lng: 149.0341457}
+  - { name: WjrXIqp,stop_code: WjrXIqp, lat: -35.352473, lng: 149.0342718}
+  - { name: WjrXHvw,stop_code: WjrXHvw, lat: -35.3546272, lng: 149.0344542}
+  - { name: WjrXHuL,stop_code: WjrXHuL, lat: -35.3547054, lng: 149.0346008}
+  - { name: WjrXHH7,stop_code: WjrXHH7, lat: -35.3568349, lng: 149.0364585}
+  - { name: WjrXHHk,stop_code: WjrXHHk, lat: -35.3570187, lng: 149.0369096}
+  - { name: WjrXHYJ,stop_code: WjrXHYJ, lat: -35.356246, lng: 149.0401055}
+  - { name: WjrXPgO,stop_code: WjrXPgO, lat: -35.3592839, lng: 149.0444246}
+  - { name: WjrXOn_,stop_code: WjrXOn_, lat: -35.359526, lng: 149.0445552}
+  - { name: WjrXPFr,stop_code: WjrXPFr, lat: -35.3585046, lng: 149.0479415}
+  - { name: WjrXPFn,stop_code: WjrXPFn, lat: -35.358206, lng: 149.0478792}
+  - { name: WjrXPR4,stop_code: WjrXPR4, lat: -35.3556673, lng: 149.048857}
+  - { name: WjrXPJX,stop_code: WjrXPJX, lat: -35.3557253, lng: 149.0486263}
+  - { name: WjrXQO9,stop_code: WjrXQO9, lat: -35.352521, lng: 149.0490119}
+  - { name: WjrXQOh,stop_code: WjrXQOh, lat: -35.3524926, lng: 149.049231}
+  - { name: WjrXQTq,stop_code: WjrXQTq, lat: -35.348941, lng: 149.0494159}
+  - { name: WjrXQTy,stop_code: WjrXQTy, lat: -35.3489683, lng: 149.0495709}
+  - { name: WjrXRMq,stop_code: WjrXRMq, lat: -35.3483271, lng: 149.0492963}
+  - { name: WjrXRFB,stop_code: WjrXRFB, lat: -35.3473864, lng: 149.048202}
+  - { name: WjrXRyK,stop_code: WjrXRyK, lat: -35.3465911, lng: 149.0470392}
+  - { name: WjrXRzE,stop_code: WjrXRzE, lat: -35.3464066, lng: 149.0469632}
+  - { name: WjrXRBQ,stop_code: WjrXRBQ, lat: -35.3446963, lng: 149.0471083}
+  - { name: WjrXRBJ,stop_code: WjrXRBJ, lat: -35.344588, lng: 149.0469995}
+  - { name: WjrX-0-,stop_code: WjrX-0-, lat: -35.3424839, lng: 149.052828}
+  - { name: WjrX-90,stop_code: WjrX-90, lat: -35.3423165, lng: 149.0529937}
+  - { name: WjrXZv3,stop_code: WjrXZv3, lat: -35.3434037, lng: 149.0557375}
+  - { name: WjrXZv5,stop_code: WjrXZv5, lat: -35.3432647, lng: 149.0558034}
+  - { name: Wjz3dXS,stop_code: Wjz3dXS, lat: -35.3459117, lng: 149.0842511}
+  - { name: Wjr-uhM,stop_code: Wjr-uhM, lat: -35.2104818, lng: 149.0114129}
+  - { name: Wjz3BfO,stop_code: Wjz3BfO, lat: -35.3434784, lng: 149.1088951}
+  - { name: Wjz3Bea,stop_code: Wjz3Bea, lat: -35.3442178, lng: 149.1080098}
 routes:
 

--- a/maxious-canberra-transit-feed/createfeed.py
+++ b/maxious-canberra-transit-feed/createfeed.py
@@ -69,8 +69,10 @@
   stopset = set()
   for route in routedata:
     stopset.update(route['time_points'])
-    for between_list in route['between_stops']:
-      stopset.update(route['between_stops'][between_list])
+    if len(route['between_stops']) > 0:
+	for between_list in route['between_stops']:
+		if route['between_stops'][between_list] != None:
+		      stopset.update(route['between_stops'][between_list])
 
   toprune = list()
   for i, stop in enumerate(stopsdata):

--- a/maxious-canberra-transit-feed/gs.sh
+++ /dev/null
@@ -1,6 +1,1 @@
-gs_osmdb_compile ~/osm/canberra.osm canberra.osmdb
-gs_gtfsdb_build cbrfeed.zip canberra.gtfsdb
-gs_link_osm_gtfs map.gdb canberra.osmdb canberra.gtfsdb
-gs_import_osm
-gs_import_gtfs
 

--- a/maxious-canberra-transit-feed/output/10-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/10-to-cohen-st-station.stop_times.yml
@@ -1,512 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "10"
+stop_times: [["-", "-", "-", "-", "-", "-", 632a, 642a, 644a, 649a, 659a, 706a, 708a, 712a], ["-", "-", "-", "-", "-", "-", 702a, 712a, 714a, 719a, 729a, 736a, 738a, 742a], ["-", "-", "-", "-", "-", "-", 732a, 742a, 744a, 749a, 759a, 806a, 808a, 812a], ["-", "-", "-", "-", "-", "-", 802a, 812a, 814a, 819a, 829a, 836a, 838a, 842a], ["-", "-", "-", 800a, 803a, 808a, 820a, 830a, 832a, 837a, 847a, 854a, 856a, 900a], ["-", "-", "-", 830a, 833a, 838a, 850a, 900a, 902a, 907a, 917a, 924a, 926a, 930a], ["-", "-", "-", 900a, 903a, 908a, 920a, 930a, 932a, 937a, 947a, 954a, 956a, 1000a], [918a, 929a, 934a, 941a, 944a, 949a, 1001a, 1011a, 1013a, 1018a, 1028a, 1035a, 1037a, 1041a], [948a, 959a, 1004a, 1011a, 1014a, 1019a, 1031a, 1041a, 1043a, 1048a, 1058a, 1105a, 1107a, 1111a], [1018a, 1029a, 1034a, 1041a, 1044a, 1049a, 1101a, 1111a, 1113a, 1118a, 1128a, 1135a, 1137a, 1141a], [1048a, 1059a, 1104a, 1111a, 1114a, 1119a, 1131a, 1141a, 1143a, 1148a, 1158a, 1205p, 1207p, 1211p], [1118a, 1129a, 1134a, 1141a, 1144a, 1149a, 1201p, 1211p, 1213p, 1218p, 1228p, 1235p, 1237p, 1241p], [1148a, 1159a, 1204p, 1211p, 1214p, 1219p, 1231p, 1241p, 1243p, 1248p, 1258p, 105p, 107p, 111p], [1218p, 1229p, 1234p, 1241p, 1244p, 1249p, 101p, 111p, 113p, 118p, 128p, 135p, 137p, 141p], [1248p, 1259p, 104p, 111p, 114p, 119p, 131p, 141p, 143p, 148p, 158p, 205p, 207p, 211p], [118p, 129p, 134p, 141p, 144p, 149p, 201p, 211p, 213p, 218p, 228p, 235p, 237p, 241p], [148p, 159p, 204p, 211p, 214p, 219p, 231p, 241p, 243p, 248p, 258p, 305p, 307p, 311p], [218p, 229p, 234p, 241p, 244p, 249p, 301p, 311p, 314p, 319p, 329p, 336p, 338p, 342p], [248p, 259p, 304p, 311p, 315p, 320p, 332p, 342p, 345p, 350p, 400p, 407p, 409p, 413p], [318p, 329p, 334p, 341p, 345p, 350p, 402p, 412p, 415p, 420p, 430p, 437p, 439p, 443p], ["-", "-", "-", "-", "-", "-", 416p, 426p, 429p, 434p, 444p, 451p, 453p, 457p], [348p, 359p, 404p, 411p, 415p, 420p, 432p, 442p, 445p, 450p, 500p, 507p, 509p, 513p], ["-", "-", "-", "-", "-", "-", 446p, 456p, 459p, 504p, 514p, 521p, 523p, 527p], ["-", "-", 431p, 441p, 445p, 450p, 502p, 512p, 515p, 520p, 530p, 537p, 539p, 543p], ["-", "-", "-", "-", "-", "-", 516p, 526p, 529p, 534p, 544p, 551p, 553p, 557p], ["-", "-", 458p, 511p, 515p, 520p, 532p, 542p, 545p, 550p, 600p, 607p, 609p, 613p], ["-", "-", "-", "-", "-", "-", 546p, 556p, 559p, 604p, 614p, 621p, 623p, 627p], ["-", "-", "-", 540p, 544p, 549p, 601p, 611p, 614p, 619p, 629p, 636p, 638p, 641p], ["-", "-", "-", "-", "-", "-", 616p, 626p, 629p, 634p, 644p, 651p, 653p, 656p], ["-", "-", "-", 611p, 615p, 620p, 632p, 642p, 644p, 649p, 659p, 706p, 708p, 711p], ["-", "-", "-", "-", "-", "-", 736p, 746p, 748p, 753p, 803p, 810p, 812p, 815p], ["-", "-", "-", "-", "-", "-", 836p, 846p, 848p, 853p, 903p, 910p, 912p, 915p], ["-", "-", "-", "-", "-", "-", 936p, 946p, 948p, 953p, 1003p, 1010p, 1012p, 1015p], ["-", "-", "-", "-", "-", "-", 1036p, 1046p, 1048p, 1053p, 1103p, 1110p, 1112p, 1115p], ["-", "-", "-", "-", "-", "-", 1136p, 1146p, 1148p, 1153p, 1203a, 1210a, 1212a, 1215a]]
+time_points: [Fairbairn Park, Brindabella Business Park, Majura Business Park, Campbell Park Offices, ADFA, War Memorial, City Interchange (Platform 4), Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "10"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 632a
-  - 642a
-  - 644a
-  - 649a
-  - 659a
-  - 706a
-  - 708a
-  - 712a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 702a
-  - 712a
-  - 714a
-  - 719a
-  - 729a
-  - 736a
-  - 738a
-  - 742a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 732a
-  - 742a
-  - 744a
-  - 749a
-  - 759a
-  - 806a
-  - 808a
-  - 812a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 802a
-  - 812a
-  - 814a
-  - 819a
-  - 829a
-  - 836a
-  - 838a
-  - 842a
-- - "-"
-  - "-"
-  - "-"
-  - 800a
-  - 803a
-  - 808a
-  - 820a
-  - 830a
-  - 832a
-  - 837a
-  - 847a
-  - 854a
-  - 856a
-  - 900a
-- - "-"
-  - "-"
-  - "-"
-  - 830a
-  - 833a
-  - 838a
-  - 850a
-  - 900a
-  - 902a
-  - 907a
-  - 917a
-  - 924a
-  - 926a
-  - 930a
-- - "-"
-  - "-"
-  - "-"
-  - 900a
-  - 903a
-  - 908a
-  - 920a
-  - 930a
-  - 932a
-  - 937a
-  - 947a
-  - 954a
-  - 956a
-  - 1000a
-- - 918a
-  - 929a
-  - 934a
-  - 941a
-  - 944a
-  - 949a
-  - 1001a
-  - 1011a
-  - 1013a
-  - 1018a
-  - 1028a
-  - 1035a
-  - 1037a
-  - 1041a
-- - 948a
-  - 959a
-  - 1004a
-  - 1011a
-  - 1014a
-  - 1019a
-  - 1031a
-  - 1041a
-  - 1043a
-  - 1048a
-  - 1058a
-  - 1105a
-  - 1107a
-  - 1111a
-- - 1018a
-  - 1029a
-  - 1034a
-  - 1041a
-  - 1044a
-  - 1049a
-  - 1101a
-  - 1111a
-  - 1113a
-  - 1118a
-  - 1128a
-  - 1135a
-  - 1137a
-  - 1141a
-- - 1048a
-  - 1059a
-  - 1104a
-  - 1111a
-  - 1114a
-  - 1119a
-  - 1131a
-  - 1141a
-  - 1143a
-  - 1148a
-  - 1158a
-  - 1205p
-  - 1207p
-  - 1211p
-- - 1118a
-  - 1129a
-  - 1134a
-  - 1141a
-  - 1144a
-  - 1149a
-  - 1201p
-  - 1211p
-  - 1213p
-  - 1218p
-  - 1228p
-  - 1235p
-  - 1237p
-  - 1241p
-- - 1148a
-  - 1159a
-  - 1204p
-  - 1211p
-  - 1214p
-  - 1219p
-  - 1231p
-  - 1241p
-  - 1243p
-  - 1248p
-  - 1258p
-  - 105p
-  - 107p
-  - 111p
-- - 1218p
-  - 1229p
-  - 1234p
-  - 1241p
-  - 1244p
-  - 1249p
-  - 101p
-  - 111p
-  - 113p
-  - 118p
-  - 128p
-  - 135p
-  - 137p
-  - 141p
-- - 1248p
-  - 1259p
-  - 104p
-  - 111p
-  - 114p
-  - 119p
-  - 131p
-  - 141p
-  - 143p
-  - 148p
-  - 158p
-  - 205p
-  - 207p
-  - 211p
-- - 118p
-  - 129p
-  - 134p
-  - 141p
-  - 144p
-  - 149p
-  - 201p
-  - 211p
-  - 213p
-  - 218p
-  - 228p
-  - 235p
-  - 237p
-  - 241p
-- - 148p
-  - 159p
-  - 204p
-  - 211p
-  - 214p
-  - 219p
-  - 231p
-  - 241p
-  - 243p
-  - 248p
-  - 258p
-  - 305p
-  - 307p
-  - 311p
-- - 218p
-  - 229p
-  - 234p
-  - 241p
-  - 244p
-  - 249p
-  - 301p
-  - 311p
-  - 314p
-  - 319p
-  - 329p
-  - 336p
-  - 338p
-  - 342p
-- - 248p
-  - 259p
-  - 304p
-  - 311p
-  - 315p
-  - 320p
-  - 332p
-  - 342p
-  - 345p
-  - 350p
-  - 400p
-  - 407p
-  - 409p
-  - 413p
-- - 318p
-  - 329p
-  - 334p
-  - 341p
-  - 345p
-  - 350p
-  - 402p
-  - 412p
-  - 415p
-  - 420p
-  - 430p
-  - 437p
-  - 439p
-  - 443p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 416p
-  - 426p
-  - 429p
-  - 434p
-  - 444p
-  - 451p
-  - 453p
-  - 457p
-- - 348p
-  - 359p
-  - 404p
-  - 411p
-  - 415p
-  - 420p
-  - 432p
-  - 442p
-  - 445p
-  - 450p
-  - 500p
-  - 507p
-  - 509p
-  - 513p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 446p
-  - 456p
-  - 459p
-  - 504p
-  - 514p
-  - 521p
-  - 523p
-  - 527p
-- - "-"
-  - "-"
-  - 431p
-  - 441p
-  - 445p
-  - 450p
-  - 502p
-  - 512p
-  - 515p
-  - 520p
-  - 530p
-  - 537p
-  - 539p
-  - 543p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 516p
-  - 526p
-  - 529p
-  - 534p
-  - 544p
-  - 551p
-  - 553p
-  - 557p
-- - "-"
-  - "-"
-  - 458p
-  - 511p
-  - 515p
-  - 520p
-  - 532p
-  - 542p
-  - 545p
-  - 550p
-  - 600p
-  - 607p
-  - 609p
-  - 613p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 546p
-  - 556p
-  - 559p
-  - 604p
-  - 614p
-  - 621p
-  - 623p
-  - 627p
-- - "-"
-  - "-"
-  - "-"
-  - 540p
-  - 544p
-  - 549p
-  - 601p
-  - 611p
-  - 614p
-  - 619p
-  - 629p
-  - 636p
-  - 638p
-  - 641p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 616p
-  - 626p
-  - 629p
-  - 634p
-  - 644p
-  - 651p
-  - 653p
-  - 656p
-- - "-"
-  - "-"
-  - "-"
-  - 611p
-  - 615p
-  - 620p
-  - 632p
-  - 642p
-  - 644p
-  - 649p
-  - 659p
-  - 706p
-  - 708p
-  - 711p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 736p
-  - 746p
-  - 748p
-  - 753p
-  - 803p
-  - 810p
-  - 812p
-  - 815p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 836p
-  - 846p
-  - 848p
-  - 853p
-  - 903p
-  - 910p
-  - 912p
-  - 915p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 936p
-  - 946p
-  - 948p
-  - 953p
-  - 1003p
-  - 1010p
-  - 1012p
-  - 1015p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1036p
-  - 1046p
-  - 1048p
-  - 1053p
-  - 1103p
-  - 1110p
-  - 1112p
-  - 1115p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1136p
-  - 1146p
-  - 1148p
-  - 1153p
-  - 1203a
-  - 1210a
-  - 1212a
-  - 1215a
-time_points: 
-  - Fairbairn Park
-  - Brindabella Business Park
-  - Majura Business Park
-  - Campbell Park Offices
-  - ADFA
-  - War Memorial
-  - City Interchange - Platform 4
-  - Caswell Drive
-  - Aranda
-  - Cook
-  - Jamison Centre
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/10-to-fairbairn-park.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/10-to-fairbairn-park.stop_times.yml
@@ -1,806 +1,9 @@
 --- 
 long_name: To Fairbairn Park
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
+short_name: "10"
+stop_times: [[553a, 555a, 559a, 606a, 616a, 621a, 624a, 634a, "-", "-", "-", "-", "-", "-"], [624a, 626a, 630a, 637a, 647a, 652a, 655a, 705a, "-", "-", "-", "-", "-", "-"], [654a, 656a, 700a, 707a, 717a, 722a, 725a, 736a, 746a, 752a, 756a, 803a, "-", "-"], ["-", "-", "-", "-", 724a, 729a, 732a, 742a, "-", "-", "-", "-", "-", "-"], [709a, 711a, 715a, 722a, 732a, 737a, 740a, 750a, "-", "-", "-", "-", "-", "-"], [724a, 726a, 730a, 737a, 747a, 752a, 755a, 806a, 816a, 822a, 826a, 835a, "-", "-"], ["-", "-", "-", "-", 754a, 759a, 802a, 812a, "-", "-", "-", "-", "-", "-"], [739a, 741a, 745a, 752a, 802a, 807a, 810a, 820a, "-", "-", "-", "-", "-", "-"], [754a, 756a, 800a, 807a, 817a, 822a, 825a, 836a, 846a, 852a, 856a, "-", "-", "-"], ["-", "-", "-", 812a, 822a, 827a, 830a, 840a, "-", "-", "-", "-", "-", "-"], [809a, 811a, 815a, 822a, 832a, 837a, 840a, 851a, 901a, 907a, 911a, 918a, 927a, 935a], [824a, 826a, 830a, 837a, 847a, 852a, 855a, 905a, "-", "-", "-", "-", "-", "-"], [839a, 841a, 845a, 852a, 902a, 907a, 910a, 921a, 931a, 937a, 940a, 947a, 956a, 1004a], [854a, 856a, 900a, 907a, 917a, 922a, 925a, 935a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 955a, 1005a, 1011a, 1014a, 1021a, 1030a, 1038a], [925a, 927a, 931a, 938a, 948a, 953a, 955a, 1005a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1025a, 1035a, 1041a, 1044a, 1051a, 1100a, 1108a], [957a, 959a, 1003a, 1010a, 1020a, 1025a, 1027a, 1037a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1055a, 1105a, 1111a, 1114a, 1121a, 1130a, 1138a], [1026a, 1028a, 1032a, 1039a, 1049a, 1054a, 1056a, 1106a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1125a, 1135a, 1141a, 1144a, 1151a, 1200p, 1208p], [1056a, 1058a, 1102a, 1109a, 1119a, 1124a, 1126a, 1136a, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1155a, 1205p, 1211p, 1214p, 1221p, 1230p, 1238p], [1126a, 1128a, 1132a, 1139a, 1149a, 1154a, 1156a, 1206p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1225p, 1235p, 1241p, 1244p, 1251p, 100p, 108p], [1156a, 1158a, 1202p, 1209p, 1219p, 1224p, 1226p, 1236p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1255p, 105p, 111p, 114p, 121p, 130p, 138p], [1226p, 1228p, 1232p, 1239p, 1249p, 1254p, 1256p, 106p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 125p, 135p, 141p, 144p, 151p, 200p, 208p], [1256p, 1258p, 102p, 109p, 119p, 124p, 126p, 136p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 155p, 205p, 211p, 214p, 221p, 230p, 238p], [126p, 128p, 132p, 139p, 149p, 154p, 156p, 206p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 225p, 235p, 241p, 244p, 251p, 300p, 308p], [156p, 158p, 202p, 209p, 219p, 224p, 226p, 236p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 255p, 305p, 311p, 315p, 322p, 331p, 339p], [226p, 228p, 232p, 239p, 249p, 254p, 256p, 306p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 329p, 339p, 345p, 349p, 356p, 405p, 413p], [256p, 258p, 302p, 309p, 319p, 324p, 326p, 336p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 359p, 409p, 415p, 419p, 426p, 435p, 443p], [326p, 328p, 332p, 339p, 349p, 354p, 356p, 406p, "-", "-", "-", "-", "-", "-"], [341p, 343p, 347p, 354p, 404p, 409p, 411p, 421p, "-", "-", "-", "-", "-", "-"], [356p, 358p, 402p, 409p, 419p, 424p, 426p, 436p, "-", "-", "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 447p, 457p, 503p, 507p, "-", "-", "-"], [411p, 413p, 417p, 424p, 434p, 439p, 441p, 451p, "-", "-", "-", "-", "-", "-"], [426p, 428p, 432p, 439p, 449p, 454p, 456p, 506p, "-", "-", "-", "-", "-", "-"], [441p, 443p, 447p, 454p, 504p, 509p, 511p, 521p, "-", "-", "-", "-", "-", "-"], [456p, 458p, 502p, 509p, 519p, 524p, 526p, 536p, "-", "-", "-", "-", "-", "-"], [511p, 513p, 517p, 524p, 534p, 539p, 541p, 551p, "-", "-", "-", "-", "-", "-"], [526p, 528p, 532p, 539p, 549p, 554p, 556p, 606p, "-", "-", "-", "-", "-", "-"], [541p, 543p, 547p, 554p, 604p, 609p, 611p, 621p, "-", "-", "-", "-", "-", "-"], [620p, 622p, 626p, 633p, 643p, 648p, 650p, 700p, "-", "-", "-", "-", "-", "-"], [720p, 722p, 725p, 732p, 742p, 747p, 749p, 759p, "-", "-", "-", "-", "-", "-"], [820p, 822p, 825p, 832p, 842p, 847p, 849p, 859p, "-", "-", "-", "-", "-", "-"], [920p, 922p, 925p, 932p, 942p, 947p, 949p, 959p, "-", "-", "-", "-", "-", "-"], [1020p, 1022p, 1025p, 1032p, 1042p, 1047p, 1049p, 1059p, "-", "-", "-", "-", "-", "-"], [1120p, 1122p, 1125p, 1132p, 1142p, 1147p, 1149p, "-", "-", "-", "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange (Platform 7), War Memorial, ADFA, Campbell Park Offices, Majura Business Park, Brindabella Business Park, Fairbairn Park]
 
-short_name: "10"
-stop_times: 
-- - 553a
-  - 555a
-  - 559a
-  - 606a
-  - 616a
-  - 621a
-  - 624a
-  - 634a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 624a
-  - 626a
-  - 630a
-  - 637a
-  - 647a
-  - 652a
-  - 655a
-  - 705a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 654a
-  - 656a
-  - 700a
-  - 707a
-  - 717a
-  - 722a
-  - 725a
-  - 736a
-  - 746a
-  - 752a
-  - 756a
-  - 803a
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 724a
-  - 729a
-  - 732a
-  - 742a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 709a
-  - 711a
-  - 715a
-  - 722a
-  - 732a
-  - 737a
-  - 740a
-  - 750a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 724a
-  - 726a
-  - 730a
-  - 737a
-  - 747a
-  - 752a
-  - 755a
-  - 806a
-  - 816a
-  - 822a
-  - 826a
-  - 835a
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 754a
-  - 759a
-  - 802a
-  - 812a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 739a
-  - 741a
-  - 745a
-  - 752a
-  - 802a
-  - 807a
-  - 810a
-  - 820a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 754a
-  - 756a
-  - 800a
-  - 807a
-  - 817a
-  - 822a
-  - 825a
-  - 836a
-  - 846a
-  - 852a
-  - 856a
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - 812a
-  - 822a
-  - 827a
-  - 830a
-  - 840a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 809a
-  - 811a
-  - 815a
-  - 822a
-  - 832a
-  - 837a
-  - 840a
-  - 851a
-  - 901a
-  - 907a
-  - 911a
-  - 918a
-  - 927a
-  - 935a
-- - 824a
-  - 826a
-  - 830a
-  - 837a
-  - 847a
-  - 852a
-  - 855a
-  - 905a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 839a
-  - 841a
-  - 845a
-  - 852a
-  - 902a
-  - 907a
-  - 910a
-  - 921a
-  - 931a
-  - 937a
-  - 940a
-  - 947a
-  - 956a
-  - 1004a
-- - 854a
-  - 856a
-  - 900a
-  - 907a
-  - 917a
-  - 922a
-  - 925a
-  - 935a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 955a
-  - 1005a
-  - 1011a
-  - 1014a
-  - 1021a
-  - 1030a
-  - 1038a
-- - 925a
-  - 927a
-  - 931a
-  - 938a
-  - 948a
-  - 953a
-  - 955a
-  - 1005a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1025a
-  - 1035a
-  - 1041a
-  - 1044a
-  - 1051a
-  - 1100a
-  - 1108a
-- - 957a
-  - 959a
-  - 1003a
-  - 1010a
-  - 1020a
-  - 1025a
-  - 1027a
-  - 1037a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1055a
-  - 1105a
-  - 1111a
-  - 1114a
-  - 1121a
-  - 1130a
-  - 1138a
-- - 1026a
-  - 1028a
-  - 1032a
-  - 1039a
-  - 1049a
-  - 1054a
-  - 1056a
-  - 1106a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1125a
-  - 1135a
-  - 1141a
-  - 1144a
-  - 1151a
-  - 1200p
-  - 1208p
-- - 1056a
-  - 1058a
-  - 1102a
-  - 1109a
-  - 1119a
-  - 1124a
-  - 1126a
-  - 1136a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1155a
-  - 1205p
-  - 1211p
-  - 1214p
-  - 1221p
-  - 1230p
-  - 1238p
-- - 1126a
-  - 1128a
-  - 1132a
-  - 1139a
-  - 1149a
-  - 1154a
-  - 1156a
-  - 1206p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1225p
-  - 1235p
-  - 1241p
-  - 1244p
-  - 1251p
-  - 100p
-  - 108p
-- - 1156a
-  - 1158a
-  - 1202p
-  - 1209p
-  - 1219p
-  - 1224p
-  - 1226p
-  - 1236p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1255p
-  - 105p
-  - 111p
-  - 114p
-  - 121p
-  - 130p
-  - 138p
-- - 1226p
-  - 1228p
-  - 1232p
-  - 1239p
-  - 1249p
-  - 1254p
-  - 1256p
-  - 106p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 125p
-  - 135p
-  - 141p
-  - 144p
-  - 151p
-  - 200p
-  - 208p
-- - 1256p
-  - 1258p
-  - 102p
-  - 109p
-  - 119p
-  - 124p
-  - 126p
-  - 136p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 155p
-  - 205p
-  - 211p
-  - 214p
-  - 221p
-  - 230p
-  - 238p
-- - 126p
-  - 128p
-  - 132p
-  - 139p
-  - 149p
-  - 154p
-  - 156p
-  - 206p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 225p
-  - 235p
-  - 241p
-  - 244p
-  - 251p
-  - 300p
-  - 308p
-- - 156p
-  - 158p
-  - 202p
-  - 209p
-  - 219p
-  - 224p
-  - 226p
-  - 236p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 255p
-  - 305p
-  - 311p
-  - 315p
-  - 322p
-  - 331p
-  - 339p
-- - 226p
-  - 228p
-  - 232p
-  - 239p
-  - 249p
-  - 254p
-  - 256p
-  - 306p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 329p
-  - 339p
-  - 345p
-  - 349p
-  - 356p
-  - 405p
-  - 413p
-- - 256p
-  - 258p
-  - 302p
-  - 309p
-  - 319p
-  - 324p
-  - 326p
-  - 336p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 359p
-  - 409p
-  - 415p
-  - 419p
-  - 426p
-  - 435p
-  - 443p
-- - 326p
-  - 328p
-  - 332p
-  - 339p
-  - 349p
-  - 354p
-  - 356p
-  - 406p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 341p
-  - 343p
-  - 347p
-  - 354p
-  - 404p
-  - 409p
-  - 411p
-  - 421p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 356p
-  - 358p
-  - 402p
-  - 409p
-  - 419p
-  - 424p
-  - 426p
-  - 436p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 447p
-  - 457p
-  - 503p
-  - 507p
-  - "-"
-  - "-"
-  - "-"
-- - 411p
-  - 413p
-  - 417p
-  - 424p
-  - 434p
-  - 439p
-  - 441p
-  - 451p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 426p
-  - 428p
-  - 432p
-  - 439p
-  - 449p
-  - 454p
-  - 456p
-  - 506p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 441p
-  - 443p
-  - 447p
-  - 454p
-  - 504p
-  - 509p
-  - 511p
-  - 521p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 456p
-  - 458p
-  - 502p
-  - 509p
-  - 519p
-  - 524p
-  - 526p
-  - 536p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 511p
-  - 513p
-  - 517p
-  - 524p
-  - 534p
-  - 539p
-  - 541p
-  - 551p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 526p
-  - 528p
-  - 532p
-  - 539p
-  - 549p
-  - 554p
-  - 556p
-  - 606p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 541p
-  - 543p
-  - 547p
-  - 554p
-  - 604p
-  - 609p
-  - 611p
-  - 621p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 620p
-  - 622p
-  - 626p
-  - 633p
-  - 643p
-  - 648p
-  - 650p
-  - 700p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 720p
-  - 722p
-  - 725p
-  - 732p
-  - 742p
-  - 747p
-  - 749p
-  - 759p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 820p
-  - 822p
-  - 825p
-  - 832p
-  - 842p
-  - 847p
-  - 849p
-  - 859p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 920p
-  - 922p
-  - 925p
-  - 932p
-  - 942p
-  - 947p
-  - 949p
-  - 959p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1020p
-  - 1022p
-  - 1025p
-  - 1032p
-  - 1042p
-  - 1047p
-  - 1049p
-  - 1059p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1120p
-  - 1122p
-  - 1125p
-  - 1132p
-  - 1142p
-  - 1147p
-  - 1149p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Jamison Centre
-  - Cook
-  - Aranda
-  - Caswell Drive
-  - City Interchange - Platform 7
-  - War Memorial
-  - ADFA
-  - Campbell Park Offices
-  - Majura Business Park
-  - Brindabella Business Park
-  - Fairbairn Park
-

--- a/maxious-canberra-transit-feed/output/11-111-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/11-111-to-city-interchange.stop_times.yml
@@ -1,260 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+short_name: 11/111
+stop_times: [[621a, 627a, 641a, 651a, 657a, 713a, 729a], [641a, 647a, 701a, 711a, 717a, 733a, 751a], [701a, 707a, 721a, 731a, 737a, 754a, 812a], [721a, 727a, 742a, 752a, 758a, 815a, 833a], [741a, 748a, 803a, 813a, 819a, 836a, 854a], [801a, 808a, 823a, 833a, 839a, 856a, 914a], [821a, 828a, 843a, 853a, 859a, 914a, "-"], [841a, 848a, 903a, 913a, 919a, 933a, "-"], [921a, 927a, 940a, 949a, 955a, 1007a, "-"], [951a, 957a, 1010a, 1019a, 1025a, 1037a, "-"], [1021a, 1027a, 1040a, 1049a, 1055a, 1107a, "-"], [1051a, 1057a, 1110a, 1119a, 1125a, 1137a, "-"], [1121a, 1127a, 1140a, 1149a, 1155a, 1207p, "-"], [1151a, 1157a, 1210p, 1219p, 1225p, 1237p, "-"], [1221p, 1227p, 1240p, 1249p, 1255p, 107p, "-"], [1251p, 1257p, 110p, 119p, 125p, 137p, "-"], [121p, 127p, 140p, 149p, 155p, 207p, "-"], [151p, 157p, 210p, 219p, 225p, 237p, "-"], [221p, 227p, 240p, 249p, 255p, 307p, "-"], [251p, 257p, 310p, 319p, 325p, 339p, "-"], [323p, 330p, 345p, 355p, 401p, 416p, "-"], [340p, 347p, 402p, 412p, 418p, 433p, "-"], [400p, 407p, 422p, 432p, 438p, 453p, "-"], [418p, 425p, 440p, 450p, 456p, 511p, "-"], [441p, 448p, 503p, 513p, 519p, "-", "-"], [501p, 508p, 523p, 533p, 539p, "-", "-"], [521p, 528p, 543p, 553p, 559p, 614p, "-"], [541p, 548p, 603p, 613p, 619p, "-", "-"], [601p, 608p, 623p, 633p, 639p, "-", "-"], [625p, 632p, 645p, 654p, 700p, 712p, "-"], [725p, 731p, 744p, 753p, 759p, 811p, "-"], [825p, 831p, 844p, 853p, 859p, 911p, "-"], [925p, 931p, 944p, 953p, 959p, 1011p, "-"], [1025p, 1031p, 1044p, 1053p, 1059p, 1111p, "-"], [1125p, 1131p, 1144p, 1153p, 1159p, "-", "-"]]
+time_points: [Tuggeranong Interchange (Platform 3), MacKillop College Isabella Campus, Theodore, Calwell Shops, Erindale Centre, Woden Interchange (Platform 9), City Interchange]
 
-short_name: 11/111
-stop_times: 
-- - 621a
-  - 627a
-  - 641a
-  - 651a
-  - 657a
-  - 713a
-  - 729a
-- - 641a
-  - 647a
-  - 701a
-  - 711a
-  - 717a
-  - 733a
-  - 751a
-- - 701a
-  - 707a
-  - 721a
-  - 731a
-  - 737a
-  - 754a
-  - 812a
-- - 721a
-  - 727a
-  - 742a
-  - 752a
-  - 758a
-  - 815a
-  - 833a
-- - 741a
-  - 748a
-  - 803a
-  - 813a
-  - 819a
-  - 836a
-  - 854a
-- - 801a
-  - 808a
-  - 823a
-  - 833a
-  - 839a
-  - 856a
-  - 914a
-- - 821a
-  - 828a
-  - 843a
-  - 853a
-  - 859a
-  - 914a
-  - "-"
-- - 841a
-  - 848a
-  - 903a
-  - 913a
-  - 919a
-  - 933a
-  - "-"
-- - 921a
-  - 927a
-  - 940a
-  - 949a
-  - 955a
-  - 1007a
-  - "-"
-- - 951a
-  - 957a
-  - 1010a
-  - 1019a
-  - 1025a
-  - 1037a
-  - "-"
-- - 1021a
-  - 1027a
-  - 1040a
-  - 1049a
-  - 1055a
-  - 1107a
-  - "-"
-- - 1051a
-  - 1057a
-  - 1110a
-  - 1119a
-  - 1125a
-  - 1137a
-  - "-"
-- - 1121a
-  - 1127a
-  - 1140a
-  - 1149a
-  - 1155a
-  - 1207p
-  - "-"
-- - 1151a
-  - 1157a
-  - 1210p
-  - 1219p
-  - 1225p
-  - 1237p
-  - "-"
-- - 1221p
-  - 1227p
-  - 1240p
-  - 1249p
-  - 1255p
-  - 107p
-  - "-"
-- - 1251p
-  - 1257p
-  - 110p
-  - 119p
-  - 125p
-  - 137p
-  - "-"
-- - 121p
-  - 127p
-  - 140p
-  - 149p
-  - 155p
-  - 207p
-  - "-"
-- - 151p
-  - 157p
-  - 210p
-  - 219p
-  - 225p
-  - 237p
-  - "-"
-- - 221p
-  - 227p
-  - 240p
-  - 249p
-  - 255p
-  - 307p
-  - "-"
-- - 251p
-  - 257p
-  - 310p
-  - 319p
-  - 325p
-  - 339p
-  - "-"
-- - 323p
-  - 330p
-  - 345p
-  - 355p
-  - 401p
-  - 416p
-  - "-"
-- - 340p
-  - 347p
-  - 402p
-  - 412p
-  - 418p
-  - 433p
-  - "-"
-- - 400p
-  - 407p
-  - 422p
-  - 432p
-  - 438p
-  - 453p
-  - "-"
-- - 418p
-  - 425p
-  - 440p
-  - 450p
-  - 456p
-  - 511p
-  - "-"
-- - 441p
-  - 448p
-  - 503p
-  - 513p
-  - 519p
-  - "-"
-  - "-"
-- - 501p
-  - 508p
-  - 523p
-  - 533p
-  - 539p
-  - "-"
-  - "-"
-- - 521p
-  - 528p
-  - 543p
-  - 553p
-  - 559p
-  - 614p
-  - "-"
-- - 541p
-  - 548p
-  - 603p
-  - 613p
-  - 619p
-  - "-"
-  - "-"
-- - 601p
-  - 608p
-  - 623p
-  - 633p
-  - 639p
-  - "-"
-  - "-"
-- - 625p
-  - 632p
-  - 645p
-  - 654p
-  - 700p
-  - 712p
-  - "-"
-- - 725p
-  - 731p
-  - 744p
-  - 753p
-  - 759p
-  - 811p
-  - "-"
-- - 825p
-  - 831p
-  - 844p
-  - 853p
-  - 859p
-  - 911p
-  - "-"
-- - 925p
-  - 931p
-  - 944p
-  - 953p
-  - 959p
-  - 1011p
-  - "-"
-- - 1025p
-  - 1031p
-  - 1044p
-  - 1053p
-  - 1059p
-  - 1111p
-  - "-"
-- - 1125p
-  - 1131p
-  - 1144p
-  - 1153p
-  - 1159p
-  - "-"
-  - "-"
-time_points: 
-  - Tuggeranong Interchange - Platform 3
-  - MacKillop College Isabella Campus
-  - Theodore
-  - Calwell Shops
-  - Erindale Centre
-  - Woden Interchange - Platform 9
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/11-111-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/11-111-to-tuggeranong-interchange.stop_times.yml
@@ -1,281 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 11): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+short_name: 11/111
+stop_times: [["-", "-", "-", 546a, 556a, 609a, 616a], ["-", "-", "-", 606a, 616a, 629a, 636a], ["-", "-", "-", 626a, 636a, 649a, 656a], ["-", "-", "-", 646a, 656a, 709a, 716a], ["-", "-", "-", 706a, 716a, 729a, 736a], ["-", "-", "-", 725a, 735a, 749a, 756a], ["-", "-", "-", 745a, 755a, 809a, 816a], ["-", "-", "-", 805a, 815a, 829a, 836a], ["-", "-", "-", 825a, 835a, 849a, 856a], ["-", "-", "-", 845a, 855a, 909a, 916a], ["-", "-", "-", 917a, 927a, 940a, 946a], ["-", 930a, 942a, 948a, 957a, 1010a, 1016a], ["-", 1000a, 1012a, 1018a, 1027a, 1040a, 1046a], ["-", 1030a, 1042a, 1048a, 1057a, 1110a, 1116a], ["-", 1100a, 1112a, 1118a, 1127a, 1140a, 1146a], ["-", 1130a, 1142a, 1148a, 1157a, 1210p, 1216p], ["-", 1200p, 1212p, 1218p, 1227p, 1240p, 1246p], ["-", 1230p, 1242p, 1248p, 1257p, 110p, 116p], ["-", 100p, 112p, 118p, 127p, 140p, 146p], ["-", 130p, 142p, 148p, 157p, 210p, 216p], ["-", 200p, 212p, 218p, 227p, 240p, 246p], ["-", 230p, 242p, 248p, 257p, 311p, 318p], ["-", 300p, 314p, 321p, 331p, 345p, 352p], ["-", 320p, 334p, 341p, 351p, 405p, 412p], ["-", 340p, 354p, 401p, 411p, 425p, 432p], ["-", 400p, 414p, 421p, 431p, 445p, 452p], ["-", 425p, 439p, 446p, 456p, 510p, 517p], ["-", 440p, 454p, 501p, 511p, 525p, 532p], ["-", 500p, 514p, 521p, 531p, 545p, 552p], [456p, 513p, 527p, 534p, 544p, 558p, 605p], [516p, 533p, 547p, 554p, 604p, 618p, 625p], [534p, 551p, 605p, 612p, 622p, 636p, 641p], [556p, 613p, 627p, 633p, 642p, 655p, 701p], [616p, 633p, 645p, 651p, 700p, 713p, 719p], ["-", 733p, 745p, 751p, 800p, 813p, 819p], ["-", 833p, 845p, 851p, 900p, 913p, 919p], ["-", 933p, 945p, 951p, 1000p, 1013p, 1019p], ["-", 1033p, 1045p, 1051p, 1100p, 1113p, 1119p]]
+time_points: [City Interchange (Platform 1), Woden Interchange (Platform 11), Erindale Centre, Calwell Shops, Theodore, MacKillop College Isabella Campus, Tuggeranong Interchange]
 
-short_name: 11/111
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 546a
-  - 556a
-  - 609a
-  - 616a
-- - "-"
-  - "-"
-  - "-"
-  - 606a
-  - 616a
-  - 629a
-  - 636a
-- - "-"
-  - "-"
-  - "-"
-  - 626a
-  - 636a
-  - 649a
-  - 656a
-- - "-"
-  - "-"
-  - "-"
-  - 646a
-  - 656a
-  - 709a
-  - 716a
-- - "-"
-  - "-"
-  - "-"
-  - 706a
-  - 716a
-  - 729a
-  - 736a
-- - "-"
-  - "-"
-  - "-"
-  - 725a
-  - 735a
-  - 749a
-  - 756a
-- - "-"
-  - "-"
-  - "-"
-  - 745a
-  - 755a
-  - 809a
-  - 816a
-- - "-"
-  - "-"
-  - "-"
-  - 805a
-  - 815a
-  - 829a
-  - 836a
-- - "-"
-  - "-"
-  - "-"
-  - 825a
-  - 835a
-  - 849a
-  - 856a
-- - "-"
-  - "-"
-  - "-"
-  - 845a
-  - 855a
-  - 909a
-  - 916a
-- - "-"
-  - "-"
-  - "-"
-  - 917a
-  - 927a
-  - 940a
-  - 946a
-- - "-"
-  - 930a
-  - 942a
-  - 948a
-  - 957a
-  - 1010a
-  - 1016a
-- - "-"
-  - 1000a
-  - 1012a
-  - 1018a
-  - 1027a
-  - 1040a
-  - 1046a
-- - "-"
-  - 1030a
-  - 1042a
-  - 1048a
-  - 1057a
-  - 1110a
-  - 1116a
-- - "-"
-  - 1100a
-  - 1112a
-  - 1118a
-  - 1127a
-  - 1140a
-  - 1146a
-- - "-"
-  - 1130a
-  - 1142a
-  - 1148a
-  - 1157a
-  - 1210p
-  - 1216p
-- - "-"
-  - 1200p
-  - 1212p
-  - 1218p
-  - 1227p
-  - 1240p
-  - 1246p
-- - "-"
-  - 1230p
-  - 1242p
-  - 1248p
-  - 1257p
-  - 110p
-  - 116p
-- - "-"
-  - 100p
-  - 112p
-  - 118p
-  - 127p
-  - 140p
-  - 146p
-- - "-"
-  - 130p
-  - 142p
-  - 148p
-  - 157p
-  - 210p
-  - 216p
-- - "-"
-  - 200p
-  - 212p
-  - 218p
-  - 227p
-  - 240p
-  - 246p
-- - "-"
-  - 230p
-  - 242p
-  - 248p
-  - 257p
-  - 311p
-  - 318p
-- - "-"
-  - 300p
-  - 314p
-  - 321p
-  - 331p
-  - 345p
-  - 352p
-- - "-"
-  - 320p
-  - 334p
-  - 341p
-  - 351p
-  - 405p
-  - 412p
-- - "-"
-  - 340p
-  - 354p
-  - 401p
-  - 411p
-  - 425p
-  - 432p
-- - "-"
-  - 400p
-  - 414p
-  - 421p
-  - 431p
-  - 445p
-  - 452p
-- - "-"
-  - 425p
-  - 439p
-  - 446p
-  - 456p
-  - 510p
-  - 517p
-- - "-"
-  - 440p
-  - 454p
-  - 501p
-  - 511p
-  - 525p
-  - 532p
-- - "-"
-  - 500p
-  - 514p
-  - 521p
-  - 531p
-  - 545p
-  - 552p
-- - 456p
-  - 513p
-  - 527p
-  - 534p
-  - 544p
-  - 558p
-  - 605p
-- - 516p
-  - 533p
-  - 547p
-  - 554p
-  - 604p
-  - 618p
-  - 625p
-- - 534p
-  - 551p
-  - 605p
-  - 612p
-  - 622p
-  - 636p
-  - 641p
-- - 556p
-  - 613p
-  - 627p
-  - 633p
-  - 642p
-  - 655p
-  - 701p
-- - 616p
-  - 633p
-  - 645p
-  - 651p
-  - 700p
-  - 713p
-  - 719p
-- - "-"
-  - 733p
-  - 745p
-  - 751p
-  - 800p
-  - 813p
-  - 819p
-- - "-"
-  - 833p
-  - 845p
-  - 851p
-  - 900p
-  - 913p
-  - 919p
-- - "-"
-  - 933p
-  - 945p
-  - 951p
-  - 1000p
-  - 1013p
-  - 1019p
-- - "-"
-  - 1033p
-  - 1045p
-  - 1051p
-  - 1100p
-  - 1113p
-  - 1119p
-time_points: 
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 11
-  - Erindale Centre
-  - Calwell Shops
-  - Theodore
-  - MacKillop College Isabella Campus
-  - Tuggeranong Interchange
-

--- a/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
@@ -1,308 +1,12 @@
 --- 
 long_name: To Spence Terminus
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+  City Interchange (Platform 5)-Cameron Ave Bus Station (Platform 4): [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+short_name: 12/312
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 752a], ["-", "-", "-", 802a, 804a, 808a, 816a, 820a, 825a, 831a], [726a, 745a, 803a, 821a, 823a, 827a, 835a, 839a, 844a, 850a], [826a, 845a, 903a, 921a, 923a, 927a, 934a, 938a, 942a, 948a], [901a, 920a, 937a, 954a, 956a, 1000a, 1007a, 1011a, 1015a, 1021a], [931a, 949a, 1005a, 1022a, 1024a, 1028a, 1035a, 1039a, 1043a, 1049a], [1001a, 1019a, 1035a, 1052a, 1054a, 1058a, 1105a, 1109a, 1113a, 1119a], [1031a, 1049a, 1105a, 1122a, 1124a, 1128a, 1135a, 1139a, 1143a, 1149a], [1101a, 1119a, 1135a, 1152a, 1154a, 1158a, 1205p, 1209p, 1213p, 1219p], [1131a, 1149a, 1205p, 1222p, 1224p, 1228p, 1235p, 1239p, 1243p, 1249p], [1201p, 1219p, 1235p, 1252p, 1254p, 1258p, 105p, 109p, 113p, 119p], [1231p, 1249p, 105p, 122p, 124p, 128p, 135p, 139p, 143p, 149p], [101p, 119p, 135p, 152p, 154p, 158p, 205p, 209p, 213p, 219p], [131p, 149p, 205p, 222p, 224p, 228p, 235p, 239p, 243p, 249p], [201p, 219p, 235p, 252p, 254p, 258p, 306p, 310p, 315p, 321p], [231p, 249p, 305p, 323p, 325p, 329p, 337p, 341p, 346p, 352p], [301p, 320p, 338p, 356p, 358p, 402p, 410p, 414p, 419p, 425p], [331p, 350p, 408p, 426p, 428p, 432p, 440p, 444p, 449p, 455p], [356p, 415p, 433p, 451p, 453p, 457p, 505p, 509p, 514p, 520p], [416p, 435p, 453p, 511p, 513p, 517p, 525p, 529p, 534p, 540p], [436p, 455p, 513p, 531p, 533p, 537p, 545p, 549p, 554p, 600p], [456p, 515p, 533p, 551p, 553p, 557p, 605p, 609p, 614p, 620p], [516p, 535p, 553p, 611p, 613p, 617p, 625p, 629p, 633p, 639p], [536p, 555p, 613p, 631p, 633p, 636p, 643p, 647p, 651p, 657p], [636p, 653p, 708p, 725p, 727p, 730p, 737p, 741p, 745p, 751p], ["-", "-", "-", 835p, 837p, 840p, 847p, 851p, 855p, 901p], ["-", "-", "-", 935p, 937p, 940p, 947p, 951p, 955p, 1001p], ["-", "-", "-", 1035p, 1037p, 1040p, 1047p, 1051p, 1055p, 1101p], ["-", "-", "-", 1135p, 1137p, 1140p, 1147p, 1151p, 1155p, 1201a]]
+time_points: [Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), McKellar, Copland College, Evatt, Spence Terminus]
 
-short_name: 12/312
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 737a
-  - 741a
-  - 746a
-  - 752a
-- - "-"
-  - "-"
-  - "-"
-  - 802a
-  - 804a
-  - 808a
-  - 816a
-  - 820a
-  - 825a
-  - 831a
-- - 726a
-  - 745a
-  - 803a
-  - 821a
-  - 823a
-  - 827a
-  - 835a
-  - 839a
-  - 844a
-  - 850a
-- - 826a
-  - 845a
-  - 903a
-  - 921a
-  - 923a
-  - 927a
-  - 934a
-  - 938a
-  - 942a
-  - 948a
-- - 901a
-  - 920a
-  - 937a
-  - 954a
-  - 956a
-  - 1000a
-  - 1007a
-  - 1011a
-  - 1015a
-  - 1021a
-- - 931a
-  - 949a
-  - 1005a
-  - 1022a
-  - 1024a
-  - 1028a
-  - 1035a
-  - 1039a
-  - 1043a
-  - 1049a
-- - 1001a
-  - 1019a
-  - 1035a
-  - 1052a
-  - 1054a
-  - 1058a
-  - 1105a
-  - 1109a
-  - 1113a
-  - 1119a
-- - 1031a
-  - 1049a
-  - 1105a
-  - 1122a
-  - 1124a
-  - 1128a
-  - 1135a
-  - 1139a
-  - 1143a
-  - 1149a
-- - 1101a
-  - 1119a
-  - 1135a
-  - 1152a
-  - 1154a
-  - 1158a
-  - 1205p
-  - 1209p
-  - 1213p
-  - 1219p
-- - 1131a
-  - 1149a
-  - 1205p
-  - 1222p
-  - 1224p
-  - 1228p
-  - 1235p
-  - 1239p
-  - 1243p
-  - 1249p
-- - 1201p
-  - 1219p
-  - 1235p
-  - 1252p
-  - 1254p
-  - 1258p
-  - 105p
-  - 109p
-  - 113p
-  - 119p
-- - 1231p
-  - 1249p
-  - 105p
-  - 122p
-  - 124p
-  - 128p
-  - 135p
-  - 139p
-  - 143p
-  - 149p
-- - 101p
-  - 119p
-  - 135p
-  - 152p
-  - 154p
-  - 158p
-  - 205p
-  - 209p
-  - 213p
-  - 219p
-- - 131p
-  - 149p
-  - 205p
-  - 222p
-  - 224p
-  - 228p
-  - 235p
-  - 239p
-  - 243p
-  - 249p
-- - 201p
-  - 219p
-  - 235p
-  - 252p
-  - 254p
-  - 258p
-  - 306p
-  - 310p
-  - 315p
-  - 321p
-- - 231p
-  - 249p
-  - 305p
-  - 323p
-  - 325p
-  - 329p
-  - 337p
-  - 341p
-  - 346p
-  - 352p
-- - 301p
-  - 320p
-  - 338p
-  - 356p
-  - 358p
-  - 402p
-  - 410p
-  - 414p
-  - 419p
-  - 425p
-- - 331p
-  - 350p
-  - 408p
-  - 426p
-  - 428p
-  - 432p
-  - 440p
-  - 444p
-  - 449p
-  - 455p
-- - 356p
-  - 415p
-  - 433p
-  - 451p
-  - 453p
-  - 457p
-  - 505p
-  - 509p
-  - 514p
-  - 520p
-- - 416p
-  - 435p
-  - 453p
-  - 511p
-  - 513p
-  - 517p
-  - 525p
-  - 529p
-  - 534p
-  - 540p
-- - 436p
-  - 455p
-  - 513p
-  - 531p
-  - 533p
-  - 537p
-  - 545p
-  - 549p
-  - 554p
-  - 600p
-- - 456p
-  - 515p
-  - 533p
-  - 551p
-  - 553p
-  - 557p
-  - 605p
-  - 609p
-  - 614p
-  - 620p
-- - 516p
-  - 535p
-  - 553p
-  - 611p
-  - 613p
-  - 617p
-  - 625p
-  - 629p
-  - 633p
-  - 639p
-- - 536p
-  - 555p
-  - 613p
-  - 631p
-  - 633p
-  - 636p
-  - 643p
-  - 647p
-  - 651p
-  - 657p
-- - 636p
-  - 653p
-  - 708p
-  - 725p
-  - 727p
-  - 730p
-  - 737p
-  - 741p
-  - 745p
-  - 751p
-- - "-"
-  - "-"
-  - "-"
-  - 835p
-  - 837p
-  - 840p
-  - 847p
-  - 851p
-  - 855p
-  - 901p
-- - "-"
-  - "-"
-  - "-"
-  - 935p
-  - 937p
-  - 940p
-  - 947p
-  - 951p
-  - 955p
-  - 1001p
-- - "-"
-  - "-"
-  - "-"
-  - 1035p
-  - 1037p
-  - 1040p
-  - 1047p
-  - 1051p
-  - 1055p
-  - 1101p
-- - "-"
-  - "-"
-  - "-"
-  - 1135p
-  - 1137p
-  - 1140p
-  - 1147p
-  - 1151p
-  - 1155p
-  - 1201a
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - McKellar
-  - Copland College
-  - Evatt
-  - Spence Terminus
-

--- a/maxious-canberra-transit-feed/output/12-312-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/12-312-to-tuggeranong-interchange.stop_times.yml
@@ -1,338 +1,12 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 3)-Lathlain St Bus Station (Platform 1): []
+  Woden Interchange (Platform 6)-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+short_name: 12/312
+stop_times: [[628a, 633a, 636a, 640a, 650a, 652a, 656a, "-", "-", "-"], [656a, 701a, 704a, 708a, 718a, 720a, 724a, 742a, 759a, 816a], [725a, 730a, 734a, 738a, 748a, 750a, 754a, 813a, 830a, 847a], [736a, 741a, 745a, 749a, 759a, 801a, 805a, 824a, 841a, 858a], [750a, 755a, 759a, 803a, 813a, 815a, 819a, 838a, 855a, 912a], [810a, 815a, 819a, 823a, 833a, 835a, 839a, 858a, 915a, 932a], [830a, 835a, 839a, 843a, 853a, 855a, 859a, 918a, 935a, 950a], [855a, 900a, 904a, 908a, 918a, 920a, 924a, 942a, 959a, 1014a], [926a, 931a, 934a, 938a, 948a, 950a, 954a, 1011a, 1028a, 1043a], [956a, 1001a, 1004a, 1008a, 1018a, 1020a, 1024a, 1041a, 1058a, 1113a], [1026a, 1031a, 1034a, 1038a, 1048a, 1050a, 1054a, 1111a, 1128a, 1143a], [1056a, 1101a, 1104a, 1108a, 1118a, 1120a, 1124a, 1141a, 1158a, 1213p], [1126a, 1131a, 1134a, 1138a, 1148a, 1150a, 1154a, 1211p, 1228p, 1243p], [1156a, 1201p, 1204p, 1208p, 1218p, 1220p, 1224p, 1241p, 1258p, 113p], [1226p, 1231p, 1234p, 1238p, 1248p, 1250p, 1254p, 111p, 128p, 143p], [1256p, 101p, 104p, 108p, 118p, 120p, 124p, 141p, 158p, 213p], [126p, 131p, 134p, 138p, 148p, 150p, 154p, 211p, 228p, 243p], [156p, 201p, 204p, 208p, 218p, 220p, 224p, 241p, 258p, 316p], [226p, 231p, 234p, 238p, 248p, 250p, 254p, 312p, 329p, 348p], [255p, 300p, 304p, 308p, 318p, 320p, 324p, 343p, 400p, 419p], [325p, 330p, 334p, 338p, 348p, 350p, 354p, 413p, 430p, 449p], [345p, 350p, 354p, 358p, 408p, 410p, 414p, 433p, 450p, 509p], [415p, 420p, 424p, 428p, 438p, 440p, 444p, 503p, 520p, 539p], [435p, 440p, 444p, 448p, 458p, 500p, 504p, 523p, 540p, 559p], [500p, 505p, 509p, 513p, 523p, 525p, 529p, 548p, 605p, 624p], [525p, 530p, 534p, 538p, 548p, 550p, 554p, 613p, 630p, 645p], [555p, 600p, 604p, 608p, 618p, 620p, 624p, 641p, 655p, 710p], [627p, 632p, 635p, 639p, 649p, 651p, 654p, 710p, 724p, 739p], [707p, 712p, 715p, 719p, 728a, 730a, 734p, "-", "-", "-"], [807p, 812p, 815p, 819p, 828a, 830a, 834p, "-", "-", "-"], [907p, 912p, 915p, 919p, 928a, 930a, 934p, "-", "-", "-"], [1007p, 1012p, 1015p, 1019p, 1028a, 1030a, 1034p, "-", "-", "-"]]
+time_points: [Spence Terminus, Evatt, Copland College, McKellar, Cohen St Bus Station (Platform 3), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange]
 
-short_name: 12/312
-stop_times: 
-- - 628a
-  - 633a
-  - 636a
-  - 640a
-  - 650a
-  - 652a
-  - 656a
-  - "-"
-  - "-"
-  - "-"
-- - 656a
-  - 701a
-  - 704a
-  - 708a
-  - 718a
-  - 720a
-  - 724a
-  - 742a
-  - 759a
-  - 816a
-- - 725a
-  - 730a
-  - 734a
-  - 738a
-  - 748a
-  - 750a
-  - 754a
-  - 813a
-  - 830a
-  - 847a
-- - 736a
-  - 741a
-  - 745a
-  - 749a
-  - 759a
-  - 801a
-  - 805a
-  - 824a
-  - 841a
-  - 858a
-- - 750a
-  - 755a
-  - 759a
-  - 803a
-  - 813a
-  - 815a
-  - 819a
-  - 838a
-  - 855a
-  - 912a
-- - 810a
-  - 815a
-  - 819a
-  - 823a
-  - 833a
-  - 835a
-  - 839a
-  - 858a
-  - 915a
-  - 932a
-- - 830a
-  - 835a
-  - 839a
-  - 843a
-  - 853a
-  - 855a
-  - 859a
-  - 918a
-  - 935a
-  - 950a
-- - 855a
-  - 900a
-  - 904a
-  - 908a
-  - 918a
-  - 920a
-  - 924a
-  - 942a
-  - 959a
-  - 1014a
-- - 926a
-  - 931a
-  - 934a
-  - 938a
-  - 948a
-  - 950a
-  - 954a
-  - 1011a
-  - 1028a
-  - 1043a
-- - 956a
-  - 1001a
-  - 1004a
-  - 1008a
-  - 1018a
-  - 1020a
-  - 1024a
-  - 1041a
-  - 1058a
-  - 1113a
-- - 1026a
-  - 1031a
-  - 1034a
-  - 1038a
-  - 1048a
-  - 1050a
-  - 1054a
-  - 1111a
-  - 1128a
-  - 1143a
-- - 1056a
-  - 1101a
-  - 1104a
-  - 1108a
-  - 1118a
-  - 1120a
-  - 1124a
-  - 1141a
-  - 1158a
-  - 1213p
-- - 1126a
-  - 1131a
-  - 1134a
-  - 1138a
-  - 1148a
-  - 1150a
-  - 1154a
-  - 1211p
-  - 1228p
-  - 1243p
-- - 1156a
-  - 1201p
-  - 1204p
-  - 1208p
-  - 1218p
-  - 1220p
-  - 1224p
-  - 1241p
-  - 1258p
-  - 113p
-- - 1226p
-  - 1231p
-  - 1234p
-  - 1238p
-  - 1248p
-  - 1250p
-  - 1254p
-  - 111p
-  - 128p
-  - 143p
-- - 1256p
-  - 101p
-  - 104p
-  - 108p
-  - 118p
-  - 120p
-  - 124p
-  - 141p
-  - 158p
-  - 213p
-- - 126p
-  - 131p
-  - 134p
-  - 138p
-  - 148p
-  - 150p
-  - 154p
-  - 211p
-  - 228p
-  - 243p
-- - 156p
-  - 201p
-  - 204p
-  - 208p
-  - 218p
-  - 220p
-  - 224p
-  - 241p
-  - 258p
-  - 316p
-- - 226p
-  - 231p
-  - 234p
-  - 238p
-  - 248p
-  - 250p
-  - 254p
-  - 312p
-  - 329p
-  - 348p
-- - 255p
-  - 300p
-  - 304p
-  - 308p
-  - 318p
-  - 320p
-  - 324p
-  - 343p
-  - 400p
-  - 419p
-- - 325p
-  - 330p
-  - 334p
-  - 338p
-  - 348p
-  - 350p
-  - 354p
-  - 413p
-  - 430p
-  - 449p
-- - 345p
-  - 350p
-  - 354p
-  - 358p
-  - 408p
-  - 410p
-  - 414p
-  - 433p
-  - 450p
-  - 509p
-- - 415p
-  - 420p
-  - 424p
-  - 428p
-  - 438p
-  - 440p
-  - 444p
-  - 503p
-  - 520p
-  - 539p
-- - 435p
-  - 440p
-  - 444p
-  - 448p
-  - 458p
-  - 500p
-  - 504p
-  - 523p
-  - 540p
-  - 559p
-- - 500p
-  - 505p
-  - 509p
-  - 513p
-  - 523p
-  - 525p
-  - 529p
-  - 548p
-  - 605p
-  - 624p
-- - 525p
-  - 530p
-  - 534p
-  - 538p
-  - 548p
-  - 550p
-  - 554p
-  - 613p
-  - 630p
-  - 645p
-- - 555p
-  - 600p
-  - 604p
-  - 608p
-  - 618p
-  - 620p
-  - 624p
-  - 641p
-  - 655p
-  - 710p
-- - 627p
-  - 632p
-  - 635p
-  - 639p
-  - 649p
-  - 651p
-  - 654p
-  - 710p
-  - 724p
-  - 739p
-- - 707p
-  - 712p
-  - 715p
-  - 719p
-  - 728a
-  - 730a
-  - 734p
-  - "-"
-  - "-"
-  - "-"
-- - 807p
-  - 812p
-  - 815p
-  - 819p
-  - 828a
-  - 830a
-  - 834p
-  - "-"
-  - "-"
-  - "-"
-- - 907p
-  - 912p
-  - 915p
-  - 919p
-  - 928a
-  - 930a
-  - 934p
-  - "-"
-  - "-"
-  - "-"
-- - 1007p
-  - 1012p
-  - 1015p
-  - 1019p
-  - 1028a
-  - 1030a
-  - 1034p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Spence Terminus
-  - Evatt
-  - Copland College
-  - McKellar
-  - Cohen St Bus Station - Platform 3
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange
-

--- a/maxious-canberra-transit-feed/output/13-313-to-fraser-west-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/13-313-to-fraser-west-terminus.stop_times.yml
@@ -1,298 +1,12 @@
 --- 
 long_name: To Fraser West Terminus
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+  City Interchange (Platform 5)-Cameron Ave Bus Station (Platform 4): [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+short_name: 13/313
+stop_times: [["-", "-", "-", 728a, 730a, 734a, 737a, 741a, 750a, 757a], [711a, 729a, 747a, 805a, 807a, 811a, 814a, 818a, 827a, 834a], [751a, 810a, 828a, 846a, 848a, 852a, 855a, 859a, 908a, 915a], [811a, 830a, 848a, 906a, 908a, 912a, 915a, 919a, 928a, 934a], [851a, 910a, 928a, 945a, 947a, 951a, 953a, 957a, 1005a, 1011a], [921a, 940a, 956a, 1013a, 1015a, 1019a, 1021a, 1025a, 1033a, 1039a], [951a, 1009a, 1025a, 1042a, 1044a, 1048a, 1050a, 1054a, 1102a, 1108a], [1021a, 1039a, 1055a, 1112a, 1114a, 1118a, 1120a, 1124a, 1132a, 1138a], [1051a, 1109a, 1125a, 1142a, 1144a, 1148a, 1150a, 1154a, 1202p, 1208p], [1121a, 1139a, 1155a, 1212p, 1214p, 1218p, 1220p, 1224p, 1232p, 1238p], [1151a, 1209p, 1225p, 1242p, 1244p, 1248p, 1250p, 1254p, 102p, 108p], [1221p, 1239p, 1255p, 112p, 114p, 118p, 120p, 124p, 132p, 138p], [1251p, 109p, 125p, 142p, 144p, 148p, 150p, 154p, 202p, 208p], [121p, 139p, 155p, 212p, 214p, 218p, 220p, 224p, 232p, 238p], [151p, 209p, 225p, 242p, 244p, 248p, 250p, 254p, 303p, 309p], [221p, 239p, 255p, 313p, 315p, 319p, 322p, 327p, 337p, 343p], [250p, 308p, 326p, 344p, 346p, 350p, 353p, 358p, 408p, 414p], [316p, 335p, 353p, 411p, 413p, 417p, 420p, 425p, 435p, 441p], [346p, 405p, 423p, 441p, 443p, 447p, 450p, 455p, 505p, 511p], [406p, 425p, 443p, 501p, 503p, 507p, 510p, 515p, 525p, 531p], [426p, 445p, 503p, 521p, 523p, 527p, 530p, 535p, 545p, 551p], [446p, 505p, 523p, 541p, 543p, 547p, 550p, 555p, 605p, 611p], [526p, 545p, 603p, 621p, 623p, 627p, 630p, 634p, 642p, 648p], [556p, 615p, 632p, 649p, 651p, 654p, 656p, 700p, 708p, 714p], [656p, 713p, 728p, 745p, 747p, 750p, 752p, 756p, 804p, 810p], ["-", "-", "-", 840p, 842p, 845p, 847p, 851p, 859p, 905p], ["-", "-", "-", 940p, 942p, 945p, 947p, 951p, 959p, 1005p], ["-", "-", "-", 1040p, 1042p, 1045p, 1047p, 1051p, 1059p, 1105p]]
+time_points: [Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Page Shops, Scullin Shops, Charnwood, Fraser West Terminus]
 
-short_name: 13/313
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 728a
-  - 730a
-  - 734a
-  - 737a
-  - 741a
-  - 750a
-  - 757a
-- - 711a
-  - 729a
-  - 747a
-  - 805a
-  - 807a
-  - 811a
-  - 814a
-  - 818a
-  - 827a
-  - 834a
-- - 751a
-  - 810a
-  - 828a
-  - 846a
-  - 848a
-  - 852a
-  - 855a
-  - 859a
-  - 908a
-  - 915a
-- - 811a
-  - 830a
-  - 848a
-  - 906a
-  - 908a
-  - 912a
-  - 915a
-  - 919a
-  - 928a
-  - 934a
-- - 851a
-  - 910a
-  - 928a
-  - 945a
-  - 947a
-  - 951a
-  - 953a
-  - 957a
-  - 1005a
-  - 1011a
-- - 921a
-  - 940a
-  - 956a
-  - 1013a
-  - 1015a
-  - 1019a
-  - 1021a
-  - 1025a
-  - 1033a
-  - 1039a
-- - 951a
-  - 1009a
-  - 1025a
-  - 1042a
-  - 1044a
-  - 1048a
-  - 1050a
-  - 1054a
-  - 1102a
-  - 1108a
-- - 1021a
-  - 1039a
-  - 1055a
-  - 1112a
-  - 1114a
-  - 1118a
-  - 1120a
-  - 1124a
-  - 1132a
-  - 1138a
-- - 1051a
-  - 1109a
-  - 1125a
-  - 1142a
-  - 1144a
-  - 1148a
-  - 1150a
-  - 1154a
-  - 1202p
-  - 1208p
-- - 1121a
-  - 1139a
-  - 1155a
-  - 1212p
-  - 1214p
-  - 1218p
-  - 1220p
-  - 1224p
-  - 1232p
-  - 1238p
-- - 1151a
-  - 1209p
-  - 1225p
-  - 1242p
-  - 1244p
-  - 1248p
-  - 1250p
-  - 1254p
-  - 102p
-  - 108p
-- - 1221p
-  - 1239p
-  - 1255p
-  - 112p
-  - 114p
-  - 118p
-  - 120p
-  - 124p
-  - 132p
-  - 138p
-- - 1251p
-  - 109p
-  - 125p
-  - 142p
-  - 144p
-  - 148p
-  - 150p
-  - 154p
-  - 202p
-  - 208p
-- - 121p
-  - 139p
-  - 155p
-  - 212p
-  - 214p
-  - 218p
-  - 220p
-  - 224p
-  - 232p
-  - 238p
-- - 151p
-  - 209p
-  - 225p
-  - 242p
-  - 244p
-  - 248p
-  - 250p
-  - 254p
-  - 303p
-  - 309p
-- - 221p
-  - 239p
-  - 255p
-  - 313p
-  - 315p
-  - 319p
-  - 322p
-  - 327p
-  - 337p
-  - 343p
-- - 250p
-  - 308p
-  - 326p
-  - 344p
-  - 346p
-  - 350p
-  - 353p
-  - 358p
-  - 408p
-  - 414p
-- - 316p
-  - 335p
-  - 353p
-  - 411p
-  - 413p
-  - 417p
-  - 420p
-  - 425p
-  - 435p
-  - 441p
-- - 346p
-  - 405p
-  - 423p
-  - 441p
-  - 443p
-  - 447p
-  - 450p
-  - 455p
-  - 505p
-  - 511p
-- - 406p
-  - 425p
-  - 443p
-  - 501p
-  - 503p
-  - 507p
-  - 510p
-  - 515p
-  - 525p
-  - 531p
-- - 426p
-  - 445p
-  - 503p
-  - 521p
-  - 523p
-  - 527p
-  - 530p
-  - 535p
-  - 545p
-  - 551p
-- - 446p
-  - 505p
-  - 523p
-  - 541p
-  - 543p
-  - 547p
-  - 550p
-  - 555p
-  - 605p
-  - 611p
-- - 526p
-  - 545p
-  - 603p
-  - 621p
-  - 623p
-  - 627p
-  - 630p
-  - 634p
-  - 642p
-  - 648p
-- - 556p
-  - 615p
-  - 632p
-  - 649p
-  - 651p
-  - 654p
-  - 656p
-  - 700p
-  - 708p
-  - 714p
-- - 656p
-  - 713p
-  - 728p
-  - 745p
-  - 747p
-  - 750p
-  - 752p
-  - 756p
-  - 804p
-  - 810p
-- - "-"
-  - "-"
-  - "-"
-  - 840p
-  - 842p
-  - 845p
-  - 847p
-  - 851p
-  - 859p
-  - 905p
-- - "-"
-  - "-"
-  - "-"
-  - 940p
-  - 942p
-  - 945p
-  - 947p
-  - 951p
-  - 959p
-  - 1005p
-- - "-"
-  - "-"
-  - "-"
-  - 1040p
-  - 1042p
-  - 1045p
-  - 1047p
-  - 1051p
-  - 1059p
-  - 1105p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - Page Shops
-  - Scullin Shops
-  - Charnwood
-  - Fraser West Terminus
-

--- a/maxious-canberra-transit-feed/output/13-313-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/13-313-to-tuggeranong-interchange.stop_times.yml
@@ -1,328 +1,12 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 3)-Lathlain St Bus Station (Platform 1): []
+  Woden Interchange (Platform 6)-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+short_name: 13/313
+stop_times: [[549a, 553a, 602a, 606a, 613a, 615a, 619a, 636a, 653a, 706a], [619a, 623a, 632a, 636a, 643a, 645a, 649a, 706a, 723a, 738a], [649a, 653a, 702a, 706a, 713a, 715a, 719a, 737a, 754a, 811a], [717a, 721a, 730a, 735a, 743a, 745a, 749a, 808a, 825a, 842a], [740a, 745a, 755a, 800a, 808a, 810a, 814a, 833a, 850a, 907a], [800a, 805a, 815a, 820a, 828a, 830a, 834a, 853a, 910a, 927a], [820a, 825a, 835a, 840a, 848a, 850a, 854a, 913a, 930a, 945a], [845a, 850a, 900a, 905a, 913a, 915a, 919a, 937a, 954a, 1009a], [917a, 922a, 932a, 936a, 943a, 945a, 949a, 1006a, 1023a, 1038a], [949a, 953a, 1002a, 1006a, 1013a, 1015a, 1019a, 1036a, 1053a, 1108a], [1019a, 1023a, 1032a, 1036a, 1043a, 1045a, 1049a, 1106a, 1123a, 1138a], [1049a, 1053a, 1102a, 1106a, 1113a, 1115a, 1119a, 1136a, 1153a, 1208p], [1119a, 1123a, 1132a, 1136a, 1143a, 1145a, 1149a, 1206p, 1223p, 1238p], [1149a, 1153a, 1202p, 1206p, 1213p, 1215p, 1219p, 1236p, 1253p, 108p], [1219p, 1223p, 1232p, 1236p, 1243p, 1245p, 1249p, 106p, 123p, 138p], [1249p, 1253p, 102p, 106p, 113p, 115p, 119p, 136p, 153p, 208p], [119p, 123p, 132p, 136p, 143p, 145p, 149p, 206p, 223p, 238p], [149p, 153p, 202p, 206p, 213p, 215p, 219p, 236p, 253p, 310p], [219p, 223p, 232p, 236p, 243p, 245p, 249p, 307p, 324p, 343p], [248p, 252p, 301p, 305p, 313p, 315p, 319p, 338p, 355p, 414p], [316p, 321p, 331p, 335p, 343p, 345p, 349p, 408p, 425p, 444p], [346p, 351p, 401p, 405p, 413p, 415p, 419p, 438p, 455p, 514p], [421p, 426p, 436p, 440p, 448p, 450p, 454p, "-", "-", "-"], [450p, 455p, 505p, 509p, 517p, 519p, 523p, "-", "-", "-"], [516p, 521p, 531p, 535p, 543p, 545p, 549p, 608p, 625p, 641p], [546p, 551p, 601p, 605p, 613p, 615p, 619p, 636p, 650p, 705p], [619p, 624p, 634p, 638p, 644p, 646p, 649p, 705p, 719p, 734p], [712p, 716p, 725p, 729p, 735p, 737p, 740p, "-", "-", "-"], [812p, 816p, 825p, 829p, 835p, 837p, 840p, "-", "-", "-"], [912p, 916p, 925p, 929p, 935p, 937p, 940p, "-", "-", "-"], [1012p, 1016p, 1025p, 1029p, 1035p, 1037p, 1040p, "-", "-", "-"]]
+time_points: [Fraser West Terminus, Charnwood, Scullin Shops, Page Shops, Cohen St Bus Station (Platform 3), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange]
 
-short_name: 13/313
-stop_times: 
-- - 549a
-  - 553a
-  - 602a
-  - 606a
-  - 613a
-  - 615a
-  - 619a
-  - 636a
-  - 653a
-  - 706a
-- - 619a
-  - 623a
-  - 632a
-  - 636a
-  - 643a
-  - 645a
-  - 649a
-  - 706a
-  - 723a
-  - 738a
-- - 649a
-  - 653a
-  - 702a
-  - 706a
-  - 713a
-  - 715a
-  - 719a
-  - 737a
-  - 754a
-  - 811a
-- - 717a
-  - 721a
-  - 730a
-  - 735a
-  - 743a
-  - 745a
-  - 749a
-  - 808a
-  - 825a
-  - 842a
-- - 740a
-  - 745a
-  - 755a
-  - 800a
-  - 808a
-  - 810a
-  - 814a
-  - 833a
-  - 850a
-  - 907a
-- - 800a
-  - 805a
-  - 815a
-  - 820a
-  - 828a
-  - 830a
-  - 834a
-  - 853a
-  - 910a
-  - 927a
-- - 820a
-  - 825a
-  - 835a
-  - 840a
-  - 848a
-  - 850a
-  - 854a
-  - 913a
-  - 930a
-  - 945a
-- - 845a
-  - 850a
-  - 900a
-  - 905a
-  - 913a
-  - 915a
-  - 919a
-  - 937a
-  - 954a
-  - 1009a
-- - 917a
-  - 922a
-  - 932a
-  - 936a
-  - 943a
-  - 945a
-  - 949a
-  - 1006a
-  - 1023a
-  - 1038a
-- - 949a
-  - 953a
-  - 1002a
-  - 1006a
-  - 1013a
-  - 1015a
-  - 1019a
-  - 1036a
-  - 1053a
-  - 1108a
-- - 1019a
-  - 1023a
-  - 1032a
-  - 1036a
-  - 1043a
-  - 1045a
-  - 1049a
-  - 1106a
-  - 1123a
-  - 1138a
-- - 1049a
-  - 1053a
-  - 1102a
-  - 1106a
-  - 1113a
-  - 1115a
-  - 1119a
-  - 1136a
-  - 1153a
-  - 1208p
-- - 1119a
-  - 1123a
-  - 1132a
-  - 1136a
-  - 1143a
-  - 1145a
-  - 1149a
-  - 1206p
-  - 1223p
-  - 1238p
-- - 1149a
-  - 1153a
-  - 1202p
-  - 1206p
-  - 1213p
-  - 1215p
-  - 1219p
-  - 1236p
-  - 1253p
-  - 108p
-- - 1219p
-  - 1223p
-  - 1232p
-  - 1236p
-  - 1243p
-  - 1245p
-  - 1249p
-  - 106p
-  - 123p
-  - 138p
-- - 1249p
-  - 1253p
-  - 102p
-  - 106p
-  - 113p
-  - 115p
-  - 119p
-  - 136p
-  - 153p
-  - 208p
-- - 119p
-  - 123p
-  - 132p
-  - 136p
-  - 143p
-  - 145p
-  - 149p
-  - 206p
-  - 223p
-  - 238p
-- - 149p
-  - 153p
-  - 202p
-  - 206p
-  - 213p
-  - 215p
-  - 219p
-  - 236p
-  - 253p
-  - 310p
-- - 219p
-  - 223p
-  - 232p
-  - 236p
-  - 243p
-  - 245p
-  - 249p
-  - 307p
-  - 324p
-  - 343p
-- - 248p
-  - 252p
-  - 301p
-  - 305p
-  - 313p
-  - 315p
-  - 319p
-  - 338p
-  - 355p
-  - 414p
-- - 316p
-  - 321p
-  - 331p
-  - 335p
-  - 343p
-  - 345p
-  - 349p
-  - 408p
-  - 425p
-  - 444p
-- - 346p
-  - 351p
-  - 401p
-  - 405p
-  - 413p
-  - 415p
-  - 419p
-  - 438p
-  - 455p
-  - 514p
-- - 421p
-  - 426p
-  - 436p
-  - 440p
-  - 448p
-  - 450p
-  - 454p
-  - "-"
-  - "-"
-  - "-"
-- - 450p
-  - 455p
-  - 505p
-  - 509p
-  - 517p
-  - 519p
-  - 523p
-  - "-"
-  - "-"
-  - "-"
-- - 516p
-  - 521p
-  - 531p
-  - 535p
-  - 543p
-  - 545p
-  - 549p
-  - 608p
-  - 625p
-  - 641p
-- - 546p
-  - 551p
-  - 601p
-  - 605p
-  - 613p
-  - 615p
-  - 619p
-  - 636p
-  - 650p
-  - 705p
-- - 619p
-  - 624p
-  - 634p
-  - 638p
-  - 644p
-  - 646p
-  - 649p
-  - 705p
-  - 719p
-  - 734p
-- - 712p
-  - 716p
-  - 725p
-  - 729p
-  - 735p
-  - 737p
-  - 740p
-  - "-"
-  - "-"
-  - "-"
-- - 812p
-  - 816p
-  - 825p
-  - 829p
-  - 835p
-  - 837p
-  - 840p
-  - "-"
-  - "-"
-  - "-"
-- - 912p
-  - 916p
-  - 925p
-  - 929p
-  - 935p
-  - 937p
-  - 940p
-  - "-"
-  - "-"
-  - "-"
-- - 1012p
-  - 1016p
-  - 1025p
-  - 1029p
-  - 1035p
-  - 1037p
-  - 1040p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Fraser West Terminus
-  - Charnwood
-  - Scullin Shops
-  - Page Shops
-  - Cohen St Bus Station - Platform 3
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange
-

--- a/maxious-canberra-transit-feed/output/14-314-to-fraser-west-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/14-314-to-fraser-west-terminus.stop_times.yml
@@ -1,328 +1,12 @@
 --- 
 long_name: To Fraser West Terminus
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+  City Interchange (Platform 5)-Cameron Ave Bus Station (Platform 4): [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+short_name: 14/314
+stop_times: [["-", "-", "-", 705a, 707a, 711a, 716a, 721a, 725a, 733a], ["-", "-", "-", 723a, 725a, 729a, 735a, 740a, 745a, 753a], [706a, 724a, 741a, 759a, 801a, 805a, 811a, 816a, 821a, 829a], [746a, 805a, 823a, 841a, 843a, 847a, 853a, 858a, 903a, 911a], [806a, 825a, 843a, 901a, 903a, 907a, 913a, 918a, 923a, 931a], [843a, 902a, 920a, 938a, 940a, 944a, 949a, 954a, 958a, 1006a], [916a, 935a, 951a, 1008a, 1010a, 1014a, 1019a, 1024a, 1028a, 1036a], [946a, 1004a, 1020a, 1037a, 1039a, 1043a, 1048a, 1053a, 1057a, 1105a], [1016a, 1034a, 1050a, 1107a, 1109a, 1113a, 1118a, 1123a, 1127a, 1135a], [1046a, 1104a, 1120a, 1137a, 1139a, 1143a, 1148a, 1153a, 1157a, 1205p], [1116a, 1134a, 1150a, 1207p, 1209p, 1213p, 1218p, 1223p, 1227p, 1235p], [1146a, 1204p, 1220p, 1237p, 1239p, 1243p, 1248p, 1253p, 1257p, 105p], [1216p, 1234p, 1250p, 107p, 109p, 113p, 118p, 123p, 127p, 135p], [1246p, 104p, 120p, 137p, 139p, 143p, 148p, 153p, 157p, 205p], [116p, 134p, 150p, 207p, 209p, 213p, 218p, 223p, 227p, 235p], [146p, 204p, 220p, 237p, 239p, 243p, 248p, 253p, 257p, 306p], [216p, 234p, 250p, 307p, 309p, 313p, 319p, 324p, 329p, 338p], [245p, 303p, 321p, 339p, 341p, 345p, 351p, 356p, 401p, 410p], ["-", "-", "-", 342p, 344p, 348p, 354p, 359p, 404p, 413p], [321p, 340p, 358p, 416p, 418p, 422p, 428p, 433p, 438p, 447p], [351p, 410p, 428p, 446p, 448p, 452p, 458p, 503p, 508p, 517p], [421p, 440p, 458p, 516p, 518p, 522p, 528p, 533p, 538p, 547p], [451p, 510p, 528p, 546p, 548p, 552p, 558p, 603p, 608p, 617p], [511p, 530p, 548p, 606p, 608p, 612p, 618p, 623p, 628p, 636p], [531p, 550p, 608p, 626p, 628p, 632p, 637p, 642p, 646p, 654p], [551p, 610p, 628p, 645p, 647p, 650p, 655p, 700p, 704p, 712p], [621p, 639p, 654p, 711p, 713p, 716p, 721p, 726p, 730p, 738p], ["-", "-", "-", 746p, 748p, 751p, 756p, 801p, 805p, 813p], ["-", "-", "-", 846p, 848p, 851p, 856p, 901p, 905p, 913p], ["-", "-", "-", 946p, 948p, 951p, 956p, 1001p, 1005p, 1013p], ["-", "-", "-", 1046p, 1048p, 1051p, 1056p, 1101p, 1105p, 1113p]]
+time_points: [Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), St Francis Xavier Florey, Charnwood, Fraser, Fraser West Terminus]
 
-short_name: 14/314
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 705a
-  - 707a
-  - 711a
-  - 716a
-  - 721a
-  - 725a
-  - 733a
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 735a
-  - 740a
-  - 745a
-  - 753a
-- - 706a
-  - 724a
-  - 741a
-  - 759a
-  - 801a
-  - 805a
-  - 811a
-  - 816a
-  - 821a
-  - 829a
-- - 746a
-  - 805a
-  - 823a
-  - 841a
-  - 843a
-  - 847a
-  - 853a
-  - 858a
-  - 903a
-  - 911a
-- - 806a
-  - 825a
-  - 843a
-  - 901a
-  - 903a
-  - 907a
-  - 913a
-  - 918a
-  - 923a
-  - 931a
-- - 843a
-  - 902a
-  - 920a
-  - 938a
-  - 940a
-  - 944a
-  - 949a
-  - 954a
-  - 958a
-  - 1006a
-- - 916a
-  - 935a
-  - 951a
-  - 1008a
-  - 1010a
-  - 1014a
-  - 1019a
-  - 1024a
-  - 1028a
-  - 1036a
-- - 946a
-  - 1004a
-  - 1020a
-  - 1037a
-  - 1039a
-  - 1043a
-  - 1048a
-  - 1053a
-  - 1057a
-  - 1105a
-- - 1016a
-  - 1034a
-  - 1050a
-  - 1107a
-  - 1109a
-  - 1113a
-  - 1118a
-  - 1123a
-  - 1127a
-  - 1135a
-- - 1046a
-  - 1104a
-  - 1120a
-  - 1137a
-  - 1139a
-  - 1143a
-  - 1148a
-  - 1153a
-  - 1157a
-  - 1205p
-- - 1116a
-  - 1134a
-  - 1150a
-  - 1207p
-  - 1209p
-  - 1213p
-  - 1218p
-  - 1223p
-  - 1227p
-  - 1235p
-- - 1146a
-  - 1204p
-  - 1220p
-  - 1237p
-  - 1239p
-  - 1243p
-  - 1248p
-  - 1253p
-  - 1257p
-  - 105p
-- - 1216p
-  - 1234p
-  - 1250p
-  - 107p
-  - 109p
-  - 113p
-  - 118p
-  - 123p
-  - 127p
-  - 135p
-- - 1246p
-  - 104p
-  - 120p
-  - 137p
-  - 139p
-  - 143p
-  - 148p
-  - 153p
-  - 157p
-  - 205p
-- - 116p
-  - 134p
-  - 150p
-  - 207p
-  - 209p
-  - 213p
-  - 218p
-  - 223p
-  - 227p
-  - 235p
-- - 146p
-  - 204p
-  - 220p
-  - 237p
-  - 239p
-  - 243p
-  - 248p
-  - 253p
-  - 257p
-  - 306p
-- - 216p
-  - 234p
-  - 250p
-  - 307p
-  - 309p
-  - 313p
-  - 319p
-  - 324p
-  - 329p
-  - 338p
-- - 245p
-  - 303p
-  - 321p
-  - 339p
-  - 341p
-  - 345p
-  - 351p
-  - 356p
-  - 401p
-  - 410p
-- - "-"
-  - "-"
-  - "-"
-  - 342p
-  - 344p
-  - 348p
-  - 354p
-  - 359p
-  - 404p
-  - 413p
-- - 321p
-  - 340p
-  - 358p
-  - 416p
-  - 418p
-  - 422p
-  - 428p
-  - 433p
-  - 438p
-  - 447p
-- - 351p
-  - 410p
-  - 428p
-  - 446p
-  - 448p
-  - 452p
-  - 458p
-  - 503p
-  - 508p
-  - 517p
-- - 421p
-  - 440p
-  - 458p
-  - 516p
-  - 518p
-  - 522p
-  - 528p
-  - 533p
-  - 538p
-  - 547p
-- - 451p
-  - 510p
-  - 528p
-  - 546p
-  - 548p
-  - 552p
-  - 558p
-  - 603p
-  - 608p
-  - 617p
-- - 511p
-  - 530p
-  - 548p
-  - 606p
-  - 608p
-  - 612p
-  - 618p
-  - 623p
-  - 628p
-  - 636p
-- - 531p
-  - 550p
-  - 608p
-  - 626p
-  - 628p
-  - 632p
-  - 637p
-  - 642p
-  - 646p
-  - 654p
-- - 551p
-  - 610p
-  - 628p
-  - 645p
-  - 647p
-  - 650p
-  - 655p
-  - 700p
-  - 704p
-  - 712p
-- - 621p
-  - 639p
-  - 654p
-  - 711p
-  - 713p
-  - 716p
-  - 721p
-  - 726p
-  - 730p
-  - 738p
-- - "-"
-  - "-"
-  - "-"
-  - 746p
-  - 748p
-  - 751p
-  - 756p
-  - 801p
-  - 805p
-  - 813p
-- - "-"
-  - "-"
-  - "-"
-  - 846p
-  - 848p
-  - 851p
-  - 856p
-  - 901p
-  - 905p
-  - 913p
-- - "-"
-  - "-"
-  - "-"
-  - 946p
-  - 948p
-  - 951p
-  - 956p
-  - 1001p
-  - 1005p
-  - 1013p
-- - "-"
-  - "-"
-  - "-"
-  - 1046p
-  - 1048p
-  - 1051p
-  - 1056p
-  - 1101p
-  - 1105p
-  - 1113p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - St Francis Xavier Florey
-  - Charnwood
-  - Fraser
-  - Fraser West Terminus
-

--- a/maxious-canberra-transit-feed/output/14-314-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/14-314-to-tuggeranong-interchange.stop_times.yml
@@ -1,318 +1,12 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 3)-Lathlain St Bus Station (Platform 1): []
+  Woden Interchange (Platform 6)-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+short_name: 14/314
+stop_times: [[613a, 620a, 624a, 629a, 638a, 640a, 644a, "-", "-", "-"], [643a, 650a, 654a, 659a, 708a, 710a, 714a, 731a, 748a, 805a], [712a, 719a, 723a, 728a, 738a, 740a, 744a, 803a, 820a, 837a], [735a, 743a, 748a, 753a, 803a, 805a, 809a, 828a, 845a, 902a], [755a, 803a, 808a, 813a, 823a, 825a, 829a, 848a, 905a, 922a], [815a, 823a, 828a, 833a, 843a, 845a, 849a, 908a, 925a, 941a], [840a, 848a, 853a, 858a, 908a, 910a, 914a, 933a, 950a, 1005a], [911a, 919a, 924a, 929a, 938a, 940a, 944a, 1001a, 1018a, 1033a], [943a, 950a, 954a, 959a, 1008a, 1010a, 1014a, 1031a, 1048a, 1103a], [1013a, 1020a, 1024a, 1029a, 1038a, 1040a, 1044a, 1101a, 1118a, 1133a], [1043a, 1050a, 1054a, 1059a, 1108a, 1110a, 1114a, 1131a, 1148a, 1203p], [1113a, 1120a, 1124a, 1129a, 1138a, 1140a, 1144a, 1201p, 1218p, 1233p], [1143a, 1150a, 1154a, 1159a, 1208p, 1210p, 1214p, 1231p, 1248p, 103p], [1213p, 1220p, 1224p, 1229p, 1238p, 1240p, 1244p, 101p, 118p, 133p], [1243p, 1250p, 1254p, 1259p, 108p, 110p, 114p, 131p, 148p, 203p], [113p, 120p, 124p, 129p, 138p, 140p, 144p, 201p, 218p, 233p], [143p, 150p, 154p, 159p, 208p, 210p, 214p, 231p, 248p, 304p], [213p, 220p, 224p, 229p, 238p, 240p, 244p, 301p, 318p, 337p], [242p, 249p, 253p, 258p, 308p, 310p, 314p, 333p, 350p, 409p], [311p, 318p, 323p, 328p, 338p, 340p, 344p, 403p, 420p, 439p], [351p, 358p, 403p, 408p, 418p, 420p, 424p, 443p, 500p, 519p], [421p, 428p, 433p, 438p, 448p, 450p, 454p, 513p, 530p, 549p], [451p, 458p, 503p, 508p, 518a, 520a, 524p, "-", "-", "-"], [541p, 548p, 553p, 558p, 608p, 610p, 614p, 632p, 646p, 701p], [614p, 621p, 626p, 631p, 639p, 641p, 644p, 700p, 714p, 729p], [639p, 646p, 650p, 655p, 702a, 704a, 708p, "-", "-", "-"], [717p, 724p, 728p, 733p, 740a, 742a, 746p, "-", "-", "-"], [817p, 824p, 828p, 833p, 840a, 842a, 846p, "-", "-", "-"], [917p, 924p, 928p, 933p, 940a, 942a, 946p, "-", "-", "-"], [1017p, 1024p, 1028p, 1033p, 1040a, 1042a, 1046p, "-", "-", "-"]]
+time_points: [Fraser West Terminus, Fraser, Charnwood, St Francis Xavier Florey, Cohen St Bus Station (Platform 3), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange]
 
-short_name: 14/314
-stop_times: 
-- - 613a
-  - 620a
-  - 624a
-  - 629a
-  - 638a
-  - 640a
-  - 644a
-  - "-"
-  - "-"
-  - "-"
-- - 643a
-  - 650a
-  - 654a
-  - 659a
-  - 708a
-  - 710a
-  - 714a
-  - 731a
-  - 748a
-  - 805a
-- - 712a
-  - 719a
-  - 723a
-  - 728a
-  - 738a
-  - 740a
-  - 744a
-  - 803a
-  - 820a
-  - 837a
-- - 735a
-  - 743a
-  - 748a
-  - 753a
-  - 803a
-  - 805a
-  - 809a
-  - 828a
-  - 845a
-  - 902a
-- - 755a
-  - 803a
-  - 808a
-  - 813a
-  - 823a
-  - 825a
-  - 829a
-  - 848a
-  - 905a
-  - 922a
-- - 815a
-  - 823a
-  - 828a
-  - 833a
-  - 843a
-  - 845a
-  - 849a
-  - 908a
-  - 925a
-  - 941a
-- - 840a
-  - 848a
-  - 853a
-  - 858a
-  - 908a
-  - 910a
-  - 914a
-  - 933a
-  - 950a
-  - 1005a
-- - 911a
-  - 919a
-  - 924a
-  - 929a
-  - 938a
-  - 940a
-  - 944a
-  - 1001a
-  - 1018a
-  - 1033a
-- - 943a
-  - 950a
-  - 954a
-  - 959a
-  - 1008a
-  - 1010a
-  - 1014a
-  - 1031a
-  - 1048a
-  - 1103a
-- - 1013a
-  - 1020a
-  - 1024a
-  - 1029a
-  - 1038a
-  - 1040a
-  - 1044a
-  - 1101a
-  - 1118a
-  - 1133a
-- - 1043a
-  - 1050a
-  - 1054a
-  - 1059a
-  - 1108a
-  - 1110a
-  - 1114a
-  - 1131a
-  - 1148a
-  - 1203p
-- - 1113a
-  - 1120a
-  - 1124a
-  - 1129a
-  - 1138a
-  - 1140a
-  - 1144a
-  - 1201p
-  - 1218p
-  - 1233p
-- - 1143a
-  - 1150a
-  - 1154a
-  - 1159a
-  - 1208p
-  - 1210p
-  - 1214p
-  - 1231p
-  - 1248p
-  - 103p
-- - 1213p
-  - 1220p
-  - 1224p
-  - 1229p
-  - 1238p
-  - 1240p
-  - 1244p
-  - 101p
-  - 118p
-  - 133p
-- - 1243p
-  - 1250p
-  - 1254p
-  - 1259p
-  - 108p
-  - 110p
-  - 114p
-  - 131p
-  - 148p
-  - 203p
-- - 113p
-  - 120p
-  - 124p
-  - 129p
-  - 138p
-  - 140p
-  - 144p
-  - 201p
-  - 218p
-  - 233p
-- - 143p
-  - 150p
-  - 154p
-  - 159p
-  - 208p
-  - 210p
-  - 214p
-  - 231p
-  - 248p
-  - 304p
-- - 213p
-  - 220p
-  - 224p
-  - 229p
-  - 238p
-  - 240p
-  - 244p
-  - 301p
-  - 318p
-  - 337p
-- - 242p
-  - 249p
-  - 253p
-  - 258p
-  - 308p
-  - 310p
-  - 314p
-  - 333p
-  - 350p
-  - 409p
-- - 311p
-  - 318p
-  - 323p
-  - 328p
-  - 338p
-  - 340p
-  - 344p
-  - 403p
-  - 420p
-  - 439p
-- - 351p
-  - 358p
-  - 403p
-  - 408p
-  - 418p
-  - 420p
-  - 424p
-  - 443p
-  - 500p
-  - 519p
-- - 421p
-  - 428p
-  - 433p
-  - 438p
-  - 448p
-  - 450p
-  - 454p
-  - 513p
-  - 530p
-  - 549p
-- - 451p
-  - 458p
-  - 503p
-  - 508p
-  - 518a
-  - 520a
-  - 524p
-  - "-"
-  - "-"
-  - "-"
-- - 541p
-  - 548p
-  - 553p
-  - 558p
-  - 608p
-  - 610p
-  - 614p
-  - 632p
-  - 646p
-  - 701p
-- - 614p
-  - 621p
-  - 626p
-  - 631p
-  - 639p
-  - 641p
-  - 644p
-  - 700p
-  - 714p
-  - 729p
-- - 639p
-  - 646p
-  - 650p
-  - 655p
-  - 702a
-  - 704a
-  - 708p
-  - "-"
-  - "-"
-  - "-"
-- - 717p
-  - 724p
-  - 728p
-  - 733p
-  - 740a
-  - 742a
-  - 746p
-  - "-"
-  - "-"
-  - "-"
-- - 817p
-  - 824p
-  - 828p
-  - 833p
-  - 840a
-  - 842a
-  - 846p
-  - "-"
-  - "-"
-  - "-"
-- - 917p
-  - 924p
-  - 928p
-  - 933p
-  - 940a
-  - 942a
-  - 946p
-  - "-"
-  - "-"
-  - "-"
-- - 1017p
-  - 1024p
-  - 1028p
-  - 1033p
-  - 1040a
-  - 1042a
-  - 1046p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Fraser West Terminus
-  - Fraser
-  - Charnwood
-  - St Francis Xavier Florey
-  - Cohen St Bus Station - Platform 3
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange
-

--- a/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
@@ -1,298 +1,12 @@
 --- 
 long_name: To Spence Terminus
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+  City Interchange (Platform 5)-Cameron Ave Bus Station (Platform 4): [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+short_name: 15/315
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 749a, 754a], ["-", "-", "-", 803a, 805a, 809a, 817a, 821a, 829a, 834a], [731a, 750a, 808a, 826a, 828a, 832a, 840a, 844a, 852a, 857a], [831a, 850a, 908a, 926a, 928a, 932a, 939a, 942a, 948a, 953a], [911a, 930a, 946a, 1003a, 1005a, 1009a, 1016a, 1019a, 1025a, 1030a], [941a, 959a, 1015a, 1032a, 1034a, 1038a, 1045a, 1048a, 1054a, 1059a], [1011a, 1029a, 1045a, 1102a, 1104a, 1108a, 1115a, 1118a, 1124a, 1129a], [1041a, 1059a, 1115a, 1132a, 1134a, 1138a, 1145a, 1148a, 1154a, 1159a], [1111a, 1129a, 1145a, 1202p, 1204p, 1208p, 1215p, 1218p, 1224p, 1229p], [1141a, 1159a, 1215p, 1232p, 1234p, 1238p, 1245p, 1248p, 1254p, 1259p], [1211p, 1229p, 1245p, 102p, 104p, 108p, 115p, 118p, 124p, 129p], [1241p, 1259p, 115p, 132p, 134p, 138p, 145p, 148p, 154p, 159p], [111p, 129p, 145p, 202p, 204p, 208p, 215p, 218p, 224p, 229p], [141p, 159p, 215p, 232p, 234p, 238p, 245p, 248p, 254p, 259p], [211p, 229p, 245p, 302p, 304p, 308p, 316p, 320p, 328p, 333p], [241p, 259p, 317p, 335p, 337p, 341p, 349p, 353p, 401p, 406p], ["-", "-", "-", 354p, 356p, 400p, 408p, 412p, 420p, 425p], [311p, 330p, 348p, 406p, 408p, 412p, 420p, 424p, 432p, 437p], [341p, 400p, 418p, 436p, 438p, 442p, 450p, 454p, 502p, 507p], [411p, 430p, 448p, 506p, 508p, 512p, 520p, 524p, 532p, 537p], [441p, 500p, 518p, 536p, 538p, 542p, 550p, 554p, 602p, 607p], [501p, 520p, 538p, 556p, 558p, 602p, 610p, 614p, 622p, 627p], [521p, 540p, 558p, 616p, 618p, 622p, 630p, 633p, 639p, 644p], [601p, 620p, 636p, 653p, 655p, 658p, 705p, 708p, 714p, 719p], ["-", "-", "-", 753p, 755p, 758p, 805p, 808p, 814p, 819p], ["-", "-", "-", 853p, 855p, 858p, 905p, 908p, 914p, 919p], ["-", "-", "-", 953p, 955p, 958p, 1005p, 1008p, 1014p, 1019p], ["-", "-", "-", 1053p, 1055p, 1058p, 1105p, 1108p, 1114p, 1119p]]
+time_points: [Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Copland College, Melba, Spence, Spence Terminus]
 
-short_name: 15/315
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 737a
-  - 741a
-  - 749a
-  - 754a
-- - "-"
-  - "-"
-  - "-"
-  - 803a
-  - 805a
-  - 809a
-  - 817a
-  - 821a
-  - 829a
-  - 834a
-- - 731a
-  - 750a
-  - 808a
-  - 826a
-  - 828a
-  - 832a
-  - 840a
-  - 844a
-  - 852a
-  - 857a
-- - 831a
-  - 850a
-  - 908a
-  - 926a
-  - 928a
-  - 932a
-  - 939a
-  - 942a
-  - 948a
-  - 953a
-- - 911a
-  - 930a
-  - 946a
-  - 1003a
-  - 1005a
-  - 1009a
-  - 1016a
-  - 1019a
-  - 1025a
-  - 1030a
-- - 941a
-  - 959a
-  - 1015a
-  - 1032a
-  - 1034a
-  - 1038a
-  - 1045a
-  - 1048a
-  - 1054a
-  - 1059a
-- - 1011a
-  - 1029a
-  - 1045a
-  - 1102a
-  - 1104a
-  - 1108a
-  - 1115a
-  - 1118a
-  - 1124a
-  - 1129a
-- - 1041a
-  - 1059a
-  - 1115a
-  - 1132a
-  - 1134a
-  - 1138a
-  - 1145a
-  - 1148a
-  - 1154a
-  - 1159a
-- - 1111a
-  - 1129a
-  - 1145a
-  - 1202p
-  - 1204p
-  - 1208p
-  - 1215p
-  - 1218p
-  - 1224p
-  - 1229p
-- - 1141a
-  - 1159a
-  - 1215p
-  - 1232p
-  - 1234p
-  - 1238p
-  - 1245p
-  - 1248p
-  - 1254p
-  - 1259p
-- - 1211p
-  - 1229p
-  - 1245p
-  - 102p
-  - 104p
-  - 108p
-  - 115p
-  - 118p
-  - 124p
-  - 129p
-- - 1241p
-  - 1259p
-  - 115p
-  - 132p
-  - 134p
-  - 138p
-  - 145p
-  - 148p
-  - 154p
-  - 159p
-- - 111p
-  - 129p
-  - 145p
-  - 202p
-  - 204p
-  - 208p
-  - 215p
-  - 218p
-  - 224p
-  - 229p
-- - 141p
-  - 159p
-  - 215p
-  - 232p
-  - 234p
-  - 238p
-  - 245p
-  - 248p
-  - 254p
-  - 259p
-- - 211p
-  - 229p
-  - 245p
-  - 302p
-  - 304p
-  - 308p
-  - 316p
-  - 320p
-  - 328p
-  - 333p
-- - 241p
-  - 259p
-  - 317p
-  - 335p
-  - 337p
-  - 341p
-  - 349p
-  - 353p
-  - 401p
-  - 406p
-- - "-"
-  - "-"
-  - "-"
-  - 354p
-  - 356p
-  - 400p
-  - 408p
-  - 412p
-  - 420p
-  - 425p
-- - 311p
-  - 330p
-  - 348p
-  - 406p
-  - 408p
-  - 412p
-  - 420p
-  - 424p
-  - 432p
-  - 437p
-- - 341p
-  - 400p
-  - 418p
-  - 436p
-  - 438p
-  - 442p
-  - 450p
-  - 454p
-  - 502p
-  - 507p
-- - 411p
-  - 430p
-  - 448p
-  - 506p
-  - 508p
-  - 512p
-  - 520p
-  - 524p
-  - 532p
-  - 537p
-- - 441p
-  - 500p
-  - 518p
-  - 536p
-  - 538p
-  - 542p
-  - 550p
-  - 554p
-  - 602p
-  - 607p
-- - 501p
-  - 520p
-  - 538p
-  - 556p
-  - 558p
-  - 602p
-  - 610p
-  - 614p
-  - 622p
-  - 627p
-- - 521p
-  - 540p
-  - 558p
-  - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 633p
-  - 639p
-  - 644p
-- - 601p
-  - 620p
-  - 636p
-  - 653p
-  - 655p
-  - 658p
-  - 705p
-  - 708p
-  - 714p
-  - 719p
-- - "-"
-  - "-"
-  - "-"
-  - 753p
-  - 755p
-  - 758p
-  - 805p
-  - 808p
-  - 814p
-  - 819p
-- - "-"
-  - "-"
-  - "-"
-  - 853p
-  - 855p
-  - 858p
-  - 905p
-  - 908p
-  - 914p
-  - 919p
-- - "-"
-  - "-"
-  - "-"
-  - 953p
-  - 955p
-  - 958p
-  - 1005p
-  - 1008p
-  - 1014p
-  - 1019p
-- - "-"
-  - "-"
-  - "-"
-  - 1053p
-  - 1055p
-  - 1058p
-  - 1105p
-  - 1108p
-  - 1114p
-  - 1119p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - Copland College
-  - Melba
-  - Spence
-  - Spence Terminus
-

--- a/maxious-canberra-transit-feed/output/15-315-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/15-315-to-tuggeranong-interchange.stop_times.yml
@@ -1,371 +1,12 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 3)-Lathlain St Bus Station (Platform 1): []
+  Woden Interchange (Platform 6)-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+short_name: 15/315
+stop_times: [[535a, 540a, 543a, 545a, 548a, 558a, 600a, 604a, "-", "-", "-"], [605a, 610a, 613a, 615a, 618a, 628a, 630a, 634a, "-", "-", "-"], [635a, 640a, 643a, 645a, 648a, 658a, 700a, 704a, 721a, 738a, 755a], [705a, 710a, 713a, 715a, 718a, 728a, 730a, 734a, 753a, 810a, 827a], [733a, 738a, 741a, 744a, 748a, 758a, 800a, 804a, 823a, 840a, 857a], [753a, 758a, 801a, 804a, 808a, 818a, 820a, 824a, 843a, 900a, 917a], ["-", "-", 821a, 823a, 827a, 837a, 839a, 843a, 900a, "-", "-"], [813a, 818a, 821a, 824a, 828a, 838a, 840a, 844a, 903a, 920a, 936a], [833a, 838a, 841a, 844a, 848a, 858a, 900a, 904a, 923a, 940a, 955a], [903a, 908a, 911a, 914a, 918a, 928a, 930a, 934a, 951a, 1008a, 1023a], [935a, 940a, 943a, 945a, 948a, 958a, 1000a, 1004a, 1021a, 1038a, 1053a], [1005a, 1010a, 1013a, 1015a, 1018a, 1028a, 1030a, 1034a, 1051a, 1108a, 1123a], [1035a, 1040a, 1043a, 1045a, 1048a, 1058a, 1100a, 1104a, 1121a, 1138a, 1153a], [1105a, 1110a, 1113a, 1115a, 1118a, 1128a, 1130a, 1134a, 1151a, 1208p, 1223p], [1135a, 1140a, 1143a, 1145a, 1148a, 1158a, 1200p, 1204p, 1221p, 1238p, 1253p], [1205p, 1210p, 1213p, 1215p, 1218p, 1228p, 1230p, 1234p, 1251p, 108p, 123p], [1235p, 1240p, 1243p, 1245p, 1248p, 1258p, 100p, 104p, 121p, 138p, 153p], [105p, 110p, 113p, 115p, 118p, 128p, 130p, 134p, 151p, 208p, 223p], [135p, 140p, 143p, 145p, 148p, 158p, 200p, 204p, 221p, 238p, 253p], [205p, 210p, 213p, 215p, 218p, 228p, 230p, 234p, 251p, 308p, 327p], [235p, 240p, 243p, 245p, 248p, 258p, 300p, 304p, 323p, 340p, 359p], [303p, 308p, 311p, 314p, 318p, 328p, 330p, 334p, 353p, 410p, 429p], [333p, 338p, 341p, 344p, 348p, 358p, 400p, 404p, 423p, 440p, 459p], [403p, 408p, 411p, 414p, 418p, 428p, 430p, 434p, 453p, 510p, 529p], [443p, 448p, 451p, 454p, 458p, 508p, 510p, 514p, 533p, 550p, 609p], [533p, 538p, 541p, 544p, 548p, 558p, 600p, 604p, 623p, 638p, 653p], [604p, 609p, 612p, 615p, 619p, 629p, 631p, 634p, 650p, 704p, 719p], [623p, 628p, 631p, 633p, 636p, 645p, 647p, 650p, "-", "-", "-"], [723p, 728p, 731p, 733p, 736p, 745p, 747p, 750p, "-", "-", "-"], [823p, 828p, 831p, 833p, 836p, 845p, 847p, 850p, "-", "-", "-"], [923p, 928p, 931p, 933p, 936p, 945p, 947p, 950p, "-", "-", "-"], [1023p, 1028p, 1031p, 1033p, 1036p, 1045p, 1047p, 1050p, "-", "-", "-"]]
+time_points: [Spence Terminus, Spence, Alpen & Clifford St, Melba, Copland College, Cohen St Bus Station (Platform 3), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange]
 
-short_name: 15/315
-stop_times: 
-- - 535a
-  - 540a
-  - 543a
-  - 545a
-  - 548a
-  - 558a
-  - 600a
-  - 604a
-  - "-"
-  - "-"
-  - "-"
-- - 605a
-  - 610a
-  - 613a
-  - 615a
-  - 618a
-  - 628a
-  - 630a
-  - 634a
-  - "-"
-  - "-"
-  - "-"
-- - 635a
-  - 640a
-  - 643a
-  - 645a
-  - 648a
-  - 658a
-  - 700a
-  - 704a
-  - 721a
-  - 738a
-  - 755a
-- - 705a
-  - 710a
-  - 713a
-  - 715a
-  - 718a
-  - 728a
-  - 730a
-  - 734a
-  - 753a
-  - 810a
-  - 827a
-- - 733a
-  - 738a
-  - 741a
-  - 744a
-  - 748a
-  - 758a
-  - 800a
-  - 804a
-  - 823a
-  - 840a
-  - 857a
-- - 753a
-  - 758a
-  - 801a
-  - 804a
-  - 808a
-  - 818a
-  - 820a
-  - 824a
-  - 843a
-  - 900a
-  - 917a
-- - "-"
-  - "-"
-  - 821a
-  - 823a
-  - 827a
-  - 837a
-  - 839a
-  - 843a
-  - 900a
-  - "-"
-  - "-"
-- - 813a
-  - 818a
-  - 821a
-  - 824a
-  - 828a
-  - 838a
-  - 840a
-  - 844a
-  - 903a
-  - 920a
-  - 936a
-- - 833a
-  - 838a
-  - 841a
-  - 844a
-  - 848a
-  - 858a
-  - 900a
-  - 904a
-  - 923a
-  - 940a
-  - 955a
-- - 903a
-  - 908a
-  - 911a
-  - 914a
-  - 918a
-  - 928a
-  - 930a
-  - 934a
-  - 951a
-  - 1008a
-  - 1023a
-- - 935a
-  - 940a
-  - 943a
-  - 945a
-  - 948a
-  - 958a
-  - 1000a
-  - 1004a
-  - 1021a
-  - 1038a
-  - 1053a
-- - 1005a
-  - 1010a
-  - 1013a
-  - 1015a
-  - 1018a
-  - 1028a
-  - 1030a
-  - 1034a
-  - 1051a
-  - 1108a
-  - 1123a
-- - 1035a
-  - 1040a
-  - 1043a
-  - 1045a
-  - 1048a
-  - 1058a
-  - 1100a
-  - 1104a
-  - 1121a
-  - 1138a
-  - 1153a
-- - 1105a
-  - 1110a
-  - 1113a
-  - 1115a
-  - 1118a
-  - 1128a
-  - 1130a
-  - 1134a
-  - 1151a
-  - 1208p
-  - 1223p
-- - 1135a
-  - 1140a
-  - 1143a
-  - 1145a
-  - 1148a
-  - 1158a
-  - 1200p
-  - 1204p
-  - 1221p
-  - 1238p
-  - 1253p
-- - 1205p
-  - 1210p
-  - 1213p
-  - 1215p
-  - 1218p
-  - 1228p
-  - 1230p
-  - 1234p
-  - 1251p
-  - 108p
-  - 123p
-- - 1235p
-  - 1240p
-  - 1243p
-  - 1245p
-  - 1248p
-  - 1258p
-  - 100p
-  - 104p
-  - 121p
-  - 138p
-  - 153p
-- - 105p
-  - 110p
-  - 113p
-  - 115p
-  - 118p
-  - 128p
-  - 130p
-  - 134p
-  - 151p
-  - 208p
-  - 223p
-- - 135p
-  - 140p
-  - 143p
-  - 145p
-  - 148p
-  - 158p
-  - 200p
-  - 204p
-  - 221p
-  - 238p
-  - 253p
-- - 205p
-  - 210p
-  - 213p
-  - 215p
-  - 218p
-  - 228p
-  - 230p
-  - 234p
-  - 251p
-  - 308p
-  - 327p
-- - 235p
-  - 240p
-  - 243p
-  - 245p
-  - 248p
-  - 258p
-  - 300p
-  - 304p
-  - 323p
-  - 340p
-  - 359p
-- - 303p
-  - 308p
-  - 311p
-  - 314p
-  - 318p
-  - 328p
-  - 330p
-  - 334p
-  - 353p
-  - 410p
-  - 429p
-- - 333p
-  - 338p
-  - 341p
-  - 344p
-  - 348p
-  - 358p
-  - 400p
-  - 404p
-  - 423p
-  - 440p
-  - 459p
-- - 403p
-  - 408p
-  - 411p
-  - 414p
-  - 418p
-  - 428p
-  - 430p
-  - 434p
-  - 453p
-  - 510p
-  - 529p
-- - 443p
-  - 448p
-  - 451p
-  - 454p
-  - 458p
-  - 508p
-  - 510p
-  - 514p
-  - 533p
-  - 550p
-  - 609p
-- - 533p
-  - 538p
-  - 541p
-  - 544p
-  - 548p
-  - 558p
-  - 600p
-  - 604p
-  - 623p
-  - 638p
-  - 653p
-- - 604p
-  - 609p
-  - 612p
-  - 615p
-  - 619p
-  - 629p
-  - 631p
-  - 634p
-  - 650p
-  - 704p
-  - 719p
-- - 623p
-  - 628p
-  - 631p
-  - 633p
-  - 636p
-  - 645p
-  - 647p
-  - 650p
-  - "-"
-  - "-"
-  - "-"
-- - 723p
-  - 728p
-  - 731p
-  - 733p
-  - 736p
-  - 745p
-  - 747p
-  - 750p
-  - "-"
-  - "-"
-  - "-"
-- - 823p
-  - 828p
-  - 831p
-  - 833p
-  - 836p
-  - 845p
-  - 847p
-  - 850p
-  - "-"
-  - "-"
-  - "-"
-- - 923p
-  - 928p
-  - 931p
-  - 933p
-  - 936p
-  - 945p
-  - 947p
-  - 950p
-  - "-"
-  - "-"
-  - "-"
-- - 1023p
-  - 1028p
-  - 1031p
-  - 1033p
-  - 1036p
-  - 1045p
-  - 1047p
-  - 1050p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Spence Terminus
-  - Spence
-  - Alpen & Clifford St
-  - Melba
-  - Copland College
-  - Cohen St Bus Station - Platform 3
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange
-

--- a/maxious-canberra-transit-feed/output/16-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/16-to-cameron-ave-station.stop_times.yml
@@ -1,200 +1,9 @@
 --- 
 long_name: To Cameron Ave Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "16"
+stop_times: [[610a, 619a, 625a, 630a, 632a, 636a], [640a, 649a, 655a, 700a, 702a, 706a], [711a, 720a, 726a, 731a, 733a, 737a], [730a, 741a, 747a, 753a, 755a, 759a], [750a, 801a, 807a, 813a, 815a, 819a], [810a, 821a, 827a, 833a, 835a, 839a], [830a, 841a, 847a, 853a, 855a, 859a], [851a, 902a, 908a, 912a, 914a, 918a], [925a, 935a, 940a, 944a, 946a, 950a], [954a, 1003a, 1009a, 1014a, 1016a, 1020a], [1024a, 1033a, 1039a, 1044a, 1046a, 1050a], [1054a, 1103a, 1109a, 1114a, 1116a, 1120a], [1124a, 1133a, 1139a, 1144a, 1146a, 1150a], [1154a, 1203p, 1209p, 1214p, 1216p, 1220p], [1224p, 1233p, 1239p, 1244p, 1246p, 1250p], [1254p, 103p, 109p, 114p, 116p, 120p], [124p, 133p, 139p, 144p, 146p, 150p], [154p, 203p, 209p, 214p, 216p, 220p], [224p, 233p, 239p, 244p, 246p, 250p], [255p, 304p, 310p, 314p, 316p, 320p], [324p, 335p, 341p, 347p, 349p, 353p], [354p, 405p, 411p, 417p, 419p, 423p], [427p, 438p, 444p, 450p, 452p, 456p], [456p, 507p, 513p, 519p, 521p, 525p], [526p, 537p, 543p, 549p, 551p, 555p], [549p, 600p, 606p, 612p, 614p, 618p], [649p, 658p, 704p, 708p, 710p, 713p], [749p, 758p, 804p, 808p, 810p, 813p], [849p, 858p, 904p, 908p, 910p, 913p], [949p, 958p, 1004p, 1008p, 1010p, 1013p], [1049p, 1058p, 1104p, 1108p, 1110p, 1113p]]
+time_points: [Kippax, Latham Shops, Florey Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "16"
-stop_times: 
-- - 610a
-  - 619a
-  - 625a
-  - 630a
-  - 632a
-  - 636a
-- - 640a
-  - 649a
-  - 655a
-  - 700a
-  - 702a
-  - 706a
-- - 711a
-  - 720a
-  - 726a
-  - 731a
-  - 733a
-  - 737a
-- - 730a
-  - 741a
-  - 747a
-  - 753a
-  - 755a
-  - 759a
-- - 750a
-  - 801a
-  - 807a
-  - 813a
-  - 815a
-  - 819a
-- - 810a
-  - 821a
-  - 827a
-  - 833a
-  - 835a
-  - 839a
-- - 830a
-  - 841a
-  - 847a
-  - 853a
-  - 855a
-  - 859a
-- - 851a
-  - 902a
-  - 908a
-  - 912a
-  - 914a
-  - 918a
-- - 925a
-  - 935a
-  - 940a
-  - 944a
-  - 946a
-  - 950a
-- - 954a
-  - 1003a
-  - 1009a
-  - 1014a
-  - 1016a
-  - 1020a
-- - 1024a
-  - 1033a
-  - 1039a
-  - 1044a
-  - 1046a
-  - 1050a
-- - 1054a
-  - 1103a
-  - 1109a
-  - 1114a
-  - 1116a
-  - 1120a
-- - 1124a
-  - 1133a
-  - 1139a
-  - 1144a
-  - 1146a
-  - 1150a
-- - 1154a
-  - 1203p
-  - 1209p
-  - 1214p
-  - 1216p
-  - 1220p
-- - 1224p
-  - 1233p
-  - 1239p
-  - 1244p
-  - 1246p
-  - 1250p
-- - 1254p
-  - 103p
-  - 109p
-  - 114p
-  - 116p
-  - 120p
-- - 124p
-  - 133p
-  - 139p
-  - 144p
-  - 146p
-  - 150p
-- - 154p
-  - 203p
-  - 209p
-  - 214p
-  - 216p
-  - 220p
-- - 224p
-  - 233p
-  - 239p
-  - 244p
-  - 246p
-  - 250p
-- - 255p
-  - 304p
-  - 310p
-  - 314p
-  - 316p
-  - 320p
-- - 324p
-  - 335p
-  - 341p
-  - 347p
-  - 349p
-  - 353p
-- - 354p
-  - 405p
-  - 411p
-  - 417p
-  - 419p
-  - 423p
-- - 427p
-  - 438p
-  - 444p
-  - 450p
-  - 452p
-  - 456p
-- - 456p
-  - 507p
-  - 513p
-  - 519p
-  - 521p
-  - 525p
-- - 526p
-  - 537p
-  - 543p
-  - 549p
-  - 551p
-  - 555p
-- - 549p
-  - 600p
-  - 606p
-  - 612p
-  - 614p
-  - 618p
-- - 649p
-  - 658p
-  - 704p
-  - 708p
-  - 710p
-  - 713p
-- - 749p
-  - 758p
-  - 804p
-  - 808p
-  - 810p
-  - 813p
-- - 849p
-  - 858p
-  - 904p
-  - 908p
-  - 910p
-  - 913p
-- - 949p
-  - 958p
-  - 1004p
-  - 1008p
-  - 1010p
-  - 1013p
-- - 1049p
-  - 1058p
-  - 1104p
-  - 1108p
-  - 1110p
-  - 1113p
-time_points: 
-  - Kippax
-  - Latham Shops
-  - Florey Shops
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-

--- a/maxious-canberra-transit-feed/output/16-to-kippax.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/16-to-kippax.stop_times.yml
@@ -1,188 +1,9 @@
 --- 
 long_name: To Kippax
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+short_name: "16"
+stop_times: [[701a, 703a, 707a, 712a, 718a, 727a], [801a, 803a, 807a, 813a, 819a, 830a], [857a, 859a, 903a, 909a, 915a, 926a], [927a, 929a, 933a, 938a, 944a, 953a], [957a, 959a, 1003a, 1008a, 1014a, 1023a], [1027a, 1029a, 1033a, 1038a, 1044a, 1053a], [1057a, 1059a, 1103a, 1108a, 1114a, 1123a], [1127a, 1129a, 1133a, 1138a, 1144a, 1153a], [1157a, 1159a, 1203p, 1208p, 1214p, 1223p], [1227p, 1229p, 1233p, 1238p, 1244p, 1253p], [1257p, 1259p, 103p, 108p, 114p, 123p], [127p, 129p, 133p, 138p, 144p, 153p], [157p, 159p, 203p, 208p, 214p, 223p], [227p, 229p, 233p, 238p, 244p, 253p], [257p, 259p, 303p, 309p, 315p, 326p], [327p, 329p, 333p, 339p, 345p, 356p], [357p, 359p, 403p, 409p, 415p, 426p], [427p, 429p, 433p, 439p, 445p, 456p], [447p, 449p, 453p, 459p, 505p, 516p], [507p, 509p, 513p, 519p, 525p, 536p], [527p, 529p, 533p, 539p, 545p, 556p], [547p, 549p, 553p, 559p, 605p, 616p], [602p, 604p, 608p, 614p, 620p, 631p], [618p, 620p, 624p, 630p, 636p, 645p], [718p, 720p, 723p, 727p, 733p, 742p], [818p, 820p, 823p, 827p, 833p, 842p], [918p, 920p, 923p, 927p, 933p, 942p], [1018p, 1020p, 1023p, 1027p, 1033p, 1042p], [1118p, 1120p, 1123p, 1127p, 1133p, 1142p]]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Florey Shops, Latham Shops, Kippax]
 
-short_name: "16"
-stop_times: 
-- - 701a
-  - 703a
-  - 707a
-  - 712a
-  - 718a
-  - 727a
-- - 801a
-  - 803a
-  - 807a
-  - 813a
-  - 819a
-  - 830a
-- - 857a
-  - 859a
-  - 903a
-  - 909a
-  - 915a
-  - 926a
-- - 927a
-  - 929a
-  - 933a
-  - 938a
-  - 944a
-  - 953a
-- - 957a
-  - 959a
-  - 1003a
-  - 1008a
-  - 1014a
-  - 1023a
-- - 1027a
-  - 1029a
-  - 1033a
-  - 1038a
-  - 1044a
-  - 1053a
-- - 1057a
-  - 1059a
-  - 1103a
-  - 1108a
-  - 1114a
-  - 1123a
-- - 1127a
-  - 1129a
-  - 1133a
-  - 1138a
-  - 1144a
-  - 1153a
-- - 1157a
-  - 1159a
-  - 1203p
-  - 1208p
-  - 1214p
-  - 1223p
-- - 1227p
-  - 1229p
-  - 1233p
-  - 1238p
-  - 1244p
-  - 1253p
-- - 1257p
-  - 1259p
-  - 103p
-  - 108p
-  - 114p
-  - 123p
-- - 127p
-  - 129p
-  - 133p
-  - 138p
-  - 144p
-  - 153p
-- - 157p
-  - 159p
-  - 203p
-  - 208p
-  - 214p
-  - 223p
-- - 227p
-  - 229p
-  - 233p
-  - 238p
-  - 244p
-  - 253p
-- - 257p
-  - 259p
-  - 303p
-  - 309p
-  - 315p
-  - 326p
-- - 327p
-  - 329p
-  - 333p
-  - 339p
-  - 345p
-  - 356p
-- - 357p
-  - 359p
-  - 403p
-  - 409p
-  - 415p
-  - 426p
-- - 427p
-  - 429p
-  - 433p
-  - 439p
-  - 445p
-  - 456p
-- - 447p
-  - 449p
-  - 453p
-  - 459p
-  - 505p
-  - 516p
-- - 507p
-  - 509p
-  - 513p
-  - 519p
-  - 525p
-  - 536p
-- - 527p
-  - 529p
-  - 533p
-  - 539p
-  - 545p
-  - 556p
-- - 547p
-  - 549p
-  - 553p
-  - 559p
-  - 605p
-  - 616p
-- - 602p
-  - 604p
-  - 608p
-  - 614p
-  - 620p
-  - 631p
-- - 618p
-  - 620p
-  - 624p
-  - 630p
-  - 636p
-  - 645p
-- - 718p
-  - 720p
-  - 723p
-  - 727p
-  - 733p
-  - 742p
-- - 818p
-  - 820p
-  - 823p
-  - 827p
-  - 833p
-  - 842p
-- - 918p
-  - 920p
-  - 923p
-  - 927p
-  - 933p
-  - 942p
-- - 1018p
-  - 1020p
-  - 1023p
-  - 1027p
-  - 1033p
-  - 1042p
-- - 1118p
-  - 1120p
-  - 1123p
-  - 1127p
-  - 1133p
-  - 1142p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 6
-  - Cohen St Bus Station - Platform 5
-  - Florey Shops
-  - Latham Shops
-  - Kippax
-

--- a/maxious-canberra-transit-feed/output/17-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/17-to-cameron-ave-station.stop_times.yml
@@ -1,288 +1,9 @@
 --- 
 long_name: To Cameron Ave Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "17"
+stop_times: [[601a, 606a, 612a, 617a, 620a, 625a, 627a, 631a], [631a, 636a, 642a, 647a, 650a, 655a, 657a, 701a], [701a, 706a, 712a, 717a, 720a, 725a, 727a, 731a], [721a, 726a, 732a, 737a, 740a, 746a, 748a, 752a], [741a, 747a, 753a, 758a, 801a, 807a, 809a, 813a], [801a, 807a, 813a, 818a, 821a, 827a, 829a, 833a], [821a, 827a, 833a, 838a, 841a, 847a, 849a, 853a], [841a, 847a, 853a, 858a, 901a, 907a, 909a, 913a], [925a, 931a, 937a, 942a, 945a, 950a, 952a, 956a], [956a, 1001a, 1007a, 1012a, 1015a, 1020a, 1022a, 1026a], [1026a, 1031a, 1037a, 1042a, 1045a, 1050a, 1052a, 1056a], [1056a, 1101a, 1107a, 1112a, 1115a, 1120a, 1122a, 1126a], [1126a, 1131a, 1137a, 1142a, 1145a, 1150a, 1152a, 1156a], [1156a, 1201p, 1207p, 1212p, 1215p, 1220p, 1222p, 1226p], [1226p, 1231p, 1237p, 1242p, 1245p, 1250p, 1252p, 1256p], [1256p, 101p, 107p, 112p, 115p, 120p, 122p, 126p], [126p, 131p, 137p, 142p, 145p, 150p, 152p, 156p], [156p, 201p, 207p, 212p, 215p, 220p, 222p, 226p], [226p, 231p, 237p, 242p, 245p, 250p, 252p, 256p], [255p, 300p, 306p, 311p, 314p, 320p, 322p, 326p], ["-", "-", 325p, 330p, 333p, 339p, 341p, 345p], [326p, 332p, 338p, 343p, 346p, 352p, 354p, 358p], [347p, 353p, 359p, 404p, 407p, 413p, 415p, 419p], ["-", "-", 403p, 408p, 411p, 417p, 419p, 423p], [417p, 423p, 429p, 434p, 437p, 443p, 445p, 449p], [447p, 453p, 459p, 504p, 507p, 513p, 515p, 519p], [517p, 523p, 529p, 534p, 537p, 543p, 545p, 549p], [547p, 553p, 559p, 604p, 607p, 613p, 615p, 619p], [617p, 623p, 629p, 634p, 637p, 641p, 643p, 646p], [657p, 702p, 708p, 713p, 716p, 720p, 722p, 725p], [757p, 802p, 808p, 813p, 816p, 820p, 822p, 825p], [857p, 902p, 908p, 913p, 916p, 920p, 922p, 925p], [957p, 1002p, 1008p, 1013p, 1016p, 1020p, 1022p, 1025p], [1057p, 1102p, 1108p, 1113p, 1116p, 1120p, 1122p, 1125p]]
+time_points: [Kippax, Higgins, Hawker College, Hawker, Weetangera Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "17"
-stop_times: 
-- - 601a
-  - 606a
-  - 612a
-  - 617a
-  - 620a
-  - 625a
-  - 627a
-  - 631a
-- - 631a
-  - 636a
-  - 642a
-  - 647a
-  - 650a
-  - 655a
-  - 657a
-  - 701a
-- - 701a
-  - 706a
-  - 712a
-  - 717a
-  - 720a
-  - 725a
-  - 727a
-  - 731a
-- - 721a
-  - 726a
-  - 732a
-  - 737a
-  - 740a
-  - 746a
-  - 748a
-  - 752a
-- - 741a
-  - 747a
-  - 753a
-  - 758a
-  - 801a
-  - 807a
-  - 809a
-  - 813a
-- - 801a
-  - 807a
-  - 813a
-  - 818a
-  - 821a
-  - 827a
-  - 829a
-  - 833a
-- - 821a
-  - 827a
-  - 833a
-  - 838a
-  - 841a
-  - 847a
-  - 849a
-  - 853a
-- - 841a
-  - 847a
-  - 853a
-  - 858a
-  - 901a
-  - 907a
-  - 909a
-  - 913a
-- - 925a
-  - 931a
-  - 937a
-  - 942a
-  - 945a
-  - 950a
-  - 952a
-  - 956a
-- - 956a
-  - 1001a
-  - 1007a
-  - 1012a
-  - 1015a
-  - 1020a
-  - 1022a
-  - 1026a
-- - 1026a
-  - 1031a
-  - 1037a
-  - 1042a
-  - 1045a
-  - 1050a
-  - 1052a
-  - 1056a
-- - 1056a
-  - 1101a
-  - 1107a
-  - 1112a
-  - 1115a
-  - 1120a
-  - 1122a
-  - 1126a
-- - 1126a
-  - 1131a
-  - 1137a
-  - 1142a
-  - 1145a
-  - 1150a
-  - 1152a
-  - 1156a
-- - 1156a
-  - 1201p
-  - 1207p
-  - 1212p
-  - 1215p
-  - 1220p
-  - 1222p
-  - 1226p
-- - 1226p
-  - 1231p
-  - 1237p
-  - 1242p
-  - 1245p
-  - 1250p
-  - 1252p
-  - 1256p
-- - 1256p
-  - 101p
-  - 107p
-  - 112p
-  - 115p
-  - 120p
-  - 122p
-  - 126p
-- - 126p
-  - 131p
-  - 137p
-  - 142p
-  - 145p
-  - 150p
-  - 152p
-  - 156p
-- - 156p
-  - 201p
-  - 207p
-  - 212p
-  - 215p
-  - 220p
-  - 222p
-  - 226p
-- - 226p
-  - 231p
-  - 237p
-  - 242p
-  - 245p
-  - 250p
-  - 252p
-  - 256p
-- - 255p
-  - 300p
-  - 306p
-  - 311p
-  - 314p
-  - 320p
-  - 322p
-  - 326p
-- - "-"
-  - "-"
-  - 325p
-  - 330p
-  - 333p
-  - 339p
-  - 341p
-  - 345p
-- - 326p
-  - 332p
-  - 338p
-  - 343p
-  - 346p
-  - 352p
-  - 354p
-  - 358p
-- - 347p
-  - 353p
-  - 359p
-  - 404p
-  - 407p
-  - 413p
-  - 415p
-  - 419p
-- - "-"
-  - "-"
-  - 403p
-  - 408p
-  - 411p
-  - 417p
-  - 419p
-  - 423p
-- - 417p
-  - 423p
-  - 429p
-  - 434p
-  - 437p
-  - 443p
-  - 445p
-  - 449p
-- - 447p
-  - 453p
-  - 459p
-  - 504p
-  - 507p
-  - 513p
-  - 515p
-  - 519p
-- - 517p
-  - 523p
-  - 529p
-  - 534p
-  - 537p
-  - 543p
-  - 545p
-  - 549p
-- - 547p
-  - 553p
-  - 559p
-  - 604p
-  - 607p
-  - 613p
-  - 615p
-  - 619p
-- - 617p
-  - 623p
-  - 629p
-  - 634p
-  - 637p
-  - 641p
-  - 643p
-  - 646p
-- - 657p
-  - 702p
-  - 708p
-  - 713p
-  - 716p
-  - 720p
-  - 722p
-  - 725p
-- - 757p
-  - 802p
-  - 808p
-  - 813p
-  - 816p
-  - 820p
-  - 822p
-  - 825p
-- - 857p
-  - 902p
-  - 908p
-  - 913p
-  - 916p
-  - 920p
-  - 922p
-  - 925p
-- - 957p
-  - 1002p
-  - 1008p
-  - 1013p
-  - 1016p
-  - 1020p
-  - 1022p
-  - 1025p
-- - 1057p
-  - 1102p
-  - 1108p
-  - 1113p
-  - 1116p
-  - 1120p
-  - 1122p
-  - 1125p
-time_points: 
-  - Kippax
-  - Higgins
-  - Hawker College
-  - Hawker
-  - Weetangera Shops
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-

--- a/maxious-canberra-transit-feed/output/17-to-kippax.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/17-to-kippax.stop_times.yml
@@ -1,256 +1,9 @@
 --- 
 long_name: To Kippax
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+short_name: "17"
+stop_times: [[707a, 709a, 713a, 717a, 720a, 725a, 730a, 737a], [807a, 809a, 813a, 818a, 821a, 826a, 831a, 838a], [837a, 839a, 843a, 848a, 851a, 856a, 901a, 908a], [855a, 857a, 901a, 906a, 909a, 914a, 919a, 926a], [925a, 927a, 931a, 935a, 938a, 943a, 948a, 953a], [955a, 957a, 1001a, 1005a, 1008a, 1013a, 1018a, 1023a], [1025a, 1027a, 1031a, 1035a, 1038a, 1043a, 1048a, 1053a], [1055a, 1057a, 1101a, 1105a, 1108a, 1113a, 1118a, 1123a], [1125a, 1127a, 1131a, 1135a, 1138a, 1143a, 1148a, 1153a], [1155a, 1157a, 1201p, 1205p, 1208p, 1213p, 1218p, 1223p], [1225p, 1227p, 1231p, 1235p, 1238p, 1243p, 1248p, 1253p], [1255p, 1257p, 101p, 105p, 108p, 113p, 118p, 123p], [125p, 127p, 131p, 135p, 138p, 143p, 148p, 153p], [155p, 157p, 201p, 205p, 208p, 213p, 218p, 223p], [225p, 227p, 231p, 235p, 238p, 243p, 248p, 253p], [255p, 257p, 301p, 306p, 309p, 314p, 320p, 327p], [325p, 327p, 331p, 336p, 339p, 344p, 350p, 357p], [354p, 356p, 400p, 405p, 408p, 413p, 419p, 426p], [413p, 415p, 419p, 424p, 427p, 432p, 438p, 445p], [433p, 435p, 439p, 444p, 447p, 452p, 458p, 505p], [453p, 455p, 459p, 504p, 507p, 512p, 518p, 525p], [513p, 515p, 519p, 524p, 527p, 532p, 538p, 545p], [533p, 535p, 539p, 544p, 547p, 552p, 558p, 605p], [553p, 555p, 559p, 604p, 607p, 612p, 618p, 625p], [624p, 626p, 630p, 634p, 637p, 642p, 647p, 652p], [724p, 726p, 729p, 733p, 736p, 741p, 746p, 751p], [824p, 826p, 829p, 833p, 836p, 841p, 846p, 851p], [924p, 926p, 929p, 933p, 936p, 941p, 946p, 951p], [1024p, 1026p, 1029p, 1033p, 1036p, 1041p, 1046p, 1051p], [1124p, 1126p, 1129p, 1133p, 1136p, 1141p, 1146p, 1151p]]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Weetangera Shops, Hawker, Hawker College, Higgins, Kippax]
 
-short_name: "17"
-stop_times: 
-- - 707a
-  - 709a
-  - 713a
-  - 717a
-  - 720a
-  - 725a
-  - 730a
-  - 737a
-- - 807a
-  - 809a
-  - 813a
-  - 818a
-  - 821a
-  - 826a
-  - 831a
-  - 838a
-- - 837a
-  - 839a
-  - 843a
-  - 848a
-  - 851a
-  - 856a
-  - 901a
-  - 908a
-- - 855a
-  - 857a
-  - 901a
-  - 906a
-  - 909a
-  - 914a
-  - 919a
-  - 926a
-- - 925a
-  - 927a
-  - 931a
-  - 935a
-  - 938a
-  - 943a
-  - 948a
-  - 953a
-- - 955a
-  - 957a
-  - 1001a
-  - 1005a
-  - 1008a
-  - 1013a
-  - 1018a
-  - 1023a
-- - 1025a
-  - 1027a
-  - 1031a
-  - 1035a
-  - 1038a
-  - 1043a
-  - 1048a
-  - 1053a
-- - 1055a
-  - 1057a
-  - 1101a
-  - 1105a
-  - 1108a
-  - 1113a
-  - 1118a
-  - 1123a
-- - 1125a
-  - 1127a
-  - 1131a
-  - 1135a
-  - 1138a
-  - 1143a
-  - 1148a
-  - 1153a
-- - 1155a
-  - 1157a
-  - 1201p
-  - 1205p
-  - 1208p
-  - 1213p
-  - 1218p
-  - 1223p
-- - 1225p
-  - 1227p
-  - 1231p
-  - 1235p
-  - 1238p
-  - 1243p
-  - 1248p
-  - 1253p
-- - 1255p
-  - 1257p
-  - 101p
-  - 105p
-  - 108p
-  - 113p
-  - 118p
-  - 123p
-- - 125p
-  - 127p
-  - 131p
-  - 135p
-  - 138p
-  - 143p
-  - 148p
-  - 153p
-- - 155p
-  - 157p
-  - 201p
-  - 205p
-  - 208p
-  - 213p
-  - 218p
-  - 223p
-- - 225p
-  - 227p
-  - 231p
-  - 235p
-  - 238p
-  - 243p
-  - 248p
-  - 253p
-- - 255p
-  - 257p
-  - 301p
-  - 306p
-  - 309p
-  - 314p
-  - 320p
-  - 327p
-- - 325p
-  - 327p
-  - 331p
-  - 336p
-  - 339p
-  - 344p
-  - 350p
-  - 357p
-- - 354p
-  - 356p
-  - 400p
-  - 405p
-  - 408p
-  - 413p
-  - 419p
-  - 426p
-- - 413p
-  - 415p
-  - 419p
-  - 424p
-  - 427p
-  - 432p
-  - 438p
-  - 445p
-- - 433p
-  - 435p
-  - 439p
-  - 444p
-  - 447p
-  - 452p
-  - 458p
-  - 505p
-- - 453p
-  - 455p
-  - 459p
-  - 504p
-  - 507p
-  - 512p
-  - 518p
-  - 525p
-- - 513p
-  - 515p
-  - 519p
-  - 524p
-  - 527p
-  - 532p
-  - 538p
-  - 545p
-- - 533p
-  - 535p
-  - 539p
-  - 544p
-  - 547p
-  - 552p
-  - 558p
-  - 605p
-- - 553p
-  - 555p
-  - 559p
-  - 604p
-  - 607p
-  - 612p
-  - 618p
-  - 625p
-- - 624p
-  - 626p
-  - 630p
-  - 634p
-  - 637p
-  - 642p
-  - 647p
-  - 652p
-- - 724p
-  - 726p
-  - 729p
-  - 733p
-  - 736p
-  - 741p
-  - 746p
-  - 751p
-- - 824p
-  - 826p
-  - 829p
-  - 833p
-  - 836p
-  - 841p
-  - 846p
-  - 851p
-- - 924p
-  - 926p
-  - 929p
-  - 933p
-  - 936p
-  - 941p
-  - 946p
-  - 951p
-- - 1024p
-  - 1026p
-  - 1029p
-  - 1033p
-  - 1036p
-  - 1041p
-  - 1046p
-  - 1051p
-- - 1124p
-  - 1126p
-  - 1129p
-  - 1133p
-  - 1136p
-  - 1141p
-  - 1146p
-  - 1151p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 6
-  - Cohen St Bus Station - Platform 5
-  - Weetangera Shops
-  - Hawker
-  - Hawker College
-  - Higgins
-  - Kippax
-

--- a/maxious-canberra-transit-feed/output/170-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/170-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange (Platform 3): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
 short_name: "170"
 stop_times: [[710a, 720a, 732a, 749a, 804a, 806a], [728a, 738a, 750a, 807a, 822a, 824a]]
-time_points: [Erindale Dr/ Charleston St Monash, Gowrie, Erindale Drive/Sternberg, Woden Interchange - Platform 9, City Interchange - Platform 3, Citywest]
+time_points: [Erindale Dr/ Charleston St Monash, Gowrie, Erindale Drive/Sternberg, Woden Interchange (Platform 9), City Interchange (Platform 3), Citywest]
 

--- a/maxious-canberra-transit-feed/output/170-to-erindale-dr--charleston-st-monash.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/170-to-erindale-dr--charleston-st-monash.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Erindale Dr/ Charleston St Monash
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 12): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
 short_name: "170"
 stop_times: [[500p, 505p, 521p, 536p, 546p, 556p]]
-time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 12, Erindale Drive/Sternberg, Gowrie, Erindale Dr/ Charleston St Monash]
+time_points: [Citywest, City Interchange (Platform 1), Woden Interchange (Platform 12), Erindale Drive/Sternberg, Gowrie, Erindale Dr/ Charleston St Monash]
 

--- a/maxious-canberra-transit-feed/output/18-318-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/18-318-to-cohen-st-station.stop_times.yml
@@ -1,358 +1,12 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  City Interchange (Platform 5)-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+short_name: 18/318
+stop_times: [[543a, 552a, 553a, 556a, 608a, 626a, 642a, 659a, 701a, 705a], [613a, 622a, 623a, 626a, 638a, 656a, 712a, 729a, 731a, 735a], [633a, 642a, 643a, 646a, 658a, 716a, 732a, 750a, 752a, 756a], [655a, 704a, 705a, 708a, 720a, 738a, 756a, 814a, 816a, 820a], [714a, 723a, 724a, 727a, 740a, 759a, 817a, 835a, 837a, 841a], [731a, 741a, 742a, 746a, 800a, 819a, 837a, 855a, 857a, 901a], ["-", "-", 746a, 750a, 758a, "-", "-", "-", "-", "-"], [751a, 801a, 802a, 806a, 820a, 839a, 857a, 915a, 917a, 921a], [811a, 821a, 822a, 826a, 840a, 859a, 917a, 935a, 937a, 941a], [836a, 846a, 847a, 851a, 905a, 924a, 941a, 958a, 1000a, 1004a], [906a, 916a, 917a, 921a, 935a, 953a, 1009a, 1026a, 1028a, 1032a], [940a, 949a, 950a, 953a, 1005a, 1023a, 1039a, 1056a, 1058a, 1102a], [1010a, 1019a, 1020a, 1023a, 1035a, 1053a, 1109a, 1126a, 1128a, 1132a], [1040a, 1049a, 1050a, 1053a, 1105a, 1123a, 1139a, 1156a, 1158a, 1202p], [1110a, 1119a, 1120a, 1123a, 1135a, 1153a, 1209p, 1226p, 1228p, 1232p], [1140a, 1149a, 1150a, 1153a, 1205p, 1223p, 1239p, 1256p, 1258p, 102p], [1210p, 1219p, 1220p, 1223p, 1235p, 1253p, 109p, 126p, 128p, 132p], [1240p, 1249p, 1250p, 1253p, 105p, 123p, 139p, 156p, 158p, 202p], [110p, 119p, 120p, 123p, 135p, 153p, 209p, 226p, 228p, 232p], [140p, 149p, 150p, 153p, 205p, 223p, 239p, 256p, 258p, 302p], [210p, 219p, 220p, 223p, 235p, 253p, 310p, 328p, 330p, 334p], [239p, 248p, 249p, 252p, 304p, 323p, 341p, 359p, 401p, 405p], [306p, 316p, 317p, 321p, 335p, 354p, 412p, 430p, 432p, 436p], [331p, 341p, 342p, 346p, 400p, 419p, 437p, 455p, 457p, 501p], [400p, 410p, 411p, 415p, 429p, 448p, 506p, 524p, 526p, 530p], [435p, 445p, 446p, 450p, 504p, 523p, 541p, 559p, 601p, 605p], [515p, 525p, 526p, 530p, 540p, "-", "-", "-", "-", "-"], [545p, 555p, 556p, 600p, 610p, "-", "-", "-", "-", "-"], [615p, 625p, 626p, 630p, 642p, 659p, 714p, 731p, 733p, 736p], [713p, 722p, 723p, 726p, 734p, "-", "-", "-", "-", "-"], [814p, 823p, 824p, 827p, 835p, "-", "-", "-", "-", "-"], [914p, 923p, 924p, 927p, 935p, "-", "-", "-", "-", "-"], [1014p, 1023p, 1024p, 1027p, 1035p, "-", "-", "-", "-", "-"], [1114p, 1123p, 1124p, 1127p, 1135p, "-", "-", "-", "-", "-"]]
+time_points: [Lanyon Market Place, Gordon Primary, Lewis Luxton/Woodcock Dr, Woodcock/Clare Dennis, Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: 18/318
-stop_times: 
-- - 543a
-  - 552a
-  - 553a
-  - 556a
-  - 608a
-  - 626a
-  - 642a
-  - 659a
-  - 701a
-  - 705a
-- - 613a
-  - 622a
-  - 623a
-  - 626a
-  - 638a
-  - 656a
-  - 712a
-  - 729a
-  - 731a
-  - 735a
-- - 633a
-  - 642a
-  - 643a
-  - 646a
-  - 658a
-  - 716a
-  - 732a
-  - 750a
-  - 752a
-  - 756a
-- - 655a
-  - 704a
-  - 705a
-  - 708a
-  - 720a
-  - 738a
-  - 756a
-  - 814a
-  - 816a
-  - 820a
-- - 714a
-  - 723a
-  - 724a
-  - 727a
-  - 740a
-  - 759a
-  - 817a
-  - 835a
-  - 837a
-  - 841a
-- - 731a
-  - 741a
-  - 742a
-  - 746a
-  - 800a
-  - 819a
-  - 837a
-  - 855a
-  - 857a
-  - 901a
-- - "-"
-  - "-"
-  - 746a
-  - 750a
-  - 758a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 751a
-  - 801a
-  - 802a
-  - 806a
-  - 820a
-  - 839a
-  - 857a
-  - 915a
-  - 917a
-  - 921a
-- - 811a
-  - 821a
-  - 822a
-  - 826a
-  - 840a
-  - 859a
-  - 917a
-  - 935a
-  - 937a
-  - 941a
-- - 836a
-  - 846a
-  - 847a
-  - 851a
-  - 905a
-  - 924a
-  - 941a
-  - 958a
-  - 1000a
-  - 1004a
-- - 906a
-  - 916a
-  - 917a
-  - 921a
-  - 935a
-  - 953a
-  - 1009a
-  - 1026a
-  - 1028a
-  - 1032a
-- - 940a
-  - 949a
-  - 950a
-  - 953a
-  - 1005a
-  - 1023a
-  - 1039a
-  - 1056a
-  - 1058a
-  - 1102a
-- - 1010a
-  - 1019a
-  - 1020a
-  - 1023a
-  - 1035a
-  - 1053a
-  - 1109a
-  - 1126a
-  - 1128a
-  - 1132a
-- - 1040a
-  - 1049a
-  - 1050a
-  - 1053a
-  - 1105a
-  - 1123a
-  - 1139a
-  - 1156a
-  - 1158a
-  - 1202p
-- - 1110a
-  - 1119a
-  - 1120a
-  - 1123a
-  - 1135a
-  - 1153a
-  - 1209p
-  - 1226p
-  - 1228p
-  - 1232p
-- - 1140a
-  - 1149a
-  - 1150a
-  - 1153a
-  - 1205p
-  - 1223p
-  - 1239p
-  - 1256p
-  - 1258p
-  - 102p
-- - 1210p
-  - 1219p
-  - 1220p
-  - 1223p
-  - 1235p
-  - 1253p
-  - 109p
-  - 126p
-  - 128p
-  - 132p
-- - 1240p
-  - 1249p
-  - 1250p
-  - 1253p
-  - 105p
-  - 123p
-  - 139p
-  - 156p
-  - 158p
-  - 202p
-- - 110p
-  - 119p
-  - 120p
-  - 123p
-  - 135p
-  - 153p
-  - 209p
-  - 226p
-  - 228p
-  - 232p
-- - 140p
-  - 149p
-  - 150p
-  - 153p
-  - 205p
-  - 223p
-  - 239p
-  - 256p
-  - 258p
-  - 302p
-- - 210p
-  - 219p
-  - 220p
-  - 223p
-  - 235p
-  - 253p
-  - 310p
-  - 328p
-  - 330p
-  - 334p
-- - 239p
-  - 248p
-  - 249p
-  - 252p
-  - 304p
-  - 323p
-  - 341p
-  - 359p
-  - 401p
-  - 405p
-- - 306p
-  - 316p
-  - 317p
-  - 321p
-  - 335p
-  - 354p
-  - 412p
-  - 430p
-  - 432p
-  - 436p
-- - 331p
-  - 341p
-  - 342p
-  - 346p
-  - 400p
-  - 419p
-  - 437p
-  - 455p
-  - 457p
-  - 501p
-- - 400p
-  - 410p
-  - 411p
-  - 415p
-  - 429p
-  - 448p
-  - 506p
-  - 524p
-  - 526p
-  - 530p
-- - 435p
-  - 445p
-  - 446p
-  - 450p
-  - 504p
-  - 523p
-  - 541p
-  - 559p
-  - 601p
-  - 605p
-- - 515p
-  - 525p
-  - 526p
-  - 530p
-  - 540p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 545p
-  - 555p
-  - 556p
-  - 600p
-  - 610p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 615p
-  - 625p
-  - 626p
-  - 630p
-  - 642p
-  - 659p
-  - 714p
-  - 731p
-  - 733p
-  - 736p
-- - 713p
-  - 722p
-  - 723p
-  - 726p
-  - 734p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 814p
-  - 823p
-  - 824p
-  - 827p
-  - 835p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 914p
-  - 923p
-  - 924p
-  - 927p
-  - 935p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1014p
-  - 1023p
-  - 1024p
-  - 1027p
-  - 1035p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1114p
-  - 1123p
-  - 1124p
-  - 1127p
-  - 1135p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Lanyon Market Place
-  - Gordon Primary
-  - Lewis Luxton/Woodcock Dr
-  - Woodcock/Clare Dennis
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/18-318-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/18-318-to-lanyon-market-place.stop_times.yml
@@ -1,287 +1,12 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 1): []
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+  Woden Interchange (Platform 6)-Tuggeranong Interchange (Platform 7): [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+short_name: 18/318
+stop_times: [["-", "-", "-", "-", "-", 714a, 722a, 726a, 736a], ["-", "-", "-", "-", "-", 740a, 750a, 755a, 805a], [723a, 725a, 729a, 748a, 805a, 823a, 833a, 838a, 848a], [753a, 755a, 759a, 818a, 835a, 853a, 903a, 908a, 918a], ["-", "-", "-", "-", "-", 916a, 926a, 931a, 940a], ["-", "-", "-", "-", "-", 949a, 957a, 1001a, 1010a], [923a, 925a, 929a, 946a, 1003a, 1019a, 1027a, 1031a, 1040a], [953a, 955a, 959a, 1016a, 1033a, 1049a, 1057a, 1101a, 1110a], [1023a, 1025a, 1029a, 1046a, 1103a, 1119a, 1127a, 1131a, 1140a], [1053a, 1055a, 1059a, 1116a, 1133a, 1149a, 1157a, 1201p, 1210p], [1123a, 1125a, 1129a, 1146a, 1203p, 1219p, 1227p, 1231p, 1240p], [1153a, 1155a, 1159a, 1216p, 1233p, 1249p, 1257p, 101p, 110p], [1223p, 1225p, 1229p, 1246p, 103p, 119p, 127p, 131p, 140p], [1253p, 1255p, 1259p, 116p, 133p, 149p, 157p, 201p, 210p], [123p, 125p, 129p, 146p, 203p, 219p, 227p, 231p, 240p], [153p, 155p, 159p, 216p, 233p, 249p, 257p, 301p, 310p], [223p, 225p, 229p, 246p, 303p, 323p, 331p, 335p, 344p], [253p, 255p, 259p, 318p, 335p, 355p, 403p, 407p, 416p], [323p, 325p, 329p, 348p, 405p, 425p, 433p, 437p, 446p], [353p, 355p, 359p, 418p, 435p, 455p, 503p, 507p, 516p], [423p, 425p, 429p, 448p, 505p, 525p, 533p, 537p, 546p], [443p, 445p, 449p, 508p, 525p, 545p, 553p, 557p, 606p], [503p, 505p, 509p, 528p, 545p, 605p, 613p, 617p, 626p], [518p, 520p, 524p, 543p, 600p, 620p, 628p, 632p, 641p], [553p, 555p, 559p, 618p, 634p, 650p, 658p, 702p, 711p], [623p, 625p, 629p, 645p, 659p, 715p, 723p, 727p, 736p], [654p, 656p, 659p, 715p, 729p, 745p, 753p, 757p, 806p], ["-", "-", "-", "-", "-", 848p, 856p, 900p, 909p], ["-", "-", "-", "-", "-", 948p, 956p, 1000p, 1009p], ["-", "-", "-", "-", "-", 1048p, 1056p, 1100p, 1109p]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange (Platform 7), Woodcock/Clare Dennis, Gordon Primary, Lanyon Market Place]
 
-short_name: 18/318
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 714a
-  - 722a
-  - 726a
-  - 736a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 750a
-  - 755a
-  - 805a
-- - 723a
-  - 725a
-  - 729a
-  - 748a
-  - 805a
-  - 823a
-  - 833a
-  - 838a
-  - 848a
-- - 753a
-  - 755a
-  - 759a
-  - 818a
-  - 835a
-  - 853a
-  - 903a
-  - 908a
-  - 918a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 916a
-  - 926a
-  - 931a
-  - 940a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 949a
-  - 957a
-  - 1001a
-  - 1010a
-- - 923a
-  - 925a
-  - 929a
-  - 946a
-  - 1003a
-  - 1019a
-  - 1027a
-  - 1031a
-  - 1040a
-- - 953a
-  - 955a
-  - 959a
-  - 1016a
-  - 1033a
-  - 1049a
-  - 1057a
-  - 1101a
-  - 1110a
-- - 1023a
-  - 1025a
-  - 1029a
-  - 1046a
-  - 1103a
-  - 1119a
-  - 1127a
-  - 1131a
-  - 1140a
-- - 1053a
-  - 1055a
-  - 1059a
-  - 1116a
-  - 1133a
-  - 1149a
-  - 1157a
-  - 1201p
-  - 1210p
-- - 1123a
-  - 1125a
-  - 1129a
-  - 1146a
-  - 1203p
-  - 1219p
-  - 1227p
-  - 1231p
-  - 1240p
-- - 1153a
-  - 1155a
-  - 1159a
-  - 1216p
-  - 1233p
-  - 1249p
-  - 1257p
-  - 101p
-  - 110p
-- - 1223p
-  - 1225p
-  - 1229p
-  - 1246p
-  - 103p
-  - 119p
-  - 127p
-  - 131p
-  - 140p
-- - 1253p
-  - 1255p
-  - 1259p
-  - 116p
-  - 133p
-  - 149p
-  - 157p
-  - 201p
-  - 210p
-- - 123p
-  - 125p
-  - 129p
-  - 146p
-  - 203p
-  - 219p
-  - 227p
-  - 231p
-  - 240p
-- - 153p
-  - 155p
-  - 159p
-  - 216p
-  - 233p
-  - 249p
-  - 257p
-  - 301p
-  - 310p
-- - 223p
-  - 225p
-  - 229p
-  - 246p
-  - 303p
-  - 323p
-  - 331p
-  - 335p
-  - 344p
-- - 253p
-  - 255p
-  - 259p
-  - 318p
-  - 335p
-  - 355p
-  - 403p
-  - 407p
-  - 416p
-- - 323p
-  - 325p
-  - 329p
-  - 348p
-  - 405p
-  - 425p
-  - 433p
-  - 437p
-  - 446p
-- - 353p
-  - 355p
-  - 359p
-  - 418p
-  - 435p
-  - 455p
-  - 503p
-  - 507p
-  - 516p
-- - 423p
-  - 425p
-  - 429p
-  - 448p
-  - 505p
-  - 525p
-  - 533p
-  - 537p
-  - 546p
-- - 443p
-  - 445p
-  - 449p
-  - 508p
-  - 525p
-  - 545p
-  - 553p
-  - 557p
-  - 606p
-- - 503p
-  - 505p
-  - 509p
-  - 528p
-  - 545p
-  - 605p
-  - 613p
-  - 617p
-  - 626p
-- - 518p
-  - 520p
-  - 524p
-  - 543p
-  - 600p
-  - 620p
-  - 628p
-  - 632p
-  - 641p
-- - 553p
-  - 555p
-  - 559p
-  - 618p
-  - 634p
-  - 650p
-  - 658p
-  - 702p
-  - 711p
-- - 623p
-  - 625p
-  - 629p
-  - 645p
-  - 659p
-  - 715p
-  - 723p
-  - 727p
-  - 736p
-- - 654p
-  - 656p
-  - 659p
-  - 715p
-  - 729p
-  - 745p
-  - 753p
-  - 757p
-  - 806p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 848p
-  - 856p
-  - 900p
-  - 909p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 948p
-  - 956p
-  - 1000p
-  - 1009p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1048p
-  - 1056p
-  - 1100p
-  - 1109p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange - Platform 7
-  - Woodcock/Clare Dennis
-  - Gordon Primary
-  - Lanyon Market Place
-

--- a/maxious-canberra-transit-feed/output/19-319-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/19-319-to-cohen-st-station.stop_times.yml
@@ -1,348 +1,12 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  City Interchange (Platform 5)-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+  Tuggeranong Interchange (Platform 8)-Woden Interchange (Platform 9): [Wjz238T, Wjz239F, Wjz2lDC, Wjz2mGO, Wjz2mTK, Wjz3gMq, Wjz3gQn, Wjz3gK-, Wjz3hL_, Wjz3iFK, Wjz3kwU, Wjz3kyX, Wjz3kAx]
+short_name: 19/319
+stop_times: [[550a, 556a, 606a, 612a, 625a, 643a, 659a, 716a, 718a, 722a], [620a, 626a, 636a, 642a, 655a, 713a, 729a, 747a, 749a, 753a], [640a, 646a, 656a, 702a, 715a, 733a, 751a, 809a, 811a, 815a], [700a, 706a, 716a, 722a, 735a, 754a, 812a, 830a, 832a, 836a], [717a, 723a, 733a, 741a, 755a, 814a, 832a, 850a, 852a, 856a], [724a, 730a, 740a, 748a, 758a, "-", "-", "-", "-", "-"], [736a, 743a, 753a, 801a, 815a, 834a, 852a, 910a, 912a, 916a], [755a, 802a, 812a, 820a, 834a, 853a, 911a, 929a, 931a, 935a], [816a, 823a, 833a, 841a, 855a, 914a, 932a, 949a, 951a, 955a], [846a, 853a, 903a, 911a, 925a, 943a, 959a, 1016a, 1018a, 1022a], [919a, 926a, 936a, 942a, 955a, 1013a, 1029a, 1046a, 1048a, 1052a], [950a, 956a, 1006a, 1012a, 1025a, 1043a, 1059a, 1116a, 1118a, 1122a], [1020a, 1026a, 1036a, 1042a, 1055a, 1113a, 1129a, 1146a, 1148a, 1152a], [1050a, 1056a, 1106a, 1112a, 1125a, 1143a, 1159a, 1216p, 1218p, 1222p], [1120a, 1126a, 1136a, 1142a, 1155a, 1213p, 1229p, 1246p, 1248p, 1252p], [1150a, 1156a, 1206p, 1212p, 1225p, 1243p, 1259p, 116p, 118p, 122p], [1220p, 1226p, 1236p, 1242p, 1255p, 113p, 129p, 146p, 148p, 152p], [1250p, 1256p, 106p, 112p, 125p, 143p, 159p, 216p, 218p, 222p], [120p, 126p, 136p, 142p, 155p, 213p, 229p, 246p, 248p, 252p], [150p, 156p, 206p, 212p, 225p, 243p, 259p, 317p, 319p, 323p], [219p, 225p, 235p, 241p, 254p, 313p, 331p, 349p, 351p, 355p], [246p, 252p, 302p, 310p, 324p, 343p, 401p, 419p, 421p, 425p], [320p, 327p, 337p, 345p, 355p, "-", "-", "-", "-", "-"], [352p, 359p, 409p, 417p, 427p, "-", "-", "-", "-", "-"], [424p, 431p, 441p, 449p, 459p, "-", "-", "-", "-", "-"], [454p, 501p, 511p, 519p, 529p, "-", "-", "-", "-", "-"], [524p, 531p, 541p, 549p, 559p, "-", "-", "-", "-", "-"], [556p, 603p, 613p, 621p, 631p, "-", "-", "-", "-", "-"], [654p, 700p, 710p, 716p, 725p, "-", "-", "-", "-", "-"], [754p, 800p, 810p, 816p, 825p, "-", "-", "-", "-", "-"], [849p, 855p, 905p, 911p, 920p, "-", "-", "-", "-", "-"], [949p, 955p, 1005p, 1011p, 1020p, "-", "-", "-", "-", "-"], [1049p, 1055p, 1105p, 1111p, 1120p, "-", "-", "-", "-", "-"]]
+time_points: [Lanyon Market Place, Conder Primary, St Clare of Assisi Primary, Bonython Primary, Tuggeranong Interchange (Platform 8), Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: 19/319
-stop_times: 
-- - 550a
-  - 556a
-  - 606a
-  - 612a
-  - 625a
-  - 643a
-  - 659a
-  - 716a
-  - 718a
-  - 722a
-- - 620a
-  - 626a
-  - 636a
-  - 642a
-  - 655a
-  - 713a
-  - 729a
-  - 747a
-  - 749a
-  - 753a
-- - 640a
-  - 646a
-  - 656a
-  - 702a
-  - 715a
-  - 733a
-  - 751a
-  - 809a
-  - 811a
-  - 815a
-- - 700a
-  - 706a
-  - 716a
-  - 722a
-  - 735a
-  - 754a
-  - 812a
-  - 830a
-  - 832a
-  - 836a
-- - 717a
-  - 723a
-  - 733a
-  - 741a
-  - 755a
-  - 814a
-  - 832a
-  - 850a
-  - 852a
-  - 856a
-- - 724a
-  - 730a
-  - 740a
-  - 748a
-  - 758a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 736a
-  - 743a
-  - 753a
-  - 801a
-  - 815a
-  - 834a
-  - 852a
-  - 910a
-  - 912a
-  - 916a
-- - 755a
-  - 802a
-  - 812a
-  - 820a
-  - 834a
-  - 853a
-  - 911a
-  - 929a
-  - 931a
-  - 935a
-- - 816a
-  - 823a
-  - 833a
-  - 841a
-  - 855a
-  - 914a
-  - 932a
-  - 949a
-  - 951a
-  - 955a
-- - 846a
-  - 853a
-  - 903a
-  - 911a
-  - 925a
-  - 943a
-  - 959a
-  - 1016a
-  - 1018a
-  - 1022a
-- - 919a
-  - 926a
-  - 936a
-  - 942a
-  - 955a
-  - 1013a
-  - 1029a
-  - 1046a
-  - 1048a
-  - 1052a
-- - 950a
-  - 956a
-  - 1006a
-  - 1012a
-  - 1025a
-  - 1043a
-  - 1059a
-  - 1116a
-  - 1118a
-  - 1122a
-- - 1020a
-  - 1026a
-  - 1036a
-  - 1042a
-  - 1055a
-  - 1113a
-  - 1129a
-  - 1146a
-  - 1148a
-  - 1152a
-- - 1050a
-  - 1056a
-  - 1106a
-  - 1112a
-  - 1125a
-  - 1143a
-  - 1159a
-  - 1216p
-  - 1218p
-  - 1222p
-- - 1120a
-  - 1126a
-  - 1136a
-  - 1142a
-  - 1155a
-  - 1213p
-  - 1229p
-  - 1246p
-  - 1248p
-  - 1252p
-- - 1150a
-  - 1156a
-  - 1206p
-  - 1212p
-  - 1225p
-  - 1243p
-  - 1259p
-  - 116p
-  - 118p
-  - 122p
-- - 1220p
-  - 1226p
-  - 1236p
-  - 1242p
-  - 1255p
-  - 113p
-  - 129p
-  - 146p
-  - 148p
-  - 152p
-- - 1250p
-  - 1256p
-  - 106p
-  - 112p
-  - 125p
-  - 143p
-  - 159p
-  - 216p
-  - 218p
-  - 222p
-- - 120p
-  - 126p
-  - 136p
-  - 142p
-  - 155p
-  - 213p
-  - 229p
-  - 246p
-  - 248p
-  - 252p
-- - 150p
-  - 156p
-  - 206p
-  - 212p
-  - 225p
-  - 243p
-  - 259p
-  - 317p
-  - 319p
-  - 323p
-- - 219p
-  - 225p
-  - 235p
-  - 241p
-  - 254p
-  - 313p
-  - 331p
-  - 349p
-  - 351p
-  - 355p
-- - 246p
-  - 252p
-  - 302p
-  - 310p
-  - 324p
-  - 343p
-  - 401p
-  - 419p
-  - 421p
-  - 425p
-- - 320p
-  - 327p
-  - 337p
-  - 345p
-  - 355p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 352p
-  - 359p
-  - 409p
-  - 417p
-  - 427p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 424p
-  - 431p
-  - 441p
-  - 449p
-  - 459p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 454p
-  - 501p
-  - 511p
-  - 519p
-  - 529p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 524p
-  - 531p
-  - 541p
-  - 549p
-  - 559p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 556p
-  - 603p
-  - 613p
-  - 621p
-  - 631p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 654p
-  - 700p
-  - 710p
-  - 716p
-  - 725p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 754p
-  - 800p
-  - 810p
-  - 816p
-  - 825p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 849p
-  - 855p
-  - 905p
-  - 911p
-  - 920p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 949p
-  - 955p
-  - 1005p
-  - 1011p
-  - 1020p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1049p
-  - 1055p
-  - 1105p
-  - 1111p
-  - 1120p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Lanyon Market Place
-  - Conder Primary
-  - St Clare of Assisi Primary
-  - Bonython Primary
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/19-319-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/19-319-to-lanyon-market-place.stop_times.yml
@@ -1,338 +1,12 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 6)-Tuggeranong Interchange (Platform 4): [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 1): []
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
+short_name: 19/319
+stop_times: [["-", "-", "-", "-", "-", 705a, 711a, 716a, 725a, 731a], ["-", "-", "-", "-", "-", 740a, 747a, 754a, 803a, 810a], [703a, 705a, 709a, 726a, 743a, 801a, 808a, 815a, 824a, 831a], [733a, 735a, 739a, 758a, 815a, 833a, 840a, 847a, 856a, 903a], ["-", "-", "-", "-", "-", 904a, 911a, 918a, 927a, 933a], ["-", "-", "-", "-", "-", 933a, 939a, 944a, 953a, 959a], [903a, 905a, 909a, 928a, 945a, 1001a, 1007a, 1012a, 1021a, 1027a], [933a, 935a, 939a, 956a, 1013a, 1029a, 1035a, 1040a, 1049a, 1055a], [1003a, 1005a, 1009a, 1026a, 1043a, 1059a, 1105a, 1110a, 1119a, 1125a], [1033a, 1035a, 1039a, 1056a, 1113a, 1129a, 1135a, 1140a, 1149a, 1155a], [1103a, 1105a, 1109a, 1126a, 1143a, 1159a, 1205p, 1210p, 1219p, 1225p], [1133a, 1135a, 1139a, 1156a, 1213p, 1229p, 1235p, 1240p, 1249p, 1255p], [1203p, 1205p, 1209p, 1226p, 1243p, 1259p, 105p, 110p, 119p, 125p], [1233p, 1235p, 1239p, 1256p, 113p, 129p, 135p, 140p, 149p, 155p], [103p, 105p, 109p, 126p, 143p, 159p, 205p, 210p, 219p, 225p], [133p, 135p, 139p, 156p, 213p, 229p, 235p, 240p, 249p, 255p], [203p, 205p, 209p, 226p, 243p, 259p, 306p, 313p, 322p, 329p], [233p, 235p, 239p, 256p, 313p, 333p, 340p, 347p, 356p, 403p], ["-", "-", "-", "-", 330p, 350p, 357p, 404p, 413p, 420p], [303p, 305p, 309p, 328p, 345p, 405p, 412p, 419p, 428p, 435p], [333p, 335p, 339p, 358p, 415p, 435p, 442p, 449p, 458p, 505p], [403p, 405p, 409p, 428p, 445p, 505p, 512p, 519p, 528p, 535p], [433p, 435p, 439p, 458p, 515p, 535p, 542p, 549p, 558p, 605p], [453p, 455p, 459p, 518p, 535p, 555p, 602p, 609p, 618p, 625p], [513p, 515p, 519p, 538p, 555p, 615p, 622p, 629p, 638p, 644p], [533p, 535p, 539p, 558p, 615p, 634p, 640p, 645p, 654p, 700p], [603p, 605p, 609p, 628p, 642p, 658p, 704p, 709p, 718p, 724p], [634p, 636p, 639p, 655p, 709p, 725p, 731p, 736p, 745p, 751p], ["-", "-", "-", "-", "-", 818p, 824p, 829p, 838p, 844p], ["-", "-", "-", "-", "-", 918p, 924p, 929p, 938p, 944p], ["-", "-", "-", "-", "-", 1018p, 1024p, 1029p, 1038p, 1044p], ["-", "-", "-", "-", "-", 1118p, 1124p, 1129p, 1138p, 1144p]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Tuggeranong Interchange (Platform 4), Bonython Primary, St Clare of Assisi Primary, Conder Primary, Lanyon Market Place]
 
-short_name: 19/319
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 705a
-  - 711a
-  - 716a
-  - 725a
-  - 731a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 747a
-  - 754a
-  - 803a
-  - 810a
-- - 703a
-  - 705a
-  - 709a
-  - 726a
-  - 743a
-  - 801a
-  - 808a
-  - 815a
-  - 824a
-  - 831a
-- - 733a
-  - 735a
-  - 739a
-  - 758a
-  - 815a
-  - 833a
-  - 840a
-  - 847a
-  - 856a
-  - 903a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 904a
-  - 911a
-  - 918a
-  - 927a
-  - 933a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 933a
-  - 939a
-  - 944a
-  - 953a
-  - 959a
-- - 903a
-  - 905a
-  - 909a
-  - 928a
-  - 945a
-  - 1001a
-  - 1007a
-  - 1012a
-  - 1021a
-  - 1027a
-- - 933a
-  - 935a
-  - 939a
-  - 956a
-  - 1013a
-  - 1029a
-  - 1035a
-  - 1040a
-  - 1049a
-  - 1055a
-- - 1003a
-  - 1005a
-  - 1009a
-  - 1026a
-  - 1043a
-  - 1059a
-  - 1105a
-  - 1110a
-  - 1119a
-  - 1125a
-- - 1033a
-  - 1035a
-  - 1039a
-  - 1056a
-  - 1113a
-  - 1129a
-  - 1135a
-  - 1140a
-  - 1149a
-  - 1155a
-- - 1103a
-  - 1105a
-  - 1109a
-  - 1126a
-  - 1143a
-  - 1159a
-  - 1205p
-  - 1210p
-  - 1219p
-  - 1225p
-- - 1133a
-  - 1135a
-  - 1139a
-  - 1156a
-  - 1213p
-  - 1229p
-  - 1235p
-  - 1240p
-  - 1249p
-  - 1255p
-- - 1203p
-  - 1205p
-  - 1209p
-  - 1226p
-  - 1243p
-  - 1259p
-  - 105p
-  - 110p
-  - 119p
-  - 125p
-- - 1233p
-  - 1235p
-  - 1239p
-  - 1256p
-  - 113p
-  - 129p
-  - 135p
-  - 140p
-  - 149p
-  - 155p
-- - 103p
-  - 105p
-  - 109p
-  - 126p
-  - 143p
-  - 159p
-  - 205p
-  - 210p
-  - 219p
-  - 225p
-- - 133p
-  - 135p
-  - 139p
-  - 156p
-  - 213p
-  - 229p
-  - 235p
-  - 240p
-  - 249p
-  - 255p
-- - 203p
-  - 205p
-  - 209p
-  - 226p
-  - 243p
-  - 259p
-  - 306p
-  - 313p
-  - 322p
-  - 329p
-- - 233p
-  - 235p
-  - 239p
-  - 256p
-  - 313p
-  - 333p
-  - 340p
-  - 347p
-  - 356p
-  - 403p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 330p
-  - 350p
-  - 357p
-  - 404p
-  - 413p
-  - 420p
-- - 303p
-  - 305p
-  - 309p
-  - 328p
-  - 345p
-  - 405p
-  - 412p
-  - 419p
-  - 428p
-  - 435p
-- - 333p
-  - 335p
-  - 339p
-  - 358p
-  - 415p
-  - 435p
-  - 442p
-  - 449p
-  - 458p
-  - 505p
-- - 403p
-  - 405p
-  - 409p
-  - 428p
-  - 445p
-  - 505p
-  - 512p
-  - 519p
-  - 528p
-  - 535p
-- - 433p
-  - 435p
-  - 439p
-  - 458p
-  - 515p
-  - 535p
-  - 542p
-  - 549p
-  - 558p
-  - 605p
-- - 453p
-  - 455p
-  - 459p
-  - 518p
-  - 535p
-  - 555p
-  - 602p
-  - 609p
-  - 618p
-  - 625p
-- - 513p
-  - 515p
-  - 519p
-  - 538p
-  - 555p
-  - 615p
-  - 622p
-  - 629p
-  - 638p
-  - 644p
-- - 533p
-  - 535p
-  - 539p
-  - 558p
-  - 615p
-  - 634p
-  - 640p
-  - 645p
-  - 654p
-  - 700p
-- - 603p
-  - 605p
-  - 609p
-  - 628p
-  - 642p
-  - 658p
-  - 704p
-  - 709p
-  - 718p
-  - 724p
-- - 634p
-  - 636p
-  - 639p
-  - 655p
-  - 709p
-  - 725p
-  - 731p
-  - 736p
-  - 745p
-  - 751p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 818p
-  - 824p
-  - 829p
-  - 838p
-  - 844p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 918p
-  - 924p
-  - 929p
-  - 938p
-  - 944p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1018p
-  - 1024p
-  - 1029p
-  - 1038p
-  - 1044p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1118p
-  - 1124p
-  - 1129p
-  - 1138p
-  - 1144p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange - Platform 4
-  - Bonython Primary
-  - St Clare of Assisi Primary
-  - Conder Primary
-  - Lanyon Market Place
-

--- a/maxious-canberra-transit-feed/output/2-to-dickson.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/2-to-dickson.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Dickson
-between_stops: []
+between_stops: {}
+
 short_name: "2"
 stop_times: [["-", "-", "-", "-", "-", "-", "-", 703a, 710a, 715a, 723a, 728a], [653a, 704a, 708a, 711a, 715a, 719a, 723a, 733a, 740a, 746a, 754a, 801a], [708a, 719a, 723a, 726a, 730a, 734a, 738a, 749a, 756a, 802a, 810a, 817a], [719a, 730a, 734a, 737a, 741a, 745a, 749a, 800a, 807a, 813a, 821a, 828a], [738a, 749a, 754a, 758a, 803a, 808a, 814a, 830a, 838a, 845a, 853a, 859a], [753a, 804a, 808a, 812a, 817a, 823a, 826a, 843a, 849a, 854a, 902a, 910a], [808a, 819a, 823a, 826a, 830a, 834a, 838a, 849a, 856a, 902a, 910a, 917a], [823a, 834a, 838a, 841a, 845a, 849a, 853a, 904a, 911a, 917a, 925a, 931a], [838a, 851a, 855a, 858a, 903a, 908a, 914a, 926a, "-", "-", "-", "-"], [853a, 904a, 908a, 911a, 915a, 919a, 923a, 934a, 941a, 946a, 954a, 959a], [923a, 934a, 938a, 941a, 945a, 949a, 953a, 1004a, 1011a, 1016a, 1024a, 1029a], [953a, 1004a, 1008a, 1011a, 1015a, 1019a, 1023a, 1034a, 1041a, 1046a, 1054a, 1059a], [1023a, 1034a, 1038a, 1041a, 1045a, 1049a, 1053a, 1104a, 1111a, 1116a, 1124a, 1129a], [1053a, 1104a, 1108a, 1111a, 1115a, 1119a, 1123a, 1134a, 1141a, 1146a, 1154a, 1159a], [1123a, 1134a, 1138a, 1141a, 1145a, 1149a, 1153a, 1204p, 1211p, 1216p, 1224p, 1229p], [1153a, 1204p, 1208p, 1211p, 1215p, 1219p, 1223p, 1234p, 1241p, 1246p, 1254p, 1259p], [1223p, 1234p, 1238p, 1241p, 1245p, 1249p, 1253p, 104p, 111p, 116p, 124p, 129p], [1253p, 104p, 108p, 111p, 115p, 119p, 123p, 134p, 141p, 146p, 154p, 159p], [123p, 134p, 138p, 141p, 145p, 149p, 153p, 204p, 211p, 216p, 224p, 229p], [153p, 204p, 208p, 211p, 215p, 219p, 223p, 234p, 241p, 246p, 254p, 259p], [223p, 234p, 238p, 241p, 245p, 249p, 253p, 304p, 311p, 316p, 324p, 329p], [238p, 249p, 253p, 256p, 300p, 304p, 308p, 319p, 326p, 332p, 340p, 347p], [253p, 304p, 308p, 311p, 315p, 319p, 323p, 334p, 341p, 346p, 354p, 359p], [308p, 319p, 323p, 326p, 330p, 334p, 338p, 349p, 356p, 402p, 410p, 417p], [323p, 334p, 338p, 341p, 345p, 349p, 353p, 404p, 411p, 417p, 425p, 432p], [338p, 349p, 353p, 356p, 400p, 404p, 408p, 419p, 426p, 432p, 440p, 447p], [353p, 404p, 408p, 411p, 415p, 419p, 423p, 434p, 441p, 447p, 455p, 502p], [408p, 419p, 423p, 426p, 430p, 434p, 438p, 449p, 456p, 502p, 510p, 517p], [423p, 434p, 438p, 441p, 445p, 449p, 453p, 504p, 511p, 517p, 525p, 532p], [438p, 449p, 453p, 456p, 500p, 504p, 508p, 519p, 526p, 532p, 540p, 547p], [453p, 504p, 508p, 511p, 515p, 519p, 523p, 534p, 541p, 547p, 555p, 602p], [508p, 519p, 523p, 526p, 530p, 534p, 538p, 549p, 556p, 602p, 610p, 617p], [523p, 534p, 538p, 541p, 545p, 549p, 553p, 604p, 611p, 617p, 625p, 631p], [538p, 549p, 553p, 556p, 600p, 604p, 608p, 619p, 626p, 632p, 638p, 642p], [553p, 604p, 608p, 611p, 615p, 619p, 623p, 634p, 639p, 644p, 650p, 654p], [640p, 650p, 653p, 656p, 700p, 703p, 707p, 717p, 722p, 727p, 733p, 737p], [740p, 750p, 753p, 756p, 800p, 803p, 807p, 817p, 822p, 827p, 833p, 837p], [840p, 850p, 853p, 856p, 900p, 903p, 907p, 917p, 922p, 927p, 933p, 937p], [940p, 950p, 953p, 956p, 1000p, 1003p, 1007p, 1017p, 1022p, 1027p, 1033p, 1037p], [1040p, 1050p, 1053p, 1056p, 1100p, 1103p, 1107p, 1117p, 1122p, 1127p, 1133p, 1137p]]
-time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, Deakin, Parliament House, Kings Ave/National Crt, City Interchange - Platform 10, Olims Hotel, Ainslie, Hackett, Dickson]
+time_points: [Woden Interchange (Platform 4), Curtin, John James Hospital, Yarralumla Shops, Deakin, Parliament House, Kings Ave/National Crt, City Interchange (Platform 10), Olims Hotel, Ainslie, Hackett, Dickson]
 

--- a/maxious-canberra-transit-feed/output/2-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/2-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "2"
 stop_times: [["-", 634a, 639a, 647a, 653a, 702a, 711a, 715a, 720a, 724a, 727a, 731a, 742a], ["-", 704a, 709a, 717a, 723a, 732a, 742a, 747a, 752a, 756a, 759a, 803a, 814a], ["-", 719a, 724a, 732a, 738a, 747a, 757a, 802a, 807a, 811a, 814a, 818a, 829a], ["-", 732a, 739a, 747a, 753a, 802a, 812a, 817a, 822a, 826a, 829a, 833a, 844a], ["-", 749a, 756a, 804a, 810a, 819a, 829a, 834a, 839a, 843a, 846a, 850a, 901a], ["-", 802a, 809a, 817a, 825a, 838a, 847a, 853a, 857a, 901a, 905a, 908a, 921a], ["-", 819a, 826a, 834a, 840a, 848a, "-", "-", "-", "-", "-", "-", "-"], ["-", 832a, 839a, 847a, 853a, 902a, 912a, 917a, 922a, 926a, 929a, 933a, 944a], ["-", 849a, 856a, 904a, 910a, 918a, "-", "-", "-", "-", "-", "-", "-"], ["-", 904a, 909a, 917a, 923a, 932a, 942a, 946a, 951a, 955a, 958a, 1002a, 1013a], ["-", 934a, 939a, 947a, 953a, 1002a, 1012a, 1016a, 1021a, 1025a, 1028a, 1032a, 1043a], ["-", 1004a, 1009a, 1017a, 1023a, 1032a, 1042a, 1046a, 1051a, 1055a, 1058a, 1102a, 1113a], ["-", 1034a, 1039a, 1047a, 1053a, 1102a, 1112a, 1116a, 1121a, 1125a, 1128a, 1132a, 1143a], ["-", 1104a, 1109a, 1117a, 1123a, 1132a, 1142a, 1146a, 1151a, 1155a, 1158a, 1202p, 1213p], ["-", 1134a, 1139a, 1147a, 1153a, 1202p, 1212p, 1216p, 1221p, 1225p, 1228p, 1232p, 1243p], ["-", 1204p, 1209p, 1217p, 1223p, 1232p, 1242p, 1246p, 1251p, 1255p, 1258p, 102p, 113p], ["-", 1234p, 1239p, 1247p, 1253p, 102p, 112p, 116p, 121p, 125p, 128p, 132p, 143p], ["-", 104p, 109p, 117p, 123p, 132p, 142p, 146p, 151p, 155p, 158p, 202p, 213p], ["-", 134p, 139p, 147p, 153p, 202p, 212p, 216p, 221p, 225p, 228p, 232p, 243p], ["-", 204p, 209p, 217p, 223p, 232p, 242p, 246p, 251p, 255p, 258p, 302p, 313p], ["-", 234p, 239p, 247p, 253p, 302p, 312p, 316p, 321p, 325p, 328p, 332p, 343p], ["-", 249p, 254p, 302p, 308p, 317p, 327p, 332p, 337p, 341p, 344p, 348p, 359p], ["-", 304p, 309p, 317p, 323p, 332p, 342p, 346p, 351p, 355p, 358p, 402p, 413p], [313p, 319p, 326p, 334p, 340p, 349p, 359p, 404p, 409p, 413p, 416p, 420p, 431p], ["-", 332p, 339p, 347p, 353p, 402p, 412p, 417p, 422p, 426p, 429p, 433p, 444p], ["-", 349p, 356p, 404p, 410p, 419p, 429p, 434p, 439p, 443p, 446p, 450p, 501p], ["-", 402p, 409p, 417p, 423p, 432p, 442p, 447p, 452p, 456p, 459p, 503p, 514p], ["-", 419p, 426p, 434p, 440p, 449p, 459p, 504p, 509p, 513p, 516p, 520p, 531p], ["-", 432p, 439p, 447p, 453p, 502p, 512p, 517p, 522p, 526p, 529p, 533p, 544p], ["-", 449p, 456p, 504p, 510p, 519p, 529p, 534p, 539p, 543p, 546p, 550p, 601p], ["-", 502p, 509p, 517p, 523p, 532p, 542p, 547p, 552p, 556p, 559p, 603p, 614p], ["-", 519p, 526p, 534p, 540p, 549p, 559p, 604p, 609p, 613p, 616p, 620p, 631p], ["-", 532p, 539p, 547p, 553p, 602p, 612p, 617p, 622p, 626p, 629p, 633p, 643p], ["-", 549p, 556p, 604p, 610p, 619p, 629p, 634p, 638p, 642p, 645p, 649p, 659p], ["-", 603p, 610p, 618p, 624p, 632p, 641p, 646p, 650p, 654p, 657p, 701p, 711p], ["-", 626p, 632p, 638p, 643p, 649p, 658p, 703p, 707p, 711p, 714p, 718p, 728p], ["-", 726p, 731p, 737p, 742p, 748p, 757p, 802p, 806p, 810p, 813p, 817p, 827p], ["-", 826p, 831p, 837p, 842p, 848p, 857p, 902p, 906p, 910p, 913p, 917p, 927p], ["-", 926p, 931p, 937p, 942p, 948p, 957p, 1002p, 1006p, 1010p, 1013p, 1017p, 1027p], ["-", 1026p, 1031p, 1037p, 1042p, 1048p, 1057p, 1102p, 1106p, 1110p, 1113p, 1117p, 1127p], ["-", 1126p, 1131p, 1137p, 1142p, 1147p, "-", "-", "-", "-", "-", "-", "-"]]
-time_points: [Lyneham High, Dickson, Hackett, Ainslie, Olims Hotel, City Interchange - Platform 3, Kings Ave/National Crt, Parliament House, Deakin, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
+time_points: [Lyneham High, Dickson, Hackett, Ainslie, Olims Hotel, City Interchange (Platform 3), Kings Ave/National Crt, Parliament House, Deakin, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/21-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/21-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "21"
 stop_times: [[657a, 703a, 706a, 712a, 724a], [727a, 734a, 737a, 744a, 757a], [757a, 804a, 807a, 814a, 827a], [827a, 834a, 837a, 844a, 857a], [904a, 911a, 914a, 921a, 934a], [1004a, 1010a, 1013a, 1019a, 1031a], [1104a, 1110a, 1113a, 1119a, 1131a], [1204p, 1210p, 1213p, 1219p, 1231p], [104p, 110p, 113p, 119p, 131p], [204p, 210p, 213p, 219p, 231p], [304p, 311p, 314p, 321p, 334p], [327p, 334p, 337p, 344p, 357p], [357p, 404p, 407p, 414p, 427p], [427p, 434p, 437p, 444p, 457p], [457p, 504p, 507p, 514p, 527p], [527p, 534p, 537p, 544p, 557p], [557p, 604p, 607p, 614p, 627p], [627p, 633p, 636p, 642p, 654p], [720p, 726p, 729p, 735p, 747p], [820p, 826p, 829p, 835p, 847p], [920p, 926p, 929p, 935p, 947p], [1020p, 1026p, 1029p, 1035p, 1047p], [1120p, 1126p, 1129p, 1135p, "-"]]
-time_points: [Woden Interchange - Platform 15, Pearce, Torrens Shops, Southlands Mawson, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Pearce, Torrens Shops, Southlands Mawson, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/22-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/22-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "22"
 stop_times: [[635a, 648a, 656a, 659a, 707a], [705a, 718a, 726a, 729a, 738a], [735a, 749a, 758a, 801a, 810a], [805a, 819a, 828a, 831a, 840a], [843a, 857a, 906a, 909a, 918a], [943a, 956a, 1004a, 1007a, 1015a], [1043a, 1056a, 1104a, 1107a, 1115a], [1143a, 1156a, 1204p, 1207p, 1215p], [1243p, 1256p, 104p, 107p, 115p], [143p, 156p, 204p, 207p, 215p], [243p, 256p, 305p, 308p, 317p], [313p, 327p, 336p, 339p, 348p], [335p, 349p, 358p, 401p, 410p], [405p, 419p, 428p, 431p, 440p], [435p, 449p, 458p, 501p, 510p], [505p, 519p, 528p, 531p, 540p], [535p, 549p, 558p, 601p, 610p], [605p, 619p, 628p, 631p, 639p], [638p, 651p, 659p, 702p, 710p], [738p, 751p, 759p, 802p, 810p], [838p, 851p, 859p, 902p, 910p], [938p, 951p, 959p, 1002p, 1010p], [1038p, 1051p, 1059p, 1102p, 1110p]]
-time_points: [Woden Interchange - Platform 15, Southlands Mawson, Torrens Shops, Pearce, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Southlands Mawson, Torrens Shops, Pearce, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/23-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/23-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "23"
 stop_times: [[607a, 609a, 613a, 622a, 628a, 634a, 642a, 647a], [644a, 646a, 650a, 659a, 705a, 711a, 719a, 724a], [714a, 716a, 720a, 729a, 736a, 742a, 752a, 757a], [744a, 748a, 753a, 801a, 808a, 814a, 824a, 829a], [814a, 818a, 823a, 831a, 838a, 844a, 854a, 859a], [844a, 848a, 853a, 901a, 908a, 914a, 924a, 929a], [926a, 930a, 934a, 943a, 949a, 955a, 1003a, 1008a], [1026a, 1028a, 1032a, 1041a, 1047a, 1053a, 1101a, 1106a], [1126a, 1128a, 1132a, 1141a, 1147a, 1153a, 1201p, 1206p], [1226p, 1228p, 1232p, 1241p, 1247p, 1253p, 101p, 106p], [126p, 128p, 132p, 141p, 147p, 153p, 201p, 206p], [226p, 228p, 232p, 241p, 247p, 253p, 301p, 306p], [314p, 318p, 323p, 331p, 338p, 344p, 354p, 359p], [344p, 348p, 353p, 401p, 408p, 414p, 424p, 429p], [414p, 418p, 423p, 431p, 438p, 444p, 454p, 459p], [444p, 448p, 453p, 501p, 508p, 514p, 524p, 529p], [514p, 518p, 523p, 531p, 538p, 544p, 554p, 559p], [544p, 548p, 553p, 601p, 608p, 614p, 624p, 629p], [626p, 630p, 634p, 643p, 649p, 655p, 703p, 708p], [726p, 728p, 732p, 741p, 747p, 753p, 801p, 806p], [826p, 828p, 832p, 841p, 847p, 853p, 901p, 906p], [926p, 928p, 932p, 941p, 947p, 953p, 1001p, 1006p], [1026p, 1028p, 1032p, 1041p, 1047p, 1053p, 1101p, 1106p], [1126p, 1128p, 1132p, 1141p, "-", "-", "-", "-"]]
-time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Southlands Mawson, Farrer Terminus, Isaacs, Canberra Hospital, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Lyons, Chifley, Southlands Mawson, Farrer Terminus, Isaacs, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/24-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/24-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "24"
 stop_times: [["-", "-", "-", 703a, 709a, 715a, 720a, 724a], [702a, 708a, 715a, 720a, 726a, 732a, 737a, 742a], [739a, 746a, 754a, 800a, 806a, 813a, 818a, 823a], [809a, 816a, 824a, 830a, 836a, 843a, 848a, 853a], [839a, 846a, 854a, 900a, 906a, 913a, 918a, 923a], [956a, 1002a, 1009a, 1014a, 1020a, 1026a, 1031a, 1035a], [1056a, 1102a, 1109a, 1114a, 1120a, 1126a, 1131a, 1135a], [1156a, 1202p, 1209p, 1214p, 1220p, 1226p, 1231p, 1235p], [1256p, 102p, 109p, 114p, 120p, 126p, 131p, 135p], [156p, 202p, 209p, 214p, 220p, 226p, 231p, 235p], [256p, 302p, 310p, 316p, 322p, 329p, 334p, 339p], [339p, 346p, 354p, 400p, 406p, 413p, 418p, 423p], [409p, 416p, 424p, 430p, 436p, 443p, 448p, 453p], [439p, 446p, 454p, 500p, 506p, 513p, 518p, 523p], [509p, 516p, 524p, 530p, 536p, 543p, 548p, 553p], [538p, 545p, 553p, 559p, 605p, 612p, 617p, 622p], [608p, 615p, 623p, 629p, 635p, 641p, 646p, 650p], [700p, 706p, 713p, 718p, 724p, 730p, 735p, 739p], [800p, 806p, 813p, 818p, 824p, 830p, 835p, 839p], [900p, 906p, 913p, 918p, 924p, 930p, 935p, 939p], [1000p, 1006p, 1013p, 1018p, 1024p, 1030p, 1035p, 1039p], [1100p, 1106p, 1113p, 1118p, 1124p, 1130p, 1135p, 1139p]]
-time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Terminus, Southlands Mawson, Chifley, Lyons, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Canberra Hospital, Isaacs, Farrer Terminus, Southlands Mawson, Chifley, Lyons, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/25-225-to-campbell-park-offices.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/25-225-to-campbell-park-offices.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Campbell Park Offices
-between_stops: []
+between_stops: {}
+
 short_name: 25/225
 stop_times: [[612a, 622a, 625a, 634a, "-", "-", "-", "-"], [642a, 652a, 655a, 705a, 719a, 722a, 726a, 730a], [702a, 712a, 715a, 725a, 739a, 743a, 747a, 751a], [734a, 749a, 752a, 805a, 819a, 823a, 827a, 831a], [808a, 823a, 826a, 838a, "-", "-", "-", "-"], [838a, 853a, 856a, 908a, "-", "-", "-", "-"], [910a, 925a, 928a, 938a, "-", "-", "-", "-"], [1012a, 1022a, 1025a, 1035a, "-", "-", "-", "-"], [1112a, 1122a, 1125a, 1135a, "-", "-", "-", "-"], [1212p, 1222p, 1225p, 1235p, "-", "-", "-", "-"], [112p, 122p, 125p, 135p, "-", "-", "-", "-"], [212p, 222p, 225p, 235p, "-", "-", "-", "-"], [312p, 324p, 327p, 336p, "-", "-", "-", "-"], [342p, 354p, 357p, 406p, "-", "-", "-", "-"], [412p, 424p, 427p, 436p, "-", "-", "-", "-"], [512p, 524p, 527p, 536p, "-", "-", "-", "-"], [622p, 633p, 636p, 645p, "-", "-", "-", "-"], [722p, 732p, 735p, 744p, "-", "-", "-", "-"], [822p, 832p, 835p, 844p, "-", "-", "-", "-"], [922p, 932p, 935p, 944p, "-", "-", "-", "-"], [1022p, 1032p, 1035p, 1044p, "-", "-", "-", "-"]]
-time_points: [Cooleman Court, Holder, Weston Primary, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
+time_points: [Cooleman Court, Holder, Weston Primary, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
 

--- a/maxious-canberra-transit-feed/output/25-225-to-cooleman-court.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/25-225-to-cooleman-court.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: 25/225
 stop_times: [["-", "-", "-", "-", 712a, 720a, 723a, 734a], ["-", "-", "-", "-", 807a, 819a, 823a, 835a], ["-", "-", "-", "-", 842a, 854a, 858a, 910a], ["-", "-", "-", "-", 940a, 949a, 952a, 1002a], ["-", "-", "-", "-", 1040a, 1049a, 1052a, 1102a], ["-", "-", "-", "-", 1140a, 1149a, 1152a, 1202p], ["-", "-", "-", "-", 1240p, 1249p, 1252p, 102p], ["-", "-", "-", "-", 140p, 149p, 152p, 202p], ["-", "-", "-", "-", 240p, 249p, 252p, 306p], ["-", "-", "-", "-", 342p, 352p, 356p, 408p], ["-", "-", "-", "-", 412p, 422p, 426p, 438p], [417p, 421p, 425p, 428p, 443p, 453p, 457p, 509p], [447p, 451p, 455p, 458p, 513p, 523p, 527p, 539p], [517p, 521p, 525p, 528p, 543p, 553p, 557p, 609p], ["-", "-", "-", "-", 612p, 622p, 626p, 637p], ["-", "-", "-", "-", 656p, 704p, 707p, 717p], ["-", "-", "-", "-", 756p, 804p, 807p, 817p], ["-", "-", "-", "-", 856p, 904p, 907p, 917p], ["-", "-", "-", "-", 956p, 1004p, 1007p, 1017p], ["-", "-", "-", "-", 1056p, 1104p, 1107p, 1117p]]
-time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 16, Weston Primary, Holder, Cooleman Court]
+time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 16), Weston Primary, Holder, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/26-226-to-campbell-park-offices.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/26-226-to-campbell-park-offices.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Campbell Park Offices
-between_stops: []
+between_stops: {}
+
 short_name: 26/226
 stop_times: [[615a, 619a, 623a, 625a, 632a, "-", "-", "-", "-"], [657a, 701a, 705a, 707a, 715a, 729a, 733a, 737a, 741a], [716a, 720a, 724a, 726a, 736a, 750a, 754a, 758a, 802a], [747a, 752a, 758a, 802a, 815a, 829a, 833a, 837a, 841a], [800a, 805a, 811a, 815a, 827a, "-", "-", "-", "-"], [820a, 825a, 831a, 835a, 847a, "-", "-", "-", "-"], [850a, 855a, 901a, 905a, 917a, "-", "-", "-", "-"], [925a, 930a, 935a, 938a, 948a, "-", "-", "-", "-"], [1025a, 1029a, 1034a, 1037a, 1047a, "-", "-", "-", "-"], [1125a, 1129a, 1134a, 1137a, 1147a, "-", "-", "-", "-"], [1225p, 1229p, 1234p, 1237p, 1247p, "-", "-", "-", "-"], [125p, 129p, 134p, 137p, 147p, "-", "-", "-", "-"], [225p, 229p, 234p, 237p, 247p, "-", "-", "-", "-"], [255p, 259p, 305p, 308p, 317p, "-", "-", "-", "-"], [320p, 324p, 330p, 333p, 342p, "-", "-", "-", "-"], [420p, 424p, 430p, 433p, 442p, "-", "-", "-", "-"], [520p, 524p, 530p, 533p, 542p, "-", "-", "-", "-"], [620p, 624p, 630p, 632p, 639p, "-", "-", "-", "-"], [714p, 718p, 722p, 724p, 731p, "-", "-", "-", "-"], [814p, 818p, 822p, 824p, 831p, "-", "-", "-", "-"], [914p, 918p, 922p, 924p, 931p, "-", "-", "-", "-"], [1014p, 1018p, 1022p, 1024p, 1031p, "-", "-", "-", "-"]]
-time_points: [Weston Creek Terminus, Chapman, Canberra College Weston, Cooleman Court, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
+time_points: [Weston Creek Terminus, Chapman, Canberra College Weston, Cooleman Court, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
 

--- a/maxious-canberra-transit-feed/output/26-226-to-weston-creek-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/26-226-to-weston-creek-terminus.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Weston Creek Terminus
-between_stops: []
+between_stops: {}
+
 short_name: 26/226
 stop_times: [["-", "-", "-", "-", 718a, 725a, 727a, 731a, 735a], ["-", "-", "-", "-", 818a, 828a, 832a, 837a, 841a], ["-", "-", "-", "-", 858a, 908a, 912a, 917a, 921a], ["-", "-", "-", "-", 958a, 1007a, 1010a, 1015a, 1019a], ["-", "-", "-", "-", 1058a, 1107a, 1110a, 1115a, 1119a], ["-", "-", "-", "-", 1158a, 1207p, 1210p, 1215p, 1219p], ["-", "-", "-", "-", 1258p, 107p, 110p, 115p, 119p], ["-", "-", "-", "-", 158p, 207p, 210p, 215p, 219p], ["-", "-", "-", "-", 258p, 309p, 313p, 319p, 324p], ["-", "-", "-", "-", 328p, 340p, 344p, 350p, 355p], ["-", "-", "-", "-", 354p, 406p, 410p, 416p, 421p], ["-", "-", "-", "-", 418p, 430p, 434p, 440p, 445p], ["-", "-", "-", "-", 448p, 500p, 504p, 510p, 515p], [452p, 456p, 500p, 503p, 518p, 530p, 534p, 540p, 545p], [522p, 526p, 530p, 533p, 548p, 600p, 604p, 610p, 615p], ["-", "-", "-", "-", 618p, 630p, 632p, 636p, 640p], ["-", "-", "-", "-", 650p, 657p, 659p, 703p, 707p], ["-", "-", "-", "-", 750p, 757p, 759p, 803p, 807p], ["-", "-", "-", "-", 850p, 857p, 859p, 903p, 907p], ["-", "-", "-", "-", 950p, 957p, 959p, 1003p, 1007p], ["-", "-", "-", "-", 1050p, 1057p, 1059p, 1103p, 1107p]]
-time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 3, Cooleman Court, Canberra College Weston, Chapman, Weston Creek Terminus]
+time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 3), Cooleman Court, Canberra College Weston, Chapman, Weston Creek Terminus]
 

--- a/maxious-canberra-transit-feed/output/27-227-to-campbell-park-offices.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/27-227-to-campbell-park-offices.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Campbell Park Offices
-between_stops: []
+between_stops: {}
+
 short_name: 27/227
 stop_times: [[629a, 635a, 643a, 647a, 655a, 709a, 712a, 716a, 720a], [654a, 700a, 708a, 712a, 720a, 734a, 738a, 742a, 746a], ["-", "-", 728a, 735a, 746a, "-", "-", "-", "-"], [722a, 728a, 736a, 743a, 755a, 809a, 813a, 817a, 821a], [740a, 746a, 754a, 801a, 812a, "-", "-", "-", "-"], [748a, 754a, 804a, 810a, 820a, "-", "-", "-", "-"], [823a, 829a, 837a, 844a, 855a, "-", "-", "-", "-"], [853a, 859a, 907a, 914a, 925a, "-", "-", "-", "-"], [925a, 931a, 938a, 942a, 949a, "-", "-", "-", "-"], [1025a, 1031a, 1038a, 1042a, 1049a, "-", "-", "-", "-"], [1125a, 1131a, 1138a, 1142a, 1149a, "-", "-", "-", "-"], [1225p, 1231p, 1238p, 1242p, 1249p, "-", "-", "-", "-"], [125p, 131p, 138p, 142p, 149p, "-", "-", "-", "-"], [225p, 231p, 238p, 242p, 249p, "-", "-", "-", "-"], [325p, 330p, 337p, 341p, 349p, "-", "-", "-", "-"], [355p, 400p, 407p, 411p, 419p, "-", "-", "-", "-"], [425p, 430p, 437p, 441p, 449p, "-", "-", "-", "-"], [525p, 530p, 537p, 541p, 549p, "-", "-", "-", "-"], [625p, 630p, 637p, 640p, 647p, "-", "-", "-", "-"], [700p, 705p, 712p, 715p, 722p, "-", "-", "-", "-"], [800p, 805p, 812p, 815p, 822p, "-", "-", "-", "-"], [900p, 905p, 912p, 915p, 922p, "-", "-", "-", "-"], [1000p, 1005p, 1012p, 1015p, 1022p, "-", "-", "-", "-"]]
-time_points: [Cooleman Court, Rivett, Fisher, Waramanga, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
+time_points: [Cooleman Court, Rivett, Fisher, Waramanga, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
 

--- a/maxious-canberra-transit-feed/output/27-227-to-cooleman-court.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/27-227-to-cooleman-court.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: 27/227
 stop_times: [["-", "-", "-", "-", 821a, 829a, 833a, 840a, 845a], ["-", "-", "-", "-", 854a, 902a, 906a, 913a, 918a], ["-", "-", "-", "-", 954a, 1001a, 1005a, 1013a, 1019a], ["-", "-", "-", "-", 1054a, 1101a, 1105a, 1113a, 1119a], ["-", "-", "-", "-", 1154a, 1201p, 1205p, 1213p, 1219p], ["-", "-", "-", "-", 1254p, 101p, 105p, 113p, 119p], ["-", "-", "-", "-", 154p, 201p, 205p, 213p, 219p], ["-", "-", "-", "-", 254p, 302p, 307p, 314p, 322p], ["-", "-", "-", "-", 321p, 333p, 338p, 345p, 353p], ["-", "-", "-", "-", 351p, 403p, 408p, 415p, 423p], ["-", "-", "-", "-", 421p, 433p, 438p, 445p, 453p], [427p, 431p, 435p, 438p, 453p, 505p, 510p, 517p, 525p], ["-", "-", "-", "-", 521p, 533p, 538p, 545p, 553p], [527p, 531p, 535p, 538p, 553p, 605p, 610p, 617p, 625p], ["-", "-", "-", "-", 635p, 641p, 644p, 650p, 655p], ["-", "-", "-", "-", 735p, 741p, 744p, 750p, 755p], ["-", "-", "-", "-", 835p, 841p, 844p, 850p, 855p], ["-", "-", "-", "-", 935p, 941p, 944p, 950p, 955p], ["-", "-", "-", "-", 1035p, 1041p, 1044p, 1050p, 1055p]]
-time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 3, Waramanga, Fisher, Rivett, Cooleman Court]
+time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 3), Waramanga, Fisher, Rivett, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/28-to-cooleman-court.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/28-to-cooleman-court.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: "28"
 stop_times: [["-", "-", "-", "-", 742a, 746a, 751a, 759a, 811a], ["-", "-", "-", "-", 845a, 849a, 854a, 902a, 914a], ["-", "-", "-", "-", 952a, 956a, 1000a, 1007a, 1019a], ["-", "-", "-", "-", 1052a, 1056a, 1100a, 1107a, 1119a], ["-", "-", "-", "-", 1152a, 1156a, 1200p, 1207p, 1219p], ["-", "-", "-", "-", 1252p, 1256p, 100p, 107p, 119p], ["-", "-", "-", "-", 152p, 156p, 200p, 207p, 219p], ["-", "-", "-", "-", 252p, 256p, 300p, 308p, 320p], ["-", "-", "-", "-", 312p, 316p, 321p, 329p, 341p], ["-", "-", "-", "-", 342p, 346p, 351p, 359p, 411p], ["-", "-", "-", "-", 412p, 416p, 421p, 429p, 441p], ["-", "-", "-", "-", 442p, 446p, 451p, 459p, 511p], [429p, 438p, 454p, 457p, 512p, 516p, 521p, 529p, 541p], [449p, 508p, 524p, 527p, 542p, 546p, 551p, 559p, 611p], [519p, 538p, 554p, 557p, 612p, 616p, 621p, 629p, 638p], [549p, 608p, 624p, 627p, 642p, 645p, 649p, 656p, 705p], ["-", "-", "-", "-", 732p, 735p, 739p, 746p, 755p], ["-", "-", "-", "-", 832p, 835p, 839p, 846p, 855p], ["-", "-", "-", "-", 932p, 935p, 939p, 946p, 955p], ["-", "-", "-", "-", 1032p, 1035p, 1039p, 1046p, 1055p]]
-time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 16, Lyons, Police College Weston, Duffy Primary School, Cooleman Court]
+time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 16), Lyons, Police College Weston, Duffy Primary School, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/28-to-fairbairn-park.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/28-to-fairbairn-park.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Fairbairn Park
-between_stops: []
+between_stops: {}
+
 short_name: "28"
 stop_times: [[615a, 624a, 630a, 634a, 638a, 652a, 655a, 711a, 725a], [637a, 646a, 652a, 656a, 700a, 714a, 717a, 733a, 747a], [705a, 714a, 720a, 724a, 728a, 742a, 746a, 802a, 816a], [745a, 757a, 805a, 810a, 815a, 829a, 833a, 849a, 903a], [815a, 827a, 835a, 840a, 844a, "-", "-", "-", "-"], [844a, 856a, 904a, 909a, 913a, "-", "-", "-", "-"], [926a, 938a, 945a, 949a, 953a, "-", "-", "-", "-"], [1026a, 1038a, 1045a, 1049a, 1053a, "-", "-", "-", "-"], [1126a, 1138a, 1145a, 1149a, 1153a, "-", "-", "-", "-"], [1226p, 1238p, 1245p, 1249p, 1253p, "-", "-", "-", "-"], [126p, 138p, 145p, 149p, 153p, "-", "-", "-", "-"], [226p, 238p, 245p, 249p, 253p, "-", "-", "-", "-"], [326p, 338p, 346p, 351p, 354p, "-", "-", "-", "-"], [356p, 408p, 416p, 421p, 425p, "-", "-", "-", "-"], [415p, 427p, 435p, 440p, 444p, "-", "-", "-", "-"], [515p, 527p, 535p, 540p, 544p, "-", "-", "-", "-"], [615p, 627p, 634p, 638p, 641p, "-", "-", "-", "-"], [700p, 709p, 715p, 719p, 722p, "-", "-", "-", "-"], [800p, 809p, 815p, 819p, 822p, "-", "-", "-", "-"], [900p, 909p, 915p, 919p, 922p, "-", "-", "-", "-"], [1000p, 1009p, 1015p, 1019p, 1022p, "-", "-", "-", "-"]]
-time_points: [Cooleman Court, Duffy Primary School, Police College Weston, Lyons, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, Brindabella Business Park, Fairbairn Park]
+time_points: [Cooleman Court, Duffy Primary School, Police College Weston, Lyons, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, Brindabella Business Park, Fairbairn Park]
 

--- a/maxious-canberra-transit-feed/output/3-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/3-to-cohen-st-station.stop_times.yml
@@ -1,456 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "3"
+stop_times: [[612a, 621a, 625a, 630a, 634a, 638a, 650a, 656a, 701a, 706a, 713a, 728a, 730a, 734a], [642a, 651a, 655a, 700a, 704a, 708a, 720a, 726a, 731a, 736a, 745a, 802a, 804a, 808a], [712a, 721a, 725a, 730a, 734a, 738a, 750a, 756a, 801a, 806a, 815a, 832a, 834a, 838a], [738a, 748a, 753a, 800a, 804a, 808a, 820a, 826a, 831a, 836a, 845a, 902a, 904a, 908a], [808a, 818a, 823a, 830a, 834a, 838a, 850a, 856a, 901a, 906a, 915a, 932a, 934a, 938a], [838a, 848a, 853a, 900a, 904a, 908a, 920a, 926a, 931a, 936a, 943a, 958a, 1000a, 1004a], [912a, 921a, 925a, 930a, 934a, 938a, 950a, 956a, 1001a, 1006a, 1013a, 1031a, 1033a, 1034a], [942a, 951a, 955a, 1000a, 1004a, 1008a, 1020a, 1026a, 1031a, 1036a, 1043a, 1058a, 1100a, 1104a], [1012a, 1021a, 1025a, 1030a, 1034a, 1038a, 1050a, 1056a, 1101a, 1106a, 1113a, 1128a, 1130a, 1134a], [1042a, 1051a, 1055a, 1100a, 1104a, 1108a, 1120a, 1126a, 1131a, 1136a, 1143a, 1158a, 1200p, 1204p], [1112a, 1121a, 1125a, 1130a, 1134a, 1138a, 1150a, 1156a, 1201p, 1206p, 1213p, 1228p, 1230p, 1234p], [1142a, 1151a, 1155a, 1200p, 1204p, 1208p, 1220p, 1226p, 1231p, 1236p, 1243p, 1258p, 100p, 104p], [1212p, 1221p, 1225p, 1230p, 1234p, 1238p, 1250p, 1256p, 101p, 106p, 113p, 128p, 130p, 134p], [1242p, 1251p, 1255p, 100p, 104p, 108p, 120p, 126p, 131p, 136p, 143p, 158p, 200p, 204p], [112p, 121p, 125p, 130p, 134p, 138p, 150p, 156p, 201p, 206p, 213p, 228p, 230p, 234p], [142p, 151p, 155p, 200p, 204p, 208p, 220p, 226p, 231p, 236p, 243p, 258p, 300p, 304p], [212p, 221p, 225p, 230p, 234p, 238p, 250p, 256p, 301p, 307p, 315p, 332p, 334p, 338p], [242p, 251p, 255p, 300p, 304p, 308p, 320p, 326p, 332p, 338p, 346p, 403p, 405p, 409p], [309p, 319p, 324p, 330p, 334p, 338p, 350p, 356p, 402p, 408p, 416p, 433p, 435p, 439p], [339p, 349p, 354p, 400p, 404p, 408p, 420p, 426p, 432p, 438p, 446p, 503p, 505p, 509p], [409p, 419p, 424p, 430p, 434p, 438p, 450p, 456p, 502p, 508p, 516p, 533p, 535p, 539p], [439p, 449p, 454p, 500p, 504p, 508p, 520p, 526p, 532p, 538p, 546p, 603p, 605p, 609p], [511p, 521p, 526p, 532p, 536p, 540p, 552p, 558p, 604p, 610p, 618p, 634p, 636p, 639p], [539p, 549p, 554p, 600p, 604p, 608p, 620p, 626p, 632p, 637p, 644p, 659p, 701p, 704p], [608p, 618p, 623p, 629p, 632p, 636p, 648p, 654p, 659p, 704p, 711p, 726p, 728p, 731p], [643p, 651p, 655p, 700p, 703p, 707p, 719p, 725p, 730p, 735p, 742p, 757p, 759p, 802p], [713p, 721p, 725p, 730p, 733p, 737p, 749p, 755p, 800p, 805p, 812p, 827p, 829p, 832p], [813p, 821p, 825p, 830p, 833p, 837p, 849p, 855p, 900p, 905p, 912p, 927p, 929p, 932p], [913p, 921p, 925p, 930p, 933p, 937p, 949p, 955p, 1000p, 1005p, 1012p, 1027p, 1029p, 1032p], [1013p, 1021p, 1025p, 1030p, 1033p, 1037p, 1049p, 1055p, 1100p, 1105p, 1112p, 1127p, 1129p, 1132p], [1113p, 1121p, 1125p, 1130p, 1133p, 1137p, 1147p, "-", "-", "-", "-", "-", "-", "-"]]
+time_points: [Woden Interchange (Platform 14), Garran, Hughes, Deakin, Parliament House, Kings Ave/National Crt, City Interchange (Platform 4), National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "3"
-stop_times: 
-- - 612a
-  - 621a
-  - 625a
-  - 630a
-  - 634a
-  - 638a
-  - 650a
-  - 656a
-  - 701a
-  - 706a
-  - 713a
-  - 728a
-  - 730a
-  - 734a
-- - 642a
-  - 651a
-  - 655a
-  - 700a
-  - 704a
-  - 708a
-  - 720a
-  - 726a
-  - 731a
-  - 736a
-  - 745a
-  - 802a
-  - 804a
-  - 808a
-- - 712a
-  - 721a
-  - 725a
-  - 730a
-  - 734a
-  - 738a
-  - 750a
-  - 756a
-  - 801a
-  - 806a
-  - 815a
-  - 832a
-  - 834a
-  - 838a
-- - 738a
-  - 748a
-  - 753a
-  - 800a
-  - 804a
-  - 808a
-  - 820a
-  - 826a
-  - 831a
-  - 836a
-  - 845a
-  - 902a
-  - 904a
-  - 908a
-- - 808a
-  - 818a
-  - 823a
-  - 830a
-  - 834a
-  - 838a
-  - 850a
-  - 856a
-  - 901a
-  - 906a
-  - 915a
-  - 932a
-  - 934a
-  - 938a
-- - 838a
-  - 848a
-  - 853a
-  - 900a
-  - 904a
-  - 908a
-  - 920a
-  - 926a
-  - 931a
-  - 936a
-  - 943a
-  - 958a
-  - 1000a
-  - 1004a
-- - 912a
-  - 921a
-  - 925a
-  - 930a
-  - 934a
-  - 938a
-  - 950a
-  - 956a
-  - 1001a
-  - 1006a
-  - 1013a
-  - 1031a
-  - 1033a
-  - 1034a
-- - 942a
-  - 951a
-  - 955a
-  - 1000a
-  - 1004a
-  - 1008a
-  - 1020a
-  - 1026a
-  - 1031a
-  - 1036a
-  - 1043a
-  - 1058a
-  - 1100a
-  - 1104a
-- - 1012a
-  - 1021a
-  - 1025a
-  - 1030a
-  - 1034a
-  - 1038a
-  - 1050a
-  - 1056a
-  - 1101a
-  - 1106a
-  - 1113a
-  - 1128a
-  - 1130a
-  - 1134a
-- - 1042a
-  - 1051a
-  - 1055a
-  - 1100a
-  - 1104a
-  - 1108a
-  - 1120a
-  - 1126a
-  - 1131a
-  - 1136a
-  - 1143a
-  - 1158a
-  - 1200p
-  - 1204p
-- - 1112a
-  - 1121a
-  - 1125a
-  - 1130a
-  - 1134a
-  - 1138a
-  - 1150a
-  - 1156a
-  - 1201p
-  - 1206p
-  - 1213p
-  - 1228p
-  - 1230p
-  - 1234p
-- - 1142a
-  - 1151a
-  - 1155a
-  - 1200p
-  - 1204p
-  - 1208p
-  - 1220p
-  - 1226p
-  - 1231p
-  - 1236p
-  - 1243p
-  - 1258p
-  - 100p
-  - 104p
-- - 1212p
-  - 1221p
-  - 1225p
-  - 1230p
-  - 1234p
-  - 1238p
-  - 1250p
-  - 1256p
-  - 101p
-  - 106p
-  - 113p
-  - 128p
-  - 130p
-  - 134p
-- - 1242p
-  - 1251p
-  - 1255p
-  - 100p
-  - 104p
-  - 108p
-  - 120p
-  - 126p
-  - 131p
-  - 136p
-  - 143p
-  - 158p
-  - 200p
-  - 204p
-- - 112p
-  - 121p
-  - 125p
-  - 130p
-  - 134p
-  - 138p
-  - 150p
-  - 156p
-  - 201p
-  - 206p
-  - 213p
-  - 228p
-  - 230p
-  - 234p
-- - 142p
-  - 151p
-  - 155p
-  - 200p
-  - 204p
-  - 208p
-  - 220p
-  - 226p
-  - 231p
-  - 236p
-  - 243p
-  - 258p
-  - 300p
-  - 304p
-- - 212p
-  - 221p
-  - 225p
-  - 230p
-  - 234p
-  - 238p
-  - 250p
-  - 256p
-  - 301p
-  - 307p
-  - 315p
-  - 332p
-  - 334p
-  - 338p
-- - 242p
-  - 251p
-  - 255p
-  - 300p
-  - 304p
-  - 308p
-  - 320p
-  - 326p
-  - 332p
-  - 338p
-  - 346p
-  - 403p
-  - 405p
-  - 409p
-- - 309p
-  - 319p
-  - 324p
-  - 330p
-  - 334p
-  - 338p
-  - 350p
-  - 356p
-  - 402p
-  - 408p
-  - 416p
-  - 433p
-  - 435p
-  - 439p
-- - 339p
-  - 349p
-  - 354p
-  - 400p
-  - 404p
-  - 408p
-  - 420p
-  - 426p
-  - 432p
-  - 438p
-  - 446p
-  - 503p
-  - 505p
-  - 509p
-- - 409p
-  - 419p
-  - 424p
-  - 430p
-  - 434p
-  - 438p
-  - 450p
-  - 456p
-  - 502p
-  - 508p
-  - 516p
-  - 533p
-  - 535p
-  - 539p
-- - 439p
-  - 449p
-  - 454p
-  - 500p
-  - 504p
-  - 508p
-  - 520p
-  - 526p
-  - 532p
-  - 538p
-  - 546p
-  - 603p
-  - 605p
-  - 609p
-- - 511p
-  - 521p
-  - 526p
-  - 532p
-  - 536p
-  - 540p
-  - 552p
-  - 558p
-  - 604p
-  - 610p
-  - 618p
-  - 634p
-  - 636p
-  - 639p
-- - 539p
-  - 549p
-  - 554p
-  - 600p
-  - 604p
-  - 608p
-  - 620p
-  - 626p
-  - 632p
-  - 637p
-  - 644p
-  - 659p
-  - 701p
-  - 704p
-- - 608p
-  - 618p
-  - 623p
-  - 629p
-  - 632p
-  - 636p
-  - 648p
-  - 654p
-  - 659p
-  - 704p
-  - 711p
-  - 726p
-  - 728p
-  - 731p
-- - 643p
-  - 651p
-  - 655p
-  - 700p
-  - 703p
-  - 707p
-  - 719p
-  - 725p
-  - 730p
-  - 735p
-  - 742p
-  - 757p
-  - 759p
-  - 802p
-- - 713p
-  - 721p
-  - 725p
-  - 730p
-  - 733p
-  - 737p
-  - 749p
-  - 755p
-  - 800p
-  - 805p
-  - 812p
-  - 827p
-  - 829p
-  - 832p
-- - 813p
-  - 821p
-  - 825p
-  - 830p
-  - 833p
-  - 837p
-  - 849p
-  - 855p
-  - 900p
-  - 905p
-  - 912p
-  - 927p
-  - 929p
-  - 932p
-- - 913p
-  - 921p
-  - 925p
-  - 930p
-  - 933p
-  - 937p
-  - 949p
-  - 955p
-  - 1000p
-  - 1005p
-  - 1012p
-  - 1027p
-  - 1029p
-  - 1032p
-- - 1013p
-  - 1021p
-  - 1025p
-  - 1030p
-  - 1033p
-  - 1037p
-  - 1049p
-  - 1055p
-  - 1100p
-  - 1105p
-  - 1112p
-  - 1127p
-  - 1129p
-  - 1132p
-- - 1113p
-  - 1121p
-  - 1125p
-  - 1130p
-  - 1133p
-  - 1137p
-  - 1147p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Woden Interchange - Platform 14
-  - Garran
-  - Hughes
-  - Deakin
-  - Parliament House
-  - Kings Ave/National Crt
-  - City Interchange - Platform 4
-  - National Museum
-  - Burton & Garran Hall/Daley Road ANU
-  - O'Connor
-  - Calvary Hospital
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/3-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/3-to-woden-interchange.stop_times.yml
@@ -1,456 +1,9 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
+short_name: "3"
+stop_times: [["-", "-", "-", "-", "-", "-", "-", 618a, 627a, 631a, 636a, 640a, 644a, 653a], ["-", "-", "-", "-", "-", "-", "-", 648a, 657a, 701a, 706a, 710a, 714a, 723a], [631a, 633a, 637a, 652a, 658a, 702a, 706a, 718a, 727a, 731a, 736a, 742a, 746a, 758a], [659a, 701a, 705a, 720a, 726a, 730a, 735a, 748a, 758a, 803a, 808a, 814a, 818a, 830a], [724a, 726a, 730a, 747a, 755a, 800a, 805a, 818a, 828a, 833a, 838a, 844a, 848a, 900a], [748a, 750a, 754a, 810a, 819a, 827a, 832a, 848a, 853a, 901a, 906a, 915a, 919a, 931a], [824a, 826a, 830a, 847a, 855a, 900a, 905a, 918a, 928a, 932a, 937a, 942a, 946a, 955a], [854a, 856a, 900a, 917a, 925a, 930a, 935a, 948a, 958a, 1002a, 1007a, 1012a, 1016a, 1025a], [927a, 929a, 933a, 948a, 955a, 1000a, 1005a, 1018a, 1028a, 1032a, 1037a, 1042a, 1046a, 1055a], [957a, 959a, 1003a, 1018a, 1025a, 1030a, 1035a, 1048a, 1058a, 1102a, 1107a, 1112a, 1116a, 1125a], [1027a, 1029a, 1033a, 1048a, 1055a, 1100a, 1105a, 1118a, 1128a, 1132a, 1137a, 1142a, 1146a, 1155a], [1057a, 1059a, 1103a, 1118a, 1125a, 1130a, 1135a, 1148a, 1158a, 1202p, 1207p, 1212p, 1216p, 1225p], [1127a, 1129a, 1133a, 1148a, 1155a, 1200p, 1205p, 1218p, 1228p, 1232p, 1237p, 1242p, 1246p, 1255p], [1157a, 1159a, 1203p, 1218p, 1225p, 1230p, 1235p, 1248p, 1258p, 102p, 107p, 112p, 116p, 125p], [1227p, 1229p, 1233p, 1248p, 1255p, 100p, 105p, 118p, 128p, 132p, 137p, 142p, 146p, 155p], [1257p, 1259p, 103p, 118p, 125p, 130p, 135p, 148p, 158p, 202p, 207p, 212p, 216p, 225p], [127p, 129p, 133p, 148p, 155p, 200p, 205p, 218p, 228p, 232p, 237p, 242p, 246p, 255p], [157p, 159p, 203p, 218p, 225p, 230p, 235p, 248p, 258p, 303p, 308p, 314p, 318p, 329p], [232p, 234p, 238p, 248p, 258p, 303p, 310p, 324p, 334p, 339p, 344p, 350p, 354p, 405p], [253p, 255p, 259p, 316p, 324p, 329p, 335p, 348p, 358p, 403p, 408p, 414p, 418p, 429p], [320p, 322p, 326p, 343p, 351p, 356p, 402p, 415p, 425p, 430p, 435p, 441p, 445p, 456p], [349p, 351p, 355p, 412p, 420p, 425p, 431p, 444p, 454p, 459p, 504p, 510p, 514p, 525p], [421p, 423p, 427p, 444p, 452p, 457p, 503p, 516p, 526p, 531p, 536p, 542p, 546p, 557p], [448p, 450p, 454p, 511p, 519p, 524p, 530p, 543p, 553p, 558p, 603p, 609p, 613p, 624p], [518p, 520p, 524p, 541p, 549p, 554p, 600p, 613p, 623p, 628p, 632p, 637p, 641p, 650p], [550p, 552p, 556p, 613p, 621p, 626p, 632p, 644p, 653p, 658p, 702p, 707p, 711p, 720p], [623p, 625p, 629p, 644p, 651p, 656p, 701p, 713p, 722p, 727p, 731p, 736p, 740p, 749p], [727p, 729p, 732p, 747p, 754p, 759p, 804p, 816p, 825p, 830p, 834p, 839p, 843p, 852p], [829p, 831p, 834p, 849p, 856p, 901p, 906p, 918p, 927p, 932p, 936p, 941p, 945p, 954p], [929p, 931p, 934p, 949p, 956p, 1001p, 1006p, 1018p, 1027p, 1032p, 1036p, 1041p, 1045p, 1054p], [1029p, 1031p, 1034p, 1049p, 1056p, 1101p, 1106p, 1116p, "-", "-", "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange (Platform 3), Kings Ave/National Crt, Parliament House, Deakin, Hughes, Garran, Woden Interchange]
 
-short_name: "3"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 618a
-  - 627a
-  - 631a
-  - 636a
-  - 640a
-  - 644a
-  - 653a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 648a
-  - 657a
-  - 701a
-  - 706a
-  - 710a
-  - 714a
-  - 723a
-- - 631a
-  - 633a
-  - 637a
-  - 652a
-  - 658a
-  - 702a
-  - 706a
-  - 718a
-  - 727a
-  - 731a
-  - 736a
-  - 742a
-  - 746a
-  - 758a
-- - 659a
-  - 701a
-  - 705a
-  - 720a
-  - 726a
-  - 730a
-  - 735a
-  - 748a
-  - 758a
-  - 803a
-  - 808a
-  - 814a
-  - 818a
-  - 830a
-- - 724a
-  - 726a
-  - 730a
-  - 747a
-  - 755a
-  - 800a
-  - 805a
-  - 818a
-  - 828a
-  - 833a
-  - 838a
-  - 844a
-  - 848a
-  - 900a
-- - 748a
-  - 750a
-  - 754a
-  - 810a
-  - 819a
-  - 827a
-  - 832a
-  - 848a
-  - 853a
-  - 901a
-  - 906a
-  - 915a
-  - 919a
-  - 931a
-- - 824a
-  - 826a
-  - 830a
-  - 847a
-  - 855a
-  - 900a
-  - 905a
-  - 918a
-  - 928a
-  - 932a
-  - 937a
-  - 942a
-  - 946a
-  - 955a
-- - 854a
-  - 856a
-  - 900a
-  - 917a
-  - 925a
-  - 930a
-  - 935a
-  - 948a
-  - 958a
-  - 1002a
-  - 1007a
-  - 1012a
-  - 1016a
-  - 1025a
-- - 927a
-  - 929a
-  - 933a
-  - 948a
-  - 955a
-  - 1000a
-  - 1005a
-  - 1018a
-  - 1028a
-  - 1032a
-  - 1037a
-  - 1042a
-  - 1046a
-  - 1055a
-- - 957a
-  - 959a
-  - 1003a
-  - 1018a
-  - 1025a
-  - 1030a
-  - 1035a
-  - 1048a
-  - 1058a
-  - 1102a
-  - 1107a
-  - 1112a
-  - 1116a
-  - 1125a
-- - 1027a
-  - 1029a
-  - 1033a
-  - 1048a
-  - 1055a
-  - 1100a
-  - 1105a
-  - 1118a
-  - 1128a
-  - 1132a
-  - 1137a
-  - 1142a
-  - 1146a
-  - 1155a
-- - 1057a
-  - 1059a
-  - 1103a
-  - 1118a
-  - 1125a
-  - 1130a
-  - 1135a
-  - 1148a
-  - 1158a
-  - 1202p
-  - 1207p
-  - 1212p
-  - 1216p
-  - 1225p
-- - 1127a
-  - 1129a
-  - 1133a
-  - 1148a
-  - 1155a
-  - 1200p
-  - 1205p
-  - 1218p
-  - 1228p
-  - 1232p
-  - 1237p
-  - 1242p
-  - 1246p
-  - 1255p
-- - 1157a
-  - 1159a
-  - 1203p
-  - 1218p
-  - 1225p
-  - 1230p
-  - 1235p
-  - 1248p
-  - 1258p
-  - 102p
-  - 107p
-  - 112p
-  - 116p
-  - 125p
-- - 1227p
-  - 1229p
-  - 1233p
-  - 1248p
-  - 1255p
-  - 100p
-  - 105p
-  - 118p
-  - 128p
-  - 132p
-  - 137p
-  - 142p
-  - 146p
-  - 155p
-- - 1257p
-  - 1259p
-  - 103p
-  - 118p
-  - 125p
-  - 130p
-  - 135p
-  - 148p
-  - 158p
-  - 202p
-  - 207p
-  - 212p
-  - 216p
-  - 225p
-- - 127p
-  - 129p
-  - 133p
-  - 148p
-  - 155p
-  - 200p
-  - 205p
-  - 218p
-  - 228p
-  - 232p
-  - 237p
-  - 242p
-  - 246p
-  - 255p
-- - 157p
-  - 159p
-  - 203p
-  - 218p
-  - 225p
-  - 230p
-  - 235p
-  - 248p
-  - 258p
-  - 303p
-  - 308p
-  - 314p
-  - 318p
-  - 329p
-- - 232p
-  - 234p
-  - 238p
-  - 248p
-  - 258p
-  - 303p
-  - 310p
-  - 324p
-  - 334p
-  - 339p
-  - 344p
-  - 350p
-  - 354p
-  - 405p
-- - 253p
-  - 255p
-  - 259p
-  - 316p
-  - 324p
-  - 329p
-  - 335p
-  - 348p
-  - 358p
-  - 403p
-  - 408p
-  - 414p
-  - 418p
-  - 429p
-- - 320p
-  - 322p
-  - 326p
-  - 343p
-  - 351p
-  - 356p
-  - 402p
-  - 415p
-  - 425p
-  - 430p
-  - 435p
-  - 441p
-  - 445p
-  - 456p
-- - 349p
-  - 351p
-  - 355p
-  - 412p
-  - 420p
-  - 425p
-  - 431p
-  - 444p
-  - 454p
-  - 459p
-  - 504p
-  - 510p
-  - 514p
-  - 525p
-- - 421p
-  - 423p
-  - 427p
-  - 444p
-  - 452p
-  - 457p
-  - 503p
-  - 516p
-  - 526p
-  - 531p
-  - 536p
-  - 542p
-  - 546p
-  - 557p
-- - 448p
-  - 450p
-  - 454p
-  - 511p
-  - 519p
-  - 524p
-  - 530p
-  - 543p
-  - 553p
-  - 558p
-  - 603p
-  - 609p
-  - 613p
-  - 624p
-- - 518p
-  - 520p
-  - 524p
-  - 541p
-  - 549p
-  - 554p
-  - 600p
-  - 613p
-  - 623p
-  - 628p
-  - 632p
-  - 637p
-  - 641p
-  - 650p
-- - 550p
-  - 552p
-  - 556p
-  - 613p
-  - 621p
-  - 626p
-  - 632p
-  - 644p
-  - 653p
-  - 658p
-  - 702p
-  - 707p
-  - 711p
-  - 720p
-- - 623p
-  - 625p
-  - 629p
-  - 644p
-  - 651p
-  - 656p
-  - 701p
-  - 713p
-  - 722p
-  - 727p
-  - 731p
-  - 736p
-  - 740p
-  - 749p
-- - 727p
-  - 729p
-  - 732p
-  - 747p
-  - 754p
-  - 759p
-  - 804p
-  - 816p
-  - 825p
-  - 830p
-  - 834p
-  - 839p
-  - 843p
-  - 852p
-- - 829p
-  - 831p
-  - 834p
-  - 849p
-  - 856p
-  - 901p
-  - 906p
-  - 918p
-  - 927p
-  - 932p
-  - 936p
-  - 941p
-  - 945p
-  - 954p
-- - 929p
-  - 931p
-  - 934p
-  - 949p
-  - 956p
-  - 1001p
-  - 1006p
-  - 1018p
-  - 1027p
-  - 1032p
-  - 1036p
-  - 1041p
-  - 1045p
-  - 1054p
-- - 1029p
-  - 1031p
-  - 1034p
-  - 1049p
-  - 1056p
-  - 1101p
-  - 1106p
-  - 1116p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Calvary Hospital
-  - O'Connor
-  - Burton & Garran Hall/Daley Road ANU
-  - National Museum
-  - City Interchange - Platform 3
-  - Kings Ave/National Crt
-  - Parliament House
-  - Deakin
-  - Hughes
-  - Garran
-  - Woden Interchange
-

--- a/maxious-canberra-transit-feed/output/30-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/30-to-city-interchange.stop_times.yml
@@ -1,278 +1,10 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Cameron Ave Bus Station (Platform 3)-University of Canberra: [Wjz681S, Wjz689c]
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+short_name: "30"
+stop_times: [[549a, 551a, 555a, 558a, 606a, 613a, 619a, 624a, 630a], [618a, 620a, 624a, 627a, 635a, 642a, 648a, 653a, 659a], [634a, 636a, 640a, 643a, 651a, 658a, 704a, 709a, 715a], [659a, 701a, 705a, 708a, 716a, 723a, 729a, 738a, 753a], ["-", "-", "-", "-", 729a, 738a, 746a, 755a, 810a], [727a, 729a, 733a, 736a, 744a, 753a, 801a, 810a, 825a], ["-", "-", "-", "-", 803a, 812a, 824a, 833a, 848a], [758a, 800a, 804a, 807a, 815a, 824a, 834a, 843a, 858a], ["-", "-", "-", "-", 829a, 838a, 846a, 855a, 910a], [827a, 829a, 833a, 836a, 844a, 853a, 901a, 910a, 925a], [856a, 858a, 902a, 905a, 913a, 922a, 930a, 935a, 941a], [956a, 958a, 1002a, 1005a, 1012a, 1020a, 1028a, 1033a, 1039a], [1056a, 1058a, 1102a, 1105a, 1112a, 1120a, 1128a, 1133a, 1139a], [1156a, 1158a, 1202p, 1205p, 1212p, 1220p, 1228p, 1233p, 1239p], [1256p, 1258p, 102p, 105p, 112p, 120p, 128p, 133p, 139p], [156p, 158p, 202p, 205p, 212p, 220p, 228p, 233p, 239p], [245p, 247p, 251p, 254p, 301p, 309p, 317p, 323p, 330p], [310p, 312p, 316p, 319p, 328p, 336p, 344p, 350p, 357p], [334p, 336p, 340p, 343p, 352p, 400p, 408p, 414p, 421p], [404p, 406p, 410p, 413p, 422p, 430p, 438p, 444p, 451p], [434p, 436p, 440p, 443p, 452p, 500p, 508p, 514p, 521p], [504p, 506p, 510p, 513p, 522p, 530p, 538p, 544p, 551p], [534p, 536p, 540p, 543p, 552p, 600p, 608p, 614p, 621p], [555p, 557p, 601p, 604p, 613p, 621p, 629p, 634p, 639p], [656p, 658p, 701p, 704p, 712p, 719p, 725p, 730p, 735p], [756p, 758p, 801p, 804p, 812p, 819p, 825p, 830p, 835p], [856p, 858p, 901p, 904p, 912p, 919p, 925p, 930p, 935p], [956p, 958p, 1001p, 1004p, 1012p, 1019p, 1025p, 1030p, 1035p], [1056p, 1058p, 1101p, 1104p, 1112p, 1119p, 1125p, 1130p, 1135p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Giralang, Kaleen Village/Maribyrnong, North Lyneham, Macarthur / Northbourne, City Interchange]
 
-short_name: "30"
-stop_times: 
-- - 549a
-  - 551a
-  - 555a
-  - 558a
-  - 606a
-  - 613a
-  - 619a
-  - 624a
-  - 630a
-- - 618a
-  - 620a
-  - 624a
-  - 627a
-  - 635a
-  - 642a
-  - 648a
-  - 653a
-  - 659a
-- - 634a
-  - 636a
-  - 640a
-  - 643a
-  - 651a
-  - 658a
-  - 704a
-  - 709a
-  - 715a
-- - 659a
-  - 701a
-  - 705a
-  - 708a
-  - 716a
-  - 723a
-  - 729a
-  - 738a
-  - 753a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 729a
-  - 738a
-  - 746a
-  - 755a
-  - 810a
-- - 727a
-  - 729a
-  - 733a
-  - 736a
-  - 744a
-  - 753a
-  - 801a
-  - 810a
-  - 825a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 803a
-  - 812a
-  - 824a
-  - 833a
-  - 848a
-- - 758a
-  - 800a
-  - 804a
-  - 807a
-  - 815a
-  - 824a
-  - 834a
-  - 843a
-  - 858a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 829a
-  - 838a
-  - 846a
-  - 855a
-  - 910a
-- - 827a
-  - 829a
-  - 833a
-  - 836a
-  - 844a
-  - 853a
-  - 901a
-  - 910a
-  - 925a
-- - 856a
-  - 858a
-  - 902a
-  - 905a
-  - 913a
-  - 922a
-  - 930a
-  - 935a
-  - 941a
-- - 956a
-  - 958a
-  - 1002a
-  - 1005a
-  - 1012a
-  - 1020a
-  - 1028a
-  - 1033a
-  - 1039a
-- - 1056a
-  - 1058a
-  - 1102a
-  - 1105a
-  - 1112a
-  - 1120a
-  - 1128a
-  - 1133a
-  - 1139a
-- - 1156a
-  - 1158a
-  - 1202p
-  - 1205p
-  - 1212p
-  - 1220p
-  - 1228p
-  - 1233p
-  - 1239p
-- - 1256p
-  - 1258p
-  - 102p
-  - 105p
-  - 112p
-  - 120p
-  - 128p
-  - 133p
-  - 139p
-- - 156p
-  - 158p
-  - 202p
-  - 205p
-  - 212p
-  - 220p
-  - 228p
-  - 233p
-  - 239p
-- - 245p
-  - 247p
-  - 251p
-  - 254p
-  - 301p
-  - 309p
-  - 317p
-  - 323p
-  - 330p
-- - 310p
-  - 312p
-  - 316p
-  - 319p
-  - 328p
-  - 336p
-  - 344p
-  - 350p
-  - 357p
-- - 334p
-  - 336p
-  - 340p
-  - 343p
-  - 352p
-  - 400p
-  - 408p
-  - 414p
-  - 421p
-- - 404p
-  - 406p
-  - 410p
-  - 413p
-  - 422p
-  - 430p
-  - 438p
-  - 444p
-  - 451p
-- - 434p
-  - 436p
-  - 440p
-  - 443p
-  - 452p
-  - 500p
-  - 508p
-  - 514p
-  - 521p
-- - 504p
-  - 506p
-  - 510p
-  - 513p
-  - 522p
-  - 530p
-  - 538p
-  - 544p
-  - 551p
-- - 534p
-  - 536p
-  - 540p
-  - 543p
-  - 552p
-  - 600p
-  - 608p
-  - 614p
-  - 621p
-- - 555p
-  - 557p
-  - 601p
-  - 604p
-  - 613p
-  - 621p
-  - 629p
-  - 634p
-  - 639p
-- - 656p
-  - 658p
-  - 701p
-  - 704p
-  - 712p
-  - 719p
-  - 725p
-  - 730p
-  - 735p
-- - 756p
-  - 758p
-  - 801p
-  - 804p
-  - 812p
-  - 819p
-  - 825p
-  - 830p
-  - 835p
-- - 856p
-  - 858p
-  - 901p
-  - 904p
-  - 912p
-  - 919p
-  - 925p
-  - 930p
-  - 935p
-- - 956p
-  - 958p
-  - 1001p
-  - 1004p
-  - 1012p
-  - 1019p
-  - 1025p
-  - 1030p
-  - 1035p
-- - 1056p
-  - 1058p
-  - 1101p
-  - 1104p
-  - 1112p
-  - 1119p
-  - 1125p
-  - 1130p
-  - 1135p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - University of Canberra
-  - Giralang
-  - Kaleen Village/Maribyrnong
-  - North Lyneham
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/30-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/30-to-cohen-st-station.stop_times.yml
@@ -1,269 +1,10 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  University of Canberra-Cameron Ave Bus Station: [Wjz681S, Wjz689c]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "30"
+stop_times: [[603a, 609a, 614a, 621a, 628a, 635a, 638a, 640a, 644a], [633a, 639a, 644a, 651a, 658a, 705a, 708a, 710a, 714a], [701a, 707a, 712a, 719a, 726a, 735a, 738a, 740a, 744a], [726a, 732a, 737a, 745a, 753a, 805a, 808a, 810a, 814a], [759a, 806a, 811a, 819a, 827a, 839a, 842a, 844a, 848a], [829a, 836a, 841a, 849a, 857a, 909a, 912a, 914a, 918a], [859a, 906a, 911a, 919a, 927a, 935a, 938a, 940a, 944a], [933a, 939a, 944a, 951a, 958a, 1005a, 1008a, 1010a, 1014a], [1002a, 1008a, 1013a, 1020a, 1027a, 1034a, 1037a, 1039a, 1043a], [1102a, 1108a, 1113a, 1120a, 1127a, 1134a, 1137a, 1139a, 1143a], [1202p, 1208p, 1213p, 1220p, 1227p, 1234p, 1237p, 1239p, 1243p], [102p, 108p, 113p, 120p, 127p, 134p, 137p, 139p, 143p], [202p, 208p, 213p, 220p, 227p, 234p, 237p, 239p, 243p], [302p, 309p, 316p, 324p, 332p, 344p, 347p, 349p, 353p], [334p, 341p, 348p, 356p, 404p, 416p, 419p, 421p, 425p], [359p, 406p, 413p, 421p, 429p, 441p, 444p, 446p, 450p], [429p, 436p, 443p, 451p, 459p, 511p, 514p, 516p, 520p], [459p, 506p, 513p, 521p, 529p, 541p, 544p, 546p, 550p], [514p, 521p, 528p, 536p, 544p, 556p, 559p, 601p, 605p], [529p, 536p, 543p, 551p, 559p, 611p, 614p, 616p, 620p], [544p, 551p, 558p, 606p, 614p, 626p, 629p, 631p, 634p], [559p, 606p, 613p, 621p, 629p, 636p, 639p, 641p, 644p], [633p, 639p, 644p, 651p, 658p, 705p, 708p, 710p, 713p], [702p, 708p, 713p, 720p, 727p, 734p, 737p, 739p, 742p], [802p, 808p, 813p, 820p, 827p, 834p, 837p, 839p, 842p], [902p, 908p, 913p, 920p, 927p, 934p, 937p, 939p, 942p], [1002p, 1008p, 1013p, 1020p, 1027p, 1034p, 1037p, 1039p, 1042p], [1102p, 1108p, 1113p, 1120p, 1127p, 1134p, 1137p, 1139p, 1142p]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, North Lyneham, Kaleen Village/Maribyrnong, Giralang, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "30"
-stop_times: 
-- - 603a
-  - 609a
-  - 614a
-  - 621a
-  - 628a
-  - 635a
-  - 638a
-  - 640a
-  - 644a
-- - 633a
-  - 639a
-  - 644a
-  - 651a
-  - 658a
-  - 705a
-  - 708a
-  - 710a
-  - 714a
-- - 701a
-  - 707a
-  - 712a
-  - 719a
-  - 726a
-  - 735a
-  - 738a
-  - 740a
-  - 744a
-- - 726a
-  - 732a
-  - 737a
-  - 745a
-  - 753a
-  - 805a
-  - 808a
-  - 810a
-  - 814a
-- - 759a
-  - 806a
-  - 811a
-  - 819a
-  - 827a
-  - 839a
-  - 842a
-  - 844a
-  - 848a
-- - 829a
-  - 836a
-  - 841a
-  - 849a
-  - 857a
-  - 909a
-  - 912a
-  - 914a
-  - 918a
-- - 859a
-  - 906a
-  - 911a
-  - 919a
-  - 927a
-  - 935a
-  - 938a
-  - 940a
-  - 944a
-- - 933a
-  - 939a
-  - 944a
-  - 951a
-  - 958a
-  - 1005a
-  - 1008a
-  - 1010a
-  - 1014a
-- - 1002a
-  - 1008a
-  - 1013a
-  - 1020a
-  - 1027a
-  - 1034a
-  - 1037a
-  - 1039a
-  - 1043a
-- - 1102a
-  - 1108a
-  - 1113a
-  - 1120a
-  - 1127a
-  - 1134a
-  - 1137a
-  - 1139a
-  - 1143a
-- - 1202p
-  - 1208p
-  - 1213p
-  - 1220p
-  - 1227p
-  - 1234p
-  - 1237p
-  - 1239p
-  - 1243p
-- - 102p
-  - 108p
-  - 113p
-  - 120p
-  - 127p
-  - 134p
-  - 137p
-  - 139p
-  - 143p
-- - 202p
-  - 208p
-  - 213p
-  - 220p
-  - 227p
-  - 234p
-  - 237p
-  - 239p
-  - 243p
-- - 302p
-  - 309p
-  - 316p
-  - 324p
-  - 332p
-  - 344p
-  - 347p
-  - 349p
-  - 353p
-- - 334p
-  - 341p
-  - 348p
-  - 356p
-  - 404p
-  - 416p
-  - 419p
-  - 421p
-  - 425p
-- - 359p
-  - 406p
-  - 413p
-  - 421p
-  - 429p
-  - 441p
-  - 444p
-  - 446p
-  - 450p
-- - 429p
-  - 436p
-  - 443p
-  - 451p
-  - 459p
-  - 511p
-  - 514p
-  - 516p
-  - 520p
-- - 459p
-  - 506p
-  - 513p
-  - 521p
-  - 529p
-  - 541p
-  - 544p
-  - 546p
-  - 550p
-- - 514p
-  - 521p
-  - 528p
-  - 536p
-  - 544p
-  - 556p
-  - 559p
-  - 601p
-  - 605p
-- - 529p
-  - 536p
-  - 543p
-  - 551p
-  - 559p
-  - 611p
-  - 614p
-  - 616p
-  - 620p
-- - 544p
-  - 551p
-  - 558p
-  - 606p
-  - 614p
-  - 626p
-  - 629p
-  - 631p
-  - 634p
-- - 559p
-  - 606p
-  - 613p
-  - 621p
-  - 629p
-  - 636p
-  - 639p
-  - 641p
-  - 644p
-- - 633p
-  - 639p
-  - 644p
-  - 651p
-  - 658p
-  - 705p
-  - 708p
-  - 710p
-  - 713p
-- - 702p
-  - 708p
-  - 713p
-  - 720p
-  - 727p
-  - 734p
-  - 737p
-  - 739p
-  - 742p
-- - 802p
-  - 808p
-  - 813p
-  - 820p
-  - 827p
-  - 834p
-  - 837p
-  - 839p
-  - 842p
-- - 902p
-  - 908p
-  - 913p
-  - 920p
-  - 927p
-  - 934p
-  - 937p
-  - 939p
-  - 942p
-- - 1002p
-  - 1008p
-  - 1013p
-  - 1020p
-  - 1027p
-  - 1034p
-  - 1037p
-  - 1039p
-  - 1042p
-- - 1102p
-  - 1108p
-  - 1113p
-  - 1120p
-  - 1127p
-  - 1134p
-  - 1137p
-  - 1139p
-  - 1142p
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - North Lyneham
-  - Kaleen Village/Maribyrnong
-  - Giralang
-  - University of Canberra
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/31-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/31-to-city-interchange.stop_times.yml
@@ -1,200 +1,10 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Cameron Ave Bus Station (Platform 3)-University of Canberra: [Wjz681S, Wjz689c]
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+short_name: "31"
+stop_times: [[615a, 617a, 621a, 624a, 629a, 636a, 641a, 647a], [645a, 647a, 651a, 654a, 659a, 706a, 711a, 717a], [712a, 714a, 718a, 721a, 726a, 734a, 742a, 757a], [741a, 743a, 747a, 750a, 757a, 806a, 814a, 829a], [811a, 813a, 817a, 820a, 827a, 836a, 844a, 859a], [841a, 843a, 847a, 850a, 857a, 906a, 914a, 929a], [930a, 932a, 936a, 939a, 945a, 953a, 958a, 1004a], [1030a, 1032a, 1036a, 1039a, 1045a, 1053a, 1058a, 1104a], [1130a, 1132a, 1136a, 1139a, 1145a, 1153a, 1158a, 1204p], [1230p, 1232p, 1236p, 1239p, 1245p, 1253p, 1258p, 104p], [130p, 132p, 136p, 139p, 145p, 153p, 158p, 204p], [230p, 232p, 236p, 239p, 245p, 253p, 258p, 305p], [315p, 317p, 321p, 324p, 330p, 338p, 343p, 350p], [345p, 347p, 351p, 354p, 400p, 408p, 413p, 420p], [415p, 417p, 421p, 424p, 430p, 438p, 443p, 450p], [445p, 447p, 451p, 454p, 500p, 508p, 513p, 520p], [514p, 516p, 520p, 523p, 529p, 537p, 542p, 549p], [545p, 547p, 551p, 554p, 600p, 608p, 613p, 620p], [630p, 632p, 635p, 638p, 643p, 650p, 655p, 700p], [730p, 732p, 735p, 738p, 743p, 750p, 755p, 800p], [830p, 832p, 835p, 838p, 843p, 850p, 855p, 900p], [930p, 932p, 935p, 938p, 943p, 950p, 955p, 1000p], [1030p, 1032p, 1035p, 1038p, 1043p, 1050p, 1055p, 1100p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Gwydir Square Kaleen, North Lyneham, Macarthur / Northbourne, City Interchange]
 
-short_name: "31"
-stop_times: 
-- - 615a
-  - 617a
-  - 621a
-  - 624a
-  - 629a
-  - 636a
-  - 641a
-  - 647a
-- - 645a
-  - 647a
-  - 651a
-  - 654a
-  - 659a
-  - 706a
-  - 711a
-  - 717a
-- - 712a
-  - 714a
-  - 718a
-  - 721a
-  - 726a
-  - 734a
-  - 742a
-  - 757a
-- - 741a
-  - 743a
-  - 747a
-  - 750a
-  - 757a
-  - 806a
-  - 814a
-  - 829a
-- - 811a
-  - 813a
-  - 817a
-  - 820a
-  - 827a
-  - 836a
-  - 844a
-  - 859a
-- - 841a
-  - 843a
-  - 847a
-  - 850a
-  - 857a
-  - 906a
-  - 914a
-  - 929a
-- - 930a
-  - 932a
-  - 936a
-  - 939a
-  - 945a
-  - 953a
-  - 958a
-  - 1004a
-- - 1030a
-  - 1032a
-  - 1036a
-  - 1039a
-  - 1045a
-  - 1053a
-  - 1058a
-  - 1104a
-- - 1130a
-  - 1132a
-  - 1136a
-  - 1139a
-  - 1145a
-  - 1153a
-  - 1158a
-  - 1204p
-- - 1230p
-  - 1232p
-  - 1236p
-  - 1239p
-  - 1245p
-  - 1253p
-  - 1258p
-  - 104p
-- - 130p
-  - 132p
-  - 136p
-  - 139p
-  - 145p
-  - 153p
-  - 158p
-  - 204p
-- - 230p
-  - 232p
-  - 236p
-  - 239p
-  - 245p
-  - 253p
-  - 258p
-  - 305p
-- - 315p
-  - 317p
-  - 321p
-  - 324p
-  - 330p
-  - 338p
-  - 343p
-  - 350p
-- - 345p
-  - 347p
-  - 351p
-  - 354p
-  - 400p
-  - 408p
-  - 413p
-  - 420p
-- - 415p
-  - 417p
-  - 421p
-  - 424p
-  - 430p
-  - 438p
-  - 443p
-  - 450p
-- - 445p
-  - 447p
-  - 451p
-  - 454p
-  - 500p
-  - 508p
-  - 513p
-  - 520p
-- - 514p
-  - 516p
-  - 520p
-  - 523p
-  - 529p
-  - 537p
-  - 542p
-  - 549p
-- - 545p
-  - 547p
-  - 551p
-  - 554p
-  - 600p
-  - 608p
-  - 613p
-  - 620p
-- - 630p
-  - 632p
-  - 635p
-  - 638p
-  - 643p
-  - 650p
-  - 655p
-  - 700p
-- - 730p
-  - 732p
-  - 735p
-  - 738p
-  - 743p
-  - 750p
-  - 755p
-  - 800p
-- - 830p
-  - 832p
-  - 835p
-  - 838p
-  - 843p
-  - 850p
-  - 855p
-  - 900p
-- - 930p
-  - 932p
-  - 935p
-  - 938p
-  - 943p
-  - 950p
-  - 955p
-  - 1000p
-- - 1030p
-  - 1032p
-  - 1035p
-  - 1038p
-  - 1043p
-  - 1050p
-  - 1055p
-  - 1100p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - University of Canberra
-  - Gwydir Square Kaleen
-  - North Lyneham
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/31-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/31-to-cohen-st-station.stop_times.yml
@@ -1,208 +1,10 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  University of Canberra-Cameron Ave Bus Station: [Wjz681S, Wjz689c]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "31"
+stop_times: [["-", "-", 637a, 643a, 648a, 651a, 653a, 657a], ["-", "-", 707a, 713a, 718a, 721a, 723a, 727a], [733a, 740a, 745a, 753a, 800a, 803a, 805a, 809a], [803a, 810a, 815a, 823a, 830a, 833a, 835a, 839a], [829a, 836a, 841a, 849a, 856a, 859a, 901a, 905a], [910a, 917a, 922a, 930a, 936a, 939a, 941a, 945a], [948a, 954a, 959a, 1005a, 1011a, 1014a, 1016a, 1020a], [1048a, 1054a, 1059a, 1105a, 1111a, 1114a, 1116a, 1120a], [1148a, 1154a, 1159a, 1205p, 1211p, 1214p, 1216p, 1220p], [1248p, 1254p, 1259p, 105p, 111p, 114p, 116p, 120p], [148p, 154p, 159p, 205p, 211p, 214p, 216p, 220p], [248p, 254p, 259p, 307p, 315p, 318p, 320p, 324p], [303p, 310p, 315p, 323p, 331p, 334p, 336p, 340p], [333p, 340p, 345p, 353p, 401p, 404p, 406p, 410p], [403p, 410p, 415p, 423p, 431p, 434p, 436p, 440p], [433p, 440p, 445p, 453p, 501p, 504p, 506p, 510p], [503p, 510p, 515p, 523p, 531p, 534p, 536p, 540p], [533p, 540p, 545p, 553p, 601p, 604p, 606p, 610p], [603p, 610p, 615p, 623p, 631p, 634p, 636p, 639p], [648p, 654p, 659p, 705p, 710p, 713p, 715p, 718p], [748p, 754p, 759p, 805p, 810p, 813p, 815p, 818p], [848p, 854p, 859p, 905p, 910p, 913p, 915p, 918p], [948p, 954p, 959p, 1005p, 1010p, 1013p, 1015p, 1018p], [1048p, 1054p, 1059p, 1105p, 1110p, 1113p, 1115p, 1118p]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, North Lyneham, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "31"
-stop_times: 
-- - "-"
-  - "-"
-  - 637a
-  - 643a
-  - 648a
-  - 651a
-  - 653a
-  - 657a
-- - "-"
-  - "-"
-  - 707a
-  - 713a
-  - 718a
-  - 721a
-  - 723a
-  - 727a
-- - 733a
-  - 740a
-  - 745a
-  - 753a
-  - 800a
-  - 803a
-  - 805a
-  - 809a
-- - 803a
-  - 810a
-  - 815a
-  - 823a
-  - 830a
-  - 833a
-  - 835a
-  - 839a
-- - 829a
-  - 836a
-  - 841a
-  - 849a
-  - 856a
-  - 859a
-  - 901a
-  - 905a
-- - 910a
-  - 917a
-  - 922a
-  - 930a
-  - 936a
-  - 939a
-  - 941a
-  - 945a
-- - 948a
-  - 954a
-  - 959a
-  - 1005a
-  - 1011a
-  - 1014a
-  - 1016a
-  - 1020a
-- - 1048a
-  - 1054a
-  - 1059a
-  - 1105a
-  - 1111a
-  - 1114a
-  - 1116a
-  - 1120a
-- - 1148a
-  - 1154a
-  - 1159a
-  - 1205p
-  - 1211p
-  - 1214p
-  - 1216p
-  - 1220p
-- - 1248p
-  - 1254p
-  - 1259p
-  - 105p
-  - 111p
-  - 114p
-  - 116p
-  - 120p
-- - 148p
-  - 154p
-  - 159p
-  - 205p
-  - 211p
-  - 214p
-  - 216p
-  - 220p
-- - 248p
-  - 254p
-  - 259p
-  - 307p
-  - 315p
-  - 318p
-  - 320p
-  - 324p
-- - 303p
-  - 310p
-  - 315p
-  - 323p
-  - 331p
-  - 334p
-  - 336p
-  - 340p
-- - 333p
-  - 340p
-  - 345p
-  - 353p
-  - 401p
-  - 404p
-  - 406p
-  - 410p
-- - 403p
-  - 410p
-  - 415p
-  - 423p
-  - 431p
-  - 434p
-  - 436p
-  - 440p
-- - 433p
-  - 440p
-  - 445p
-  - 453p
-  - 501p
-  - 504p
-  - 506p
-  - 510p
-- - 503p
-  - 510p
-  - 515p
-  - 523p
-  - 531p
-  - 534p
-  - 536p
-  - 540p
-- - 533p
-  - 540p
-  - 545p
-  - 553p
-  - 601p
-  - 604p
-  - 606p
-  - 610p
-- - 603p
-  - 610p
-  - 615p
-  - 623p
-  - 631p
-  - 634p
-  - 636p
-  - 639p
-- - 648p
-  - 654p
-  - 659p
-  - 705p
-  - 710p
-  - 713p
-  - 715p
-  - 718p
-- - 748p
-  - 754p
-  - 759p
-  - 805p
-  - 810p
-  - 813p
-  - 815p
-  - 818p
-- - 848p
-  - 854p
-  - 859p
-  - 905p
-  - 910p
-  - 913p
-  - 915p
-  - 918p
-- - 948p
-  - 954p
-  - 959p
-  - 1005p
-  - 1010p
-  - 1013p
-  - 1015p
-  - 1018p
-- - 1048p
-  - 1054p
-  - 1059p
-  - 1105p
-  - 1110p
-  - 1113p
-  - 1115p
-  - 1118p
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - North Lyneham
-  - Gwydir Square Kaleen
-  - University of Canberra
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/39-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/39-to-city-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "39"
 stop_times: [["-", "-", "-", 549a, 555a, 601a, 606a, 610a, 617a], [609a, 615a, 618a, 624a, 630a, 636a, 641a, 645a, 652a], [639a, 645a, 648a, 654a, 700a, 706a, 711a, 715a, 722a], ["-", "-", "-", 707a, 713a, 719a, 724a, 728a, 741a], [703a, 709a, 712a, 718a, 724a, 730a, 736a, 742a, 757a], ["-", "-", "-", 726a, 732a, 738a, 744a, 750a, 805a], [718a, 724a, 727a, 734a, 740a, 746a, 752a, 758a, 813a], ["-", "-", "-", 742a, 748a, 754a, 800a, 806a, 821a], [733a, 739a, 742a, 749a, 755a, 801a, 807a, 813a, 828a], ["-", "-", "-", 756a, 802a, 808a, 814a, 820a, 835a], [748a, 754a, 757a, 804a, 810a, 816a, 822a, 828a, 843a], [758a, 804a, 807a, 814a, 820a, 826a, 832a, 838a, 853a], ["-", "-", "-", 824a, 830a, 836a, 842a, 848a, 903a], [818a, 824a, 827a, 834a, 840a, 846a, 852a, 858a, 913a], [833a, 839a, 842a, 849a, 855a, 901a, 907a, 913a, 928a], [910a, 916a, 919a, 924a, 930a, 935a, 940a, 943a, 949a], [940a, 946a, 949a, 954a, 1000a, 1005a, 1010a, 1013a, 1019a], [1010a, 1016a, 1019a, 1024a, 1030a, 1035a, 1040a, 1043a, 1049a], [1040a, 1046a, 1049a, 1054a, 1100a, 1105a, 1110a, 1113a, 1119a], [1110a, 1116a, 1119a, 1124a, 1130a, 1135a, 1140a, 1143a, 1149a], [1140a, 1146a, 1149a, 1154a, 1200p, 1205p, 1210p, 1213p, 1219p], [1210p, 1216p, 1219p, 1224p, 1230p, 1235p, 1240p, 1243p, 1249p], [1240p, 1246p, 1249p, 1254p, 100p, 105p, 110p, 113p, 119p], [110p, 116p, 119p, 124p, 130p, 135p, 140p, 143p, 149p], [140p, 146p, 149p, 154p, 200p, 205p, 210p, 213p, 219p], [210p, 216p, 219p, 224p, 230p, 235p, 240p, 243p, 249p], [240p, 246p, 249p, 254p, 300p, 307p, 313p, 317p, 324p], [309p, 315p, 318p, 324p, 330p, 337p, 343p, 347p, 354p], [328p, 334p, 337p, 343p, 349p, 356p, 402p, 406p, 413p], [358p, 404p, 407p, 413p, 419p, 426p, 432p, 436p, 443p], [417p, 423p, 426p, 432p, 438p, 445p, 451p, 455p, 502p], [432p, 438p, 441p, 447p, 453p, 500p, 506p, 510p, 517p], [447p, 453p, 456p, 502p, 508p, 515p, 521p, 525p, 532p], [506p, 512p, 515p, 521p, 527p, 534p, 540p, 544p, 551p], [512p, 518p, 521p, 527p, 533p, 540p, "-", "-", "-"], [521p, 527p, 530p, 536p, 542p, 549p, 555p, 559p, 606p], [536p, 542p, 545p, 551p, 557p, 604p, 610p, 614p, 621p], [546p, 552p, 555p, 601p, 607p, 614p, "-", "-", "-"], [555p, 601p, 604p, 610p, 616p, 623p, 629p, 632p, 638p], [610p, 616p, 619p, 625p, 631p, 636p, 641p, 644p, 650p], [710p, 716p, 719p, 724p, 730p, 735p, 740p, 743p, 749p], [810p, 816p, 819p, 824p, 830p, 835p, 840p, 843p, 849p], [910p, 916p, 919p, 924p, 930p, 935p, 940p, 943p, 949p], [1010p, 1016p, 1019p, 1024p, 1030p, 1035p, 1040p, 1043p, 1049p], [1110p, 1116p, 1119p, 1124p, 1130p, 1135p, "-", "-", "-"]]
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Dickson Shops/Antill St, Watson, Watson Terminus, Watson, Dickson Shops/Antill St, Macarthur / Northbourne, City Interchange]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Dickson Shops/Antill St, Watson, Watson Terminus, Watson, Dickson Shops/Antill St, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/4-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/4-to-city-interchange.stop_times.yml
@@ -1,240 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "4"
-stop_times: 
-- - 712a
-  - "-"
-  - 715a
-  - 722a
-  - 725a
-  - 729a
-  - 734a
-  - 743a
-- - 743a
-  - "-"
-  - 746a
-  - 755a
-  - 759a
-  - 804a
-  - 809a
-  - 818a
-- - 817a
-  - "-"
-  - 820a
-  - 829a
-  - 833a
-  - 838a
-  - 843a
-  - 852a
-- - 847a
-  - "-"
-  - 850a
-  - 859a
-  - 903a
-  - 908a
-  - 913a
-  - 922a
-- - 917a
-  - "-"
-  - 920a
-  - 929a
-  - 932a
-  - 936a
-  - 940a
-  - 948a
-- - 946a
-  - "-"
-  - 949a
-  - 956a
-  - 959a
-  - 1003a
-  - 1007a
-  - 1015a
-- - 1013a
-  - "-"
-  - 1016a
-  - 1023a
-  - 1026a
-  - 1030a
-  - 1034a
-  - 1042a
-- - 1043a
-  - "-"
-  - 1046a
-  - 1053a
-  - 1056a
-  - 1100a
-  - 1104a
-  - 1112a
-- - 1113a
-  - "-"
-  - 1116a
-  - 1123a
-  - 1126a
-  - 1130a
-  - 1134a
-  - 1142a
-- - 1143a
-  - "-"
-  - 1146a
-  - 1153a
-  - 1156a
-  - 1200p
-  - 1204p
-  - 1212p
-- - 1213p
-  - "-"
-  - 1216p
-  - 1223p
-  - 1226p
-  - 1230p
-  - 1234p
-  - 1242p
-- - 1243p
-  - "-"
-  - 1246p
-  - 1253p
-  - 1256p
-  - 100p
-  - 104p
-  - 112p
-- - 113p
-  - "-"
-  - 116p
-  - 123p
-  - 126p
-  - 130p
-  - 134p
-  - 142p
-- - 143p
-  - "-"
-  - 146p
-  - 153p
-  - 156p
-  - 200p
-  - 204p
-  - 212p
-- - 213p
-  - "-"
-  - 216p
-  - 223p
-  - 226p
-  - 230p
-  - 234p
-  - 242p
-- - 243p
-  - "-"
-  - 246p
-  - 253p
-  - 256p
-  - 300p
-  - 305p
-  - 314p
-- - 313p
-  - "-"
-  - 316p
-  - 325p
-  - 329p
-  - 334p
-  - 339p
-  - 348p
-- - 346p
-  - "-"
-  - 349p
-  - 358p
-  - 402p
-  - 407p
-  - 412p
-  - 421p
-- - 416p
-  - "-"
-  - 419p
-  - 428p
-  - 432p
-  - 437p
-  - 442p
-  - 451p
-- - 446p
-  - "-"
-  - 449p
-  - 456p
-  - 500p
-  - 505p
-  - 510p
-  - 521p
-- - 516p
-  - "-"
-  - 519p
-  - 528p
-  - 532p
-  - 537p
-  - 542p
-  - 551p
-- - 546p
-  - "-"
-  - 549p
-  - 558p
-  - 602p
-  - 607p
-  - 612p
-  - 621p
-- - "-"
-  - 616p
-  - 619p
-  - 628p
-  - 632p
-  - 636p
-  - 640p
-  - 648p
-- - "-"
-  - 709p
-  - 712p
-  - 717p
-  - 720p
-  - 724p
-  - 728p
-  - 736p
-- - "-"
-  - 809p
-  - 812p
-  - 817p
-  - 820p
-  - 824p
-  - 828p
-  - 836p
-- - "-"
-  - 909p
-  - 912p
-  - 917p
-  - 920p
-  - 924p
-  - 928p
-  - 936p
-- - "-"
-  - 1009p
-  - 1012p
-  - 1017p
-  - 1020p
-  - 1024p
-  - 1028p
-  - 1036p
-- - "-"
-  - 1109p
-  - 1112p
-  - 1117p
-  - 1120p
-  - 1124p
-  - 1128p
-  - 1136p
-time_points: 
-  - Geoscience Australia
-  - Narrabundah Terminus
-  - Narrabundah College
-  - Manuka/Captain Cook
-  - Kingston
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange
+stop_times: [[712a, "-", 715a, 722a, 725a, 729a, 734a, 743a], [743a, "-", 746a, 755a, 759a, 804a, 809a, 818a], [817a, "-", 820a, 829a, 833a, 838a, 843a, 852a], [847a, "-", 850a, 859a, 903a, 908a, 913a, 922a], [917a, "-", 920a, 929a, 932a, 936a, 940a, 948a], [946a, "-", 949a, 956a, 959a, 1003a, 1007a, 1015a], [1013a, "-", 1016a, 1023a, 1026a, 1030a, 1034a, 1042a], [1043a, "-", 1046a, 1053a, 1056a, 1100a, 1104a, 1112a], [1113a, "-", 1116a, 1123a, 1126a, 1130a, 1134a, 1142a], [1143a, "-", 1146a, 1153a, 1156a, 1200p, 1204p, 1212p], [1213p, "-", 1216p, 1223p, 1226p, 1230p, 1234p, 1242p], [1243p, "-", 1246p, 1253p, 1256p, 100p, 104p, 112p], [113p, "-", 116p, 123p, 126p, 130p, 134p, 142p], [143p, "-", 146p, 153p, 156p, 200p, 204p, 212p], [213p, "-", 216p, 223p, 226p, 230p, 234p, 242p], [243p, "-", 246p, 253p, 256p, 300p, 305p, 314p], [313p, "-", 316p, 325p, 329p, 334p, 339p, 348p], [346p, "-", 349p, 358p, 402p, 407p, 412p, 421p], [416p, "-", 419p, 428p, 432p, 437p, 442p, 451p], [446p, "-", 449p, 456p, 500p, 505p, 510p, 521p], [516p, "-", 519p, 528p, 532p, 537p, 542p, 551p], [546p, "-", 549p, 558p, 602p, 607p, 612p, 621p], ["-", 616p, 619p, 628p, 632p, 636p, 640p, 648p], ["-", 709p, 712p, 717p, 720p, 724p, 728p, 736p], ["-", 809p, 812p, 817p, 820p, 824p, 828p, 836p], ["-", 909p, 912p, 917p, 920p, 924p, 928p, 936p], ["-", 1009p, 1012p, 1017p, 1020p, 1024p, 1028p, 1036p], ["-", 1109p, 1112p, 1117p, 1120p, 1124p, 1128p, 1136p]]
+time_points: [Geoscience Australia, Narrabundah Terminus, Narrabundah College, Manuka/Captain Cook, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/4-to-geoscience-australia.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/4-to-geoscience-australia.stop_times.yml
@@ -1,256 +1,8 @@
 --- 
 long_name: To Geoscience Australia
-between_stops: []
+between_stops: {}
 
 short_name: "4"
-stop_times: 
-- - 637a
-  - 645a
-  - 649a
-  - 653a
-  - 656a
-  - 704a
-  - "-"
-  - 707a
-- - 707a
-  - 715a
-  - 719a
-  - 723a
-  - 726a
-  - 735a
-  - "-"
-  - 738a
-- - 737a
-  - 746a
-  - 751a
-  - 756a
-  - 759a
-  - 809a
-  - "-"
-  - 812a
-- - 807a
-  - 816a
-  - 821a
-  - 826a
-  - 829a
-  - 839a
-  - "-"
-  - 842a
-- - 821a
-  - 830a
-  - 835a
-  - 840a
-  - 843a
-  - 853a
-  - "-"
-  - 856a
-- - 837a
-  - 846a
-  - 851a
-  - 856a
-  - 859a
-  - 909a
-  - "-"
-  - 912a
-- - 907a
-  - 916a
-  - 921a
-  - 926a
-  - 929a
-  - 938a
-  - "-"
-  - 941a
-- - 937a
-  - 945a
-  - 949a
-  - 953a
-  - 956a
-  - 1005a
-  - "-"
-  - 1008a
-- - 1007a
-  - 1015a
-  - 1019a
-  - 1023a
-  - 1026a
-  - 1035a
-  - "-"
-  - 1038a
-- - 1037a
-  - 1045a
-  - 1049a
-  - 1053a
-  - 1056a
-  - 1105a
-  - "-"
-  - 1108a
-- - 1107a
-  - 1115a
-  - 1119a
-  - 1123a
-  - 1126a
-  - 1135a
-  - "-"
-  - 1138a
-- - 1137a
-  - 1145a
-  - 1149a
-  - 1153a
-  - 1156a
-  - 1205p
-  - "-"
-  - 1208p
-- - 1207p
-  - 1215p
-  - 1219p
-  - 1223p
-  - 1226p
-  - 1235p
-  - "-"
-  - 1238p
-- - 1237p
-  - 1245p
-  - 1249p
-  - 1253p
-  - 1256p
-  - 105p
-  - "-"
-  - 108p
-- - 107p
-  - 115p
-  - 119p
-  - 123p
-  - 126p
-  - 135p
-  - "-"
-  - 138p
-- - 137p
-  - 145p
-  - 149p
-  - 153p
-  - 156p
-  - 205p
-  - "-"
-  - 208p
-- - 207p
-  - 215p
-  - 219p
-  - 223p
-  - 226p
-  - 235p
-  - "-"
-  - 238p
-- - 237p
-  - 245p
-  - 249p
-  - 253p
-  - 256p
-  - 305p
-  - "-"
-  - 308p
-- - 307p
-  - 316p
-  - 321p
-  - 326p
-  - 329p
-  - 338p
-  - "-"
-  - 341p
-- - 337p
-  - 346p
-  - 351p
-  - 356p
-  - 359p
-  - 408p
-  - "-"
-  - 411p
-- - 407p
-  - 416p
-  - 421p
-  - 426p
-  - 429p
-  - 438p
-  - "-"
-  - 441p
-- - 437p
-  - 446p
-  - 451p
-  - 456p
-  - 459p
-  - 508p
-  - "-"
-  - 511p
-- - 507p
-  - 516p
-  - 521p
-  - 526p
-  - 529p
-  - 538p
-  - "-"
-  - 541p
-- - 537p
-  - 546p
-  - 551p
-  - 556p
-  - 559p
-  - 608p
-  - 611p
-  - "-"
-- - 637p
-  - 645p
-  - 649p
-  - 653p
-  - 656p
-  - 701p
-  - 704p
-  - "-"
-- - 737p
-  - 745p
-  - 749p
-  - 753p
-  - 756p
-  - 801p
-  - 804p
-  - "-"
-- - 837p
-  - 845p
-  - 849p
-  - 853p
-  - 856p
-  - 901p
-  - 904p
-  - "-"
-- - 937p
-  - 945p
-  - 949p
-  - 953p
-  - 956p
-  - 1001p
-  - 1004p
-  - "-"
-- - 1037p
-  - 1045p
-  - 1049p
-  - 1053p
-  - 1056p
-  - 1101p
-  - 1104p
-  - "-"
-- - 1137p
-  - 1145p
-  - 1149p
-  - 1153p
-  - 1156p
-  - 1201a
-  - 1204a
-  - "-"
-time_points: 
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Manuka/Captain Cook
-  - Narrabundah College
-  - Narrabundah Terminus
-  - Geoscience Australia
+stop_times: [[637a, 645a, 649a, 653a, 656a, 704a, "-", 707a], [707a, 715a, 719a, 723a, 726a, 735a, "-", 738a], [737a, 746a, 751a, 756a, 759a, 809a, "-", 812a], [807a, 816a, 821a, 826a, 829a, 839a, "-", 842a], [821a, 830a, 835a, 840a, 843a, 853a, "-", 856a], [837a, 846a, 851a, 856a, 859a, 909a, "-", 912a], [907a, 916a, 921a, 926a, 929a, 938a, "-", 941a], [937a, 945a, 949a, 953a, 956a, 1005a, "-", 1008a], [1007a, 1015a, 1019a, 1023a, 1026a, 1035a, "-", 1038a], [1037a, 1045a, 1049a, 1053a, 1056a, 1105a, "-", 1108a], [1107a, 1115a, 1119a, 1123a, 1126a, 1135a, "-", 1138a], [1137a, 1145a, 1149a, 1153a, 1156a, 1205p, "-", 1208p], [1207p, 1215p, 1219p, 1223p, 1226p, 1235p, "-", 1238p], [1237p, 1245p, 1249p, 1253p, 1256p, 105p, "-", 108p], [107p, 115p, 119p, 123p, 126p, 135p, "-", 138p], [137p, 145p, 149p, 153p, 156p, 205p, "-", 208p], [207p, 215p, 219p, 223p, 226p, 235p, "-", 238p], [237p, 245p, 249p, 253p, 256p, 305p, "-", 308p], [307p, 316p, 321p, 326p, 329p, 338p, "-", 341p], [337p, 346p, 351p, 356p, 359p, 408p, "-", 411p], [407p, 416p, 421p, 426p, 429p, 438p, "-", 441p], [437p, 446p, 451p, 456p, 459p, 508p, "-", 511p], [507p, 516p, 521p, 526p, 529p, 538p, "-", 541p], [537p, 546p, 551p, 556p, 559p, 608p, 611p, "-"], [637p, 645p, 649p, 653p, 656p, 701p, 704p, "-"], [737p, 745p, 749p, 753p, 756p, 801p, 804p, "-"], [837p, 845p, 849p, 853p, 856p, 901p, 904p, "-"], [937p, 945p, 949p, 953p, 956p, 1001p, 1004p, "-"], [1037p, 1045p, 1049p, 1053p, 1056p, 1101p, 1104p, "-"], [1137p, 1145p, 1149p, 1153p, 1156p, 1201a, 1204a, "-"]]
+time_points: [City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Kingston, Manuka/Captain Cook, Narrabundah College, Narrabundah Terminus, Geoscience Australia]
 

--- a/maxious-canberra-transit-feed/output/43-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/43-to-cameron-ave-station.stop_times.yml
@@ -1,338 +1,11 @@
 --- 
 long_name: To Cameron Ave Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 5)-Cohen St Bus Station (Platform 5): []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 5): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "43"
+stop_times: [["-", "-", "-", "-", 622a, 629a, 638a, 643a, 648a, 650a, 654a], ["-", "-", "-", "-", 641a, 648a, 657a, 702a, 707a, 709a, 713a], [645a, 647a, 651a, 656a, 701a, 708a, 717a, 722a, 727a, 729a, 733a], ["-", "-", "-", "-", 721a, 728a, 739a, 744a, 752a, 754a, 758a], ["-", "-", "-", "-", 742a, 749a, 800a, 805a, 813a, 815a, 819a], ["-", "-", "-", "-", 803a, 810a, 821a, 826a, 834a, 836a, 840a], ["-", "-", "-", "-", 825a, 832a, 843a, 848a, 856a, 858a, 902a], [824a, 826a, 830a, 838a, 843a, 850a, 901a, 906a, 914a, 916a, 920a], [844a, 846a, 850a, 858a, 903a, 910a, 921a, 926a, 933a, 935a, 939a], [904a, 906a, 910a, 918a, 923a, 930a, 939a, 944a, 950a, 952a, 956a], [1004a, 1006a, 1010a, 1016a, 1021a, 1028a, 1037a, 1042a, 1048a, 1050a, 1054a], [1104a, 1106a, 1110a, 1116a, 1121a, 1128a, 1137a, 1142a, 1148a, 1150a, 1154a], [1204p, 1206p, 1210p, 1216p, 1221p, 1228p, 1237p, 1242p, 1248p, 1250p, 1254p], [104p, 106p, 110p, 116p, 121p, 128p, 137p, 142p, 148p, 150p, 154p], [204p, 206p, 210p, 216p, 221p, 228p, 237p, 242p, 248p, 250p, 254p], [255p, 257p, 301p, 309p, 314p, 321p, 332p, 337p, 345p, 347p, 351p], [324p, 326p, 330p, 338p, 343p, 350p, 401p, 406p, 414p, 416p, 420p], [344p, 346p, 350p, 358p, 403p, 410p, 421p, 426p, 434p, 436p, 440p], [404p, 406p, 410p, 418p, 423p, 430p, 441p, 446p, 454p, 456p, 500p], [424p, 426p, 430p, 438p, 443p, 450p, 501p, 506p, 514p, 516p, 520p], [444p, 446p, 450p, 458p, 503p, 510p, 521p, 526p, 534p, 536p, 540p], [504p, 506p, 510p, 518p, 523p, 530p, 541p, 546p, 554p, 556p, 600p], [524p, 526p, 530p, 538p, 543p, 550p, 601p, 606p, 614p, 616p, 620p], [604p, 606p, 610p, 618p, 623p, 629p, 639p, 644p, 649p, 651p, 654p], [704p, 706p, 709p, 714p, 719p, 726p, 735p, 740p, 745p, 747p, 750p], [804p, 806p, 809p, 814p, 819p, 826p, 835p, 840p, 845p, 847p, 850p], [904p, 906p, 909p, 914p, 919p, 926p, 935p, 940p, 945p, 947p, 950p], [1004p, 1006p, 1009p, 1014p, 1019p, 1026p, 1035p, 1040p, 1045p, 1047p, 1050p], [1104p, 1106p, 1109p, 1114p, 1119p, 1126p, 1135p, "-", "-", "-", "-"]]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 5), Cohen St Bus Station (Platform 5), Kippax, Macgregor Shops, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "43"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 622a
-  - 629a
-  - 638a
-  - 643a
-  - 648a
-  - 650a
-  - 654a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 641a
-  - 648a
-  - 657a
-  - 702a
-  - 707a
-  - 709a
-  - 713a
-- - 645a
-  - 647a
-  - 651a
-  - 656a
-  - 701a
-  - 708a
-  - 717a
-  - 722a
-  - 727a
-  - 729a
-  - 733a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 721a
-  - 728a
-  - 739a
-  - 744a
-  - 752a
-  - 754a
-  - 758a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 742a
-  - 749a
-  - 800a
-  - 805a
-  - 813a
-  - 815a
-  - 819a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 803a
-  - 810a
-  - 821a
-  - 826a
-  - 834a
-  - 836a
-  - 840a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 825a
-  - 832a
-  - 843a
-  - 848a
-  - 856a
-  - 858a
-  - 902a
-- - 824a
-  - 826a
-  - 830a
-  - 838a
-  - 843a
-  - 850a
-  - 901a
-  - 906a
-  - 914a
-  - 916a
-  - 920a
-- - 844a
-  - 846a
-  - 850a
-  - 858a
-  - 903a
-  - 910a
-  - 921a
-  - 926a
-  - 933a
-  - 935a
-  - 939a
-- - 904a
-  - 906a
-  - 910a
-  - 918a
-  - 923a
-  - 930a
-  - 939a
-  - 944a
-  - 950a
-  - 952a
-  - 956a
-- - 1004a
-  - 1006a
-  - 1010a
-  - 1016a
-  - 1021a
-  - 1028a
-  - 1037a
-  - 1042a
-  - 1048a
-  - 1050a
-  - 1054a
-- - 1104a
-  - 1106a
-  - 1110a
-  - 1116a
-  - 1121a
-  - 1128a
-  - 1137a
-  - 1142a
-  - 1148a
-  - 1150a
-  - 1154a
-- - 1204p
-  - 1206p
-  - 1210p
-  - 1216p
-  - 1221p
-  - 1228p
-  - 1237p
-  - 1242p
-  - 1248p
-  - 1250p
-  - 1254p
-- - 104p
-  - 106p
-  - 110p
-  - 116p
-  - 121p
-  - 128p
-  - 137p
-  - 142p
-  - 148p
-  - 150p
-  - 154p
-- - 204p
-  - 206p
-  - 210p
-  - 216p
-  - 221p
-  - 228p
-  - 237p
-  - 242p
-  - 248p
-  - 250p
-  - 254p
-- - 255p
-  - 257p
-  - 301p
-  - 309p
-  - 314p
-  - 321p
-  - 332p
-  - 337p
-  - 345p
-  - 347p
-  - 351p
-- - 324p
-  - 326p
-  - 330p
-  - 338p
-  - 343p
-  - 350p
-  - 401p
-  - 406p
-  - 414p
-  - 416p
-  - 420p
-- - 344p
-  - 346p
-  - 350p
-  - 358p
-  - 403p
-  - 410p
-  - 421p
-  - 426p
-  - 434p
-  - 436p
-  - 440p
-- - 404p
-  - 406p
-  - 410p
-  - 418p
-  - 423p
-  - 430p
-  - 441p
-  - 446p
-  - 454p
-  - 456p
-  - 500p
-- - 424p
-  - 426p
-  - 430p
-  - 438p
-  - 443p
-  - 450p
-  - 501p
-  - 506p
-  - 514p
-  - 516p
-  - 520p
-- - 444p
-  - 446p
-  - 450p
-  - 458p
-  - 503p
-  - 510p
-  - 521p
-  - 526p
-  - 534p
-  - 536p
-  - 540p
-- - 504p
-  - 506p
-  - 510p
-  - 518p
-  - 523p
-  - 530p
-  - 541p
-  - 546p
-  - 554p
-  - 556p
-  - 600p
-- - 524p
-  - 526p
-  - 530p
-  - 538p
-  - 543p
-  - 550p
-  - 601p
-  - 606p
-  - 614p
-  - 616p
-  - 620p
-- - 604p
-  - 606p
-  - 610p
-  - 618p
-  - 623p
-  - 629p
-  - 639p
-  - 644p
-  - 649p
-  - 651p
-  - 654p
-- - 704p
-  - 706p
-  - 709p
-  - 714p
-  - 719p
-  - 726p
-  - 735p
-  - 740p
-  - 745p
-  - 747p
-  - 750p
-- - 804p
-  - 806p
-  - 809p
-  - 814p
-  - 819p
-  - 826p
-  - 835p
-  - 840p
-  - 845p
-  - 847p
-  - 850p
-- - 904p
-  - 906p
-  - 909p
-  - 914p
-  - 919p
-  - 926p
-  - 935p
-  - 940p
-  - 945p
-  - 947p
-  - 950p
-- - 1004p
-  - 1006p
-  - 1009p
-  - 1014p
-  - 1019p
-  - 1026p
-  - 1035p
-  - 1040p
-  - 1045p
-  - 1047p
-  - 1050p
-- - 1104p
-  - 1106p
-  - 1109p
-  - 1114p
-  - 1119p
-  - 1126p
-  - 1135p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 5
-  - Cohen St Bus Station - Platform 5
-  - Kippax
-  - Macgregor Shops
-  - Charnwood
-  - Macgregor Shops
-  - Kippax
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-

--- a/maxious-canberra-transit-feed/output/44-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/44-to-cameron-ave-station.stop_times.yml
@@ -1,197 +1,9 @@
 --- 
 long_name: To Cameron Ave Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "44"
+stop_times: [[605a, 607a, 615a, 620a, 625a, 627a, 631a], [638a, 640a, 648a, 653a, 658a, 700a, 704a], [705a, 707a, 715a, 720a, 725a, 727a, 731a], ["-", "-", 732a, 739a, 745a, 747a, 751a], [738a, 741a, 750a, 757a, 803a, 805a, 809a], [807a, 810a, 819a, 826a, 832a, 834a, 838a], [842a, 845a, 854a, 901a, 907a, 909a, 913a], [912a, 915a, 924a, 931a, 937a, 939a, 943a], [937a, 939a, 948a, 954a, 1000a, 1002a, 1006a], [1037a, 1039a, 1048a, 1054a, 1100a, 1102a, 1106a], [1137a, 1139a, 1148a, 1154a, 1200p, 1202p, 1206p], [1237p, 1239p, 1248p, 1254p, 100p, 102p, 106p], [137p, 139p, 148p, 154p, 200p, 202p, 206p], [237p, 239p, 248p, 254p, 300p, 302p, 306p], [313p, 315p, 324p, 331p, 337p, 339p, 343p], [347p, 349p, 358p, 405p, 411p, 413p, 417p], [418p, 420p, 429p, 436p, 442p, 444p, 448p], [452p, 454p, 503p, 510p, 516p, 518p, 522p], [523p, 525p, 534p, 541p, 547p, 549p, 553p], [557p, 559p, 608p, 615p, 621p, 623p, 627p], [628p, 630p, 639p, 645p, 650p, 652p, 655p], [642p, 644p, 653p, 659p, 704p, 706p, 709p], [737p, 739p, 748p, 754p, 759p, 801p, 804p], [837p, 839p, 848p, 854p, 859p, 901p, 904p], [937p, 939p, 948p, 954p, 959p, 1001p, 1004p], [1037p, 1039p, 1048p, 1054p, 1059p, 1101p, 1104p]]
+time_points: [Kippax Centre, Holt, Higgins, Belconnen Way, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "44"
-stop_times: 
-- - 605a
-  - 607a
-  - 615a
-  - 620a
-  - 625a
-  - 627a
-  - 631a
-- - 638a
-  - 640a
-  - 648a
-  - 653a
-  - 658a
-  - 700a
-  - 704a
-- - 705a
-  - 707a
-  - 715a
-  - 720a
-  - 725a
-  - 727a
-  - 731a
-- - "-"
-  - "-"
-  - 732a
-  - 739a
-  - 745a
-  - 747a
-  - 751a
-- - 738a
-  - 741a
-  - 750a
-  - 757a
-  - 803a
-  - 805a
-  - 809a
-- - 807a
-  - 810a
-  - 819a
-  - 826a
-  - 832a
-  - 834a
-  - 838a
-- - 842a
-  - 845a
-  - 854a
-  - 901a
-  - 907a
-  - 909a
-  - 913a
-- - 912a
-  - 915a
-  - 924a
-  - 931a
-  - 937a
-  - 939a
-  - 943a
-- - 937a
-  - 939a
-  - 948a
-  - 954a
-  - 1000a
-  - 1002a
-  - 1006a
-- - 1037a
-  - 1039a
-  - 1048a
-  - 1054a
-  - 1100a
-  - 1102a
-  - 1106a
-- - 1137a
-  - 1139a
-  - 1148a
-  - 1154a
-  - 1200p
-  - 1202p
-  - 1206p
-- - 1237p
-  - 1239p
-  - 1248p
-  - 1254p
-  - 100p
-  - 102p
-  - 106p
-- - 137p
-  - 139p
-  - 148p
-  - 154p
-  - 200p
-  - 202p
-  - 206p
-- - 237p
-  - 239p
-  - 248p
-  - 254p
-  - 300p
-  - 302p
-  - 306p
-- - 313p
-  - 315p
-  - 324p
-  - 331p
-  - 337p
-  - 339p
-  - 343p
-- - 347p
-  - 349p
-  - 358p
-  - 405p
-  - 411p
-  - 413p
-  - 417p
-- - 418p
-  - 420p
-  - 429p
-  - 436p
-  - 442p
-  - 444p
-  - 448p
-- - 452p
-  - 454p
-  - 503p
-  - 510p
-  - 516p
-  - 518p
-  - 522p
-- - 523p
-  - 525p
-  - 534p
-  - 541p
-  - 547p
-  - 549p
-  - 553p
-- - 557p
-  - 559p
-  - 608p
-  - 615p
-  - 621p
-  - 623p
-  - 627p
-- - 628p
-  - 630p
-  - 639p
-  - 645p
-  - 650p
-  - 652p
-  - 655p
-- - 642p
-  - 644p
-  - 653p
-  - 659p
-  - 704p
-  - 706p
-  - 709p
-- - 737p
-  - 739p
-  - 748p
-  - 754p
-  - 759p
-  - 801p
-  - 804p
-- - 837p
-  - 839p
-  - 848p
-  - 854p
-  - 859p
-  - 901p
-  - 904p
-- - 937p
-  - 939p
-  - 948p
-  - 954p
-  - 959p
-  - 1001p
-  - 1004p
-- - 1037p
-  - 1039p
-  - 1048p
-  - 1054p
-  - 1059p
-  - 1101p
-  - 1104p
-time_points: 
-  - Kippax Centre
-  - Holt
-  - Higgins
-  - Belconnen Way
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-

--- a/maxious-canberra-transit-feed/output/44-to-kippax-centre.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/44-to-kippax-centre.stop_times.yml
@@ -1,155 +1,9 @@
 --- 
 long_name: To Kippax Centre
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 5)-Cohen St Bus Station (Platform 5): []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 5): []
+short_name: "44"
+stop_times: [[734a, 736a, 740a, 746a, 753a, 802a, 804a], [803a, 805a, 809a, 815a, 822a, 831a, 833a], [903a, 905a, 909a, 915a, 922a, 931a, 933a], [1003a, 1005a, 1009a, 1014a, 1020a, 1030a, 1032a], [1103a, 1105a, 1109a, 1114a, 1120a, 1130a, 1132a], [1203p, 1205p, 1209p, 1214p, 1220p, 1230p, 1232p], [103p, 105p, 109p, 114p, 120p, 130p, 132p], [203p, 205p, 209p, 214p, 220p, 230p, 232p], [313p, 315p, 319p, 325p, 332p, 341p, 344p], [345p, 347p, 351p, 357p, 404p, 413p, 416p], [419p, 421p, 425p, 431p, 438p, 447p, 450p], [450p, 452p, 456p, 502p, 509p, 518p, 521p], [524p, 526p, 530p, 536p, 543p, 552p, 555p], [555p, 557p, 601p, 607p, 614p, 623p, 626p], [629p, 631p, 634p, 639p, 645p, 655p, 657p], [703p, 705p, 708p, 713p, 719p, 729p, 731p], [803p, 805p, 808p, 813p, 819p, 829p, 831p], [903p, 905p, 908p, 913p, 919p, 929p, 931p], [1003p, 1005p, 1008p, 1013p, 1019p, 1029p, 1031p], [1103p, 1105p, 1108p, 1113p, 1119p, 1129p, 1131p]]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 5), Cohen St Bus Station (Platform 5), Belconnen Way, Higgins, Holt, Kippax Centre]
 
-short_name: "44"
-stop_times: 
-- - 734a
-  - 736a
-  - 740a
-  - 746a
-  - 753a
-  - 802a
-  - 804a
-- - 803a
-  - 805a
-  - 809a
-  - 815a
-  - 822a
-  - 831a
-  - 833a
-- - 903a
-  - 905a
-  - 909a
-  - 915a
-  - 922a
-  - 931a
-  - 933a
-- - 1003a
-  - 1005a
-  - 1009a
-  - 1014a
-  - 1020a
-  - 1030a
-  - 1032a
-- - 1103a
-  - 1105a
-  - 1109a
-  - 1114a
-  - 1120a
-  - 1130a
-  - 1132a
-- - 1203p
-  - 1205p
-  - 1209p
-  - 1214p
-  - 1220p
-  - 1230p
-  - 1232p
-- - 103p
-  - 105p
-  - 109p
-  - 114p
-  - 120p
-  - 130p
-  - 132p
-- - 203p
-  - 205p
-  - 209p
-  - 214p
-  - 220p
-  - 230p
-  - 232p
-- - 313p
-  - 315p
-  - 319p
-  - 325p
-  - 332p
-  - 341p
-  - 344p
-- - 345p
-  - 347p
-  - 351p
-  - 357p
-  - 404p
-  - 413p
-  - 416p
-- - 419p
-  - 421p
-  - 425p
-  - 431p
-  - 438p
-  - 447p
-  - 450p
-- - 450p
-  - 452p
-  - 456p
-  - 502p
-  - 509p
-  - 518p
-  - 521p
-- - 524p
-  - 526p
-  - 530p
-  - 536p
-  - 543p
-  - 552p
-  - 555p
-- - 555p
-  - 557p
-  - 601p
-  - 607p
-  - 614p
-  - 623p
-  - 626p
-- - 629p
-  - 631p
-  - 634p
-  - 639p
-  - 645p
-  - 655p
-  - 657p
-- - 703p
-  - 705p
-  - 708p
-  - 713p
-  - 719p
-  - 729p
-  - 731p
-- - 803p
-  - 805p
-  - 808p
-  - 813p
-  - 819p
-  - 829p
-  - 831p
-- - 903p
-  - 905p
-  - 908p
-  - 913p
-  - 919p
-  - 929p
-  - 931p
-- - 1003p
-  - 1005p
-  - 1008p
-  - 1013p
-  - 1019p
-  - 1029p
-  - 1031p
-- - 1103p
-  - 1105p
-  - 1108p
-  - 1113p
-  - 1119p
-  - 1129p
-  - 1131p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 5
-  - Cohen St Bus Station - Platform 5
-  - Belconnen Way
-  - Higgins
-  - Holt
-  - Kippax Centre
-

--- a/maxious-canberra-transit-feed/output/45-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/45-to-cohen-st-station.stop_times.yml
@@ -1,372 +1,11 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "45"
+stop_times: [["-", "-", "-", "-", "-", 627a, 631a, 637a, 639a, 647a, 654a, 656a, 700a], ["-", "-", "-", "-", "-", 657a, 701a, 707a, 709a, 717a, 724a, 726a, 730a], ["-", "-", "-", "-", "-", 729a, 733a, 739a, 741a, 749a, 756a, 758a, 802a], ["-", "-", "-", "-", "-", 759a, 803a, 809a, 811a, 819a, 826a, 828a, 832a], ["-", "-", "-", "-", "-", 822a, 826a, 832a, 834a, 842a, 849a, 851a, 855a], ["-", "-", "-", "-", "-", 844a, 848a, 854a, 856a, 904a, 911a, 913a, 917a], [832a, 834a, 838a, 846a, 854a, 856a, 900a, 906a, 908a, 916a, 923a, 925a, 929a], [902a, 904a, 908a, 916a, 924a, 926a, 930a, 936a, 938a, 946a, 953a, 955a, 959a], [925a, 927a, 931a, 939a, 947a, 949a, 953a, 959a, 1001a, 1009a, 1016a, 1018a, 1022a], [1025a, 1027a, 1031a, 1039a, 1047a, 1049a, 1053a, 1059a, 1101a, 1109a, 1116a, 1118a, 1122a], [1125a, 1127a, 1131a, 1139a, 1147a, 1149a, 1153a, 1159a, 1201p, 1209p, 1216p, 1218p, 1222p], [1225p, 1227p, 1231p, 1239p, 1247p, 1249p, 1253p, 1259p, 101p, 109p, 116p, 118p, 122p], [125p, 127p, 131p, 139p, 147p, 149p, 153p, 159p, 201p, 209p, 216p, 218p, 222p], [225p, 227p, 231p, 239p, 247p, 249p, 253p, 259p, 301p, 309p, 316p, 318p, 322p], [302p, 304p, 308p, 316p, 324p, 326p, 330p, 336p, 338p, 346p, 353p, 355p, 359p], [332p, 334p, 338p, 346p, 354p, 356p, 400p, 406p, 408p, 416p, 423p, 425p, 429p], [402p, 404p, 408p, 416p, 424p, 426p, 430p, 436p, 438p, 446p, 453p, 455p, 459p], [432p, 434p, 438p, 446p, 454p, 456p, 500p, 506p, 508p, 516p, 523p, 525p, 529p], [502p, 504p, 508p, 516p, 524p, 526p, 530p, 536p, 538p, 546p, 553p, 555p, 559p], [532p, 534p, 538p, 546p, 554p, 556p, 600p, 606p, 608p, 616p, 623p, 625p, 629p], [602p, 604p, 608p, 616p, 624p, 626p, 630p, 636p, 638p, 646p, 652p, 654p, 657p], [625p, 627p, 631p, 638p, 646p, 648p, 652p, 658p, 700p, 708p, 714p, 716p, 719p], [725p, 727p, 730p, 737p, 745p, 747p, 751p, 757p, 759p, 807p, 813p, 815p, 818p], [825p, 827p, 830p, 837p, 845p, 847p, 851p, 857p, 859p, 907p, 913p, 915p, 918p], [925p, 927p, 930p, 937p, 945p, 947p, 951p, 957p, 959p, 1007p, 1013p, 1015p, 1018p], [1025p, 1027p, 1030p, 1037p, 1045p, 1047p, 1051p, 1057p, 1059p, 1107p, 1113p, 1115p, 1118p], [1125p, 1127p, 1130p, 1137p, 1145p, 1147p, 1151p, 1157p, "-", "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 2), Copland College, Cnr Tillyard Dr & Spalding St, Charnwood, Cnr Kerrigan/Lhotsky, Charnwood, Cnr Tillyard Dr & Spalding St, Copland College, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "45"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 627a
-  - 631a
-  - 637a
-  - 639a
-  - 647a
-  - 654a
-  - 656a
-  - 700a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 657a
-  - 701a
-  - 707a
-  - 709a
-  - 717a
-  - 724a
-  - 726a
-  - 730a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 729a
-  - 733a
-  - 739a
-  - 741a
-  - 749a
-  - 756a
-  - 758a
-  - 802a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 759a
-  - 803a
-  - 809a
-  - 811a
-  - 819a
-  - 826a
-  - 828a
-  - 832a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 822a
-  - 826a
-  - 832a
-  - 834a
-  - 842a
-  - 849a
-  - 851a
-  - 855a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 844a
-  - 848a
-  - 854a
-  - 856a
-  - 904a
-  - 911a
-  - 913a
-  - 917a
-- - 832a
-  - 834a
-  - 838a
-  - 846a
-  - 854a
-  - 856a
-  - 900a
-  - 906a
-  - 908a
-  - 916a
-  - 923a
-  - 925a
-  - 929a
-- - 902a
-  - 904a
-  - 908a
-  - 916a
-  - 924a
-  - 926a
-  - 930a
-  - 936a
-  - 938a
-  - 946a
-  - 953a
-  - 955a
-  - 959a
-- - 925a
-  - 927a
-  - 931a
-  - 939a
-  - 947a
-  - 949a
-  - 953a
-  - 959a
-  - 1001a
-  - 1009a
-  - 1016a
-  - 1018a
-  - 1022a
-- - 1025a
-  - 1027a
-  - 1031a
-  - 1039a
-  - 1047a
-  - 1049a
-  - 1053a
-  - 1059a
-  - 1101a
-  - 1109a
-  - 1116a
-  - 1118a
-  - 1122a
-- - 1125a
-  - 1127a
-  - 1131a
-  - 1139a
-  - 1147a
-  - 1149a
-  - 1153a
-  - 1159a
-  - 1201p
-  - 1209p
-  - 1216p
-  - 1218p
-  - 1222p
-- - 1225p
-  - 1227p
-  - 1231p
-  - 1239p
-  - 1247p
-  - 1249p
-  - 1253p
-  - 1259p
-  - 101p
-  - 109p
-  - 116p
-  - 118p
-  - 122p
-- - 125p
-  - 127p
-  - 131p
-  - 139p
-  - 147p
-  - 149p
-  - 153p
-  - 159p
-  - 201p
-  - 209p
-  - 216p
-  - 218p
-  - 222p
-- - 225p
-  - 227p
-  - 231p
-  - 239p
-  - 247p
-  - 249p
-  - 253p
-  - 259p
-  - 301p
-  - 309p
-  - 316p
-  - 318p
-  - 322p
-- - 302p
-  - 304p
-  - 308p
-  - 316p
-  - 324p
-  - 326p
-  - 330p
-  - 336p
-  - 338p
-  - 346p
-  - 353p
-  - 355p
-  - 359p
-- - 332p
-  - 334p
-  - 338p
-  - 346p
-  - 354p
-  - 356p
-  - 400p
-  - 406p
-  - 408p
-  - 416p
-  - 423p
-  - 425p
-  - 429p
-- - 402p
-  - 404p
-  - 408p
-  - 416p
-  - 424p
-  - 426p
-  - 430p
-  - 436p
-  - 438p
-  - 446p
-  - 453p
-  - 455p
-  - 459p
-- - 432p
-  - 434p
-  - 438p
-  - 446p
-  - 454p
-  - 456p
-  - 500p
-  - 506p
-  - 508p
-  - 516p
-  - 523p
-  - 525p
-  - 529p
-- - 502p
-  - 504p
-  - 508p
-  - 516p
-  - 524p
-  - 526p
-  - 530p
-  - 536p
-  - 538p
-  - 546p
-  - 553p
-  - 555p
-  - 559p
-- - 532p
-  - 534p
-  - 538p
-  - 546p
-  - 554p
-  - 556p
-  - 600p
-  - 606p
-  - 608p
-  - 616p
-  - 623p
-  - 625p
-  - 629p
-- - 602p
-  - 604p
-  - 608p
-  - 616p
-  - 624p
-  - 626p
-  - 630p
-  - 636p
-  - 638p
-  - 646p
-  - 652p
-  - 654p
-  - 657p
-- - 625p
-  - 627p
-  - 631p
-  - 638p
-  - 646p
-  - 648p
-  - 652p
-  - 658p
-  - 700p
-  - 708p
-  - 714p
-  - 716p
-  - 719p
-- - 725p
-  - 727p
-  - 730p
-  - 737p
-  - 745p
-  - 747p
-  - 751p
-  - 757p
-  - 759p
-  - 807p
-  - 813p
-  - 815p
-  - 818p
-- - 825p
-  - 827p
-  - 830p
-  - 837p
-  - 845p
-  - 847p
-  - 851p
-  - 857p
-  - 859p
-  - 907p
-  - 913p
-  - 915p
-  - 918p
-- - 925p
-  - 927p
-  - 930p
-  - 937p
-  - 945p
-  - 947p
-  - 951p
-  - 957p
-  - 959p
-  - 1007p
-  - 1013p
-  - 1015p
-  - 1018p
-- - 1025p
-  - 1027p
-  - 1030p
-  - 1037p
-  - 1045p
-  - 1047p
-  - 1051p
-  - 1057p
-  - 1059p
-  - 1107p
-  - 1113p
-  - 1115p
-  - 1118p
-- - 1125p
-  - 1127p
-  - 1130p
-  - 1137p
-  - 1145p
-  - 1147p
-  - 1151p
-  - 1157p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 2
-  - Copland College
-  - Cnr Tillyard Dr & Spalding St
-  - Charnwood
-  - Cnr Kerrigan/Lhotsky
-  - Charnwood
-  - Cnr Tillyard Dr & Spalding St
-  - Copland College
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/5-to-gungahlin-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/5-to-gungahlin-market-place.stop_times.yml
@@ -1,464 +1,8 @@
 --- 
 long_name: To Gungahlin Market Place
-between_stops: []
+between_stops: {}
 
 short_name: "5"
-stop_times: 
-- - 617a
-  - 623a
-  - 632a
-  - 638a
-  - 642a
-  - 646a
-  - 650a
-  - 707a
-  - 710a
-  - 712a
-  - 717a
-  - 723a
-- - 646a
-  - 654a
-  - 704a
-  - 716a
-  - 719a
-  - 723a
-  - 727a
-  - 736a
-  - 742a
-  - 744a
-  - 752a
-  - 800a
-- - 713a
-  - 721a
-  - 731a
-  - 743a
-  - 746a
-  - 752a
-  - 757a
-  - 808a
-  - 815a
-  - 817a
-  - 825a
-  - 833a
-- - 728a
-  - 736a
-  - 746a
-  - 759a
-  - 802a
-  - 808a
-  - 813a
-  - 824a
-  - 831a
-  - 833a
-  - 841a
-  - 849a
-- - 742a
-  - 750a
-  - 800a
-  - 813a
-  - 816a
-  - 822a
-  - 827a
-  - 838a
-  - 845a
-  - 847a
-  - 855a
-  - 902a
-- - 757a
-  - 805a
-  - 815a
-  - 828a
-  - 831a
-  - 837a
-  - 842a
-  - 853a
-  - 900a
-  - 902a
-  - 910a
-  - 916a
-- - 813a
-  - 821a
-  - 831a
-  - 844a
-  - 847a
-  - 853a
-  - 858a
-  - 907a
-  - 913a
-  - 915a
-  - 923a
-  - 929a
-- - 830a
-  - 838a
-  - 848a
-  - 901a
-  - 904a
-  - 908a
-  - 912a
-  - 921a
-  - 927a
-  - 929a
-  - 937a
-  - 943a
-- - 847a
-  - 855a
-  - 905a
-  - 917a
-  - 920a
-  - 924a
-  - 928a
-  - 937a
-  - 943a
-  - 945a
-  - 953a
-  - 959a
-- - 919a
-  - 927a
-  - 937a
-  - 949a
-  - 952a
-  - 956a
-  - 1000a
-  - 1009a
-  - 1015a
-  - 1017a
-  - 1025a
-  - 1031a
-- - 949a
-  - 957a
-  - 1007a
-  - 1019a
-  - 1022a
-  - 1026a
-  - 1030a
-  - 1039a
-  - 1045a
-  - 1047a
-  - 1055a
-  - 1101a
-- - 1019a
-  - 1027a
-  - 1037a
-  - 1049a
-  - 1052a
-  - 1056a
-  - 1100a
-  - 1109a
-  - 1115a
-  - 1117a
-  - 1125a
-  - 1131a
-- - 1049a
-  - 1057a
-  - 1107a
-  - 1119a
-  - 1122a
-  - 1126a
-  - 1130a
-  - 1139a
-  - 1145a
-  - 1147a
-  - 1155a
-  - 1201p
-- - 1119a
-  - 1127a
-  - 1137a
-  - 1149a
-  - 1152a
-  - 1156a
-  - 1200p
-  - 1209p
-  - 1215p
-  - 1217p
-  - 1225p
-  - 1231p
-- - 1149a
-  - 1157a
-  - 1207p
-  - 1219p
-  - 1222p
-  - 1226p
-  - 1230p
-  - 1239p
-  - 1245p
-  - 1247p
-  - 1255p
-  - 101p
-- - 1219p
-  - 1227p
-  - 1237p
-  - 1249p
-  - 1252p
-  - 1256p
-  - 100p
-  - 109p
-  - 115p
-  - 117p
-  - 125p
-  - 131p
-- - 1249p
-  - 1257p
-  - 107p
-  - 119p
-  - 122p
-  - 126p
-  - 130p
-  - 139p
-  - 145p
-  - 147p
-  - 155p
-  - 201p
-- - 119p
-  - 127p
-  - 137p
-  - 149p
-  - 152p
-  - 156p
-  - 200p
-  - 209p
-  - 215p
-  - 217p
-  - 225p
-  - 231p
-- - 149p
-  - 154p
-  - 204p
-  - 216p
-  - 219p
-  - 223p
-  - 227p
-  - 239p
-  - 245p
-  - 247p
-  - 255p
-  - 301p
-- - 219p
-  - 227p
-  - 237p
-  - 249p
-  - 252p
-  - 256p
-  - 300p
-  - 308p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 249p
-  - 257p
-  - 307p
-  - 319p
-  - 322p
-  - 326p
-  - 330p
-  - 338p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 315p
-  - 323p
-  - 333p
-  - 345p
-  - 348p
-  - 352p
-  - 356p
-  - 405p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 341p
-  - 349p
-  - 359p
-  - 412p
-  - 415p
-  - 421p
-  - 426p
-  - 435p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 411p
-  - 419p
-  - 429p
-  - 442p
-  - 445p
-  - 451p
-  - 456p
-  - 505p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 442p
-  - 450p
-  - 500p
-  - 513p
-  - 516p
-  - 522p
-  - 527p
-  - 536p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 515p
-  - 523p
-  - 533p
-  - 546p
-  - 549p
-  - 555p
-  - 600p
-  - 608p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 550p
-  - 558p
-  - 607p
-  - 619p
-  - 622p
-  - 626p
-  - 630p
-  - 639p
-  - 645p
-  - 647p
-  - 654p
-  - 700p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 709p
-  - 715p
-  - 717p
-  - 724p
-  - 730p
-- - 651p
-  - 658p
-  - 707p
-  - 719p
-  - 722p
-  - 726p
-  - 730p
-  - 739p
-  - 745p
-  - 747p
-  - 754p
-  - 800p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 809p
-  - 815p
-  - 817p
-  - 824p
-  - 830p
-- - 751p
-  - 758p
-  - 807p
-  - 819p
-  - 822p
-  - 826p
-  - 830p
-  - 839p
-  - 845p
-  - 847p
-  - 854p
-  - 900p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 909p
-  - 915p
-  - 917p
-  - 924p
-  - 930p
-- - 851p
-  - 858p
-  - 907p
-  - 919p
-  - 922p
-  - 926p
-  - 930p
-  - 939p
-  - 945p
-  - 947p
-  - 954p
-  - 1000p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1009p
-  - 1015p
-  - 1017p
-  - 1024p
-  - 1030p
-- - 951p
-  - 958p
-  - 1007p
-  - 1019p
-  - 1022p
-  - 1026p
-  - 1030p
-  - 1039p
-  - 1045p
-  - 1047p
-  - 1054p
-  - 1100p
-- - 1051p
-  - 1058p
-  - 1107p
-  - 1119p
-  - 1122p
-  - 1126p
-  - 1130p
-  - 1138p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1109p
-  - 1115p
-  - 1117p
-  - 1124p
-  - 1130p
-time_points: 
-  - Woden Interchange - Platform 14
-  - Canberra Hospital
-  - Narrabundah College
-  - Manuka/Captain Cook
-  - Kingston
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Gungahlin Market Place
+stop_times: [[617a, 623a, 632a, 638a, 642a, 646a, 650a, 707a, 710a, 712a, 717a, 723a], [646a, 654a, 704a, 716a, 719a, 723a, 727a, 736a, 742a, 744a, 752a, 800a], [713a, 721a, 731a, 743a, 746a, 752a, 757a, 808a, 815a, 817a, 825a, 833a], [728a, 736a, 746a, 759a, 802a, 808a, 813a, 824a, 831a, 833a, 841a, 849a], [742a, 750a, 800a, 813a, 816a, 822a, 827a, 838a, 845a, 847a, 855a, 902a], [757a, 805a, 815a, 828a, 831a, 837a, 842a, 853a, 900a, 902a, 910a, 916a], [813a, 821a, 831a, 844a, 847a, 853a, 858a, 907a, 913a, 915a, 923a, 929a], [830a, 838a, 848a, 901a, 904a, 908a, 912a, 921a, 927a, 929a, 937a, 943a], [847a, 855a, 905a, 917a, 920a, 924a, 928a, 937a, 943a, 945a, 953a, 959a], [919a, 927a, 937a, 949a, 952a, 956a, 1000a, 1009a, 1015a, 1017a, 1025a, 1031a], [949a, 957a, 1007a, 1019a, 1022a, 1026a, 1030a, 1039a, 1045a, 1047a, 1055a, 1101a], [1019a, 1027a, 1037a, 1049a, 1052a, 1056a, 1100a, 1109a, 1115a, 1117a, 1125a, 1131a], [1049a, 1057a, 1107a, 1119a, 1122a, 1126a, 1130a, 1139a, 1145a, 1147a, 1155a, 1201p], [1119a, 1127a, 1137a, 1149a, 1152a, 1156a, 1200p, 1209p, 1215p, 1217p, 1225p, 1231p], [1149a, 1157a, 1207p, 1219p, 1222p, 1226p, 1230p, 1239p, 1245p, 1247p, 1255p, 101p], [1219p, 1227p, 1237p, 1249p, 1252p, 1256p, 100p, 109p, 115p, 117p, 125p, 131p], [1249p, 1257p, 107p, 119p, 122p, 126p, 130p, 139p, 145p, 147p, 155p, 201p], [119p, 127p, 137p, 149p, 152p, 156p, 200p, 209p, 215p, 217p, 225p, 231p], [149p, 154p, 204p, 216p, 219p, 223p, 227p, 239p, 245p, 247p, 255p, 301p], [219p, 227p, 237p, 249p, 252p, 256p, 300p, 308p, "-", "-", "-", "-"], [249p, 257p, 307p, 319p, 322p, 326p, 330p, 338p, "-", "-", "-", "-"], [315p, 323p, 333p, 345p, 348p, 352p, 356p, 405p, "-", "-", "-", "-"], [341p, 349p, 359p, 412p, 415p, 421p, 426p, 435p, "-", "-", "-", "-"], [411p, 419p, 429p, 442p, 445p, 451p, 456p, 505p, "-", "-", "-", "-"], [442p, 450p, 500p, 513p, 516p, 522p, 527p, 536p, "-", "-", "-", "-"], [515p, 523p, 533p, 546p, 549p, 555p, 600p, 608p, "-", "-", "-", "-"], [550p, 558p, 607p, 619p, 622p, 626p, 630p, 639p, 645p, 647p, 654p, 700p], ["-", "-", "-", "-", "-", "-", "-", 709p, 715p, 717p, 724p, 730p], [651p, 658p, 707p, 719p, 722p, 726p, 730p, 739p, 745p, 747p, 754p, 800p], ["-", "-", "-", "-", "-", "-", "-", 809p, 815p, 817p, 824p, 830p], [751p, 758p, 807p, 819p, 822p, 826p, 830p, 839p, 845p, 847p, 854p, 900p], ["-", "-", "-", "-", "-", "-", "-", 909p, 915p, 917p, 924p, 930p], [851p, 858p, 907p, 919p, 922p, 926p, 930p, 939p, 945p, 947p, 954p, 1000p], ["-", "-", "-", "-", "-", "-", "-", 1009p, 1015p, 1017p, 1024p, 1030p], [951p, 958p, 1007p, 1019p, 1022p, 1026p, 1030p, 1039p, 1045p, 1047p, 1054p, 1100p], [1051p, 1058p, 1107p, 1119p, 1122p, 1126p, 1130p, 1138p, "-", "-", "-", "-"], ["-", "-", "-", "-", "-", "-", "-", 1109p, 1115p, 1117p, 1124p, 1130p]]
+time_points: [Woden Interchange (Platform 14), Canberra Hospital, Narrabundah College, Manuka/Captain Cook, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/5-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/5-to-woden-interchange.stop_times.yml
@@ -1,464 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "5"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 630a
-  - 638a
-  - 642a
-  - 646a
-  - 649a
-  - 701a
-  - 711a
-  - 719a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 710a
-  - 718a
-  - 722a
-  - 726a
-  - 729a
-  - 741a
-  - 752a
-  - 800a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 730a
-  - 738a
-  - 742a
-  - 746a
-  - 749a
-  - 802a
-  - 814a
-  - 822a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 748a
-  - 753a
-  - 758a
-  - 801a
-  - 814a
-  - 826a
-  - 834a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 755a
-  - 804a
-  - 809a
-  - 814a
-  - 817a
-  - 830a
-  - 842a
-  - 850a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 810a
-  - 819a
-  - 824a
-  - 829a
-  - 832a
-  - 845a
-  - 857a
-  - 905a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 830a
-  - 839a
-  - 844a
-  - 849a
-  - 852a
-  - 905a
-  - 915a
-  - 923a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 840a
-  - 849a
-  - 854a
-  - 859a
-  - 902a
-  - 914a
-  - 924a
-  - 932a
-- - 909a
-  - 915a
-  - 922a
-  - 924a
-  - 932a
-  - 940a
-  - 944a
-  - 948a
-  - 951a
-  - 1003a
-  - 1013a
-  - 1021a
-- - 939a
-  - 945a
-  - 952a
-  - 954a
-  - 1002a
-  - 1010a
-  - 1014a
-  - 1018a
-  - 1021a
-  - 1033a
-  - 1043a
-  - 1051a
-- - 1009a
-  - 1015a
-  - 1022a
-  - 1024a
-  - 1032a
-  - 1040a
-  - 1044a
-  - 1048a
-  - 1051a
-  - 1103a
-  - 1113a
-  - 1121a
-- - 1039a
-  - 1045a
-  - 1052a
-  - 1054a
-  - 1102a
-  - 1110a
-  - 1114a
-  - 1118a
-  - 1121a
-  - 1133a
-  - 1143a
-  - 1151a
-- - 1109a
-  - 1115a
-  - 1122a
-  - 1124a
-  - 1132a
-  - 1140a
-  - 1144a
-  - 1148a
-  - 1151a
-  - 1203p
-  - 1213p
-  - 1221p
-- - 1139a
-  - 1145a
-  - 1152a
-  - 1154a
-  - 1202p
-  - 1210p
-  - 1214p
-  - 1218p
-  - 1221p
-  - 1233p
-  - 1243p
-  - 1251p
-- - 1209p
-  - 1215p
-  - 1222p
-  - 1224p
-  - 1232p
-  - 1240p
-  - 1244p
-  - 1248p
-  - 1251p
-  - 103p
-  - 113p
-  - 121p
-- - 1239p
-  - 1245p
-  - 1252p
-  - 1254p
-  - 102p
-  - 110p
-  - 114p
-  - 118p
-  - 121p
-  - 133p
-  - 143p
-  - 151p
-- - 109p
-  - 115p
-  - 122p
-  - 124p
-  - 132p
-  - 140p
-  - 144p
-  - 148p
-  - 151p
-  - 203p
-  - 213p
-  - 221p
-- - 139p
-  - 145p
-  - 152p
-  - 154p
-  - 202p
-  - 210p
-  - 214p
-  - 218p
-  - 221p
-  - 233p
-  - 243p
-  - 251p
-- - 209p
-  - 215p
-  - 222p
-  - 224p
-  - 232p
-  - 240p
-  - 244p
-  - 248p
-  - 251p
-  - 303p
-  - 313p
-  - 321p
-- - 239p
-  - 245p
-  - 252p
-  - 254p
-  - 302p
-  - 310p
-  - 314p
-  - 318p
-  - 321p
-  - 333p
-  - 343p
-  - 351p
-- - 309p
-  - 315p
-  - 322p
-  - 324p
-  - 332p
-  - 340p
-  - 344p
-  - 348p
-  - 351p
-  - 403p
-  - 415p
-  - 423p
-- - 339p
-  - 345p
-  - 352p
-  - 354p
-  - 403p
-  - 412p
-  - 417p
-  - 422p
-  - 425p
-  - 438p
-  - 450p
-  - 458p
-- - 407p
-  - 415p
-  - 422p
-  - 424p
-  - 433p
-  - 442p
-  - 447p
-  - 452p
-  - 455p
-  - 508p
-  - 520p
-  - 528p
-- - 437p
-  - 445p
-  - 452p
-  - 454p
-  - 503p
-  - 512p
-  - 517p
-  - 522p
-  - 525p
-  - 538p
-  - 550p
-  - 558p
-- - 510p
-  - 518p
-  - 525p
-  - 527p
-  - 536p
-  - 545p
-  - 550p
-  - 554p
-  - 556p
-  - 608p
-  - 617p
-  - 625p
-- - 537p
-  - 545p
-  - 552p
-  - 554p
-  - 602p
-  - 610p
-  - 614p
-  - 618p
-  - 621p
-  - 633p
-  - 642p
-  - 650p
-- - 609p
-  - 615p
-  - 622p
-  - 624p
-  - 632p
-  - 640p
-  - 644p
-  - 648p
-  - 651p
-  - 703p
-  - 712p
-  - 720p
-- - 639p
-  - 645p
-  - 652p
-  - 654p
-  - 702p
-  - 710p
-  - 714p
-  - 718p
-  - 721p
-  - 733p
-  - 742p
-  - 750p
-- - 709p
-  - 715p
-  - 722p
-  - 724p
-  - 732p
-  - 740p
-  - 744p
-  - 748p
-  - 751p
-  - 803p
-  - 812p
-  - 820p
-- - 739p
-  - 745p
-  - 752p
-  - 754p
-  - 801p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 809p
-  - 815p
-  - 822p
-  - 824p
-  - 832p
-  - 840p
-  - 844p
-  - 848p
-  - 851p
-  - 903p
-  - 912p
-  - 920p
-- - 839p
-  - 845p
-  - 852p
-  - 854p
-  - 901p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 909p
-  - 915p
-  - 922p
-  - 924p
-  - 932p
-  - 940p
-  - 944p
-  - 948p
-  - 951p
-  - 1003p
-  - 1012p
-  - 1020p
-- - 939p
-  - 945p
-  - 952p
-  - 954p
-  - 1001p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1009p
-  - 1015p
-  - 1022p
-  - 1024p
-  - 1032p
-  - 1040p
-  - 1044p
-  - 1048p
-  - 1051p
-  - 1103p
-  - 1112p
-  - 1120p
-- - 1039p
-  - 1045p
-  - 1052p
-  - 1054p
-  - 1101p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1109p
-  - 1115p
-  - 1122p
-  - 1124p
-  - 1131p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Gungahlin Market Place
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Manuka/Captain Cook
-  - Narrabundah College
-  - Canberra Hospital
-  - Woden Interchange
+stop_times: [["-", "-", "-", "-", 630a, 638a, 642a, 646a, 649a, 701a, 711a, 719a], ["-", "-", "-", "-", 710a, 718a, 722a, 726a, 729a, 741a, 752a, 800a], ["-", "-", "-", "-", 730a, 738a, 742a, 746a, 749a, 802a, 814a, 822a], ["-", "-", "-", "-", 740a, 748a, 753a, 758a, 801a, 814a, 826a, 834a], ["-", "-", "-", "-", 755a, 804a, 809a, 814a, 817a, 830a, 842a, 850a], ["-", "-", "-", "-", 810a, 819a, 824a, 829a, 832a, 845a, 857a, 905a], ["-", "-", "-", "-", 830a, 839a, 844a, 849a, 852a, 905a, 915a, 923a], ["-", "-", "-", "-", 840a, 849a, 854a, 859a, 902a, 914a, 924a, 932a], [909a, 915a, 922a, 924a, 932a, 940a, 944a, 948a, 951a, 1003a, 1013a, 1021a], [939a, 945a, 952a, 954a, 1002a, 1010a, 1014a, 1018a, 1021a, 1033a, 1043a, 1051a], [1009a, 1015a, 1022a, 1024a, 1032a, 1040a, 1044a, 1048a, 1051a, 1103a, 1113a, 1121a], [1039a, 1045a, 1052a, 1054a, 1102a, 1110a, 1114a, 1118a, 1121a, 1133a, 1143a, 1151a], [1109a, 1115a, 1122a, 1124a, 1132a, 1140a, 1144a, 1148a, 1151a, 1203p, 1213p, 1221p], [1139a, 1145a, 1152a, 1154a, 1202p, 1210p, 1214p, 1218p, 1221p, 1233p, 1243p, 1251p], [1209p, 1215p, 1222p, 1224p, 1232p, 1240p, 1244p, 1248p, 1251p, 103p, 113p, 121p], [1239p, 1245p, 1252p, 1254p, 102p, 110p, 114p, 118p, 121p, 133p, 143p, 151p], [109p, 115p, 122p, 124p, 132p, 140p, 144p, 148p, 151p, 203p, 213p, 221p], [139p, 145p, 152p, 154p, 202p, 210p, 214p, 218p, 221p, 233p, 243p, 251p], [209p, 215p, 222p, 224p, 232p, 240p, 244p, 248p, 251p, 303p, 313p, 321p], [239p, 245p, 252p, 254p, 302p, 310p, 314p, 318p, 321p, 333p, 343p, 351p], [309p, 315p, 322p, 324p, 332p, 340p, 344p, 348p, 351p, 403p, 415p, 423p], [339p, 345p, 352p, 354p, 403p, 412p, 417p, 422p, 425p, 438p, 450p, 458p], [407p, 415p, 422p, 424p, 433p, 442p, 447p, 452p, 455p, 508p, 520p, 528p], [437p, 445p, 452p, 454p, 503p, 512p, 517p, 522p, 525p, 538p, 550p, 558p], [510p, 518p, 525p, 527p, 536p, 545p, 550p, 554p, 556p, 608p, 617p, 625p], [537p, 545p, 552p, 554p, 602p, 610p, 614p, 618p, 621p, 633p, 642p, 650p], [609p, 615p, 622p, 624p, 632p, 640p, 644p, 648p, 651p, 703p, 712p, 720p], [639p, 645p, 652p, 654p, 702p, 710p, 714p, 718p, 721p, 733p, 742p, 750p], [709p, 715p, 722p, 724p, 732p, 740p, 744p, 748p, 751p, 803p, 812p, 820p], [739p, 745p, 752p, 754p, 801p, "-", "-", "-", "-", "-", "-", "-"], [809p, 815p, 822p, 824p, 832p, 840p, 844p, 848p, 851p, 903p, 912p, 920p], [839p, 845p, 852p, 854p, 901p, "-", "-", "-", "-", "-", "-", "-"], [909p, 915p, 922p, 924p, 932p, 940p, 944p, 948p, 951p, 1003p, 1012p, 1020p], [939p, 945p, 952p, 954p, 1001p, "-", "-", "-", "-", "-", "-", "-"], [1009p, 1015p, 1022p, 1024p, 1032p, 1040p, 1044p, 1048p, 1051p, 1103p, 1112p, 1120p], [1039p, 1045p, 1052p, 1054p, 1101p, "-", "-", "-", "-", "-", "-", "-"], [1109p, 1115p, 1122p, 1124p, 1131p, "-", "-", "-", "-", "-", "-", "-"]]
+time_points: [Gungahlin Market Place, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Kingston, Manuka/Captain Cook, Narrabundah College, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/51-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/51-to-city-interchange.stop_times.yml
@@ -1,385 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "51"
+stop_times: [["-", "-", "-", "-", 532a, 541a, 550a, 559a, 602a, "-", "-", "-", "-"], ["-", "-", "-", "-", 616a, 625a, 634a, 643a, 646a, "-", "-", "-", "-"], [618a, 620a, 624a, 631a, 636a, 645a, 654a, 703a, 706a, 709a, 716a, 718a, 725a], ["-", "-", "-", "-", 656a, 705a, 714a, 723a, 726a, 729a, 736a, 738a, 745a], [654a, 656a, 700a, 707a, 712a, 721a, 730a, 739a, 742a, 745a, 756a, 801a, 815a], ["-", "-", "-", 721a, 726a, 735a, 744a, 753a, 756a, 801a, 812a, 817a, 832a], [732a, 734a, 738a, 745a, 750a, 800a, 810a, 819a, 822a, 827a, 838a, 843a, 858a], [751a, 753a, 757a, 805a, 810a, 820a, 830a, 839a, 842a, 847a, 856a, 901a, 912a], ["-", "-", "-", "-", 830a, 840a, 850a, 859a, 902a, 905a, 912a, 917a, 928a], [838a, 840a, 844a, 852a, 857a, 906a, 915a, 924a, 927a, 930a, 937a, 939a, 946a], [913a, 915a, 919a, 926a, 931a, 940a, 949a, 958a, 1001a, "-", "-", "-", "-"], [943a, 945a, 949a, 956a, 1001a, 1010a, 1019a, 1028a, 1031a, "-", "-", "-", "-"], [1043a, 1045a, 1049a, 1056a, 1101a, 1110a, 1119a, 1128a, 1131a, "-", "-", "-", "-"], [1143a, 1145a, 1149a, 1156a, 1201p, 1210p, 1219p, 1228p, 1231p, "-", "-", "-", "-"], [1243p, 1245p, 1249p, 1256p, 101p, 110p, 119p, 128p, 131p, "-", "-", "-", "-"], [143p, 145p, 149p, 156p, 201p, 210p, 219p, 228p, 231p, "-", "-", "-", "-"], [243p, 245p, 249p, 256p, 301p, 310p, 319p, 328p, 331p, "-", "-", "-", "-"], [338p, 340p, 344p, 351p, 356p, 406p, 416p, 425p, 428p, "-", "-", "-", "-"], [418p, 420p, 424p, 432p, 437p, 448p, 458p, 507p, 510p, "-", "-", "-", "-"], [438p, 440p, 444p, 452p, 457p, 508p, 518p, 527p, 530p, "-", "-", "-", "-"], [458p, 500p, 504p, 512p, 517p, 528p, 538p, 547p, 550p, "-", "-", "-", "-"], [517p, 519p, 523p, 531p, 536p, 547p, 557p, 606p, 609p, "-", "-", "-", "-"], [539p, 541p, 545p, 553p, 558p, 607p, 616p, 625p, 628p, "-", "-", "-", "-"], [643p, 645p, 648p, 655p, 700p, 709p, 718p, 727p, 730p, "-", "-", "-", "-"], [743p, 745p, 748p, 755p, 800p, 809p, 818p, 827p, 830p, "-", "-", "-", "-"], [843p, 845p, 848p, 855p, 900p, 909p, 918p, 927p, 930p, "-", "-", "-", "-"], [943p, 945p, 948p, 955p, 1000p, 1009p, 1018p, 1027p, 1030p, "-", "-", "-", "-"], [1043p, 1045p, 1048p, 1055p, 1100p, 1109p, 1118p, 1127p, 1130p, "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "51"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 532a
-  - 541a
-  - 550a
-  - 559a
-  - 602a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 616a
-  - 625a
-  - 634a
-  - 643a
-  - 646a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 618a
-  - 620a
-  - 624a
-  - 631a
-  - 636a
-  - 645a
-  - 654a
-  - 703a
-  - 706a
-  - 709a
-  - 716a
-  - 718a
-  - 725a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 656a
-  - 705a
-  - 714a
-  - 723a
-  - 726a
-  - 729a
-  - 736a
-  - 738a
-  - 745a
-- - 654a
-  - 656a
-  - 700a
-  - 707a
-  - 712a
-  - 721a
-  - 730a
-  - 739a
-  - 742a
-  - 745a
-  - 756a
-  - 801a
-  - 815a
-- - "-"
-  - "-"
-  - "-"
-  - 721a
-  - 726a
-  - 735a
-  - 744a
-  - 753a
-  - 756a
-  - 801a
-  - 812a
-  - 817a
-  - 832a
-- - 732a
-  - 734a
-  - 738a
-  - 745a
-  - 750a
-  - 800a
-  - 810a
-  - 819a
-  - 822a
-  - 827a
-  - 838a
-  - 843a
-  - 858a
-- - 751a
-  - 753a
-  - 757a
-  - 805a
-  - 810a
-  - 820a
-  - 830a
-  - 839a
-  - 842a
-  - 847a
-  - 856a
-  - 901a
-  - 912a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 830a
-  - 840a
-  - 850a
-  - 859a
-  - 902a
-  - 905a
-  - 912a
-  - 917a
-  - 928a
-- - 838a
-  - 840a
-  - 844a
-  - 852a
-  - 857a
-  - 906a
-  - 915a
-  - 924a
-  - 927a
-  - 930a
-  - 937a
-  - 939a
-  - 946a
-- - 913a
-  - 915a
-  - 919a
-  - 926a
-  - 931a
-  - 940a
-  - 949a
-  - 958a
-  - 1001a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 943a
-  - 945a
-  - 949a
-  - 956a
-  - 1001a
-  - 1010a
-  - 1019a
-  - 1028a
-  - 1031a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1043a
-  - 1045a
-  - 1049a
-  - 1056a
-  - 1101a
-  - 1110a
-  - 1119a
-  - 1128a
-  - 1131a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1143a
-  - 1145a
-  - 1149a
-  - 1156a
-  - 1201p
-  - 1210p
-  - 1219p
-  - 1228p
-  - 1231p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1243p
-  - 1245p
-  - 1249p
-  - 1256p
-  - 101p
-  - 110p
-  - 119p
-  - 128p
-  - 131p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 143p
-  - 145p
-  - 149p
-  - 156p
-  - 201p
-  - 210p
-  - 219p
-  - 228p
-  - 231p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 243p
-  - 245p
-  - 249p
-  - 256p
-  - 301p
-  - 310p
-  - 319p
-  - 328p
-  - 331p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 338p
-  - 340p
-  - 344p
-  - 351p
-  - 356p
-  - 406p
-  - 416p
-  - 425p
-  - 428p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 418p
-  - 420p
-  - 424p
-  - 432p
-  - 437p
-  - 448p
-  - 458p
-  - 507p
-  - 510p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 438p
-  - 440p
-  - 444p
-  - 452p
-  - 457p
-  - 508p
-  - 518p
-  - 527p
-  - 530p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 458p
-  - 500p
-  - 504p
-  - 512p
-  - 517p
-  - 528p
-  - 538p
-  - 547p
-  - 550p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 517p
-  - 519p
-  - 523p
-  - 531p
-  - 536p
-  - 547p
-  - 557p
-  - 606p
-  - 609p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 539p
-  - 541p
-  - 545p
-  - 553p
-  - 558p
-  - 607p
-  - 616p
-  - 625p
-  - 628p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 643p
-  - 645p
-  - 648p
-  - 655p
-  - 700p
-  - 709p
-  - 718p
-  - 727p
-  - 730p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 743p
-  - 745p
-  - 748p
-  - 755p
-  - 800p
-  - 809p
-  - 818p
-  - 827p
-  - 830p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 843p
-  - 845p
-  - 848p
-  - 855p
-  - 900p
-  - 909p
-  - 918p
-  - 927p
-  - 930p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 943p
-  - 945p
-  - 948p
-  - 955p
-  - 1000p
-  - 1009p
-  - 1018p
-  - 1027p
-  - 1030p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1043p
-  - 1045p
-  - 1048p
-  - 1055p
-  - 1100p
-  - 1109p
-  - 1118p
-  - 1127p
-  - 1130p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Federation Square
-  - Nicholls Primary
-  - Ngunnawal Primary
-  - Gungahlin Market Place
-  - Hibberson/Kate Crace
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/51-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/51-to-cohen-st-station.stop_times.yml
@@ -1,372 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "51"
+stop_times: [["-", "-", "-", "-", 701a, 704a, 713a, 723a, 733a, 738a, 748a, 750a, 754a], ["-", "-", "-", "-", 721a, 724a, 733a, 743a, 753a, 758a, 809a, 811a, 815a], ["-", "-", "-", "-", 741a, 744a, 753a, 803a, 813a, 818a, 829a, 831a, 835a], ["-", "-", "-", "-", 800a, 803a, 812a, 822a, 832a, 837a, 848a, 850a, 854a], ["-", "-", "-", "-", 821a, 824a, 833a, 843a, 853a, 858a, 906a, 908a, 912a], ["-", "-", "-", "-", 840a, 843a, 852a, 902a, 911a, 916a, 923a, 925a, 929a], ["-", "-", "-", "-", 940a, 943a, 952a, 1001a, 1010a, 1015a, 1022a, 1024a, 1028a], ["-", "-", "-", "-", 1040a, 1043a, 1052a, 1101a, 1110a, 1115a, 1122a, 1124a, 1128a], ["-", "-", "-", "-", 1140a, 1143a, 1152a, 1201p, 1210p, 1215p, 1222p, 1224p, 1228p], ["-", "-", "-", "-", 1240p, 1243p, 1252p, 101p, 110p, 115p, 122p, 124p, 128p], ["-", "-", "-", "-", 140p, 143p, 152p, 201p, 210p, 215p, 222p, 224p, 228p], ["-", "-", "-", "-", 240p, 243p, 252p, 301p, 310p, 315p, 322p, 324p, 328p], ["-", "-", "-", "-", 307p, 310p, 319p, 328p, 337p, 342p, 349p, 351p, 355p], [328p, 334p, 336p, 344p, 347p, 350p, 359p, 409p, 419p, 424p, 432p, 434p, 438p], [404p, 411p, 413p, 422p, 427p, 430p, 439p, 449p, 459p, 504p, 512p, 514p, 518p], [424p, 431p, 433p, 442p, 447p, 450p, 459p, 509p, 519p, 524p, 532p, 534p, 538p], [444p, 451p, 453p, 502p, 507p, 510p, 519p, 529p, 539p, 544p, 552p, 554p, 558p], [508p, 515p, 517p, 526p, 531p, 534p, 543p, 553p, 603p, 608p, 615p, 617p, 620p], [524p, 531p, 533p, 542p, 547p, 550p, 559p, 608p, 617p, 622p, 629p, 631p, 634p], [535p, 542p, 544p, 553p, 558p, 601p, 610p, 619p, 628p, 633p, 640p, 642p, 645p], [547p, 554p, 556p, 604p, 607p, 610p, 619p, 628p, 637p, 642p, 649p, 651p, 654p], [613p, 619p, 621p, 628p, 631p, 634p, 643p, 652p, 701p, 706p, 713p, 715p, 718p], ["-", "-", "-", "-", 740p, 743p, 752p, 801p, 810p, 815p, 822p, 824p, 827p], ["-", "-", "-", "-", 840p, 843p, 852p, 901p, 910p, 915p, 922p, 924p, 927p], ["-", "-", "-", "-", 940p, 943p, 952p, 1001p, 1010p, 1015p, 1022p, 1024p, 1027p], ["-", "-", "-", "-", 1040p, 1043p, 1052p, 1101p, 1110p, 1115p, 1122p, 1124p, 1127p], ["-", "-", "-", "-", 1140p, 1143p, 1152p, 1201a, 1210a, 1215a, 1222a, 1224a, 1227a]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "51"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 701a
-  - 704a
-  - 713a
-  - 723a
-  - 733a
-  - 738a
-  - 748a
-  - 750a
-  - 754a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 721a
-  - 724a
-  - 733a
-  - 743a
-  - 753a
-  - 758a
-  - 809a
-  - 811a
-  - 815a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 741a
-  - 744a
-  - 753a
-  - 803a
-  - 813a
-  - 818a
-  - 829a
-  - 831a
-  - 835a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 800a
-  - 803a
-  - 812a
-  - 822a
-  - 832a
-  - 837a
-  - 848a
-  - 850a
-  - 854a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 821a
-  - 824a
-  - 833a
-  - 843a
-  - 853a
-  - 858a
-  - 906a
-  - 908a
-  - 912a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 840a
-  - 843a
-  - 852a
-  - 902a
-  - 911a
-  - 916a
-  - 923a
-  - 925a
-  - 929a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 940a
-  - 943a
-  - 952a
-  - 1001a
-  - 1010a
-  - 1015a
-  - 1022a
-  - 1024a
-  - 1028a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1040a
-  - 1043a
-  - 1052a
-  - 1101a
-  - 1110a
-  - 1115a
-  - 1122a
-  - 1124a
-  - 1128a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1140a
-  - 1143a
-  - 1152a
-  - 1201p
-  - 1210p
-  - 1215p
-  - 1222p
-  - 1224p
-  - 1228p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1240p
-  - 1243p
-  - 1252p
-  - 101p
-  - 110p
-  - 115p
-  - 122p
-  - 124p
-  - 128p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 140p
-  - 143p
-  - 152p
-  - 201p
-  - 210p
-  - 215p
-  - 222p
-  - 224p
-  - 228p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 240p
-  - 243p
-  - 252p
-  - 301p
-  - 310p
-  - 315p
-  - 322p
-  - 324p
-  - 328p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 307p
-  - 310p
-  - 319p
-  - 328p
-  - 337p
-  - 342p
-  - 349p
-  - 351p
-  - 355p
-- - 328p
-  - 334p
-  - 336p
-  - 344p
-  - 347p
-  - 350p
-  - 359p
-  - 409p
-  - 419p
-  - 424p
-  - 432p
-  - 434p
-  - 438p
-- - 404p
-  - 411p
-  - 413p
-  - 422p
-  - 427p
-  - 430p
-  - 439p
-  - 449p
-  - 459p
-  - 504p
-  - 512p
-  - 514p
-  - 518p
-- - 424p
-  - 431p
-  - 433p
-  - 442p
-  - 447p
-  - 450p
-  - 459p
-  - 509p
-  - 519p
-  - 524p
-  - 532p
-  - 534p
-  - 538p
-- - 444p
-  - 451p
-  - 453p
-  - 502p
-  - 507p
-  - 510p
-  - 519p
-  - 529p
-  - 539p
-  - 544p
-  - 552p
-  - 554p
-  - 558p
-- - 508p
-  - 515p
-  - 517p
-  - 526p
-  - 531p
-  - 534p
-  - 543p
-  - 553p
-  - 603p
-  - 608p
-  - 615p
-  - 617p
-  - 620p
-- - 524p
-  - 531p
-  - 533p
-  - 542p
-  - 547p
-  - 550p
-  - 559p
-  - 608p
-  - 617p
-  - 622p
-  - 629p
-  - 631p
-  - 634p
-- - 535p
-  - 542p
-  - 544p
-  - 553p
-  - 558p
-  - 601p
-  - 610p
-  - 619p
-  - 628p
-  - 633p
-  - 640p
-  - 642p
-  - 645p
-- - 547p
-  - 554p
-  - 556p
-  - 604p
-  - 607p
-  - 610p
-  - 619p
-  - 628p
-  - 637p
-  - 642p
-  - 649p
-  - 651p
-  - 654p
-- - 613p
-  - 619p
-  - 621p
-  - 628p
-  - 631p
-  - 634p
-  - 643p
-  - 652p
-  - 701p
-  - 706p
-  - 713p
-  - 715p
-  - 718p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740p
-  - 743p
-  - 752p
-  - 801p
-  - 810p
-  - 815p
-  - 822p
-  - 824p
-  - 827p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 840p
-  - 843p
-  - 852p
-  - 901p
-  - 910p
-  - 915p
-  - 922p
-  - 924p
-  - 927p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 940p
-  - 943p
-  - 952p
-  - 1001p
-  - 1010p
-  - 1015p
-  - 1022p
-  - 1024p
-  - 1027p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1040p
-  - 1043p
-  - 1052p
-  - 1101p
-  - 1110p
-  - 1115p
-  - 1122p
-  - 1124p
-  - 1127p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1140p
-  - 1143p
-  - 1152p
-  - 1201a
-  - 1210a
-  - 1215a
-  - 1222a
-  - 1224a
-  - 1227a
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Hibberson/Kate Crace
-  - Gungahlin Market Place
-  - Ngunnawal Primary
-  - Nicholls Primary
-  - Federation Square
-  - Chuculba/William Slim
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/52-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/52-to-city-interchange.stop_times.yml
@@ -1,385 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "52"
+stop_times: [["-", "-", "-", "-", 539a, 547a, 555a, 601a, 604a, "-", "-", "-", "-"], ["-", "-", "-", "-", 618a, 626a, 634a, 640a, 643a, "-", "-", "-", "-"], [630a, 632a, 636a, 646a, 651a, 659a, 707a, 713a, 716a, 719a, 726a, 728a, 735a], ["-", "-", "-", "-", 708a, 716a, 724a, 730a, 733a, 736a, 743a, 745a, 800a], ["-", "-", "-", "-", 725a, 733a, 741a, 747a, 750a, 755a, 806a, 811a, 826a], [723a, 725a, 729a, 739a, 744a, 752a, 800a, 807a, 810a, 815a, 826a, 831a, 846a], ["-", "-", "-", "-", 806a, 814a, 822a, 829a, 832a, 837a, 848a, 853a, 905a], [801a, 803a, 807a, 818a, 823a, 831a, 839a, 846a, 849a, 854a, 902a, 907a, 918a], [830a, 832a, 836a, 847a, 852a, 900a, 908a, 914a, 917a, 920a, 927a, 929a, 936a], [916a, 918a, 922a, 932a, 937a, 945a, 953a, 959a, 1002a, "-", "-", "-", "-"], [1016a, 1018a, 1022a, 1032a, 1037a, 1045a, 1053a, 1059a, 1102a, "-", "-", "-", "-"], [1116a, 1118a, 1122a, 1132a, 1137a, 1145a, 1153a, 1159a, 1202p, "-", "-", "-", "-"], [1216p, 1218p, 1222p, 1232p, 1237p, 1245p, 1253p, 1259p, 102p, "-", "-", "-", "-"], [116p, 118p, 122p, 132p, 137p, 145p, 153p, 159p, 202p, "-", "-", "-", "-"], [216p, 218p, 222p, 232p, 237p, 245p, 253p, 259p, 302p, "-", "-", "-", "-"], [233p, 235p, 239p, 249p, 254p, 302p, 310p, 316p, 319p, "-", "-", "-", "-"], [316p, 318p, 322p, 332p, 337p, 345p, 353p, 359p, 402p, "-", "-", "-", "-"], [356p, 358p, 402p, 413p, 418p, 427p, 435p, 442p, 445p, "-", "-", "-", "-"], [416p, 418p, 422p, 433p, 438p, 447p, 455p, 502p, 505p, "-", "-", "-", "-"], [436p, 438p, 442p, 453p, 458p, 507p, 515p, 522p, 525p, "-", "-", "-", "-"], [456p, 458p, 502p, 513p, 518p, 527p, 535p, 542p, 545p, "-", "-", "-", "-"], [516p, 518p, 522p, 533p, 538p, 547p, 555p, 602p, 605p, "-", "-", "-", "-"], [536p, 538p, 542p, 553p, 558p, 606p, 614p, 620p, 623p, "-", "-", "-", "-"], [616p, 618p, 621p, 631p, 636p, 644p, 652p, 658p, 701p, "-", "-", "-", "-"], [716p, 718p, 721p, 731p, 736p, 744p, 752p, 758p, 801p, "-", "-", "-", "-"], [816p, 818p, 821p, 831p, 836p, 844p, 852p, 858p, 901p, "-", "-", "-", "-"], [916p, 918p, 921p, 931p, 936p, 944p, 952p, 958p, 1001p, "-", "-", "-", "-"], [1016p, 1018p, 1021p, 1031p, 1036p, 1044p, 1052p, 1058p, 1101p, "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "52"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 539a
-  - 547a
-  - 555a
-  - 601a
-  - 604a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 618a
-  - 626a
-  - 634a
-  - 640a
-  - 643a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 630a
-  - 632a
-  - 636a
-  - 646a
-  - 651a
-  - 659a
-  - 707a
-  - 713a
-  - 716a
-  - 719a
-  - 726a
-  - 728a
-  - 735a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 708a
-  - 716a
-  - 724a
-  - 730a
-  - 733a
-  - 736a
-  - 743a
-  - 745a
-  - 800a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 725a
-  - 733a
-  - 741a
-  - 747a
-  - 750a
-  - 755a
-  - 806a
-  - 811a
-  - 826a
-- - 723a
-  - 725a
-  - 729a
-  - 739a
-  - 744a
-  - 752a
-  - 800a
-  - 807a
-  - 810a
-  - 815a
-  - 826a
-  - 831a
-  - 846a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 806a
-  - 814a
-  - 822a
-  - 829a
-  - 832a
-  - 837a
-  - 848a
-  - 853a
-  - 905a
-- - 801a
-  - 803a
-  - 807a
-  - 818a
-  - 823a
-  - 831a
-  - 839a
-  - 846a
-  - 849a
-  - 854a
-  - 902a
-  - 907a
-  - 918a
-- - 830a
-  - 832a
-  - 836a
-  - 847a
-  - 852a
-  - 900a
-  - 908a
-  - 914a
-  - 917a
-  - 920a
-  - 927a
-  - 929a
-  - 936a
-- - 916a
-  - 918a
-  - 922a
-  - 932a
-  - 937a
-  - 945a
-  - 953a
-  - 959a
-  - 1002a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1016a
-  - 1018a
-  - 1022a
-  - 1032a
-  - 1037a
-  - 1045a
-  - 1053a
-  - 1059a
-  - 1102a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1116a
-  - 1118a
-  - 1122a
-  - 1132a
-  - 1137a
-  - 1145a
-  - 1153a
-  - 1159a
-  - 1202p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1216p
-  - 1218p
-  - 1222p
-  - 1232p
-  - 1237p
-  - 1245p
-  - 1253p
-  - 1259p
-  - 102p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 116p
-  - 118p
-  - 122p
-  - 132p
-  - 137p
-  - 145p
-  - 153p
-  - 159p
-  - 202p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 216p
-  - 218p
-  - 222p
-  - 232p
-  - 237p
-  - 245p
-  - 253p
-  - 259p
-  - 302p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 233p
-  - 235p
-  - 239p
-  - 249p
-  - 254p
-  - 302p
-  - 310p
-  - 316p
-  - 319p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 316p
-  - 318p
-  - 322p
-  - 332p
-  - 337p
-  - 345p
-  - 353p
-  - 359p
-  - 402p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 356p
-  - 358p
-  - 402p
-  - 413p
-  - 418p
-  - 427p
-  - 435p
-  - 442p
-  - 445p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 416p
-  - 418p
-  - 422p
-  - 433p
-  - 438p
-  - 447p
-  - 455p
-  - 502p
-  - 505p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 436p
-  - 438p
-  - 442p
-  - 453p
-  - 458p
-  - 507p
-  - 515p
-  - 522p
-  - 525p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 456p
-  - 458p
-  - 502p
-  - 513p
-  - 518p
-  - 527p
-  - 535p
-  - 542p
-  - 545p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 516p
-  - 518p
-  - 522p
-  - 533p
-  - 538p
-  - 547p
-  - 555p
-  - 602p
-  - 605p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 536p
-  - 538p
-  - 542p
-  - 553p
-  - 558p
-  - 606p
-  - 614p
-  - 620p
-  - 623p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 616p
-  - 618p
-  - 621p
-  - 631p
-  - 636p
-  - 644p
-  - 652p
-  - 658p
-  - 701p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 716p
-  - 718p
-  - 721p
-  - 731p
-  - 736p
-  - 744p
-  - 752p
-  - 758p
-  - 801p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 816p
-  - 818p
-  - 821p
-  - 831p
-  - 836p
-  - 844p
-  - 852p
-  - 858p
-  - 901p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 916p
-  - 918p
-  - 921p
-  - 931p
-  - 936p
-  - 944p
-  - 952p
-  - 958p
-  - 1001p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1016p
-  - 1018p
-  - 1021p
-  - 1031p
-  - 1036p
-  - 1044p
-  - 1052p
-  - 1058p
-  - 1101p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Federation Square
-  - Nicholls Primary
-  - Ngunnawal Primary
-  - Gungahlin Market Place
-  - Hibberson/Kate Crace
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/52-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/52-to-cohen-st-station.stop_times.yml
@@ -1,385 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "52"
+stop_times: [["-", "-", "-", "-", 715a, 718a, 724a, 732a, 740a, 745a, 756a, 758a, 802a], ["-", "-", "-", "-", 735a, 738a, 744a, 753a, 801a, 806a, 817a, 819a, 823a], ["-", "-", "-", "-", 755a, 758a, 804a, 813a, 821a, 826a, 837a, 839a, 843a], ["-", "-", "-", "-", 815a, 818a, 824a, 833a, 841a, 846a, 857a, 859a, 903a], ["-", "-", "-", "-", 835a, 838a, 844a, 853a, 901a, 906a, 916a, 918a, 922a], ["-", "-", "-", "-", 855a, 858a, 904a, 912a, 920a, 925a, 935a, 937a, 941a], ["-", "-", "-", "-", 915a, 918a, 924a, 932a, 940a, 945a, 955a, 957a, 1001a], ["-", "-", "-", "-", 942a, 945a, 951a, 959a, 1007a, 1012a, 1022a, 1024a, 1028a], ["-", "-", "-", "-", 1005a, 1008a, 1014a, 1022a, 1030a, 1035a, 1045a, 1047a, 1051a], ["-", "-", "-", "-", 1105a, 1108a, 1114a, 1122a, 1130a, 1135a, 1145a, 1147a, 1151a], ["-", "-", "-", "-", 1205p, 1208p, 1214p, 1222p, 1230p, 1235p, 1245p, 1247p, 1251p], ["-", "-", "-", "-", 105p, 108p, 114p, 122p, 130p, 135p, 145p, 147p, 151p], ["-", "-", "-", "-", 205p, 208p, 214p, 222p, 230p, 235p, 245p, 247p, 251p], ["-", "-", "-", "-", 301p, 304p, 310p, 318p, 326p, 331p, 341p, 343p, 347p], ["-", "-", "-", "-", 340p, 343p, 349p, 357p, 405p, 410p, 421p, 423p, 427p], [341p, 347p, 349p, 357p, 400p, 403p, 409p, 418p, 426p, 431p, 442p, 444p, 448p], [357p, 404p, 406p, 415p, 420p, 423p, 429p, 438p, 446p, 451p, 502p, 504p, 508p], [417p, 424p, 426p, 435p, 440p, 443p, 449p, 458p, 506p, 511p, 522p, 524p, 528p], [437p, 444p, 446p, 455p, 500p, 503p, 509p, 518p, 526p, 531p, 542p, 544p, 548p], [457p, 504p, 506p, 515p, 520p, 523p, 529p, 538p, 546p, 551p, 602p, 604p, 607p], [517p, 524p, 526p, 535p, 540p, 543p, 549p, 558p, 606p, 611p, 621p, 623p, 626p], [534p, 541p, 543p, 552p, 557p, 600p, 606p, 614p, 622p, 627p, 637p, 639p, 642p], [557p, 603p, 605p, 612p, 615p, 618p, 624p, 632p, 640p, 645p, 655p, 657p, 700p], ["-", "-", "-", "-", 705p, 708p, 714p, 722p, 730p, 735p, 745p, 747p, 750p], ["-", "-", "-", "-", 805p, 808p, 814p, 822p, 830p, 835p, 845p, 847p, 850p], ["-", "-", "-", "-", 905p, 908p, 914p, 922p, 930p, 935p, 945p, 947p, 950p], ["-", "-", "-", "-", 1005p, 1008p, 1014p, 1022p, 1030p, 1035p, 1045p, 1047p, 1050p], ["-", "-", "-", "-", 1105p, 1108p, 1114p, 1122p, 1130p, "-", "-", "-", "-"]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "52"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 715a
-  - 718a
-  - 724a
-  - 732a
-  - 740a
-  - 745a
-  - 756a
-  - 758a
-  - 802a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 735a
-  - 738a
-  - 744a
-  - 753a
-  - 801a
-  - 806a
-  - 817a
-  - 819a
-  - 823a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 755a
-  - 758a
-  - 804a
-  - 813a
-  - 821a
-  - 826a
-  - 837a
-  - 839a
-  - 843a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 815a
-  - 818a
-  - 824a
-  - 833a
-  - 841a
-  - 846a
-  - 857a
-  - 859a
-  - 903a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 835a
-  - 838a
-  - 844a
-  - 853a
-  - 901a
-  - 906a
-  - 916a
-  - 918a
-  - 922a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 855a
-  - 858a
-  - 904a
-  - 912a
-  - 920a
-  - 925a
-  - 935a
-  - 937a
-  - 941a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 915a
-  - 918a
-  - 924a
-  - 932a
-  - 940a
-  - 945a
-  - 955a
-  - 957a
-  - 1001a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 942a
-  - 945a
-  - 951a
-  - 959a
-  - 1007a
-  - 1012a
-  - 1022a
-  - 1024a
-  - 1028a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1005a
-  - 1008a
-  - 1014a
-  - 1022a
-  - 1030a
-  - 1035a
-  - 1045a
-  - 1047a
-  - 1051a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1105a
-  - 1108a
-  - 1114a
-  - 1122a
-  - 1130a
-  - 1135a
-  - 1145a
-  - 1147a
-  - 1151a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1205p
-  - 1208p
-  - 1214p
-  - 1222p
-  - 1230p
-  - 1235p
-  - 1245p
-  - 1247p
-  - 1251p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 105p
-  - 108p
-  - 114p
-  - 122p
-  - 130p
-  - 135p
-  - 145p
-  - 147p
-  - 151p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 205p
-  - 208p
-  - 214p
-  - 222p
-  - 230p
-  - 235p
-  - 245p
-  - 247p
-  - 251p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 301p
-  - 304p
-  - 310p
-  - 318p
-  - 326p
-  - 331p
-  - 341p
-  - 343p
-  - 347p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 340p
-  - 343p
-  - 349p
-  - 357p
-  - 405p
-  - 410p
-  - 421p
-  - 423p
-  - 427p
-- - 341p
-  - 347p
-  - 349p
-  - 357p
-  - 400p
-  - 403p
-  - 409p
-  - 418p
-  - 426p
-  - 431p
-  - 442p
-  - 444p
-  - 448p
-- - 357p
-  - 404p
-  - 406p
-  - 415p
-  - 420p
-  - 423p
-  - 429p
-  - 438p
-  - 446p
-  - 451p
-  - 502p
-  - 504p
-  - 508p
-- - 417p
-  - 424p
-  - 426p
-  - 435p
-  - 440p
-  - 443p
-  - 449p
-  - 458p
-  - 506p
-  - 511p
-  - 522p
-  - 524p
-  - 528p
-- - 437p
-  - 444p
-  - 446p
-  - 455p
-  - 500p
-  - 503p
-  - 509p
-  - 518p
-  - 526p
-  - 531p
-  - 542p
-  - 544p
-  - 548p
-- - 457p
-  - 504p
-  - 506p
-  - 515p
-  - 520p
-  - 523p
-  - 529p
-  - 538p
-  - 546p
-  - 551p
-  - 602p
-  - 604p
-  - 607p
-- - 517p
-  - 524p
-  - 526p
-  - 535p
-  - 540p
-  - 543p
-  - 549p
-  - 558p
-  - 606p
-  - 611p
-  - 621p
-  - 623p
-  - 626p
-- - 534p
-  - 541p
-  - 543p
-  - 552p
-  - 557p
-  - 600p
-  - 606p
-  - 614p
-  - 622p
-  - 627p
-  - 637p
-  - 639p
-  - 642p
-- - 557p
-  - 603p
-  - 605p
-  - 612p
-  - 615p
-  - 618p
-  - 624p
-  - 632p
-  - 640p
-  - 645p
-  - 655p
-  - 657p
-  - 700p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 705p
-  - 708p
-  - 714p
-  - 722p
-  - 730p
-  - 735p
-  - 745p
-  - 747p
-  - 750p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 805p
-  - 808p
-  - 814p
-  - 822p
-  - 830p
-  - 835p
-  - 845p
-  - 847p
-  - 850p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 905p
-  - 908p
-  - 914p
-  - 922p
-  - 930p
-  - 935p
-  - 945p
-  - 947p
-  - 950p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1005p
-  - 1008p
-  - 1014p
-  - 1022p
-  - 1030p
-  - 1035p
-  - 1045p
-  - 1047p
-  - 1050p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1105p
-  - 1108p
-  - 1114p
-  - 1122p
-  - 1130p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Hibberson/Kate Crace
-  - Gungahlin Market Place
-  - Ngunnawal Primary
-  - Nicholls Primary
-  - Federation Square
-  - Chuculba/William Slim
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/56-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/56-to-city-interchange.stop_times.yml
@@ -1,298 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "56"
+stop_times: [[537a, 539a, 543a, 557a, 608a, 618a, 625a, 631a, 633a, 639a], [617a, 619a, 623a, 637a, 648a, 658a, 705a, 711a, 713a, 719a], [637a, 639a, 643a, 657a, 708a, 718a, 725a, 731a, 733a, 739a], ["-", "-", "-", "-", 722a, 731a, 738a, 744a, 749a, 804a], [701a, 703a, 707a, 721a, 732a, 741a, 749a, 800a, 805a, 820a], [720a, 722a, 726a, 740a, 751a, 805a, 813a, 824a, 829a, 844a], [741a, 743a, 747a, 802a, 813a, 827a, 835a, 846a, 851a, 902a], [805a, 807a, 811a, 826a, 837a, 851a, 858a, 904a, 909a, 919a], [850a, 852a, 856a, 910a, 920a, 930a, 937a, 943a, 945a, 951a], [933a, 935a, 939a, 953a, 1003a, 1013a, 1020a, 1026a, 1028a, 1034a], [1033a, 1035a, 1039a, 1053a, 1103a, 1113a, 1120a, 1126a, 1128a, 1134a], [1133a, 1135a, 1139a, 1153a, 1203p, 1213p, 1220p, 1226p, 1228p, 1234p], [1233p, 1235p, 1239p, 1253p, 103p, 113p, 120p, 126p, 128p, 134p], [133p, 135p, 139p, 153p, 203p, 213p, 220p, 226p, 228p, 234p], [238p, 240p, 244p, 258p, 308p, 318p, 325p, 331p, 333p, 339p], [315p, 317p, 321p, 335p, 345p, 355p, 402p, 409p, 411p, 418p], [343p, 345p, 349p, 403p, 414p, 426p, 434p, 441p, 443p, 450p], [423p, 425p, 429p, 444p, 455p, 507p, 515p, 522p, 524p, 531p], [443p, 445p, 449p, 504p, 515p, 525p, 533p, 540p, 542p, 549p], [459p, 501p, 505p, 520p, 531p, 543p, 551p, 558p, 600p, 605p], [519p, 521p, 525p, 540p, 551p, 603p, 610p, 616p, 618p, 623p], [539p, 541p, 545p, 600p, 610p, 620p, 627p, 633p, 635p, 640p], [600p, 602p, 605p, 619p, 629p, 639p, 646p, 652p, 654p, 659p], [633p, 635p, 638p, 652p, 702p, 712p, 719p, 725p, 727p, 732p], [733p, 735p, 738p, 752p, 802p, 812p, 819p, 825p, 827p, 832p], [833p, 835p, 838p, 852p, 902p, 912p, 919p, 925p, 927p, 932p], [933p, 935p, 938p, 952p, 1002p, 1012p, 1019p, 1025p, 1027p, 1032p], [1033p, 1035p, 1038p, 1052p, 1102p, 1112p, 1119p, 1125p, 1127p, 1132p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "56"
-stop_times: 
-- - 537a
-  - 539a
-  - 543a
-  - 557a
-  - 608a
-  - 618a
-  - 625a
-  - 631a
-  - 633a
-  - 639a
-- - 617a
-  - 619a
-  - 623a
-  - 637a
-  - 648a
-  - 658a
-  - 705a
-  - 711a
-  - 713a
-  - 719a
-- - 637a
-  - 639a
-  - 643a
-  - 657a
-  - 708a
-  - 718a
-  - 725a
-  - 731a
-  - 733a
-  - 739a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 722a
-  - 731a
-  - 738a
-  - 744a
-  - 749a
-  - 804a
-- - 701a
-  - 703a
-  - 707a
-  - 721a
-  - 732a
-  - 741a
-  - 749a
-  - 800a
-  - 805a
-  - 820a
-- - 720a
-  - 722a
-  - 726a
-  - 740a
-  - 751a
-  - 805a
-  - 813a
-  - 824a
-  - 829a
-  - 844a
-- - 741a
-  - 743a
-  - 747a
-  - 802a
-  - 813a
-  - 827a
-  - 835a
-  - 846a
-  - 851a
-  - 902a
-- - 805a
-  - 807a
-  - 811a
-  - 826a
-  - 837a
-  - 851a
-  - 858a
-  - 904a
-  - 909a
-  - 919a
-- - 850a
-  - 852a
-  - 856a
-  - 910a
-  - 920a
-  - 930a
-  - 937a
-  - 943a
-  - 945a
-  - 951a
-- - 933a
-  - 935a
-  - 939a
-  - 953a
-  - 1003a
-  - 1013a
-  - 1020a
-  - 1026a
-  - 1028a
-  - 1034a
-- - 1033a
-  - 1035a
-  - 1039a
-  - 1053a
-  - 1103a
-  - 1113a
-  - 1120a
-  - 1126a
-  - 1128a
-  - 1134a
-- - 1133a
-  - 1135a
-  - 1139a
-  - 1153a
-  - 1203p
-  - 1213p
-  - 1220p
-  - 1226p
-  - 1228p
-  - 1234p
-- - 1233p
-  - 1235p
-  - 1239p
-  - 1253p
-  - 103p
-  - 113p
-  - 120p
-  - 126p
-  - 128p
-  - 134p
-- - 133p
-  - 135p
-  - 139p
-  - 153p
-  - 203p
-  - 213p
-  - 220p
-  - 226p
-  - 228p
-  - 234p
-- - 238p
-  - 240p
-  - 244p
-  - 258p
-  - 308p
-  - 318p
-  - 325p
-  - 331p
-  - 333p
-  - 339p
-- - 315p
-  - 317p
-  - 321p
-  - 335p
-  - 345p
-  - 355p
-  - 402p
-  - 409p
-  - 411p
-  - 418p
-- - 343p
-  - 345p
-  - 349p
-  - 403p
-  - 414p
-  - 426p
-  - 434p
-  - 441p
-  - 443p
-  - 450p
-- - 423p
-  - 425p
-  - 429p
-  - 444p
-  - 455p
-  - 507p
-  - 515p
-  - 522p
-  - 524p
-  - 531p
-- - 443p
-  - 445p
-  - 449p
-  - 504p
-  - 515p
-  - 525p
-  - 533p
-  - 540p
-  - 542p
-  - 549p
-- - 459p
-  - 501p
-  - 505p
-  - 520p
-  - 531p
-  - 543p
-  - 551p
-  - 558p
-  - 600p
-  - 605p
-- - 519p
-  - 521p
-  - 525p
-  - 540p
-  - 551p
-  - 603p
-  - 610p
-  - 616p
-  - 618p
-  - 623p
-- - 539p
-  - 541p
-  - 545p
-  - 600p
-  - 610p
-  - 620p
-  - 627p
-  - 633p
-  - 635p
-  - 640p
-- - 600p
-  - 602p
-  - 605p
-  - 619p
-  - 629p
-  - 639p
-  - 646p
-  - 652p
-  - 654p
-  - 659p
-- - 633p
-  - 635p
-  - 638p
-  - 652p
-  - 702p
-  - 712p
-  - 719p
-  - 725p
-  - 727p
-  - 732p
-- - 733p
-  - 735p
-  - 738p
-  - 752p
-  - 802p
-  - 812p
-  - 819p
-  - 825p
-  - 827p
-  - 832p
-- - 833p
-  - 835p
-  - 838p
-  - 852p
-  - 902p
-  - 912p
-  - 919p
-  - 925p
-  - 927p
-  - 932p
-- - 933p
-  - 935p
-  - 938p
-  - 952p
-  - 1002p
-  - 1012p
-  - 1019p
-  - 1025p
-  - 1027p
-  - 1032p
-- - 1033p
-  - 1035p
-  - 1038p
-  - 1052p
-  - 1102p
-  - 1112p
-  - 1119p
-  - 1125p
-  - 1127p
-  - 1132p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Gungahlin Market Place
-  - Kosciuszko/Everard
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/56-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/56-to-cohen-st-station.stop_times.yml
@@ -1,308 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "56"
+stop_times: [["-", "-", "-", "-", 602a, 612a, 623a, 637a, 639a, 643a], ["-", "-", "-", "-", 636a, 646a, 657a, 711a, 713a, 717a], ["-", "-", "-", "-", 706a, 716a, 727a, 741a, 743a, 747a], [651a, 657a, 659a, 705a, 712a, 722a, 733a, 747a, 749a, 753a], ["-", "-", "-", "-", 726a, 736a, 747a, 802a, 804a, 808a], ["-", "-", "-", "-", 744a, 756a, 807a, 822a, 824a, 828a], [741a, 747a, 749a, 755a, 803a, 815a, 826a, 841a, 843a, 847a], [801a, 808a, 810a, 816a, 824a, 836a, 847a, 902a, 904a, 908a], [821a, 828a, 830a, 836a, 844a, 856a, 906a, 920a, 922a, 926a], [851a, 858a, 900a, 906a, 913a, 925a, 935a, 949a, 951a, 955a], [1004a, 1010a, 1012a, 1018a, 1025a, 1037a, 1047a, 1101a, 1103a, 1107a], [1104a, 1110a, 1112a, 1118a, 1125a, 1137a, 1147a, 1201p, 1203p, 1207p], [1204p, 1210p, 1212p, 1218p, 1225p, 1237p, 1247p, 101p, 103p, 107p], [104p, 110p, 112p, 118p, 125p, 137p, 147p, 201p, 203p, 207p], [204p, 210p, 212p, 218p, 225p, 237p, 247p, 301p, 303p, 307p], [304p, 311p, 313p, 320p, 328p, 340p, 351p, 406p, 408p, 412p], [358p, 405p, 407p, 414p, 422p, 434p, 445p, 501p, 502p, 509p], [409p, 416p, 418p, 425p, 433p, 445p, 456p, 511p, 513p, 517p], [429p, 436p, 438p, 445p, 453p, 505p, 516p, 531p, 533p, 537p], [449p, 456p, 458p, 505p, 513p, 525p, 536p, 551p, 553p, 557p], [510p, 517p, 519p, 526p, 534p, 546p, 557p, 611p, 613p, 616p], [530p, 537p, 539p, 546p, 554p, 605p, 615p, 629p, 631p, 634p], [550p, 557p, 559p, 604p, 611p, 621p, 631p, 645p, 647p, 650p], [610p, 616p, 618p, 623p, 630p, 640p, 650p, 704p, 706p, 709p], [704p, 710p, 712p, 717p, 724p, 734p, 744p, 758p, 800p, 803p], [804p, 810p, 812p, 817p, 824p, 834p, 844p, 858p, 900p, 903p], [904p, 910p, 912p, 917p, 924p, 934p, 944p, 958p, 1000p, 1003p], [1004p, 1010p, 1012p, 1017p, 1024p, 1034p, 1044p, 1058p, 1100p, 1103p], [1104p, 1110p, 1112p, 1117p, 1124p, 1134p, 1144p, 1158p, 1200a, 1203a]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "56"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 602a
-  - 612a
-  - 623a
-  - 637a
-  - 639a
-  - 643a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 636a
-  - 646a
-  - 657a
-  - 711a
-  - 713a
-  - 717a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 706a
-  - 716a
-  - 727a
-  - 741a
-  - 743a
-  - 747a
-- - 651a
-  - 657a
-  - 659a
-  - 705a
-  - 712a
-  - 722a
-  - 733a
-  - 747a
-  - 749a
-  - 753a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 726a
-  - 736a
-  - 747a
-  - 802a
-  - 804a
-  - 808a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 744a
-  - 756a
-  - 807a
-  - 822a
-  - 824a
-  - 828a
-- - 741a
-  - 747a
-  - 749a
-  - 755a
-  - 803a
-  - 815a
-  - 826a
-  - 841a
-  - 843a
-  - 847a
-- - 801a
-  - 808a
-  - 810a
-  - 816a
-  - 824a
-  - 836a
-  - 847a
-  - 902a
-  - 904a
-  - 908a
-- - 821a
-  - 828a
-  - 830a
-  - 836a
-  - 844a
-  - 856a
-  - 906a
-  - 920a
-  - 922a
-  - 926a
-- - 851a
-  - 858a
-  - 900a
-  - 906a
-  - 913a
-  - 925a
-  - 935a
-  - 949a
-  - 951a
-  - 955a
-- - 1004a
-  - 1010a
-  - 1012a
-  - 1018a
-  - 1025a
-  - 1037a
-  - 1047a
-  - 1101a
-  - 1103a
-  - 1107a
-- - 1104a
-  - 1110a
-  - 1112a
-  - 1118a
-  - 1125a
-  - 1137a
-  - 1147a
-  - 1201p
-  - 1203p
-  - 1207p
-- - 1204p
-  - 1210p
-  - 1212p
-  - 1218p
-  - 1225p
-  - 1237p
-  - 1247p
-  - 101p
-  - 103p
-  - 107p
-- - 104p
-  - 110p
-  - 112p
-  - 118p
-  - 125p
-  - 137p
-  - 147p
-  - 201p
-  - 203p
-  - 207p
-- - 204p
-  - 210p
-  - 212p
-  - 218p
-  - 225p
-  - 237p
-  - 247p
-  - 301p
-  - 303p
-  - 307p
-- - 304p
-  - 311p
-  - 313p
-  - 320p
-  - 328p
-  - 340p
-  - 351p
-  - 406p
-  - 408p
-  - 412p
-- - 358p
-  - 405p
-  - 407p
-  - 414p
-  - 422p
-  - 434p
-  - 445p
-  - 501p
-  - 502p
-  - 509p
-- - 409p
-  - 416p
-  - 418p
-  - 425p
-  - 433p
-  - 445p
-  - 456p
-  - 511p
-  - 513p
-  - 517p
-- - 429p
-  - 436p
-  - 438p
-  - 445p
-  - 453p
-  - 505p
-  - 516p
-  - 531p
-  - 533p
-  - 537p
-- - 449p
-  - 456p
-  - 458p
-  - 505p
-  - 513p
-  - 525p
-  - 536p
-  - 551p
-  - 553p
-  - 557p
-- - 510p
-  - 517p
-  - 519p
-  - 526p
-  - 534p
-  - 546p
-  - 557p
-  - 611p
-  - 613p
-  - 616p
-- - 530p
-  - 537p
-  - 539p
-  - 546p
-  - 554p
-  - 605p
-  - 615p
-  - 629p
-  - 631p
-  - 634p
-- - 550p
-  - 557p
-  - 559p
-  - 604p
-  - 611p
-  - 621p
-  - 631p
-  - 645p
-  - 647p
-  - 650p
-- - 610p
-  - 616p
-  - 618p
-  - 623p
-  - 630p
-  - 640p
-  - 650p
-  - 704p
-  - 706p
-  - 709p
-- - 704p
-  - 710p
-  - 712p
-  - 717p
-  - 724p
-  - 734p
-  - 744p
-  - 758p
-  - 800p
-  - 803p
-- - 804p
-  - 810p
-  - 812p
-  - 817p
-  - 824p
-  - 834p
-  - 844p
-  - 858p
-  - 900p
-  - 903p
-- - 904p
-  - 910p
-  - 912p
-  - 917p
-  - 924p
-  - 934p
-  - 944p
-  - 958p
-  - 1000p
-  - 1003p
-- - 1004p
-  - 1010p
-  - 1012p
-  - 1017p
-  - 1024p
-  - 1034p
-  - 1044p
-  - 1058p
-  - 1100p
-  - 1103p
-- - 1104p
-  - 1110p
-  - 1112p
-  - 1117p
-  - 1124p
-  - 1134p
-  - 1144p
-  - 1158p
-  - 1200a
-  - 1203a
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Kosciuszko/Everard
-  - Gungahlin Market Place
-  - Chuculba/William Slim
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/58-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/58-to-city-interchange.stop_times.yml
@@ -1,316 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "58"
+stop_times: [["-", "-", "-", 543a, 554a, 602a, 609a, 615a, 621a, 623a, 629a], ["-", "-", "-", 623a, 634a, 642a, 649a, 655a, 701a, 703a, 709a], ["-", "-", "-", "-", 654a, 702a, 709a, 715a, 721a, 723a, 729a], ["-", "-", "-", "-", 713a, 721a, 728a, 734a, 740a, 742a, 752a], ["-", "-", "-", "-", 723a, 731a, 738a, 744a, 754a, 759a, 814a], ["-", "-", "-", "-", 740a, 748a, 755a, 803a, 814a, 819a, 834a], [726a, 728a, 732a, 746a, 757a, 806a, 813a, 821a, 833a, 839a, 854a], [747a, 749a, 753a, 808a, 819a, 828a, 835a, 843a, 854a, 859a, 909a], [829a, 831a, 835a, 850a, 901a, 909a, 916a, 923a, 929a, 931a, 937a], [909a, 911a, 915a, 929a, 939a, 947a, 954a, 1001a, 1007a, 1009a, 1015a], [1009a, 1011a, 1015a, 1029a, 1039a, 1047a, 1054a, 1101a, 1107a, 1109a, 1115a], [1109a, 1111a, 1115a, 1129a, 1139a, 1147a, 1154a, 1201p, 1207p, 1209p, 1215p], [1209p, 1211p, 1215p, 1229p, 1239p, 1247p, 1254p, 101p, 107p, 109p, 115p], [109p, 111p, 115p, 129p, 139p, 147p, 154p, 201p, 207p, 209p, 215p], [209p, 211p, 215p, 229p, 239p, 247p, 254p, 301p, 307p, 309p, 315p], [309p, 311p, 315p, 329p, 339p, 347p, 354p, 401p, 408p, 410p, 417p], [409p, 411p, 415p, 430p, 441p, 450p, 457p, 505p, 512p, 514p, 521p], [429p, 431p, 435p, 450p, 501p, 510p, 517p, 525p, 532p, 534p, 541p], [449p, 451p, 455p, 510p, 521p, 530p, 537p, 545p, 552p, 554p, 601p], [509p, 511p, 515p, 530p, 541p, 550p, 557p, 604p, 610p, 612p, 617p], [529p, 531p, 535p, 550p, 601p, 609p, 616p, 622p, 628p, 630p, 635p], [549p, 551p, 555p, 609p, 619p, 627p, 633p, 639p, 645p, 647p, 652p], [609p, 611p, 614p, 628p, 638p, 646p, 653p, 659p, 705p, 707p, 712p], [709p, 711p, 714p, 728p, 738p, 746p, 753p, 759p, 805p, 807p, 812p], [809p, 811p, 814p, 828p, 838p, 846p, 853p, 859p, 905p, 907p, 912p], [909p, 911p, 914p, 928p, 938p, 946p, 953p, 959p, 1005p, 1007p, 1012p], [1009p, 1011p, 1014p, 1028p, 1038p, 1046p, 1053p, 1059p, 1105p, 1107p, 1112p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "58"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 543a
-  - 554a
-  - 602a
-  - 609a
-  - 615a
-  - 621a
-  - 623a
-  - 629a
-- - "-"
-  - "-"
-  - "-"
-  - 623a
-  - 634a
-  - 642a
-  - 649a
-  - 655a
-  - 701a
-  - 703a
-  - 709a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 654a
-  - 702a
-  - 709a
-  - 715a
-  - 721a
-  - 723a
-  - 729a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 713a
-  - 721a
-  - 728a
-  - 734a
-  - 740a
-  - 742a
-  - 752a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 731a
-  - 738a
-  - 744a
-  - 754a
-  - 759a
-  - 814a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 748a
-  - 755a
-  - 803a
-  - 814a
-  - 819a
-  - 834a
-- - 726a
-  - 728a
-  - 732a
-  - 746a
-  - 757a
-  - 806a
-  - 813a
-  - 821a
-  - 833a
-  - 839a
-  - 854a
-- - 747a
-  - 749a
-  - 753a
-  - 808a
-  - 819a
-  - 828a
-  - 835a
-  - 843a
-  - 854a
-  - 859a
-  - 909a
-- - 829a
-  - 831a
-  - 835a
-  - 850a
-  - 901a
-  - 909a
-  - 916a
-  - 923a
-  - 929a
-  - 931a
-  - 937a
-- - 909a
-  - 911a
-  - 915a
-  - 929a
-  - 939a
-  - 947a
-  - 954a
-  - 1001a
-  - 1007a
-  - 1009a
-  - 1015a
-- - 1009a
-  - 1011a
-  - 1015a
-  - 1029a
-  - 1039a
-  - 1047a
-  - 1054a
-  - 1101a
-  - 1107a
-  - 1109a
-  - 1115a
-- - 1109a
-  - 1111a
-  - 1115a
-  - 1129a
-  - 1139a
-  - 1147a
-  - 1154a
-  - 1201p
-  - 1207p
-  - 1209p
-  - 1215p
-- - 1209p
-  - 1211p
-  - 1215p
-  - 1229p
-  - 1239p
-  - 1247p
-  - 1254p
-  - 101p
-  - 107p
-  - 109p
-  - 115p
-- - 109p
-  - 111p
-  - 115p
-  - 129p
-  - 139p
-  - 147p
-  - 154p
-  - 201p
-  - 207p
-  - 209p
-  - 215p
-- - 209p
-  - 211p
-  - 215p
-  - 229p
-  - 239p
-  - 247p
-  - 254p
-  - 301p
-  - 307p
-  - 309p
-  - 315p
-- - 309p
-  - 311p
-  - 315p
-  - 329p
-  - 339p
-  - 347p
-  - 354p
-  - 401p
-  - 408p
-  - 410p
-  - 417p
-- - 409p
-  - 411p
-  - 415p
-  - 430p
-  - 441p
-  - 450p
-  - 457p
-  - 505p
-  - 512p
-  - 514p
-  - 521p
-- - 429p
-  - 431p
-  - 435p
-  - 450p
-  - 501p
-  - 510p
-  - 517p
-  - 525p
-  - 532p
-  - 534p
-  - 541p
-- - 449p
-  - 451p
-  - 455p
-  - 510p
-  - 521p
-  - 530p
-  - 537p
-  - 545p
-  - 552p
-  - 554p
-  - 601p
-- - 509p
-  - 511p
-  - 515p
-  - 530p
-  - 541p
-  - 550p
-  - 557p
-  - 604p
-  - 610p
-  - 612p
-  - 617p
-- - 529p
-  - 531p
-  - 535p
-  - 550p
-  - 601p
-  - 609p
-  - 616p
-  - 622p
-  - 628p
-  - 630p
-  - 635p
-- - 549p
-  - 551p
-  - 555p
-  - 609p
-  - 619p
-  - 627p
-  - 633p
-  - 639p
-  - 645p
-  - 647p
-  - 652p
-- - 609p
-  - 611p
-  - 614p
-  - 628p
-  - 638p
-  - 646p
-  - 653p
-  - 659p
-  - 705p
-  - 707p
-  - 712p
-- - 709p
-  - 711p
-  - 714p
-  - 728p
-  - 738p
-  - 746p
-  - 753p
-  - 759p
-  - 805p
-  - 807p
-  - 812p
-- - 809p
-  - 811p
-  - 814p
-  - 828p
-  - 838p
-  - 846p
-  - 853p
-  - 859p
-  - 905p
-  - 907p
-  - 912p
-- - 909p
-  - 911p
-  - 914p
-  - 928p
-  - 938p
-  - 946p
-  - 953p
-  - 959p
-  - 1005p
-  - 1007p
-  - 1012p
-- - 1009p
-  - 1011p
-  - 1014p
-  - 1028p
-  - 1038p
-  - 1046p
-  - 1053p
-  - 1059p
-  - 1105p
-  - 1107p
-  - 1112p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Gungahlin Market Place
-  - Anthony Rolfe/Moonlight
-  - Flemington/Nullabor
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/58-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/58-to-cohen-st-station.stop_times.yml
@@ -1,305 +1,9 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "58"
+stop_times: [["-", "-", "-", "-", 551a, 558a, 606a, "-", "-", "-", "-"], ["-", "-", "-", "-", 624a, 631a, 639a, "-", "-", "-", "-"], [631a, 637a, 639a, 645a, 651a, 658a, 706a, 717a, 731a, 733a, 737a], [711a, 717a, 719a, 725a, 731a, 738a, 746a, 757a, 812a, 814a, 818a], [727a, 733a, 735a, 741a, 748a, 757a, 806a, 817a, 832a, 834a, 838a], [745a, 752a, 754a, 800a, 808a, 817a, 826a, 837a, 852a, 854a, 858a], [805a, 812a, 814a, 820a, 828a, 837a, 846a, 857a, 911a, 913a, 917a], [917a, 923a, 925a, 931a, 938a, 945a, 953a, 1003a, 1017a, 1019a, 1023a], [1017a, 1023a, 1025a, 1031a, 1038a, 1045a, 1053a, 1103a, 1117a, 1119a, 1123a], [1117a, 1123a, 1125a, 1131a, 1138a, 1145a, 1153a, 1203p, 1217p, 1219p, 1223p], [1217p, 1223p, 1225p, 1231p, 1238p, 1245p, 1253p, 103p, 117p, 119p, 123p], [117p, 123p, 125p, 131p, 138p, 145p, 153p, 203p, 217p, 219p, 223p], [217p, 223p, 225p, 231p, 238p, 245p, 253p, 303p, 318p, 320p, 324p], [328p, 335p, 337p, 344p, 352p, 401p, 410p, 421p, 436p, 438p, 442p], [419p, 426p, 428p, 435p, 443p, 452p, 501p, 512p, 527p, 529p, 533p], [439p, 446p, 448p, 455p, 503p, 512p, 521p, 532p, 547p, 549p, 553p], [500p, 507p, 509p, 516p, 524p, 533p, 542p, 553p, 607p, 609p, 612p], [520p, 527p, 529p, 536p, 544p, 553p, 602p, 612p, 626p, 628p, 631p], [540p, 547p, 549p, 556p, 603p, 610p, 618p, 628p, 642p, 644p, 647p], [600p, 606p, 608p, 613p, 619p, 626p, 634p, 644p, 658p, 700p, 703p], [631p, 637p, 639p, 644p, 650p, 657p, 705p, 715p, 729p, 731p, 734p], [717p, 723p, 725p, 730p, 736p, 743p, 751p, 801p, 815p, 817p, 820p], [817p, 823p, 825p, 830p, 836p, 843p, 851p, 901p, 915p, 917p, 920p], [917p, 923p, 925p, 930p, 936p, 943p, 951p, 1001p, 1015p, 1017p, 1020p], [1017p, 1023p, 1025p, 1030p, 1036p, 1043p, 1051p, 1101p, 1115p, 1117p, 1120p], [1117p, 1123p, 1125p, 1130p, 1136p, 1143p, 1151p, 1201a, 1215a, 1217a, 1220a]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "58"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 551a
-  - 558a
-  - 606a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 624a
-  - 631a
-  - 639a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 631a
-  - 637a
-  - 639a
-  - 645a
-  - 651a
-  - 658a
-  - 706a
-  - 717a
-  - 731a
-  - 733a
-  - 737a
-- - 711a
-  - 717a
-  - 719a
-  - 725a
-  - 731a
-  - 738a
-  - 746a
-  - 757a
-  - 812a
-  - 814a
-  - 818a
-- - 727a
-  - 733a
-  - 735a
-  - 741a
-  - 748a
-  - 757a
-  - 806a
-  - 817a
-  - 832a
-  - 834a
-  - 838a
-- - 745a
-  - 752a
-  - 754a
-  - 800a
-  - 808a
-  - 817a
-  - 826a
-  - 837a
-  - 852a
-  - 854a
-  - 858a
-- - 805a
-  - 812a
-  - 814a
-  - 820a
-  - 828a
-  - 837a
-  - 846a
-  - 857a
-  - 911a
-  - 913a
-  - 917a
-- - 917a
-  - 923a
-  - 925a
-  - 931a
-  - 938a
-  - 945a
-  - 953a
-  - 1003a
-  - 1017a
-  - 1019a
-  - 1023a
-- - 1017a
-  - 1023a
-  - 1025a
-  - 1031a
-  - 1038a
-  - 1045a
-  - 1053a
-  - 1103a
-  - 1117a
-  - 1119a
-  - 1123a
-- - 1117a
-  - 1123a
-  - 1125a
-  - 1131a
-  - 1138a
-  - 1145a
-  - 1153a
-  - 1203p
-  - 1217p
-  - 1219p
-  - 1223p
-- - 1217p
-  - 1223p
-  - 1225p
-  - 1231p
-  - 1238p
-  - 1245p
-  - 1253p
-  - 103p
-  - 117p
-  - 119p
-  - 123p
-- - 117p
-  - 123p
-  - 125p
-  - 131p
-  - 138p
-  - 145p
-  - 153p
-  - 203p
-  - 217p
-  - 219p
-  - 223p
-- - 217p
-  - 223p
-  - 225p
-  - 231p
-  - 238p
-  - 245p
-  - 253p
-  - 303p
-  - 318p
-  - 320p
-  - 324p
-- - 328p
-  - 335p
-  - 337p
-  - 344p
-  - 352p
-  - 401p
-  - 410p
-  - 421p
-  - 436p
-  - 438p
-  - 442p
-- - 419p
-  - 426p
-  - 428p
-  - 435p
-  - 443p
-  - 452p
-  - 501p
-  - 512p
-  - 527p
-  - 529p
-  - 533p
-- - 439p
-  - 446p
-  - 448p
-  - 455p
-  - 503p
-  - 512p
-  - 521p
-  - 532p
-  - 547p
-  - 549p
-  - 553p
-- - 500p
-  - 507p
-  - 509p
-  - 516p
-  - 524p
-  - 533p
-  - 542p
-  - 553p
-  - 607p
-  - 609p
-  - 612p
-- - 520p
-  - 527p
-  - 529p
-  - 536p
-  - 544p
-  - 553p
-  - 602p
-  - 612p
-  - 626p
-  - 628p
-  - 631p
-- - 540p
-  - 547p
-  - 549p
-  - 556p
-  - 603p
-  - 610p
-  - 618p
-  - 628p
-  - 642p
-  - 644p
-  - 647p
-- - 600p
-  - 606p
-  - 608p
-  - 613p
-  - 619p
-  - 626p
-  - 634p
-  - 644p
-  - 658p
-  - 700p
-  - 703p
-- - 631p
-  - 637p
-  - 639p
-  - 644p
-  - 650p
-  - 657p
-  - 705p
-  - 715p
-  - 729p
-  - 731p
-  - 734p
-- - 717p
-  - 723p
-  - 725p
-  - 730p
-  - 736p
-  - 743p
-  - 751p
-  - 801p
-  - 815p
-  - 817p
-  - 820p
-- - 817p
-  - 823p
-  - 825p
-  - 830p
-  - 836p
-  - 843p
-  - 851p
-  - 901p
-  - 915p
-  - 917p
-  - 920p
-- - 917p
-  - 923p
-  - 925p
-  - 930p
-  - 936p
-  - 943p
-  - 951p
-  - 1001p
-  - 1015p
-  - 1017p
-  - 1020p
-- - 1017p
-  - 1023p
-  - 1025p
-  - 1030p
-  - 1036p
-  - 1043p
-  - 1051p
-  - 1101p
-  - 1115p
-  - 1117p
-  - 1120p
-- - 1117p
-  - 1123p
-  - 1125p
-  - 1130p
-  - 1136p
-  - 1143p
-  - 1151p
-  - 1201a
-  - 1215a
-  - 1217a
-  - 1220a
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Flemington/Nullabor
-  - Anthony Rolfe/Moonlight
-  - Gungahlin Market Place
-  - Chuculba/William Slim
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/59-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/59-to-city-interchange.stop_times.yml
@@ -1,416 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "59"
+stop_times: [["-", "-", "-", "-", 542a, 548a, 603a, 606a, "-", "-", "-", "-"], ["-", "-", "-", "-", 617a, 623a, 638a, 641a, "-", "-", "-", "-"], ["-", "-", "-", "-", 650a, 656a, 711a, 714a, 717a, 724a, 726a, 733a], ["-", "-", "-", "-", 706a, 712a, 727a, 730a, 733a, 740a, 742a, 754a], ["-", "-", "-", "-", 718a, 724a, 739a, 742a, 745a, 756a, 801a, 815a], ["-", "-", "-", "-", 741a, 747a, 802a, 805a, 810a, 821a, 826a, 841a], ["-", "-", "-", "-", 813a, 819a, 834a, 837a, 842a, 853a, 858a, 906a], ["-", "-", "-", "-", 824a, 830a, 845a, 848a, 853a, 904a, 909a, 920a], ["-", "-", "-", "-", 857a, 903a, 918a, 921a, 924a, 931a, 933a, 940a], [907a, 909a, 913a, 927a, 937a, 943a, 958a, 1001a, "-", "-", "-", "-"], [1007a, 1009a, 1013a, 1027a, 1037a, 1043a, 1058a, 1101a, "-", "-", "-", "-"], [1107a, 1109a, 1113a, 1127a, 1137a, 1143a, 1158a, 1201p, "-", "-", "-", "-"], [1207p, 1209p, 1213p, 1227p, 1237p, 1243p, 1258p, 101p, "-", "-", "-", "-"], [107p, 109p, 113p, 127p, 137p, 143p, 158p, 201p, "-", "-", "-", "-"], [207p, 209p, 213p, 227p, 237p, 243p, 258p, 301p, "-", "-", "-", "-"], [244p, 246p, 250p, 304p, 314p, 320p, 335p, 338p, "-", "-", "-", "-"], [322p, 324p, 328p, 343p, 353p, 359p, 414p, 417p, "-", "-", "-", "-"], [337p, 339p, 343p, 358p, 408p, 414p, 429p, 432p, "-", "-", "-", "-"], [352p, 354p, 358p, 413p, 423p, 429p, 444p, 447p, "-", "-", "-", "-"], [407p, 409p, 413p, 428p, 438p, 444p, 459p, 502p, "-", "-", "-", "-"], [422p, 424p, 428p, 443p, 453p, 459p, 514p, 517p, "-", "-", "-", "-"], [437p, 439p, 443p, 458p, 508p, 514p, 529p, 532p, "-", "-", "-", "-"], [452p, 454p, 458p, 513p, 523p, 529p, 544p, 547p, "-", "-", "-", "-"], [507p, 509p, 513p, 528p, 538p, 544p, 559p, 602p, "-", "-", "-", "-"], [522p, 524p, 528p, 543p, 553p, 559p, 614p, 617p, "-", "-", "-", "-"], [535p, 537p, 541p, 556p, 605p, 611p, 626p, 629p, "-", "-", "-", "-"], [552p, 554p, 558p, 612p, 621p, 627p, 642p, 645p, "-", "-", "-", "-"], [608p, 610p, 613p, 627p, 636p, 642p, 657p, 700p, "-", "-", "-", "-"], [708p, 710p, 713p, 727p, 736p, 742p, 757p, 800p, "-", "-", "-", "-"], [808p, 810p, 813p, 827p, 836p, 842p, 857p, 900p, "-", "-", "-", "-"], [908p, 910p, 913p, 927p, 936p, 942p, 957p, 1000p, "-", "-", "-", "-"], [1008p, 1010p, 1013p, 1027p, 1036p, 1042p, 1057p, 1100p, "-", "-", "-", "-"], [1108p, 1110p, 1113p, 1127p, 1136p, 1142p, 1157p, 1200a, "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Paul Coe / Mirrabei, Katherine / Horse Park, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "59"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 542a
-  - 548a
-  - 603a
-  - 606a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 617a
-  - 623a
-  - 638a
-  - 641a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 650a
-  - 656a
-  - 711a
-  - 714a
-  - 717a
-  - 724a
-  - 726a
-  - 733a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 706a
-  - 712a
-  - 727a
-  - 730a
-  - 733a
-  - 740a
-  - 742a
-  - 754a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 718a
-  - 724a
-  - 739a
-  - 742a
-  - 745a
-  - 756a
-  - 801a
-  - 815a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 741a
-  - 747a
-  - 802a
-  - 805a
-  - 810a
-  - 821a
-  - 826a
-  - 841a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 813a
-  - 819a
-  - 834a
-  - 837a
-  - 842a
-  - 853a
-  - 858a
-  - 906a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 824a
-  - 830a
-  - 845a
-  - 848a
-  - 853a
-  - 904a
-  - 909a
-  - 920a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 857a
-  - 903a
-  - 918a
-  - 921a
-  - 924a
-  - 931a
-  - 933a
-  - 940a
-- - 907a
-  - 909a
-  - 913a
-  - 927a
-  - 937a
-  - 943a
-  - 958a
-  - 1001a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1007a
-  - 1009a
-  - 1013a
-  - 1027a
-  - 1037a
-  - 1043a
-  - 1058a
-  - 1101a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1107a
-  - 1109a
-  - 1113a
-  - 1127a
-  - 1137a
-  - 1143a
-  - 1158a
-  - 1201p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1207p
-  - 1209p
-  - 1213p
-  - 1227p
-  - 1237p
-  - 1243p
-  - 1258p
-  - 101p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 107p
-  - 109p
-  - 113p
-  - 127p
-  - 137p
-  - 143p
-  - 158p
-  - 201p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 207p
-  - 209p
-  - 213p
-  - 227p
-  - 237p
-  - 243p
-  - 258p
-  - 301p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 244p
-  - 246p
-  - 250p
-  - 304p
-  - 314p
-  - 320p
-  - 335p
-  - 338p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 322p
-  - 324p
-  - 328p
-  - 343p
-  - 353p
-  - 359p
-  - 414p
-  - 417p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 337p
-  - 339p
-  - 343p
-  - 358p
-  - 408p
-  - 414p
-  - 429p
-  - 432p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 352p
-  - 354p
-  - 358p
-  - 413p
-  - 423p
-  - 429p
-  - 444p
-  - 447p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 407p
-  - 409p
-  - 413p
-  - 428p
-  - 438p
-  - 444p
-  - 459p
-  - 502p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 422p
-  - 424p
-  - 428p
-  - 443p
-  - 453p
-  - 459p
-  - 514p
-  - 517p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 437p
-  - 439p
-  - 443p
-  - 458p
-  - 508p
-  - 514p
-  - 529p
-  - 532p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 452p
-  - 454p
-  - 458p
-  - 513p
-  - 523p
-  - 529p
-  - 544p
-  - 547p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 507p
-  - 509p
-  - 513p
-  - 528p
-  - 538p
-  - 544p
-  - 559p
-  - 602p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 522p
-  - 524p
-  - 528p
-  - 543p
-  - 553p
-  - 559p
-  - 614p
-  - 617p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 535p
-  - 537p
-  - 541p
-  - 556p
-  - 605p
-  - 611p
-  - 626p
-  - 629p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 552p
-  - 554p
-  - 558p
-  - 612p
-  - 621p
-  - 627p
-  - 642p
-  - 645p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 608p
-  - 610p
-  - 613p
-  - 627p
-  - 636p
-  - 642p
-  - 657p
-  - 700p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 708p
-  - 710p
-  - 713p
-  - 727p
-  - 736p
-  - 742p
-  - 757p
-  - 800p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 808p
-  - 810p
-  - 813p
-  - 827p
-  - 836p
-  - 842p
-  - 857p
-  - 900p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 908p
-  - 910p
-  - 913p
-  - 927p
-  - 936p
-  - 942p
-  - 957p
-  - 1000p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1008p
-  - 1010p
-  - 1013p
-  - 1027p
-  - 1036p
-  - 1042p
-  - 1057p
-  - 1100p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1108p
-  - 1110p
-  - 1113p
-  - 1127p
-  - 1136p
-  - 1142p
-  - 1157p
-  - 1200a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Paul Coe / Mirrabei
-  - Katherine / Horse Park
-  - Gungahlin Market Place
-  - Hibberson/Kate Crace
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/59-to-cohen-street-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/59-to-cohen-street-station.stop_times.yml
@@ -1,356 +1,9 @@
 --- 
 long_name: To Cohen Street Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "59"
+stop_times: [["-", "-", "-", "-", 645a, 648a, 703a, 709a, 718a, 732a, 734a, 738a], ["-", "-", "-", "-", 710a, 713a, 728a, 734a, 743a, 758a, 800a, 804a], ["-", "-", "-", "-", 730a, 733a, 748a, 754a, 803a, 818a, 820a, 824a], ["-", "-", "-", "-", 755a, 758a, 813a, 819a, 828a, 843a, 845a, 849a], ["-", "-", "-", "-", 815a, 818a, 833a, 839a, 848a, 903a, 905a, 909a], ["-", "-", "-", "-", 907a, 910a, 925a, 931a, 940a, 954a, 956a, 1000a], ["-", "-", "-", "-", 1007a, 1010a, 1025a, 1031a, 1040a, 1054a, 1056a, 1100a], ["-", "-", "-", "-", 1107a, 1110a, 1125a, 1131a, 1140a, 1154a, 1156a, 1200p], ["-", "-", "-", "-", 1207p, 1210p, 1225p, 1231p, 1240p, 1254p, 1256p, 100p], ["-", "-", "-", "-", 107p, 110p, 125p, 131p, 140p, 154p, 156p, 200p], ["-", "-", "-", "-", 207p, 210p, 225p, 231p, 240p, 254p, 256p, 300p], ["-", "-", "-", "-", 307p, 310p, 325p, 331p, 340p, 354p, 356p, 400p], [326p, 332p, 334p, 342p, 345p, 348p, 403p, 409p, 419p, 434p, 436p, 440p], [341p, 347p, 349p, 357p, 400p, 403p, 418p, 424p, 434p, 449p, 451p, 455p], [353p, 359p, 401p, 410p, 415p, 418p, 433p, 439p, 449p, 504p, 506p, 510p], [407p, 414p, 416p, 425p, 430p, 433p, 448p, 454p, 504p, 519p, 521p, 525p], [422p, 429p, 431p, 440p, 445p, 448p, 503p, 509p, 519p, 534p, 536p, 540p], [437p, 444p, 446p, 455p, 500p, 503p, 518p, 524p, 534p, 549p, 551p, 555p], [452p, 459p, 501p, 510p, 515p, 518p, 533p, 539p, 549p, 604p, 606p, 609p], [507p, 514p, 516p, 525p, 530p, 533p, 548p, 554p, 604p, 618p, 620p, 623p], [522p, 529p, 531p, 540p, 545p, 548p, 603p, 609p, 618p, 632p, 634p, 637p], [536p, 543p, 545p, 554p, 559p, 602p, 617p, 623p, 632p, 646p, 648p, 651p], [552p, 559p, 601p, 608p, 611p, 614p, 629p, 635p, 644p, 658p, 700p, 703p], ["-", "-", "-", "-", 707p, 710p, 725p, 731p, 740p, 754p, 756p, 759p], ["-", "-", "-", "-", 807p, 810p, 825p, 831p, 840p, 854p, 856p, 859p], ["-", "-", "-", "-", 907p, 910p, 925p, 931p, 940p, 954p, 956p, 959p], ["-", "-", "-", "-", 1007p, 1010p, 1025p, 1031p, 1040p, 1054p, 1056p, 1059p], ["-", "-", "-", "-", 1107p, 1110p, 1125p, 1131p, 1140p, 1154p, 1156p, 1159p]]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Hibberson/Kate Crace, Gungahlin Market Place, Katherine / Horse Park, Paul Coe / Mirrabei, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "59"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 645a
-  - 648a
-  - 703a
-  - 709a
-  - 718a
-  - 732a
-  - 734a
-  - 738a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 710a
-  - 713a
-  - 728a
-  - 734a
-  - 743a
-  - 758a
-  - 800a
-  - 804a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 730a
-  - 733a
-  - 748a
-  - 754a
-  - 803a
-  - 818a
-  - 820a
-  - 824a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 755a
-  - 758a
-  - 813a
-  - 819a
-  - 828a
-  - 843a
-  - 845a
-  - 849a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 815a
-  - 818a
-  - 833a
-  - 839a
-  - 848a
-  - 903a
-  - 905a
-  - 909a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 907a
-  - 910a
-  - 925a
-  - 931a
-  - 940a
-  - 954a
-  - 956a
-  - 1000a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1007a
-  - 1010a
-  - 1025a
-  - 1031a
-  - 1040a
-  - 1054a
-  - 1056a
-  - 1100a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1107a
-  - 1110a
-  - 1125a
-  - 1131a
-  - 1140a
-  - 1154a
-  - 1156a
-  - 1200p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1207p
-  - 1210p
-  - 1225p
-  - 1231p
-  - 1240p
-  - 1254p
-  - 1256p
-  - 100p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 107p
-  - 110p
-  - 125p
-  - 131p
-  - 140p
-  - 154p
-  - 156p
-  - 200p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 207p
-  - 210p
-  - 225p
-  - 231p
-  - 240p
-  - 254p
-  - 256p
-  - 300p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 307p
-  - 310p
-  - 325p
-  - 331p
-  - 340p
-  - 354p
-  - 356p
-  - 400p
-- - 326p
-  - 332p
-  - 334p
-  - 342p
-  - 345p
-  - 348p
-  - 403p
-  - 409p
-  - 419p
-  - 434p
-  - 436p
-  - 440p
-- - 341p
-  - 347p
-  - 349p
-  - 357p
-  - 400p
-  - 403p
-  - 418p
-  - 424p
-  - 434p
-  - 449p
-  - 451p
-  - 455p
-- - 353p
-  - 359p
-  - 401p
-  - 410p
-  - 415p
-  - 418p
-  - 433p
-  - 439p
-  - 449p
-  - 504p
-  - 506p
-  - 510p
-- - 407p
-  - 414p
-  - 416p
-  - 425p
-  - 430p
-  - 433p
-  - 448p
-  - 454p
-  - 504p
-  - 519p
-  - 521p
-  - 525p
-- - 422p
-  - 429p
-  - 431p
-  - 440p
-  - 445p
-  - 448p
-  - 503p
-  - 509p
-  - 519p
-  - 534p
-  - 536p
-  - 540p
-- - 437p
-  - 444p
-  - 446p
-  - 455p
-  - 500p
-  - 503p
-  - 518p
-  - 524p
-  - 534p
-  - 549p
-  - 551p
-  - 555p
-- - 452p
-  - 459p
-  - 501p
-  - 510p
-  - 515p
-  - 518p
-  - 533p
-  - 539p
-  - 549p
-  - 604p
-  - 606p
-  - 609p
-- - 507p
-  - 514p
-  - 516p
-  - 525p
-  - 530p
-  - 533p
-  - 548p
-  - 554p
-  - 604p
-  - 618p
-  - 620p
-  - 623p
-- - 522p
-  - 529p
-  - 531p
-  - 540p
-  - 545p
-  - 548p
-  - 603p
-  - 609p
-  - 618p
-  - 632p
-  - 634p
-  - 637p
-- - 536p
-  - 543p
-  - 545p
-  - 554p
-  - 559p
-  - 602p
-  - 617p
-  - 623p
-  - 632p
-  - 646p
-  - 648p
-  - 651p
-- - 552p
-  - 559p
-  - 601p
-  - 608p
-  - 611p
-  - 614p
-  - 629p
-  - 635p
-  - 644p
-  - 658p
-  - 700p
-  - 703p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 707p
-  - 710p
-  - 725p
-  - 731p
-  - 740p
-  - 754p
-  - 756p
-  - 759p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 807p
-  - 810p
-  - 825p
-  - 831p
-  - 840p
-  - 854p
-  - 856p
-  - 859p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 907p
-  - 910p
-  - 925p
-  - 931p
-  - 940p
-  - 954p
-  - 956p
-  - 959p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1007p
-  - 1010p
-  - 1025p
-  - 1031p
-  - 1040p
-  - 1054p
-  - 1056p
-  - 1059p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1107p
-  - 1110p
-  - 1125p
-  - 1131p
-  - 1140p
-  - 1154p
-  - 1156p
-  - 1159p
-time_points: 
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Hibberson/Kate Crace
-  - Gungahlin Market Place
-  - Katherine / Horse Park
-  - Paul Coe / Mirrabei
-  - Chuculba/William Slim
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/6-to-dickson.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/6-to-dickson.stop_times.yml
@@ -1,233 +1,8 @@
 --- 
 long_name: To Dickson
-between_stops: []
+between_stops: {}
 
 short_name: "6"
-stop_times: 
-- - 618a
-  - 626a
-  - 638a
-  - 645a
-  - 650a
-  - 701a
-  - 713a
-  - 719a
-  - 725a
-- - 653a
-  - 701a
-  - 713a
-  - 720a
-  - 725a
-  - 737a
-  - 751a
-  - 759a
-  - 806a
-- - 723a
-  - 731a
-  - 745a
-  - 753a
-  - 758a
-  - 812a
-  - 826a
-  - 834a
-  - 841a
-- - 753a
-  - 803a
-  - 817a
-  - 825a
-  - 830a
-  - 844a
-  - 858a
-  - 906a
-  - 913a
-- - 823a
-  - 833a
-  - 847a
-  - 855a
-  - 900a
-  - 914a
-  - 928a
-  - 936a
-  - 943a
-- - 853a
-  - 903a
-  - 917a
-  - 925a
-  - 930a
-  - 944a
-  - 956a
-  - 1004a
-  - 1011a
-- - 923a
-  - 933a
-  - 945a
-  - 952a
-  - 957a
-  - 1011a
-  - 1023a
-  - 1031a
-  - 1038a
-- - 1023a
-  - 1033a
-  - 1045a
-  - 1052a
-  - 1057a
-  - 1111a
-  - 1123a
-  - 1131a
-  - 1138a
-- - 1123a
-  - 1133a
-  - 1145a
-  - 1152a
-  - 1157a
-  - 1211p
-  - 1223p
-  - 1231p
-  - 1238p
-- - 1223p
-  - 1233p
-  - 1245p
-  - 1252p
-  - 1257p
-  - 111p
-  - 123p
-  - 131p
-  - 138p
-- - 123p
-  - 133p
-  - 145p
-  - 152p
-  - 157p
-  - 211p
-  - 223p
-  - 231p
-  - 238p
-- - 223p
-  - 233p
-  - 245p
-  - 252p
-  - 257p
-  - 311p
-  - 325p
-  - 333p
-  - 340p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 344p
-  - 358p
-  - 406p
-  - 413p
-- - 323p
-  - 333p
-  - 347p
-  - 355p
-  - 400p
-  - 414p
-  - 428p
-  - 436p
-  - 443p
-- - 353p
-  - 403p
-  - 417p
-  - 425p
-  - 430p
-  - 444p
-  - 458p
-  - 506p
-  - 513p
-- - 423p
-  - 433p
-  - 447p
-  - 455p
-  - 500p
-  - 514p
-  - 528p
-  - 536p
-  - 543p
-- - 453p
-  - 503p
-  - 517p
-  - 525p
-  - 530p
-  - 544p
-  - 558p
-  - 606p
-  - 613p
-- - 516p
-  - 526p
-  - 540p
-  - 548p
-  - 553p
-  - 607p
-  - 621p
-  - 629p
-  - 635p
-- - 553p
-  - 603p
-  - 617p
-  - 625p
-  - 630p
-  - 640p
-  - 650p
-  - 656p
-  - 702p
-- - 630p
-  - 638p
-  - 648p
-  - 655p
-  - 700p
-  - 710p
-  - 720p
-  - 726p
-  - 732p
-- - 730p
-  - 738p
-  - 748p
-  - 755p
-  - 800p
-  - 810p
-  - 820p
-  - 826p
-  - 832p
-- - 830p
-  - 838p
-  - 848p
-  - 855p
-  - 900p
-  - 910p
-  - 920p
-  - 926p
-  - 932p
-- - 930p
-  - 938p
-  - 948p
-  - 955p
-  - 1000p
-  - 1010p
-  - 1020p
-  - 1026p
-  - 1032p
-- - 1030p
-  - 1038p
-  - 1048p
-  - 1055p
-  - 1100p
-  - 1110p
-  - 1120p
-  - 1126p
-  - 1132p
-time_points: 
-  - Woden Interchange
-  - Canberra Hospital
-  - Red Hill
-  - Manuka/Captain Cook
-  - Kings Ave/National Crt
-  - City Interchange
-  - Lyneham
-  - North Lyneham
-  - Dickson
+stop_times: [[618a, 626a, 638a, 645a, 650a, 701a, 713a, 719a, 725a], [653a, 701a, 713a, 720a, 725a, 737a, 751a, 759a, 806a], [723a, 731a, 745a, 753a, 758a, 812a, 826a, 834a, 841a], [753a, 803a, 817a, 825a, 830a, 844a, 858a, 906a, 913a], [823a, 833a, 847a, 855a, 900a, 914a, 928a, 936a, 943a], [853a, 903a, 917a, 925a, 930a, 944a, 956a, 1004a, 1011a], [923a, 933a, 945a, 952a, 957a, 1011a, 1023a, 1031a, 1038a], [1023a, 1033a, 1045a, 1052a, 1057a, 1111a, 1123a, 1131a, 1138a], [1123a, 1133a, 1145a, 1152a, 1157a, 1211p, 1223p, 1231p, 1238p], [1223p, 1233p, 1245p, 1252p, 1257p, 111p, 123p, 131p, 138p], [123p, 133p, 145p, 152p, 157p, 211p, 223p, 231p, 238p], [223p, 233p, 245p, 252p, 257p, 311p, 325p, 333p, 340p], ["-", "-", "-", "-", "-", 344p, 358p, 406p, 413p], [323p, 333p, 347p, 355p, 400p, 414p, 428p, 436p, 443p], [353p, 403p, 417p, 425p, 430p, 444p, 458p, 506p, 513p], [423p, 433p, 447p, 455p, 500p, 514p, 528p, 536p, 543p], [453p, 503p, 517p, 525p, 530p, 544p, 558p, 606p, 613p], [516p, 526p, 540p, 548p, 553p, 607p, 621p, 629p, 635p], [553p, 603p, 617p, 625p, 630p, 640p, 650p, 656p, 702p], [630p, 638p, 648p, 655p, 700p, 710p, 720p, 726p, 732p], [730p, 738p, 748p, 755p, 800p, 810p, 820p, 826p, 832p], [830p, 838p, 848p, 855p, 900p, 910p, 920p, 926p, 932p], [930p, 938p, 948p, 955p, 1000p, 1010p, 1020p, 1026p, 1032p], [1030p, 1038p, 1048p, 1055p, 1100p, 1110p, 1120p, 1126p, 1132p]]
+time_points: [Woden Interchange, Canberra Hospital, Red Hill, Manuka/Captain Cook, Kings Ave/National Crt, City Interchange, Lyneham, North Lyneham, Dickson]
 

--- a/maxious-canberra-transit-feed/output/6-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/6-to-woden-interchange.stop_times.yml
@@ -1,233 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "6"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 650a
-  - 658a
-  - 703a
-  - 710a
-  - 720a
-  - 728a
-- - 648a
-  - 655a
-  - 701a
-  - 715a
-  - 723a
-  - 728a
-  - 736a
-  - 750a
-  - 758a
-- - 718a
-  - 725a
-  - 731a
-  - 747a
-  - 759a
-  - 804a
-  - 812a
-  - 826a
-  - 834a
-- - 748a
-  - 756a
-  - 804a
-  - 820a
-  - 828a
-  - 838a
-  - 846a
-  - 903a
-  - 911a
-- - 818a
-  - 826a
-  - 833a
-  - 849a
-  - 901a
-  - 906a
-  - 914a
-  - 928a
-  - 936a
-- - 848a
-  - 856a
-  - 903a
-  - 919a
-  - 931a
-  - 936a
-  - 943a
-  - 955a
-  - 1003a
-- - 918a
-  - 926a
-  - 933a
-  - 947a
-  - 957a
-  - 1002a
-  - 1009a
-  - 1021a
-  - 1029a
-- - 948a
-  - 956a
-  - 1003a
-  - 1017a
-  - 1027a
-  - 1032a
-  - 1039a
-  - 1051a
-  - 1059a
-- - 1048a
-  - 1056a
-  - 1103a
-  - 1117a
-  - 1127a
-  - 1132a
-  - 1139a
-  - 1151a
-  - 1159a
-- - 1148a
-  - 1156a
-  - 1203p
-  - 1217p
-  - 1227p
-  - 1232p
-  - 1239p
-  - 1251p
-  - 1259p
-- - 1248p
-  - 1256p
-  - 103p
-  - 117p
-  - 127p
-  - 132p
-  - 139p
-  - 151p
-  - 159p
-- - 148p
-  - 156p
-  - 203p
-  - 217p
-  - 227p
-  - 232p
-  - 239p
-  - 251p
-  - 259p
-- - 248p
-  - 256p
-  - 303p
-  - 319p
-  - 331p
-  - 336p
-  - 344p
-  - 358p
-  - 406p
-- - 318p
-  - 326p
-  - 333p
-  - 349p
-  - 401p
-  - 406p
-  - 414p
-  - 428p
-  - 436p
-- - 348p
-  - 356p
-  - 403p
-  - 419p
-  - 431p
-  - 436p
-  - 444p
-  - 458p
-  - 506p
-- - 418p
-  - 426p
-  - 433p
-  - 449p
-  - 501p
-  - 506p
-  - 514p
-  - 528p
-  - 536p
-- - 448p
-  - 456p
-  - 503p
-  - 519p
-  - 531p
-  - 536p
-  - 544p
-  - 558p
-  - 606p
-- - 518p
-  - 526p
-  - 533p
-  - 549p
-  - 601p
-  - 606p
-  - 614p
-  - 628p
-  - 636p
-- - 548p
-  - 556p
-  - 603p
-  - 619p
-  - 631p
-  - 636p
-  - 643p
-  - 653p
-  - 701p
-- - 640p
-  - 647p
-  - 653p
-  - 705p
-  - 713p
-  - 718p
-  - 725p
-  - 735p
-  - 743p
-- - 740p
-  - 747p
-  - 753p
-  - 805p
-  - 813p
-  - 818p
-  - 825p
-  - 835p
-  - 843p
-- - 840p
-  - 847p
-  - 853p
-  - 905p
-  - 913p
-  - 918p
-  - 925p
-  - 935p
-  - 943p
-- - 940p
-  - 947p
-  - 953p
-  - 1005p
-  - 1013p
-  - 1018p
-  - 1025p
-  - 1035p
-  - 1043p
-- - 1040p
-  - 1047p
-  - 1053p
-  - 1105p
-  - 1113p
-  - 1118p
-  - 1125p
-  - 1135p
-  - 1143p
-time_points: 
-  - Dickson
-  - North Lyneham
-  - Lyneham
-  - City Interchange
-  - Kings Ave/National Crt
-  - Manuka/Captain Cook
-  - Red Hill
-  - Canberra Hospital
-  - Woden Interchange
+stop_times: [["-", "-", "-", 650a, 658a, 703a, 710a, 720a, 728a], [648a, 655a, 701a, 715a, 723a, 728a, 736a, 750a, 758a], [718a, 725a, 731a, 747a, 759a, 804a, 812a, 826a, 834a], [748a, 756a, 804a, 820a, 828a, 838a, 846a, 903a, 911a], [818a, 826a, 833a, 849a, 901a, 906a, 914a, 928a, 936a], [848a, 856a, 903a, 919a, 931a, 936a, 943a, 955a, 1003a], [918a, 926a, 933a, 947a, 957a, 1002a, 1009a, 1021a, 1029a], [948a, 956a, 1003a, 1017a, 1027a, 1032a, 1039a, 1051a, 1059a], [1048a, 1056a, 1103a, 1117a, 1127a, 1132a, 1139a, 1151a, 1159a], [1148a, 1156a, 1203p, 1217p, 1227p, 1232p, 1239p, 1251p, 1259p], [1248p, 1256p, 103p, 117p, 127p, 132p, 139p, 151p, 159p], [148p, 156p, 203p, 217p, 227p, 232p, 239p, 251p, 259p], [248p, 256p, 303p, 319p, 331p, 336p, 344p, 358p, 406p], [318p, 326p, 333p, 349p, 401p, 406p, 414p, 428p, 436p], [348p, 356p, 403p, 419p, 431p, 436p, 444p, 458p, 506p], [418p, 426p, 433p, 449p, 501p, 506p, 514p, 528p, 536p], [448p, 456p, 503p, 519p, 531p, 536p, 544p, 558p, 606p], [518p, 526p, 533p, 549p, 601p, 606p, 614p, 628p, 636p], [548p, 556p, 603p, 619p, 631p, 636p, 643p, 653p, 701p], [640p, 647p, 653p, 705p, 713p, 718p, 725p, 735p, 743p], [740p, 747p, 753p, 805p, 813p, 818p, 825p, 835p, 843p], [840p, 847p, 853p, 905p, 913p, 918p, 925p, 935p, 943p], [940p, 947p, 953p, 1005p, 1013p, 1018p, 1025p, 1035p, 1043p], [1040p, 1047p, 1053p, 1105p, 1113p, 1118p, 1125p, 1135p, 1143p]]
+time_points: [Dickson, North Lyneham, Lyneham, City Interchange, Kings Ave/National Crt, Manuka/Captain Cook, Red Hill, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/60-160-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/60-160-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
 short_name: 60/160
 stop_times: [[606a, 615a, 621a, 632a, "-", "-"], [706a, 715a, 721a, 734a, 749a, 752a], [730a, 740a, 748a, 802a, "-", "-"], [738a, 748a, 756a, 811a, 826a, 829a], [752a, 802a, 810a, 824a, "-", "-"], [808a, 818a, 826a, 841a, 856a, 859a], [836a, 846a, 854a, 908a, "-", "-"], [906a, 916a, 924a, 937a, "-", "-"], [1006a, 1016a, 1024a, 1036a, "-", "-"], [1106a, 1116a, 1124a, 1136a, "-", "-"], [1206p, 1216p, 1224p, 1236p, "-", "-"], [106p, 116p, 124p, 136p, "-", "-"], [206p, 216p, 224p, 236p, "-", "-"], [236p, 246p, 254p, 307p, "-", "-"], [306p, 316p, 324p, 338p, "-", "-"], [336p, 346p, 354p, 408p, "-", "-"], [406p, 416p, 424p, 438p, "-", "-"], [436p, 446p, 454p, 508p, "-", "-"], [506p, 516p, 524p, 538p, "-", "-"], [536p, 546p, 554p, 608p, "-", "-"], [606p, 616p, 624p, 637p, "-", "-"], [706p, 716p, 722p, 734p, "-", "-"], [806p, 816p, 822p, 834p, "-", "-"], [906p, 916p, 922p, 934p, "-", "-"], [1006p, 1016p, 1022p, 1034p, "-", "-"], [1106p, 1116p, 1122p, 1134p, "-", "-"]]
-time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange - Platform 9, City Interchange, Citywest]
+time_points: [Tuggeranong Interchange (Platform 3), Kambah High, Mount Neighbour School, Woden Interchange (Platform 9), City Interchange, Citywest]
 

--- a/maxious-canberra-transit-feed/output/60-160-to-tuggeranong-interchange---platform-3.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/60-160-to-tuggeranong-interchange---platform-3.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Tuggeranong Interchange - Platform 3
-between_stops: []
+between_stops: 
+  City Interchange - Platform 1-Woden Interchange - Platform 5: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
 short_name: 60/160
 stop_times: [["-", "-", 647a, 701a, 708a, 718a], ["-", "-", 717a, 731a, 739a, 750a], ["-", "-", 747a, 801a, 809a, 820a], ["-", "-", 817a, 831a, 839a, 850a], ["-", "-", 847a, 901a, 909a, 920a], ["-", "-", 947a, 1001a, 1009a, 1019a], ["-", "-", 1047a, 1101a, 1109a, 1119a], ["-", "-", 1147a, 1201p, 1209p, 1219p], ["-", "-", 1247p, 101p, 109p, 119p], ["-", "-", 147p, 201p, 209p, 219p], ["-", "-", 247p, 301p, 309p, 320p], ["-", "-", 317p, 331p, 339p, 350p], ["-", "-", 347p, 401p, 409p, 420p], ["-", "-", 417p, 431p, 439p, 450p], ["-", "-", 447p, 501p, 509p, 520p], [455p, 501p, 517p, 531p, 539p, 550p], [531p, 537p, 553p, 607p, 615p, 626p], [555p, 601p, 617p, 631p, 638p, 647p], ["-", "-", 647p, 701p, 708p, 717p], ["-", "-", 747p, 801p, 808p, 817p], ["-", "-", 847p, 901p, 908p, 917p], ["-", "-", 947p, 1001p, 1008p, 1017p], ["-", "-", 1047p, 1101p, 1108p, 1117p]]
 time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange - Platform 3]

--- /dev/null
+++ b/maxious-canberra-transit-feed/output/60-160-to-tuggeranong-interchange-platform-3.stop_times.yml
@@ -1,1 +1,8 @@
+--- 
+long_name: To Tuggeranong Interchange (Platform 3)
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 5): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+short_name: 60/160
+stop_times: [["-", "-", 647a, 701a, 708a, 718a], ["-", "-", 717a, 731a, 739a, 750a], ["-", "-", 747a, 801a, 809a, 820a], ["-", "-", 817a, 831a, 839a, 850a], ["-", "-", 847a, 901a, 909a, 920a], ["-", "-", 947a, 1001a, 1009a, 1019a], ["-", "-", 1047a, 1101a, 1109a, 1119a], ["-", "-", 1147a, 1201p, 1209p, 1219p], ["-", "-", 1247p, 101p, 109p, 119p], ["-", "-", 147p, 201p, 209p, 219p], ["-", "-", 247p, 301p, 309p, 320p], ["-", "-", 317p, 331p, 339p, 350p], ["-", "-", 347p, 401p, 409p, 420p], ["-", "-", 417p, 431p, 439p, 450p], ["-", "-", 447p, 501p, 509p, 520p], [455p, 501p, 517p, 531p, 539p, 550p], [531p, 537p, 553p, 607p, 615p, 626p], [555p, 601p, 617p, 631p, 638p, 647p], ["-", "-", 647p, 701p, 708p, 717p], ["-", "-", 747p, 801p, 808p, 817p], ["-", "-", 847p, 901p, 908p, 917p], ["-", "-", 947p, 1001p, 1008p, 1017p], ["-", "-", 1047p, 1101p, 1108p, 1117p]]
+time_points: [Citywest, City Interchange (Platform 1), Woden Interchange (Platform 5), Mount Neighbour School, Kambah High, Tuggeranong Interchange (Platform 3)]
 

--- a/maxious-canberra-transit-feed/output/61-161-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/61-161-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
 short_name: 61/161
 stop_times: [[630a, 641a, 646a, 651a, 658a, "-", "-"], [700a, 712a, 717a, 722a, 733a, "-", "-"], [726a, 739a, 746a, 751a, 805a, 819a, 822a], [740a, 754a, 759a, 804a, 813a, "-", "-"], [800a, 814a, 819a, 825a, 839a, "-", "-"], [837a, 851a, 856a, 901a, 910a, "-", "-"], [900a, 914a, 919a, 924a, 933a, "-", "-"], [930a, 943a, 948a, 953a, 1001a, "-", "-"], [1030a, 1043a, 1048a, 1053a, 1101a, "-", "-"], [1130a, 1143a, 1148a, 1153a, 1201p, "-", "-"], [1230p, 1243p, 1248p, 1253p, 101p, "-", "-"], [130p, 143p, 148p, 153p, 201p, "-", "-"], [230p, 243p, 248p, 253p, 301p, "-", "-"], [330p, 344p, 349p, 354p, 403p, "-", "-"], [400p, 414p, 419p, 424p, 433p, "-", "-"], [430p, 444p, 449p, 454p, 503p, "-", "-"], [500p, 514p, 519p, 524p, 533p, "-", "-"], [530p, 544p, 549p, 554p, 603p, "-", "-"], [600p, 614p, 619p, 624p, 633p, "-", "-"], [630p, 643p, 648p, 653p, 701p, "-", "-"], [730p, 743p, 748p, 753p, 801p, "-", "-"], [830p, 843p, 848p, 853p, 901p, "-", "-"], [930p, 943p, 948p, 953p, 1001p, "-", "-"], [1030p, 1043p, 1048p, 1053p, 1101p, "-", "-"], [1130p, 1143p, 1148p, 1153p, "-", "-", "-"]]
-time_points: [Tuggeranong Interchange - Platform 3, Taverner/Erindale, Livingston Shops Kambah, Athllon/Sulwood Kambah, Woden Interchange - Platform 9, City Interchange, Citywest]
+time_points: [Tuggeranong Interchange (Platform 3), Taverner/Erindale, Livingston Shops Kambah, Athllon/Sulwood Kambah, Woden Interchange (Platform 9), City Interchange, Citywest]
 

--- a/maxious-canberra-transit-feed/output/61-161-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/61-161-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 11): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
 short_name: 61/161
 stop_times: [["-", "-", 642a, 649a, 654a, 659a, 710a], ["-", "-", 712a, 719a, 724a, 729a, 743a], ["-", "-", 742a, 751a, 756a, 801a, 815a], ["-", "-", 812a, 821a, 826a, 831a, 845a], ["-", "-", 842a, 859a, 905a, 909a, 920a], ["-", "-", 912a, 921a, 926a, 931a, 944a], ["-", "-", 1012a, 1020a, 1025a, 1030a, 1043a], ["-", "-", 1112a, 1120a, 1125a, 1130a, 1143a], ["-", "-", 1212p, 1220p, 1225p, 1230p, 1243p], ["-", "-", 112p, 120p, 125p, 130p, 143p], ["-", "-", 212p, 220p, 225p, 230p, 243p], ["-", "-", 320p, 329p, 334p, 339p, 353p], ["-", "-", 342p, 351p, 356p, 401p, 415p], ["-", "-", 412p, 421p, 426p, 431p, 445p], ["-", "-", 442p, 451p, 456p, 501p, 515p], ["-", "-", 512p, 521p, 526p, 531p, 545p], [520p, 526p, 542p, 551p, 556p, 601p, 615p], ["-", "-", 612p, 621p, 626p, 631p, 644p], ["-", "-", 712p, 720p, 725p, 730p, 743p], ["-", "-", 810p, 818p, 823p, 828p, 841p], ["-", "-", 910p, 918p, 923p, 928p, 941p], ["-", "-", 1010p, 1018p, 1023p, 1028p, 1041p], ["-", "-", 1112p, 1120p, 1125p, 1130p, 1143p]]
-time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Livingston Shops Kambah, Taverner/Erindale, Tuggeranong Interchange]
+time_points: [Citywest, City Interchange (Platform 1), Woden Interchange (Platform 11), Athllon/Sulwood Kambah, Livingston Shops Kambah, Taverner/Erindale, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/62-162-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/62-162-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: 
+  Woden Interchange (Platform 9)-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
 short_name: 62/162
 stop_times: [[609a, 616a, 624a, 637a, "-", "-"], [639a, 646a, 654a, 707a, "-", "-"], [709a, 716a, 725a, 740a, 755a, 758a], [736a, 743a, 752a, 807a, 822a, 825a], [754a, 801a, 810a, 824a, "-", "-"], [809a, 816a, 825a, 840a, 855a, 858a], [839a, 846a, 855a, 909a, "-", "-"], [939a, 946a, 954a, 1007a, "-", "-"], [1039a, 1046a, 1054a, 1107a, "-", "-"], [1139a, 1146a, 1154a, 1207p, "-", "-"], [1239p, 1246p, 1254p, 107p, "-", "-"], [139p, 146p, 154p, 207p, "-", "-"], [239p, 246p, 254p, 308p, "-", "-"], [309p, 316p, 325p, 339p, "-", "-"], [339p, 346p, 355p, 409p, "-", "-"], [409p, 416p, 425p, 439p, "-", "-"], [439p, 446p, 455p, 509p, "-", "-"], [509p, 516p, 525p, 539p, "-", "-"], [539p, 546p, 555p, 609p, "-", "-"], [609p, 616p, 625p, 637p, "-", "-"], [639p, 645p, 652p, 703p, "-", "-"], [739p, 745p, 752p, 803p, "-", "-"], [839p, 845p, 852p, 903p, "-", "-"], [940p, 946p, 953p, 1004p, "-", "-"], [1040p, 1046p, 1053p, 1104p, "-", "-"]]
-time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange - Platform 9, City Interchange, Citywest]
+time_points: [Tuggeranong Interchange (Platform 4), Kambah High, Kambah Village, Woden Interchange (Platform 9), City Interchange, Citywest]
 

--- a/maxious-canberra-transit-feed/output/62-162-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/62-162-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 5): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
 short_name: 62/162
 stop_times: [["-", "-", "-", 709a, 716a, 723a], ["-", "-", 732a, 744a, 753a, 800a], ["-", "-", 802a, 814a, 823a, 830a], ["-", "-", 832a, 844a, 853a, 900a], ["-", "-", 902a, 914a, 923a, 930a], ["-", "-", 932a, 943a, 951a, 958a], ["-", "-", 1032a, 1043a, 1051a, 1058a], ["-", "-", 1132a, 1143a, 1151a, 1158a], ["-", "-", 1232p, 1243p, 1251p, 1258p], ["-", "-", 132p, 143p, 151p, 158p], ["-", "-", 232p, 243p, 251p, 258p], ["-", "-", 332p, 344p, 353p, 400p], ["-", "-", 402p, 414p, 423p, 430p], ["-", "-", 432p, 444p, 453p, 500p], ["-", "-", 502p, 514p, 523p, 530p], [510p, 516p, 532p, 544p, 553p, 600p], [540p, 546p, 602p, 614p, 623p, 630p], [610p, 616p, 632p, 643p, 651p, 658p], ["-", "-", 732p, 743p, 751p, 758p], ["-", "-", 832p, 843p, 851p, 858p], ["-", "-", 932p, 943p, 951p, 958p], ["-", "-", 1032p, 1043p, 1051p, 1058p], ["-", "-", 1132p, 1143p, 1151p, 1158p]]
-time_points: [Citywest, City Interchange - Platform 1, Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
+time_points: [Citywest, City Interchange (Platform 1), Woden Interchange (Platform 5), Kambah Village, Kambah High, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/63-to-campbell-park-offices.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/63-to-campbell-park-offices.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Campbell Park Offices
-between_stops: []
+between_stops: {}
+
 short_name: "63"
 stop_times: [[611a, 619a, 623a, 628a, 633a, 640a, "-", "-", "-", "-"], [640a, 648a, 652a, 657a, 702a, 710a, 724a, 727a, 731a, 735a], [712a, 720a, 724a, 729a, 735a, 745a, 759a, 803a, 807a, 811a], [744a, 754a, 759a, 804a, 810a, 820a, 834a, 838a, 842a, 846a], [810a, 820a, 825a, 830a, 836a, 845a, "-", "-", "-", "-"], [845a, 855a, 900a, 905a, 911a, 920a, "-", "-", "-", "-"], [945a, 954a, 958a, 1003a, 1009a, 1017a, "-", "-", "-", "-"], [1045a, 1054a, 1058a, 1103a, 1109a, 1117a, "-", "-", "-", "-"], [1145a, 1154a, 1158a, 1203p, 1209p, 1217p, "-", "-", "-", "-"], [1245p, 1254p, 1258p, 103p, 109p, 117p, "-", "-", "-", "-"], [145p, 154p, 158p, 203p, 209p, 217p, "-", "-", "-", "-"], [245p, 254p, 258p, 303p, 309p, 318p, "-", "-", "-", "-"], [314p, 324p, 329p, 334p, 340p, 349p, "-", "-", "-", "-"], [345p, 355p, 400p, 405p, 411p, 420p, "-", "-", "-", "-"], [415p, 425p, 430p, 435p, 441p, 450p, "-", "-", "-", "-"], [445p, 455p, 500p, 505p, 511p, 520p, "-", "-", "-", "-"], [515p, 525p, 530p, 535p, 541p, 550p, "-", "-", "-", "-"], [545p, 555p, 600p, 605p, 611p, 620p, "-", "-", "-", "-"], [645p, 654p, 658p, 703p, 709p, 717p, "-", "-", "-", "-"], [745p, 754p, 758p, 803p, 809p, 817p, "-", "-", "-", "-"], [845p, 854p, 858p, 903p, 909p, 917p, "-", "-", "-", "-"], [945p, 954p, 958p, 1003p, 1009p, 1017p, "-", "-", "-", "-"], [1045p, 1054p, 1058p, 1103p, 1109p, "-", "-", "-", "-", "-"]]
-time_points: [Tuggeranong Interchange - Platform 5, Monash, Erindale Centre, Wanniassa High, Athllon/Sulwood Kambah, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
+time_points: [Tuggeranong Interchange (Platform 5), Monash, Erindale Centre, Wanniassa High, Athllon/Sulwood Kambah, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, ADFA, Campbell Park Offices]
 

--- a/maxious-canberra-transit-feed/output/63-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/63-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "63"
 stop_times: [["-", "-", "-", "-", "-", "-", 610a, 615a, 619a, 623a, 631a], ["-", "-", "-", "-", "-", "-", 640a, 645a, 649a, 653a, 701a], ["-", "-", "-", "-", 703a, 710a, 711a, 715a, 719a, 723a, 731a], ["-", "-", "-", "-", 723a, 730a, 732a, 736a, 741a, 746a, 756a], ["-", "-", "-", "-", 803a, 812a, 814a, 818a, 823a, 828a, 838a], ["-", "-", "-", "-", 823a, 832a, 834a, 838a, 843a, 848a, 858a], ["-", "-", "-", "-", 903a, 912a, 914a, 918a, 923a, 928a, 937a], ["-", "-", "-", "-", 1003a, 1011a, 1013a, 1017a, 1022a, 1026a, 1035a], ["-", "-", "-", "-", 1103a, 1111a, 1113a, 1117a, 1122a, 1126a, 1135a], ["-", "-", "-", "-", 1203p, 1211p, 1213p, 1217p, 1222p, 1226p, 1235p], ["-", "-", "-", "-", 103p, 111p, 113p, 117p, 122p, 126p, 135p], ["-", "-", "-", "-", 203p, 211p, 213p, 217p, 222p, 226p, 235p], ["-", "-", "-", "-", 303p, 312p, 314p, 318p, 323p, 328p, 338p], ["-", "-", "-", "-", 323p, 332p, 334p, 338p, 343p, 348p, 358p], ["-", "-", "-", "-", 403p, 412p, 414p, 418p, 423p, 428p, 438p], ["-", "-", "-", "-", 423p, 432p, 434p, 438p, 443p, 448p, 458p], [437p, 441p, 445p, 448p, 503p, 512p, 514p, 518p, 523p, 528p, 538p], [457p, 501p, 505p, 508p, 523p, 532p, 534p, 538p, 543p, 548p, 558p], [537p, 541p, 545p, 548p, 603p, 612p, 614p, 618p, 623p, 628p, 637p], [557p, 601p, 605p, 608p, 623p, 632p, 634p, 638p, 643p, 647p, 656p], ["-", "-", "-", "-", 703p, 711p, 713p, 717p, 722p, 726p, 735p], ["-", "-", "-", "-", 803p, 811p, 813p, 817p, 822p, 826p, 835p], ["-", "-", "-", "-", 903p, 911p, 913p, 917p, 922p, 926p, 935p], ["-", "-", "-", "-", 1003p, 1011p, 1013p, 1017p, 1022p, 1026p, 1035p], ["-", "-", "-", "-", 1103p, 1111p, 1113p, 1117p, 1122p, 1126p, 1135p]]
-time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 12, Athllon/Sulwood Kambah, Sainsbury Street, Wanniassa High, Erindale Centre, Monash, Tuggeranong Interchange]
+time_points: [Campbell Park Offices, ADFA, Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 12), Athllon/Sulwood Kambah, Sainsbury Street, Wanniassa High, Erindale Centre, Monash, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/64-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/64-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "64"
 stop_times: [[], ["-", 651a, 655a, 702a], [714a, 721a, 725a, 733a], ["-", 751a, 756a, 805a], [816a, 823a, 828a, 837a], [846a, 853a, 858a, 907a], [916a, 923a, 928a, 936a], [1015a, 1022a, 1026a, 1034a], [1115a, 1122a, 1126a, 1134a], [1215p, 1222p, 1226p, 1234p], [115p, 122p, 126p, 134p], [215p, 222p, 226p, 234p], [316p, 323p, 328p, 337p], [346p, 353p, 358p, 407p], [416p, 423p, 428p, 437p], [446p, 453p, 458p, 507p], [516p, 523p, 528p, 537p], [546p, 553p, 558p, 607p], [616p, 623p, 628p, 636p], [715p, 722p, 726p, 734p], [815p, 822p, 826p, 834p], [915p, 922p, 926p, 934p], [1015p, 1022p, 1026p, 1034p], [1115p, 1122p, 1126p, 1134p]]
-time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, MacKillop College Wanniassa Campus, Monash Primary, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 11), Athllon/Sulwood Kambah, MacKillop College Wanniassa Campus, Monash Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/64-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/64-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "64"
 stop_times: [[], [612a, 616a, 623a, 631a], [642a, 646a, 653a, 701a], [712a, 716a, 723a, 731a], [744a, 749a, 756a, 806a], [814a, 819a, 826a, 836a], [834a, 839a, 846a, 856a], [914a, 919a, 926a, 935a], [943a, 947a, 954a, 1003a], [1043a, 1047a, 1054a, 1103a], [1143a, 1147a, 1154a, 1203p], [1243p, 1247p, 1254p, 103p], [143p, 147p, 154p, 203p], [243p, 247p, 254p, 303p], [314p, 319p, 326p, 336p], [344p, 349p, 356p, 406p], [444p, 449p, 456p, 506p], [514p, 519p, 526p, 536p], [544p, 549p, 556p, 606p], [644p, 648p, 655p, 704p], [743p, 747p, 754p, 803p], [843p, 847p, 854p, 903p], [943p, 947p, 954p, 1003p], [1043p, 1047p, 1054p, "-"]]
-time_points: [Tuggeranong Interchange - Platform 5, Monash Primary, MacKillop College Wanniassa Campus, Athllon/Sulwood Kambah, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 5), Monash Primary, MacKillop College Wanniassa Campus, Athllon/Sulwood Kambah, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/65-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/65-to-citywest.stop_times.yml
@@ -1,251 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
 
 short_name: "65"
-stop_times: 
-- - 535a
-  - 541a
-  - 552a
-  - 557a
-  - 611a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 635a
-  - 641a
-  - 652a
-  - 657a
-  - 711a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 653a
-  - 700a
-  - 712a
-  - 721a
-  - 737a
-  - 752a
-  - 756a
-  - 805a
-  - 808a
-- - 720a
-  - 726a
-  - 734a
-  - 743a
-  - 801a
-  - 815a
-  - 819a
-  - 829a
-  - 832a
-- - 730a
-  - 739a
-  - 756a
-  - 805a
-  - 822a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 745a
-  - 754a
-  - 811a
-  - 820a
-  - 842a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 815a
-  - 824a
-  - 841a
-  - 850a
-  - 907a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 845a
-  - 854a
-  - 911a
-  - 920a
-  - 936a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 945a
-  - 952a
-  - 1005a
-  - 1012a
-  - 1027a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1045a
-  - 1052a
-  - 1105a
-  - 1112a
-  - 1127a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1145a
-  - 1152a
-  - 1205p
-  - 1212p
-  - 1227p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1245p
-  - 1252p
-  - 105p
-  - 112p
-  - 127p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 145p
-  - 152p
-  - 205p
-  - 212p
-  - 227p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 245p
-  - 252p
-  - 305p
-  - 312p
-  - 331p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 315p
-  - 324p
-  - 337p
-  - 344p
-  - 403p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 345p
-  - 354p
-  - 407p
-  - 414p
-  - 433p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 420p
-  - 429p
-  - 442p
-  - 449p
-  - 508p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 445p
-  - 454p
-  - 507p
-  - 514p
-  - 533p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 515p
-  - 524p
-  - 537p
-  - 544p
-  - 603p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 545p
-  - 554p
-  - 607p
-  - 614p
-  - 633p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 615p
-  - 624p
-  - 636p
-  - 641p
-  - 657p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 641p
-  - 647p
-  - 659p
-  - 704p
-  - 720p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 741p
-  - 747p
-  - 759p
-  - 804p
-  - 820p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 841p
-  - 847p
-  - 859p
-  - 904p
-  - 920p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 941p
-  - 947p
-  - 959p
-  - 1004p
-  - 1020p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1041p
-  - 1047p
-  - 1059p
-  - 1104p
-  - 1120p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Tuggeranong Interchange - Platform 5
-  - MacKillop College Isabella Campus
-  - Gowrie
-  - Erindale Centre /Sternberg Crescent
-  - Woden Interchange - Platform 10
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange
-  - Citywest
+stop_times: [[535a, 541a, 552a, 557a, 611a, "-", "-", "-", "-"], [635a, 641a, 652a, 657a, 711a, "-", "-", "-", "-"], [653a, 700a, 712a, 721a, 737a, 752a, 756a, 805a, 808a], [720a, 726a, 734a, 743a, 801a, 815a, 819a, 829a, 832a], [730a, 739a, 756a, 805a, 822a, "-", "-", "-", "-"], [745a, 754a, 811a, 820a, 842a, "-", "-", "-", "-"], [815a, 824a, 841a, 850a, 907a, "-", "-", "-", "-"], [845a, 854a, 911a, 920a, 936a, "-", "-", "-", "-"], [945a, 952a, 1005a, 1012a, 1027a, "-", "-", "-", "-"], [1045a, 1052a, 1105a, 1112a, 1127a, "-", "-", "-", "-"], [1145a, 1152a, 1205p, 1212p, 1227p, "-", "-", "-", "-"], [1245p, 1252p, 105p, 112p, 127p, "-", "-", "-", "-"], [145p, 152p, 205p, 212p, 227p, "-", "-", "-", "-"], [245p, 252p, 305p, 312p, 331p, "-", "-", "-", "-"], [315p, 324p, 337p, 344p, 403p, "-", "-", "-", "-"], [345p, 354p, 407p, 414p, 433p, "-", "-", "-", "-"], [420p, 429p, 442p, 449p, 508p, "-", "-", "-", "-"], [445p, 454p, 507p, 514p, 533p, "-", "-", "-", "-"], [515p, 524p, 537p, 544p, 603p, "-", "-", "-", "-"], [545p, 554p, 607p, 614p, 633p, "-", "-", "-", "-"], [615p, 624p, 636p, 641p, 657p, "-", "-", "-", "-"], [641p, 647p, 659p, 704p, 720p, "-", "-", "-", "-"], [741p, 747p, 759p, 804p, 820p, "-", "-", "-", "-"], [841p, 847p, 859p, 904p, 920p, "-", "-", "-", "-"], [941p, 947p, 959p, 1004p, 1020p, "-", "-", "-", "-"], [1041p, 1047p, 1059p, 1104p, 1120p, "-", "-", "-", "-"]]
+time_points: [Tuggeranong Interchange (Platform 5), MacKillop College Isabella Campus, Gowrie, Erindale Drive/Sternberg, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, City Interchange, Citywest]
 

--- a/maxious-canberra-transit-feed/output/65-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/65-to-tuggeranong-interchange.stop_times.yml
@@ -1,242 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "65"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 608a
-  - 619a
-  - 625a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 625a
-  - 637a
-  - 643a
-  - 654a
-  - 700a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 655a
-  - 710a
-  - 718a
-  - 734a
-  - 744a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 725a
-  - 742a
-  - 750a
-  - 806a
-  - 816a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 755a
-  - 812a
-  - 820a
-  - 836a
-  - 846a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 825a
-  - 842a
-  - 850a
-  - 906a
-  - 916a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 855a
-  - 912a
-  - 920a
-  - 935a
-  - 943a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 955a
-  - 1009a
-  - 1015a
-  - 1027a
-  - 1035a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1055a
-  - 1109a
-  - 1115a
-  - 1127a
-  - 1135a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1155a
-  - 1209p
-  - 1215p
-  - 1227p
-  - 1235p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1255p
-  - 109p
-  - 115p
-  - 127p
-  - 135p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 155p
-  - 209p
-  - 215p
-  - 227p
-  - 235p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 255p
-  - 311p
-  - 318p
-  - 332p
-  - 341p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 325p
-  - 342p
-  - 349p
-  - 403p
-  - 412p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 355p
-  - 412p
-  - 419p
-  - 433p
-  - 442p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 420p
-  - 437p
-  - 444p
-  - 458p
-  - 507p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 455p
-  - 512p
-  - 519p
-  - 533p
-  - 542p
-- - 455p
-  - 501p
-  - 510p
-  - 513p
-  - 528p
-  - 545p
-  - 552p
-  - 606p
-  - 615p
-- - 525p
-  - 531p
-  - 540p
-  - 543p
-  - 558p
-  - 615p
-  - 622p
-  - 635p
-  - 643p
-- - 555p
-  - 601p
-  - 610p
-  - 613p
-  - 628p
-  - 642p
-  - 648p
-  - 700p
-  - 708p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 654p
-  - 708p
-  - 714p
-  - 726p
-  - 734p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 754p
-  - 808p
-  - 814p
-  - 826p
-  - 834p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 854p
-  - 908p
-  - 914p
-  - 926p
-  - 934p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 954p
-  - 1008p
-  - 1014p
-  - 1026p
-  - 1034p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1054p
-  - 1108p
-  - 1114p
-  - 1126p
-  - 1134p
-time_points: 
-  - Citywest
-  - City Interchange - Platform 10
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Woden Interchange - Platform 12
-  - Erindale Centre
-  - Gowrie
-  - MacKillop College Isabella Campus
-  - Tuggeranong Interchange
+stop_times: [["-", "-", "-", "-", "-", "-", 608a, 619a, 625a], ["-", "-", "-", "-", 625a, 637a, 643a, 654a, 700a], ["-", "-", "-", "-", 655a, 710a, 718a, 734a, 744a], ["-", "-", "-", "-", 725a, 742a, 750a, 806a, 816a], ["-", "-", "-", "-", 755a, 812a, 820a, 836a, 846a], ["-", "-", "-", "-", 825a, 842a, 850a, 906a, 916a], ["-", "-", "-", "-", 855a, 912a, 920a, 935a, 943a], ["-", "-", "-", "-", 955a, 1009a, 1015a, 1027a, 1035a], ["-", "-", "-", "-", 1055a, 1109a, 1115a, 1127a, 1135a], ["-", "-", "-", "-", 1155a, 1209p, 1215p, 1227p, 1235p], ["-", "-", "-", "-", 1255p, 109p, 115p, 127p, 135p], ["-", "-", "-", "-", 155p, 209p, 215p, 227p, 235p], ["-", "-", "-", "-", 255p, 311p, 318p, 332p, 341p], ["-", "-", "-", "-", 325p, 342p, 349p, 403p, 412p], ["-", "-", "-", "-", 355p, 412p, 419p, 433p, 442p], ["-", "-", "-", "-", 420p, 437p, 444p, 458p, 507p], ["-", "-", "-", "-", 455p, 512p, 519p, 533p, 542p], [455p, 501p, 510p, 513p, 528p, 545p, 552p, 606p, 615p], [525p, 531p, 540p, 543p, 558p, 615p, 622p, 635p, 643p], [555p, 601p, 610p, 613p, 628p, 642p, 648p, 700p, 708p], ["-", "-", "-", "-", 654p, 708p, 714p, 726p, 734p], ["-", "-", "-", "-", 754p, 808p, 814p, 826p, 834p], ["-", "-", "-", "-", 854p, 908p, 914p, 926p, 934p], ["-", "-", "-", "-", 954p, 1008p, 1014p, 1026p, 1034p], ["-", "-", "-", "-", 1054p, 1108p, 1114p, 1126p, 1134p]]
+time_points: [Citywest, City Interchange (Platform 10), Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 12), Erindale Centre, Gowrie, MacKillop College Isabella Campus, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/66-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/66-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "66"
 stop_times: [["-", 602a, 610a, 617a, 622a, 631a], [622a, 632a, 640a, 647a, 652a, 701a], [652a, 702a, 710a, 717a, 722a, 731a], [722a, 734a, 744a, 751a, 758a, 808a], [752a, 813a, 823a, 830a, 837a, 847a], [822a, 843a, 853a, 900a, 907a, 917a], [916a, 934a, 942a, 949a, 955a, 1004a], [1022a, 1034a, 1042a, 1049a, 1055a, 1104a], [1122a, 1134a, 1142a, 1149a, 1155a, 1204p], [1222p, 1234p, 1242p, 1249p, 1255p, 104p], [122p, 134p, 142p, 149p, 155p, 204p], [222p, 234p, 242p, 249p, 255p, 304p], [252p, 304p, 315p, 322p, 329p, 339p], [322p, 334p, 345p, 352p, 359p, 409p], [352p, 404p, 415p, 422p, 429p, 439p], [422p, 434p, 445p, 452p, 459p, 509p], [452p, 504p, 515p, 522p, 529p, 539p], [522p, 534p, 545p, 552p, 559p, 609p], [552p, 604p, 615p, 622p, 629p, 638p], [622p, 634p, 642p, 649p, 654p, 703p], [722p, 734p, 742p, 749p, 754p, 803p], [822p, 834p, 842p, 849p, 854p, 903p], [922p, 934p, 942p, 949p, 954p, 1003p], [1022p, 1034p, 1042p, 1049p, 1054p, 1103p], [1122p, 1134p, 1142p, 1149p, 1154p, "-"]]
-time_points: [Woden Interchange - Platform 11, Erindale Centre, Proctor / Mead, Deamer/Clift Richardson, Bonython Primary, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 11), Erindale Centre, Proctor / Mead, Deamer/Clift Richardson, Bonython Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/66-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/66-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "66"
 stop_times: [[612a, 618a, 625a, 631a, 638a, 652a], [641a, 647a, 654a, 700a, 712a, 727a], [706a, 714a, 723a, 732a, 744a, 800a], [736a, 744a, 753a, 802a, 814a, 830a], [806a, 814a, 823a, 832a, 844a, 900a], [836a, 844a, 853a, 902a, 914a, 930a], [909a, 917a, 926a, 933a, 941a, 956a], [1012a, 1018a, 1026a, 1032a, 1040a, 1055a], [1112a, 1118a, 1126a, 1132a, 1140a, 1155a], [1212p, 1218p, 1226p, 1232p, 1240p, 1255p], [112p, 118p, 126p, 132p, 140p, 155p], [212p, 218p, 226p, 232p, 240p, 255p], [312p, 319p, 327p, 334p, 345p, 400p], [412p, 419p, 427p, 434p, 445p, 500p], [442p, 449p, 457p, 504p, 515p, 530p], [512p, 519p, 527p, 534p, 545p, 600p], [542p, 549p, 557p, 604p, 615p, 630p], [613p, 620p, 628p, 634p, 642p, 657p], [714p, 720p, 728p, 734p, 742p, 757p], [814p, 820p, 828p, 834p, 842p, 857p], [914p, 920p, 928p, 934p, 942p, 957p], [1014p, 1020p, 1028p, 1034p, 1042p, 1057p], [1114p, 1120p, 1128p, 1134p, 1142p, "-"]]
-time_points: [Tuggeranong Interchange - Platform 7, Bonython Primary, Deamer/Clift Richardson, Proctor / Mead, Erindale Centre, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 7), Bonython Primary, Deamer/Clift Richardson, Proctor / Mead, Erindale Centre, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/67-267-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/67-267-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
+
 short_name: 67/267
 stop_times: [[603a, 616a, 627a, 635a, 644a, "-", "-", "-", "-"], [633a, 646a, 657a, 705a, 714a, "-", "-", "-", "-"], [702a, 715a, 726a, 735a, 750a, 804a, 808a, 818a, 821a], [718a, 731a, 745a, 755a, 809a, "-", "-", "-", "-"], [731a, 746a, 800a, 810a, 825a, 839a, 843a, 853a, 856a], [803a, 818a, 832a, 842a, 856a, "-", "-", "-", "-"], [833a, 848a, 902a, 912a, 926a, "-", "-", "-", "-"], [903a, 918a, 932a, 940a, 953a, "-", "-", "-", "-"], [1003a, 1017a, 1028a, 1036a, 1049a, "-", "-", "-", "-"], [1103a, 1117a, 1128a, 1136a, 1149a, "-", "-", "-", "-"], [1203p, 1217p, 1228p, 1236p, 1249p, "-", "-", "-", "-"], [103p, 117p, 128p, 136p, 149p, "-", "-", "-", "-"], [203p, 217p, 228p, 236p, 249p, "-", "-", "-", "-"], [303p, 318p, 332p, 342p, 356p, "-", "-", "-", "-"], [333p, 348p, 402p, 412p, 426p, "-", "-", "-", "-"], [403p, 418p, 432p, 442p, 456p, "-", "-", "-", "-"], [433p, 448p, 502p, 512p, 526p, "-", "-", "-", "-"], [503p, 518p, 532p, 542p, 556p, "-", "-", "-", "-"], [533p, 548p, 602p, 612p, 626p, "-", "-", "-", "-"], [603p, 618p, 632p, 640p, 653p, "-", "-", "-", "-"], [703p, 717p, 728p, 736p, 749p, "-", "-", "-", "-"], [803p, 817p, 828p, 836p, 849p, "-", "-", "-", "-"], [903p, 917p, 928p, 936p, 949p, "-", "-", "-", "-"], [1003p, 1017p, 1028p, 1036p, 1049p, "-", "-", "-", "-"], [1103p, 1117p, 1128p, 1136p, "-", "-", "-", "-", "-"]]
-time_points: [Tuggeranong Interchange - Platform 7, Calwell Shops, Chisholm Shops, Erindale Drive/Sternberg, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, City Interchange - Platform 11, Citywest]
+time_points: [Tuggeranong Interchange (Platform 7), Calwell Shops, Chisholm Shops, Erindale Drive/Sternberg, Woden Interchange (Platform 10), Kings Ave/National Crt, Russell Offices, City Interchange (Platform 11), Citywest]
 

--- a/maxious-canberra-transit-feed/output/67-267-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/67-267-to-tuggeranong-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: 67/267
 stop_times: [["-", "-", "-", "-", "-", "-", 601a, 608a, 618a, 632a], ["-", "-", "-", "-", 617a, 626a, 626a, 633a, 643a, 657a], ["-", "-", "-", "-", 647a, 656a, 656a, 703a, 713a, 727a], ["-", "-", "-", "-", 717a, 726a, 726a, 734a, 746a, 803a], ["-", "-", "-", "-", 747a, 801a, 801a, 810a, 822a, 839a], ["-", "-", "-", "-", 817a, 831a, 831a, 840a, 852a, 909a], ["-", "-", "-", "-", 847a, 901a, 901a, 910a, 922a, 938a], ["-", "-", "-", "-", 917a, 931a, 931a, 938a, 947a, 1002a], ["-", "-", "-", "-", 1017a, 1030a, 1030a, 1037a, 1046a, 1101a], ["-", "-", "-", "-", 1117a, 1130a, 1130a, 1137a, 1146a, 1201p], ["-", "-", "-", "-", 1217p, 1230p, 1230p, 1237p, 1246p, 101p], ["-", "-", "-", "-", 117p, 130p, 130p, 137p, 146p, 201p], ["-", "-", "-", "-", 217p, 230p, 230p, 237p, 246p, 301p], ["-", "-", "-", "-", 247p, 300p, 300p, 310p, 325p, 341p], ["-", "-", "-", "-", 317p, 334p, 334p, 344p, 359p, 415p], ["-", "-", "-", "-", 347p, 404p, 404p, 414p, 429p, 445p], ["-", "-", "-", "-", 417p, 434p, 434p, 444p, 459p, 515p], ["-", "-", "-", "-", 447p, 504p, 504p, 514p, 529p, 545p], [430p, 436p, 445p, 448p, 503p, 520p, 520p, 530p, 545p, 601p], [500p, 506p, 515p, 518p, 533p, 550p, 550p, 600p, 615p, 631p], [544p, 550p, 559p, 602p, 617p, 633p, 633p, 640p, 649p, 704p], ["-", "-", "-", "-", 717p, 730p, 730p, 737p, 746p, 801p], ["-", "-", "-", "-", 817p, 830p, 830p, 837p, 846p, 901p], ["-", "-", "-", "-", 917p, 930p, 930p, 937p, 946p, 1001p], ["-", "-", "-", "-", 1017p, 1030p, 1030p, 1037p, 1046p, 1101p], ["-", "-", "-", "-", 1117p, 1130p, 1130p, 1137p, 1146p, 1201a]]
-time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Kings Ave/National Crt, Woden Interchange - Platform 5, Erindale Drive/Sternberg, Bugden/Sternberg, Chisholm Shops, Calwell Shops, Tuggeranong Interchange]
+time_points: [Citywest, City Interchange (Platform 10), Russell Offices, Kings Ave/National Crt, Woden Interchange (Platform 5), Erindale Drive/Sternberg, Bugden/Sternberg, Chisholm Shops, Calwell Shops, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/7-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/7-to-city-interchange.stop_times.yml
@@ -1,225 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
+short_name: "7"
+stop_times: [[544a, 546a, 550a, 601a, 609a, 616a, 623a], [614a, 616a, 620a, 631a, 639a, 646a, 653a], [644a, 646a, 650a, 701a, 709a, 716a, 723a], [714a, 716a, 720a, 731a, 740a, 747a, 755a], [744a, 746a, 750a, 803a, 812a, 819a, 827a], [814a, 816a, 820a, 833a, 842a, 849a, 857a], [844a, 846a, 850a, 903a, 912a, 919a, 927a], [918a, 920a, 924a, 936a, 944a, 951a, 958a], [949a, 951a, 955a, 1006a, 1014a, 1021a, 1028a], [1019a, 1021a, 1025a, 1036a, 1044a, 1051a, 1058a], [1049a, 1051a, 1055a, 1106a, 1114a, 1121a, 1128a], [1119a, 1121a, 1125a, 1136a, 1144a, 1151a, 1158a], [1149a, 1151a, 1155a, 1206p, 1214p, 1221p, 1228p], [1219p, 1221p, 1225p, 1236p, 1244p, 1251p, 1258p], [1249p, 1251p, 1255p, 106p, 114p, 121p, 128p], [119p, 121p, 125p, 136p, 144p, 151p, 158p], [149p, 151p, 155p, 206p, 214p, 221p, 228p], [219p, 221p, 225p, 236p, 244p, 251p, 258p], [249p, 251p, 255p, 307p, 315p, 322p, 330p], [314p, 316p, 320p, 333p, 341p, 348p, 356p], [344p, 346p, 350p, 403p, 411p, 418p, 426p], [414p, 416p, 420p, 433p, 441p, 448p, 456p], [444p, 446p, 450p, 503p, 511p, 518p, 526p], [514p, 516p, 520p, 533p, 541p, 548p, 556p], [544p, 546p, 550p, 603p, 611p, 618p, 626p], [650p, 652p, 655p, 706p, 714p, 720p, 727p], [750p, 752p, 755p, 806p, 814p, 820p, 827p], [850p, 852p, 855p, 906p, 914p, 920p, 927p], [950p, 952p, 955p, 1006p, 1014p, 1020p, 1027p], [1050p, 1052p, 1055p, 1106p, 1114p, 1120p, 1127p]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Australian Institute Sports Bruce, Dickson, Merici Braddon, City Interchange]
 
-short_name: "7"
-stop_times: 
-- - 544a
-  - 546a
-  - 550a
-  - 601a
-  - 609a
-  - 616a
-  - 623a
-- - 614a
-  - 616a
-  - 620a
-  - 631a
-  - 639a
-  - 646a
-  - 653a
-- - 644a
-  - 646a
-  - 650a
-  - 701a
-  - 709a
-  - 716a
-  - 723a
-- - 714a
-  - 716a
-  - 720a
-  - 731a
-  - 740a
-  - 747a
-  - 755a
-- - 744a
-  - 746a
-  - 750a
-  - 803a
-  - 812a
-  - 819a
-  - 827a
-- - 814a
-  - 816a
-  - 820a
-  - 833a
-  - 842a
-  - 849a
-  - 857a
-- - 844a
-  - 846a
-  - 850a
-  - 903a
-  - 912a
-  - 919a
-  - 927a
-- - 918a
-  - 920a
-  - 924a
-  - 936a
-  - 944a
-  - 951a
-  - 958a
-- - 949a
-  - 951a
-  - 955a
-  - 1006a
-  - 1014a
-  - 1021a
-  - 1028a
-- - 1019a
-  - 1021a
-  - 1025a
-  - 1036a
-  - 1044a
-  - 1051a
-  - 1058a
-- - 1049a
-  - 1051a
-  - 1055a
-  - 1106a
-  - 1114a
-  - 1121a
-  - 1128a
-- - 1119a
-  - 1121a
-  - 1125a
-  - 1136a
-  - 1144a
-  - 1151a
-  - 1158a
-- - 1149a
-  - 1151a
-  - 1155a
-  - 1206p
-  - 1214p
-  - 1221p
-  - 1228p
-- - 1219p
-  - 1221p
-  - 1225p
-  - 1236p
-  - 1244p
-  - 1251p
-  - 1258p
-- - 1249p
-  - 1251p
-  - 1255p
-  - 106p
-  - 114p
-  - 121p
-  - 128p
-- - 119p
-  - 121p
-  - 125p
-  - 136p
-  - 144p
-  - 151p
-  - 158p
-- - 149p
-  - 151p
-  - 155p
-  - 206p
-  - 214p
-  - 221p
-  - 228p
-- - 219p
-  - 221p
-  - 225p
-  - 236p
-  - 244p
-  - 251p
-  - 258p
-- - 249p
-  - 251p
-  - 255p
-  - 307p
-  - 315p
-  - 322p
-  - 330p
-- - 314p
-  - 316p
-  - 320p
-  - 333p
-  - 341p
-  - 348p
-  - 356p
-- - 344p
-  - 346p
-  - 350p
-  - 403p
-  - 411p
-  - 418p
-  - 426p
-- - 414p
-  - 416p
-  - 420p
-  - 433p
-  - 441p
-  - 448p
-  - 456p
-- - 444p
-  - 446p
-  - 450p
-  - 503p
-  - 511p
-  - 518p
-  - 526p
-- - 514p
-  - 516p
-  - 520p
-  - 533p
-  - 541p
-  - 548p
-  - 556p
-- - 544p
-  - 546p
-  - 550p
-  - 603p
-  - 611p
-  - 618p
-  - 626p
-- - 650p
-  - 652p
-  - 655p
-  - 706p
-  - 714p
-  - 720p
-  - 727p
-- - 750p
-  - 752p
-  - 755p
-  - 806p
-  - 814p
-  - 820p
-  - 827p
-- - 850p
-  - 852p
-  - 855p
-  - 906p
-  - 914p
-  - 920p
-  - 927p
-- - 950p
-  - 952p
-  - 955p
-  - 1006p
-  - 1014p
-  - 1020p
-  - 1027p
-- - 1050p
-  - 1052p
-  - 1055p
-  - 1106p
-  - 1114p
-  - 1120p
-  - 1127p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Australian Institute Sports Bruce
-  - Dickson
-  - Merici Braddon
-  - City Interchange
-

--- a/maxious-canberra-transit-feed/output/7-to-cohen-street-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/7-to-cohen-street-station.stop_times.yml
@@ -1,211 +1,9 @@
 --- 
 long_name: To Cohen Street Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "7"
+stop_times: [[632a, 639a, 646a, 654a, 705a, 707a, 711a], [701a, 708a, 715a, 723a, 735a, 737a, 741a], [731a, 739a, 746a, 754a, 807a, 809a, 813a], [801a, 809a, 816a, 824a, 837a, 839a, 843a], [829a, 837a, 844a, 852a, 905a, 907a, 911a], [858a, 906a, 913a, 921a, 933a, 935a, 939a], [930a, 937a, 944a, 952a, 1003a, 1005a, 1009a], [1000a, 1007a, 1014a, 1022a, 1033a, 1035a, 1039a], [1030a, 1037a, 1044a, 1052a, 1103a, 1105a, 1109a], [1100a, 1107a, 1114a, 1122a, 1133a, 1135a, 1139a], [1130a, 1137a, 1144a, 1152a, 1203p, 1205p, 1209p], [1200p, 1207p, 1214p, 1222p, 1233p, 1235p, 1239p], [1230p, 1237p, 1244p, 1252p, 103p, 105p, 109p], [100p, 107p, 114p, 122p, 133p, 135p, 139p], [130p, 137p, 144p, 152p, 203p, 205p, 209p], [200p, 207p, 214p, 222p, 233p, 235p, 239p], [230p, 237p, 244p, 252p, 304p, 306p, 310p], [259p, 307p, 314p, 323p, 336p, 338p, 342p], [331p, 339p, 346p, 355p, 408p, 410p, 414p], [401p, 409p, 416p, 425p, 438p, 440p, 444p], [431p, 439p, 446p, 455p, 508p, 510p, 514p], [501p, 509p, 516p, 525p, 538p, 540p, 544p], [531p, 539p, 546p, 555p, 608p, 610p, 614p], [631p, 637p, 644p, 652p, 703p, 705p, 708p], [731p, 737p, 744p, 752p, 803p, 805p, 808p], [831p, 837p, 844p, 852p, 903p, 905p, 908p], [931p, 937p, 944p, 952p, 1003p, 1005p, 1008p], [1031p, 1037p, 1044p, 1052p, 1103p, 1105p, 1108p]]
+time_points: [City Interchange (Platform 10), Merici Braddon, Dickson, Australian Institute Sports Bruce, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "7"
-stop_times: 
-- - 632a
-  - 639a
-  - 646a
-  - 654a
-  - 705a
-  - 707a
-  - 711a
-- - 701a
-  - 708a
-  - 715a
-  - 723a
-  - 735a
-  - 737a
-  - 741a
-- - 731a
-  - 739a
-  - 746a
-  - 754a
-  - 807a
-  - 809a
-  - 813a
-- - 801a
-  - 809a
-  - 816a
-  - 824a
-  - 837a
-  - 839a
-  - 843a
-- - 829a
-  - 837a
-  - 844a
-  - 852a
-  - 905a
-  - 907a
-  - 911a
-- - 858a
-  - 906a
-  - 913a
-  - 921a
-  - 933a
-  - 935a
-  - 939a
-- - 930a
-  - 937a
-  - 944a
-  - 952a
-  - 1003a
-  - 1005a
-  - 1009a
-- - 1000a
-  - 1007a
-  - 1014a
-  - 1022a
-  - 1033a
-  - 1035a
-  - 1039a
-- - 1030a
-  - 1037a
-  - 1044a
-  - 1052a
-  - 1103a
-  - 1105a
-  - 1109a
-- - 1100a
-  - 1107a
-  - 1114a
-  - 1122a
-  - 1133a
-  - 1135a
-  - 1139a
-- - 1130a
-  - 1137a
-  - 1144a
-  - 1152a
-  - 1203p
-  - 1205p
-  - 1209p
-- - 1200p
-  - 1207p
-  - 1214p
-  - 1222p
-  - 1233p
-  - 1235p
-  - 1239p
-- - 1230p
-  - 1237p
-  - 1244p
-  - 1252p
-  - 103p
-  - 105p
-  - 109p
-- - 100p
-  - 107p
-  - 114p
-  - 122p
-  - 133p
-  - 135p
-  - 139p
-- - 130p
-  - 137p
-  - 144p
-  - 152p
-  - 203p
-  - 205p
-  - 209p
-- - 200p
-  - 207p
-  - 214p
-  - 222p
-  - 233p
-  - 235p
-  - 239p
-- - 230p
-  - 237p
-  - 244p
-  - 252p
-  - 304p
-  - 306p
-  - 310p
-- - 259p
-  - 307p
-  - 314p
-  - 323p
-  - 336p
-  - 338p
-  - 342p
-- - 331p
-  - 339p
-  - 346p
-  - 355p
-  - 408p
-  - 410p
-  - 414p
-- - 401p
-  - 409p
-  - 416p
-  - 425p
-  - 438p
-  - 440p
-  - 444p
-- - 431p
-  - 439p
-  - 446p
-  - 455p
-  - 508p
-  - 510p
-  - 514p
-- - 501p
-  - 509p
-  - 516p
-  - 525p
-  - 538p
-  - 540p
-  - 544p
-- - 531p
-  - 539p
-  - 546p
-  - 555p
-  - 608p
-  - 610p
-  - 614p
-- - 631p
-  - 637p
-  - 644p
-  - 652p
-  - 703p
-  - 705p
-  - 708p
-- - 731p
-  - 737p
-  - 744p
-  - 752p
-  - 803p
-  - 805p
-  - 808p
-- - 831p
-  - 837p
-  - 844p
-  - 852p
-  - 903p
-  - 905p
-  - 908p
-- - 931p
-  - 937p
-  - 944p
-  - 952p
-  - 1003p
-  - 1005p
-  - 1008p
-- - 1031p
-  - 1037p
-  - 1044p
-  - 1052p
-  - 1103p
-  - 1105p
-  - 1108p
-time_points: 
-  - City Interchange - Platform 10
-  - Merici Braddon
-  - Dickson
-  - Australian Institute Sports Bruce
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/701-to-national-circ-canberra-ave.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/701-to-national-circ-canberra-ave.stop_times.yml
@@ -1,40 +1,8 @@
 --- 
 long_name: To National Circ/Canberra Ave
-between_stops: []
+between_stops: {}
 
 short_name: "701"
-stop_times: 
-- - 658a
-  - 703a
-  - 710a
-  - 714a
-  - 726a
-  - 737a
-  - 746a
-  - 754a
-- - 731a
-  - 736a
-  - 743a
-  - 747a
-  - 810a
-  - 826a
-  - 835a
-  - 843a
-- - 745a
-  - 750a
-  - 757a
-  - 801a
-  - 824a
-  - 840a
-  - 849a
-  - 857a
-time_points: 
-  - Spence Terminus
-  - Spence
-  - Copland College
-  - William Webb / Ginninderra Drive
-  - Macarthur / Northbourne
-  - City Interchange - Platform 10
-  - Russell Offices
-  - National Circuit / Canberra Ave
+stop_times: [[658a, 703a, 710a, 714a, 726a, 737a, 746a, 754a], [731a, 736a, 743a, 747a, 810a, 826a, 835a, 843a], [745a, 750a, 757a, 801a, 824a, 840a, 849a, 857a]]
+time_points: [Spence Terminus, Spence, Copland College, William Webb / Ginninderra Drive, Macarthur / Northbourne, City Interchange (Platform 10), Russell Offices, National Circuit / Canberra Ave]
 

--- a/maxious-canberra-transit-feed/output/701-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/701-to-spence-terminus.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Spence Terminus
-between_stops: []
+between_stops: {}
+
 short_name: "701"
 stop_times: [[442p, 450p, 502p, 509p, 522p, 527p, 534p, 540p], ["-", "-", 520p, 527p, 539p, 543p, 550p, 554p], [525p, 533p, 543p, 550p, 602p, 606p, 613p, 617p], [542p, 550p, 600p, 607p, 619p, 623p, 630p, 634p]]
-time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Macarthur / Northbourne, William Webb / Ginninderra Drive, Copland College, Spence, Spence Terminus]
+time_points: [Sydney Avenue, Russell Offices, City Interchange (Platform 11), Macarthur / Northbourne, William Webb / Ginninderra Drive, Copland College, Spence, Spence Terminus]
 

--- a/maxious-canberra-transit-feed/output/702-to-fraser-east-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/702-to-fraser-east-terminus.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Fraser East Terminus
-between_stops: []
+between_stops: {}
+
 short_name: "702"
 stop_times: [[450p, 458p, 508p, 513p, 515p, 527p, 532p, 538p, 542p], ["-", "-", 530p, 535p, 537p, 549p, 554p, 600p, 604p], [535p, 543p, 553p, 558p, 600p, 612p, 617p, 623p, 627p]]
-time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Macarthur / Northbourne, Northbourne Ave/Antill St, Flynn, Charnwood, Fraser, Fraser East Terminus]
+time_points: [Sydney Avenue, Russell Offices, City Interchange (Platform 11), Macarthur / Northbourne, Northbourne Ave/Antill St, Flynn, Charnwood, Fraser, Fraser East Terminus]
 

--- a/maxious-canberra-transit-feed/output/702-to-national-circ-canberra-ave.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/702-to-national-circ-canberra-ave.stop_times.yml
@@ -1,44 +1,8 @@
 --- 
 long_name: To National Circ/Canberra Ave
-between_stops: []
+between_stops: {}
 
 short_name: "702"
-stop_times: 
-- - 658a
-  - 703a
-  - 709a
-  - 714a
-  - 727a
-  - 730a
-  - 745a
-  - 754a
-  - 802a
-- - 735a
-  - 740a
-  - 746a
-  - 751a
-  - 805a
-  - 810a
-  - 826a
-  - 835a
-  - 843a
-- - 754a
-  - 759a
-  - 806a
-  - 811a
-  - 828a
-  - 833a
-  - 849a
-  - 858a
-  - 906a
-time_points: 
-  - Fraser East Terminus
-  - Fraser
-  - Charnwood
-  - Flynn
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange - Platform 10
-  - Russell Offices
-  - National Circuit / Canberra Ave
+stop_times: [[658a, 703a, 709a, 714a, 727a, 730a, 745a, 754a, 802a], [735a, 740a, 746a, 751a, 805a, 810a, 826a, 835a, 843a], [754a, 759a, 806a, 811a, 828a, 833a, 849a, 858a, 906a]]
+time_points: [Fraser East Terminus, Fraser, Charnwood, Flynn, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange (Platform 10), Russell Offices, National Circuit / Canberra Ave]
 

--- a/maxious-canberra-transit-feed/output/703-to-fraser-west-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/703-to-fraser-west-terminus.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Fraser West Terminus
-between_stops: []
+between_stops: {}
+
 short_name: "703"
 stop_times: [[440p, 448p, 458p, 516p, 527p, 534p, 541p], ["-", "-", 515p, 533p, 544p, 551p, 558p], ["-", "-", 526p, 544p, 555p, 602p, 609p], [520p, 528p, 538p, 556p, 607p, 614p, 621p], [545p, 553p, 603p, 621p, 632p, 639p, 646p]]
-time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Belconnen Way, Macgregor Shops, Dunlop, Fraser West Terminus]
+time_points: [Sydney Avenue, Russell Offices, City Interchange (Platform 11), Belconnen Way, Macgregor Shops, Dunlop, Fraser West Terminus]
 

--- a/maxious-canberra-transit-feed/output/703-to-national-circ-canberra-ave.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/703-to-national-circ-canberra-ave.stop_times.yml
@@ -1,50 +1,8 @@
 --- 
 long_name: To National Circ/Canberra Ave
-between_stops: []
+between_stops: {}
 
 short_name: "703"
-stop_times: 
-- - 654a
-  - 701a
-  - 707a
-  - 719a
-  - 738a
-  - 747a
-  - 755a
-- - 710a
-  - 717a
-  - 723a
-  - 735a
-  - 753a
-  - "-"
-  - "-"
-- - 723a
-  - 730a
-  - 736a
-  - 748a
-  - 806a
-  - "-"
-  - "-"
-- - 738a
-  - 745a
-  - 751a
-  - 803a
-  - 834a
-  - 843a
-  - 851a
-- - 758a
-  - 806a
-  - 813a
-  - 827a
-  - 849a
-  - 858a
-  - 906a
-time_points: 
-  - Fraser West Terminus
-  - Dunlop
-  - Macgregor Shops
-  - Belconnen Way
-  - City Interchange - Platform 10
-  - Russell Offices
-  - National Circuit / Canberra Ave
+stop_times: [[654a, 701a, 707a, 719a, 738a, 747a, 755a], [710a, 717a, 723a, 735a, 753a, "-", "-"], [723a, 730a, 736a, 748a, 806a, "-", "-"], [738a, 745a, 751a, 803a, 834a, 843a, 851a], [758a, 806a, 813a, 827a, 849a, 858a, 906a]]
+time_points: [Fraser West Terminus, Dunlop, Macgregor Shops, Belconnen Way, City Interchange (Platform 10), Russell Offices, National Circuit / Canberra Ave]
 

--- a/maxious-canberra-transit-feed/output/704-to-kippax.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/704-to-kippax.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Kippax
-between_stops: []
+between_stops: {}
+
 short_name: "704"
 stop_times: [[506p, 514p, 524p, 533p, 542p, 550p, 555p, 600p, 606p]]
-time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Aranda, Macquarie, Hawker, Hawker College, Higgins, Kippax]
+time_points: [Sydney Avenue, Russell Offices, City Interchange (Platform 11), Aranda, Macquarie, Hawker, Hawker College, Higgins, Kippax]
 

--- a/maxious-canberra-transit-feed/output/704-to-national-circ-canberra-ave.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/704-to-national-circ-canberra-ave.stop_times.yml
@@ -1,35 +1,8 @@
 --- 
 long_name: To National Circ/Canberra Ave
-between_stops: []
+between_stops: {}
 
 short_name: "704"
-stop_times: 
-- - 738a
-  - 744a
-  - 749a
-  - 754a
-  - 803a
-  - 812a
-  - 825a
-  - 833a
-  - 840a
-- - 753a
-  - 759a
-  - 804a
-  - 809a
-  - 818a
-  - 827a
-  - 840a
-  - 848a
-  - 855a
-time_points: 
-  - Kippax
-  - Higgins
-  - Hawker College
-  - Hawker
-  - Macquarie
-  - Aranda
-  - City Interchange - Platform 10
-  - Russell Offices
-  - National Circuit / Canberra Ave
+stop_times: [[738a, 744a, 749a, 754a, 803a, 812a, 825a, 833a, 840a], [753a, 759a, 804a, 809a, 818a, 827a, 840a, 848a, 855a]]
+time_points: [Kippax, Higgins, Hawker College, Hawker, Macquarie, Aranda, City Interchange (Platform 10), Russell Offices, National Circuit / Canberra Ave]
 

--- a/maxious-canberra-transit-feed/output/705-to-centre-link-tuggeranong.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/705-to-centre-link-tuggeranong.stop_times.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Centre Link Tuggeranong
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 2): []
 short_name: "705"
 stop_times: [[721a, 723a, 727a, 803a, 805a], [747a, 749a, 753a, 829a, 831a], [813a, 815a, 819a, 855a, 857a], [445p, 447p, 451p, 526p, "-"], [511p, 513p, 517p, 552p, "-"], [538p, 540p, 544p, 619p, "-"]]
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Tuggeranong Interchange - Platform 7, Centre Link Tuggeranong]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Tuggeranong Interchange (Platform 7), Centre Link Tuggeranong]
 

--- a/maxious-canberra-transit-feed/output/705-to-cohen-st-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/705-to-cohen-st-bus-station.stop_times.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "705"
 stop_times: [["-", 723a, 749a, 751a, 755a], ["-", 749a, 815a, 817a, 821a], ["-", 814a, 840a, 842a, 846a], [442p, 447p, 513p, 515p, 519p], [507p, 512p, 538p, 540p, 544p], [535p, 540p, 606p, 608p, 612p]]
-time_points: [Centre Link Tuggeranong, Tuggeranong Interchange - Platform 7, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Centre Link Tuggeranong, Tuggeranong Interchange (Platform 7), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/71-to-cohen-st-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/71-to-cohen-st-bus-station.stop_times.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "71"
 stop_times: [[930a, 932a, 936a, 943a, 948a, 956a, 958a, 1003a, 1010a, 1012a, 1016a], [1030a, 1032a, 1036a, 1043a, 1048a, 1056a, 1058a, 1103a, 1110a, 1112a, 1116a], [1130a, 1132a, 1136a, 1143a, 1148a, 1156a, 1158a, 1203p, 1210p, 1212p, 1216p], [1230p, 1232p, 1236p, 1243p, 1248p, 1256p, 1258p, 103p, 110p, 112p, 116p], [130p, 132p, 136p, 143p, 148p, 156p, 158p, 203p, 210p, 212p, 216p]]
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/710-to-cohen-st-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/710-to-cohen-st-bus-station.stop_times.yml
@@ -1,7 +1,10 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  City Interchange (Platform 11)-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "710"
 stop_times: [[407p, 415p, 425p, 442p, 444p, 448p], [427p, 435p, 445p, 502p, 504p, 508p], [445p, 453p, 503p, 520p, 522p, 526p], [507p, 515p, 525p, 542p, 544p, 548p], [527p, 535p, 545p, 602p, 604p, 608p]]
-time_points: [Sydney Avenue, Russell Offices, City Interchange - Platform 11, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Sydney Avenue, Russell Offices, City Interchange (Platform 11), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/710-to-national-circ-canberra-ave.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/710-to-national-circ-canberra-ave.stop_times.yml
@@ -1,44 +1,10 @@
 --- 
 long_name: To National Circ/Canberra Ave
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 2): []
+  Cameron Ave Bus Station (Platform 2)-City Interchange (Platform 10): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+short_name: "710"
+stop_times: [[704a, 706a, 710a, 726a, 735a, 743a], [734a, 736a, 740a, 756a, 805a, 813a], [749a, 751a, 755a, 811a, 820a, 828a], [804a, 806a, 810a, 826a, 835a, 843a], [819a, 821a, 825a, 841a, 850a, 858a]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), City Interchange (Platform 10), Russell Offices, National Circuit / Canberra Ave]
 
-short_name: "710"
-stop_times: 
-- - 704a
-  - 706a
-  - 710a
-  - 726a
-  - 735a
-  - 743a
-- - 734a
-  - 736a
-  - 740a
-  - 756a
-  - 805a
-  - 813a
-- - 749a
-  - 751a
-  - 755a
-  - 811a
-  - 820a
-  - 828a
-- - 804a
-  - 806a
-  - 810a
-  - 826a
-  - 835a
-  - 843a
-- - 819a
-  - 821a
-  - 825a
-  - 841a
-  - 850a
-  - 858a
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - City Interchange - Platform 10
-  - Russell Offices
-  - National Circuit / Canberra Ave
-

--- a/maxious-canberra-transit-feed/output/720-to-electricity-house.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/720-to-electricity-house.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Electricity House
-between_stops: []
+between_stops: {}
+
 short_name: "720"
 stop_times: [[710a, 716a, 728a, 734a, 752a, 756a, 757a], [740a, 746a, 758a, 804a, 822a, 826a, 827a], [816a, 822a, 834a, 840a, 858a, 902a, 903a], [840a, 846a, 858a, 904a, 922a, 926a, 927a]]
 time_points: [Farrer Terminus, Southlands Mawson, Garran, Hughes, Citywest, City Interchange, Electricity House]

--- a/maxious-canberra-transit-feed/output/720-to-farrer-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/720-to-farrer-terminus.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Farrer Terminus
-between_stops: []
+between_stops: {}
+
 short_name: "720"
 stop_times: [[440p, 446p, 504p, 510p, 523p, 529p], [510p, 516p, 534p, 540p, 553p, 559p], [540p, 546p, 604p, 610p, 623p, 629p]]
-time_points: [Citywest, City Interchange - Platform 10, Hughes, Garran, Southlands Mawson, Farrer Terminus]
+time_points: [Citywest, City Interchange (Platform 10), Hughes, Garran, Southlands Mawson, Farrer Terminus]
 

--- a/maxious-canberra-transit-feed/output/727-to-gungahlin-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/727-to-gungahlin-market-place.stop_times.yml
@@ -1,392 +1,8 @@
 --- 
 long_name: To Gungahlin Market Place
-between_stops: []
+between_stops: {}
 
 short_name: "727"
-stop_times: 
-- - 706a
-  - 713a
-  - 717a
-  - 725a
-  - 732a
-  - 734a
-  - 741a
-  - 748a
-- - 721a
-  - 728a
-  - 732a
-  - 740a
-  - 747a
-  - 749a
-  - 756a
-  - 804a
-- - 736a
-  - 743a
-  - 747a
-  - 755a
-  - 802a
-  - 804a
-  - 811a
-  - 821a
-- - 751a
-  - 758a
-  - 803a
-  - 812a
-  - 818a
-  - 820a
-  - 827a
-  - 837a
-- - 806a
-  - 814a
-  - 820a
-  - 829a
-  - 835a
-  - 837a
-  - 844a
-  - 854a
-- - 821a
-  - 829a
-  - 835a
-  - 844a
-  - 850a
-  - 852a
-  - 859a
-  - 906a
-- - 836a
-  - 844a
-  - 850a
-  - 859a
-  - 906a
-  - 908a
-  - 915a
-  - 922a
-- - 851a
-  - 859a
-  - 903a
-  - 911a
-  - 918a
-  - 920a
-  - 927a
-  - 934a
-- - 906a
-  - 913a
-  - 917a
-  - 925a
-  - 932a
-  - 934a
-  - 941a
-  - 948a
-- - 921a
-  - 928a
-  - 932a
-  - 940a
-  - 947a
-  - 949a
-  - 956a
-  - 1003a
-- - 936a
-  - 943a
-  - 947a
-  - 955a
-  - 1002a
-  - 1004a
-  - 1011a
-  - 1018a
-- - 951a
-  - 958a
-  - 1002a
-  - 1010a
-  - 1017a
-  - 1019a
-  - 1026a
-  - 1033a
-- - 1006a
-  - 1013a
-  - 1017a
-  - 1025a
-  - 1032a
-  - 1034a
-  - 1041a
-  - 1048a
-- - 1021a
-  - 1028a
-  - 1032a
-  - 1040a
-  - 1047a
-  - 1049a
-  - 1056a
-  - 1103a
-- - 1036a
-  - 1043a
-  - 1047a
-  - 1055a
-  - 1102a
-  - 1104a
-  - 1111a
-  - 1118a
-- - 1051a
-  - 1058a
-  - 1102a
-  - 1110a
-  - 1117a
-  - 1119a
-  - 1126a
-  - 1133a
-- - 1106a
-  - 1113a
-  - 1117a
-  - 1125a
-  - 1132a
-  - 1134a
-  - 1141a
-  - 1148a
-- - 1121a
-  - 1128a
-  - 1132a
-  - 1140a
-  - 1147a
-  - 1149a
-  - 1156a
-  - 1203p
-- - 1136a
-  - 1143a
-  - 1147a
-  - 1155a
-  - 1202p
-  - 1204p
-  - 1211p
-  - 1218p
-- - 1151a
-  - 1158a
-  - 1202p
-  - 1210p
-  - 1217p
-  - 1219p
-  - 1226p
-  - 1233p
-- - 1206p
-  - 1213p
-  - 1217p
-  - 1225p
-  - 1232p
-  - 1234p
-  - 1241p
-  - 1248p
-- - 1221p
-  - 1228p
-  - 1232p
-  - 1240p
-  - 1247p
-  - 1249p
-  - 1256p
-  - 103p
-- - 1236p
-  - 1243p
-  - 1247p
-  - 1255p
-  - 102p
-  - 104p
-  - 111p
-  - 118p
-- - 1251p
-  - 1258p
-  - 102p
-  - 110p
-  - 117p
-  - 119p
-  - 126p
-  - 133p
-- - 106p
-  - 113p
-  - 117p
-  - 125p
-  - 132p
-  - 134p
-  - 141p
-  - 148p
-- - 121p
-  - 128p
-  - 132p
-  - 140p
-  - 147p
-  - 149p
-  - 156p
-  - 203p
-- - 136p
-  - 143p
-  - 147p
-  - 155p
-  - 202p
-  - 204p
-  - 211p
-  - 218p
-- - 151p
-  - 158p
-  - 202p
-  - 210p
-  - 217p
-  - 219p
-  - 226p
-  - 233p
-- - 206p
-  - 213p
-  - 217p
-  - 225p
-  - 232p
-  - 234p
-  - 241p
-  - 248p
-- - 221p
-  - 228p
-  - 232p
-  - 240p
-  - 247p
-  - 249p
-  - 256p
-  - 303p
-- - 236p
-  - 243p
-  - 247p
-  - 255p
-  - 302p
-  - 304p
-  - 311p
-  - 318p
-- - 251p
-  - 258p
-  - 302p
-  - 310p
-  - 317p
-  - 319p
-  - 326p
-  - 333p
-- - 306p
-  - 313p
-  - 317p
-  - 325p
-  - 332p
-  - 334p
-  - 341p
-  - 348p
-- - 321p
-  - 328p
-  - 332p
-  - 340p
-  - 347p
-  - 349p
-  - 356p
-  - 404p
-- - 336p
-  - 343p
-  - 347p
-  - 355p
-  - 401p
-  - 404p
-  - 411p
-  - 421p
-- - 351p
-  - 358p
-  - 403p
-  - 415p
-  - 420p
-  - 423p
-  - 430p
-  - 440p
-- - 406p
-  - 414p
-  - 420p
-  - 432p
-  - 437p
-  - 440p
-  - 447p
-  - 457p
-- - 421p
-  - 429p
-  - 435p
-  - 447p
-  - 452p
-  - 455p
-  - 502p
-  - 512p
-- - 436p
-  - 444p
-  - 450p
-  - 502p
-  - 507p
-  - 510p
-  - 517p
-  - 527p
-- - 451p
-  - 459p
-  - 505p
-  - 517p
-  - 522p
-  - 525p
-  - 532p
-  - 542p
-- - 506p
-  - 514p
-  - 520p
-  - 532p
-  - 537p
-  - 540p
-  - 547p
-  - 557p
-- - 521p
-  - 529p
-  - 535p
-  - 547p
-  - 552p
-  - 555p
-  - 602p
-  - 610p
-- - 536p
-  - 544p
-  - 550p
-  - 602p
-  - 606p
-  - 609p
-  - 615p
-  - 623p
-- - 551p
-  - 559p
-  - 603p
-  - 612p
-  - 616p
-  - 619p
-  - 625p
-  - 633p
-- - 606p
-  - 612p
-  - 616p
-  - 625p
-  - 629p
-  - 632p
-  - 638p
-  - 646p
-- - 621p
-  - 627p
-  - 631p
-  - 640p
-  - 644p
-  - 647p
-  - 653p
-  - 701p
-- - 636p
-  - 642p
-  - 646p
-  - 655p
-  - 659p
-  - 702p
-  - 708p
-  - 716p
-time_points: 
-  - Railway Station Kingston
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange - Platform 8
-  - Macarthur / Northbourne
-  - Northbourne Ave/Antill St
-  - Flemington Rd/Sandford St
-  - Gungahlin Market Place
+stop_times: [[706a, 713a, 717a, 725a, 732a, 734a, 741a, 748a], [721a, 728a, 732a, 740a, 747a, 749a, 756a, 804a], [736a, 743a, 747a, 755a, 802a, 804a, 811a, 821a], [751a, 758a, 803a, 812a, 818a, 820a, 827a, 837a], [806a, 814a, 820a, 829a, 835a, 837a, 844a, 854a], [821a, 829a, 835a, 844a, 850a, 852a, 859a, 906a], [836a, 844a, 850a, 859a, 906a, 908a, 915a, 922a], [851a, 859a, 903a, 911a, 918a, 920a, 927a, 934a], [906a, 913a, 917a, 925a, 932a, 934a, 941a, 948a], [921a, 928a, 932a, 940a, 947a, 949a, 956a, 1003a], [936a, 943a, 947a, 955a, 1002a, 1004a, 1011a, 1018a], [951a, 958a, 1002a, 1010a, 1017a, 1019a, 1026a, 1033a], [1006a, 1013a, 1017a, 1025a, 1032a, 1034a, 1041a, 1048a], [1021a, 1028a, 1032a, 1040a, 1047a, 1049a, 1056a, 1103a], [1036a, 1043a, 1047a, 1055a, 1102a, 1104a, 1111a, 1118a], [1051a, 1058a, 1102a, 1110a, 1117a, 1119a, 1126a, 1133a], [1106a, 1113a, 1117a, 1125a, 1132a, 1134a, 1141a, 1148a], [1121a, 1128a, 1132a, 1140a, 1147a, 1149a, 1156a, 1203p], [1136a, 1143a, 1147a, 1155a, 1202p, 1204p, 1211p, 1218p], [1151a, 1158a, 1202p, 1210p, 1217p, 1219p, 1226p, 1233p], [1206p, 1213p, 1217p, 1225p, 1232p, 1234p, 1241p, 1248p], [1221p, 1228p, 1232p, 1240p, 1247p, 1249p, 1256p, 103p], [1236p, 1243p, 1247p, 1255p, 102p, 104p, 111p, 118p], [1251p, 1258p, 102p, 110p, 117p, 119p, 126p, 133p], [106p, 113p, 117p, 125p, 132p, 134p, 141p, 148p], [121p, 128p, 132p, 140p, 147p, 149p, 156p, 203p], [136p, 143p, 147p, 155p, 202p, 204p, 211p, 218p], [151p, 158p, 202p, 210p, 217p, 219p, 226p, 233p], [206p, 213p, 217p, 225p, 232p, 234p, 241p, 248p], [221p, 228p, 232p, 240p, 247p, 249p, 256p, 303p], [236p, 243p, 247p, 255p, 302p, 304p, 311p, 318p], [251p, 258p, 302p, 310p, 317p, 319p, 326p, 333p], [306p, 313p, 317p, 325p, 332p, 334p, 341p, 348p], [321p, 328p, 332p, 340p, 347p, 349p, 356p, 404p], [336p, 343p, 347p, 355p, 401p, 404p, 411p, 421p], [351p, 358p, 403p, 415p, 420p, 423p, 430p, 440p], [406p, 414p, 420p, 432p, 437p, 440p, 447p, 457p], [421p, 429p, 435p, 447p, 452p, 455p, 502p, 512p], [436p, 444p, 450p, 502p, 507p, 510p, 517p, 527p], [451p, 459p, 505p, 517p, 522p, 525p, 532p, 542p], [506p, 514p, 520p, 532p, 537p, 540p, 547p, 557p], [521p, 529p, 535p, 547p, 552p, 555p, 602p, 610p], [536p, 544p, 550p, 602p, 606p, 609p, 615p, 623p], [551p, 559p, 603p, 612p, 616p, 619p, 625p, 633p], [606p, 612p, 616p, 625p, 629p, 632p, 638p, 646p], [621p, 627p, 631p, 640p, 644p, 647p, 653p, 701p], [636p, 642p, 646p, 655p, 659p, 702p, 708p, 716p]]
+time_points: [Railway Station Kingston, Kings Ave/National Crt, Russell Offices, City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Flemington Rd/Sandford St, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/727-to-railway-station-kingston.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/727-to-railway-station-kingston.stop_times.yml
@@ -1,400 +1,8 @@
 --- 
 long_name: To Railway Station Kingston
-between_stops: []
+between_stops: {}
 
 short_name: "727"
-stop_times: 
-- - 701a
-  - 709a
-  - 715a
-  - 718a
-  - 723a
-  - 731a
-  - 735a
-  - 741a
-- - 716a
-  - 724a
-  - 730a
-  - 736a
-  - 746a
-  - 756a
-  - 800a
-  - 806a
-- - 731a
-  - 740a
-  - 749a
-  - 755a
-  - 805a
-  - 815a
-  - 819a
-  - 825a
-- - 746a
-  - 755a
-  - 804a
-  - 810a
-  - 820a
-  - 830a
-  - 834a
-  - 840a
-- - 801a
-  - 810a
-  - 819a
-  - 825a
-  - 835a
-  - 845a
-  - 849a
-  - 855a
-- - 816a
-  - 825a
-  - 834a
-  - 840a
-  - 850a
-  - 900a
-  - 904a
-  - 910a
-- - 831a
-  - 840a
-  - 849a
-  - 855a
-  - 903a
-  - 911a
-  - 915a
-  - 921a
-- - 846a
-  - 855a
-  - 903a
-  - 906a
-  - 911a
-  - 919a
-  - 923a
-  - 929a
-- - 901a
-  - 909a
-  - 915a
-  - 918a
-  - 923a
-  - 931a
-  - 935a
-  - 941a
-- - 916a
-  - 924a
-  - 930a
-  - 933a
-  - 938a
-  - 946a
-  - 950a
-  - 956a
-- - 931a
-  - 939a
-  - 945a
-  - 948a
-  - 953a
-  - 1001a
-  - 1005a
-  - 1011a
-- - 946a
-  - 954a
-  - 1000a
-  - 1003a
-  - 1008a
-  - 1016a
-  - 1020a
-  - 1026a
-- - 1001a
-  - 1009a
-  - 1015a
-  - 1018a
-  - 1023a
-  - 1031a
-  - 1035a
-  - 1041a
-- - 1016a
-  - 1024a
-  - 1030a
-  - 1033a
-  - 1038a
-  - 1046a
-  - 1050a
-  - 1056a
-- - 1031a
-  - 1039a
-  - 1045a
-  - 1048a
-  - 1053a
-  - 1101a
-  - 1105a
-  - 1111a
-- - 1046a
-  - 1054a
-  - 1100a
-  - 1103a
-  - 1108a
-  - 1116a
-  - 1120a
-  - 1126a
-- - 1101a
-  - 1109a
-  - 1115a
-  - 1118a
-  - 1123a
-  - 1131a
-  - 1135a
-  - 1141a
-- - 1116a
-  - 1124a
-  - 1130a
-  - 1133a
-  - 1138a
-  - 1146a
-  - 1150a
-  - 1156a
-- - 1131a
-  - 1139a
-  - 1145a
-  - 1148a
-  - 1153a
-  - 1201p
-  - 1205p
-  - 1211p
-- - 1146a
-  - 1154a
-  - 1200p
-  - 1203p
-  - 1208p
-  - 1216p
-  - 1220p
-  - 1226p
-- - 1201p
-  - 1209p
-  - 1215p
-  - 1218p
-  - 1223p
-  - 1231p
-  - 1235p
-  - 1241p
-- - 1216p
-  - 1224p
-  - 1230p
-  - 1233p
-  - 1238p
-  - 1246p
-  - 1250p
-  - 1256p
-- - 1231p
-  - 1239p
-  - 1245p
-  - 1248p
-  - 1253p
-  - 101p
-  - 105p
-  - 111p
-- - 1246p
-  - 1254p
-  - 100p
-  - 103p
-  - 108p
-  - 116p
-  - 120p
-  - 126p
-- - 101p
-  - 109p
-  - 115p
-  - 118p
-  - 123p
-  - 131p
-  - 135p
-  - 141p
-- - 116p
-  - 124p
-  - 130p
-  - 133p
-  - 138p
-  - 146p
-  - 150p
-  - 156p
-- - 131p
-  - 139p
-  - 145p
-  - 148p
-  - 153p
-  - 201p
-  - 205p
-  - 211p
-- - 146p
-  - 154p
-  - 200p
-  - 203p
-  - 208p
-  - 216p
-  - 220p
-  - 226p
-- - 201p
-  - 209p
-  - 215p
-  - 218p
-  - 223p
-  - 231p
-  - 235p
-  - 241p
-- - 216p
-  - 224p
-  - 230p
-  - 233p
-  - 238p
-  - 246p
-  - 250p
-  - 256p
-- - 231p
-  - 239p
-  - 245p
-  - 248p
-  - 253p
-  - 301p
-  - 305p
-  - 311p
-- - 246p
-  - 254p
-  - 300p
-  - 303p
-  - 308p
-  - 316p
-  - 320p
-  - 326p
-- - 301p
-  - 309p
-  - 315p
-  - 318p
-  - 323p
-  - 331p
-  - 335p
-  - 341p
-- - 316p
-  - 324p
-  - 330p
-  - 333p
-  - 338p
-  - 346p
-  - 350p
-  - 356p
-- - 331p
-  - 339p
-  - 345p
-  - 348p
-  - 353p
-  - 401p
-  - 406p
-  - 414p
-- - 346p
-  - 354p
-  - 400p
-  - 403p
-  - 412p
-  - 422p
-  - 427p
-  - 435p
-- - 401p
-  - 410p
-  - 417p
-  - 420p
-  - 429p
-  - 439p
-  - 444p
-  - 452p
-- - 416p
-  - 425p
-  - 432p
-  - 435p
-  - 444p
-  - 454p
-  - 459p
-  - 507p
-- - 431p
-  - 440p
-  - 447p
-  - 450p
-  - 459p
-  - 509p
-  - 514p
-  - 522p
-- - 446p
-  - 455p
-  - 502p
-  - 505p
-  - 514p
-  - 524p
-  - 529p
-  - 537p
-- - 501p
-  - 510p
-  - 517p
-  - 520p
-  - 529p
-  - 539p
-  - 544p
-  - 552p
-- - 516p
-  - 525p
-  - 532p
-  - 535p
-  - 544p
-  - 554p
-  - 559p
-  - 605p
-- - 531p
-  - 540p
-  - 547p
-  - 550p
-  - 559p
-  - 607p
-  - 611p
-  - 617p
-- - 546p
-  - 555p
-  - 602p
-  - 605p
-  - 610p
-  - 618p
-  - 622p
-  - 628p
-- - 601p
-  - 609p
-  - 615p
-  - 618p
-  - 623p
-  - 631p
-  - 635p
-  - 641p
-- - 616p
-  - 624p
-  - 630p
-  - 633p
-  - 638p
-  - 646p
-  - 650p
-  - 656p
-- - 631p
-  - 639p
-  - 645p
-  - 648p
-  - 653p
-  - 701p
-  - 705p
-  - 711p
-- - 646p
-  - 654p
-  - 700p
-  - 703p
-  - 708p
-  - 716p
-  - 720p
-  - 726p
-time_points: 
-  - Gungahlin Market Place
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Railway Station Kingston
+stop_times: [[701a, 709a, 715a, 718a, 723a, 731a, 735a, 741a], [716a, 724a, 730a, 736a, 746a, 756a, 800a, 806a], [731a, 740a, 749a, 755a, 805a, 815a, 819a, 825a], [746a, 755a, 804a, 810a, 820a, 830a, 834a, 840a], [801a, 810a, 819a, 825a, 835a, 845a, 849a, 855a], [816a, 825a, 834a, 840a, 850a, 900a, 904a, 910a], [831a, 840a, 849a, 855a, 903a, 911a, 915a, 921a], [846a, 855a, 903a, 906a, 911a, 919a, 923a, 929a], [901a, 909a, 915a, 918a, 923a, 931a, 935a, 941a], [916a, 924a, 930a, 933a, 938a, 946a, 950a, 956a], [931a, 939a, 945a, 948a, 953a, 1001a, 1005a, 1011a], [946a, 954a, 1000a, 1003a, 1008a, 1016a, 1020a, 1026a], [1001a, 1009a, 1015a, 1018a, 1023a, 1031a, 1035a, 1041a], [1016a, 1024a, 1030a, 1033a, 1038a, 1046a, 1050a, 1056a], [1031a, 1039a, 1045a, 1048a, 1053a, 1101a, 1105a, 1111a], [1046a, 1054a, 1100a, 1103a, 1108a, 1116a, 1120a, 1126a], [1101a, 1109a, 1115a, 1118a, 1123a, 1131a, 1135a, 1141a], [1116a, 1124a, 1130a, 1133a, 1138a, 1146a, 1150a, 1156a], [1131a, 1139a, 1145a, 1148a, 1153a, 1201p, 1205p, 1211p], [1146a, 1154a, 1200p, 1203p, 1208p, 1216p, 1220p, 1226p], [1201p, 1209p, 1215p, 1218p, 1223p, 1231p, 1235p, 1241p], [1216p, 1224p, 1230p, 1233p, 1238p, 1246p, 1250p, 1256p], [1231p, 1239p, 1245p, 1248p, 1253p, 101p, 105p, 111p], [1246p, 1254p, 100p, 103p, 108p, 116p, 120p, 126p], [101p, 109p, 115p, 118p, 123p, 131p, 135p, 141p], [116p, 124p, 130p, 133p, 138p, 146p, 150p, 156p], [131p, 139p, 145p, 148p, 153p, 201p, 205p, 211p], [146p, 154p, 200p, 203p, 208p, 216p, 220p, 226p], [201p, 209p, 215p, 218p, 223p, 231p, 235p, 241p], [216p, 224p, 230p, 233p, 238p, 246p, 250p, 256p], [231p, 239p, 245p, 248p, 253p, 301p, 305p, 311p], [246p, 254p, 300p, 303p, 308p, 316p, 320p, 326p], [301p, 309p, 315p, 318p, 323p, 331p, 335p, 341p], [316p, 324p, 330p, 333p, 338p, 346p, 350p, 356p], [331p, 339p, 345p, 348p, 353p, 401p, 406p, 414p], [346p, 354p, 400p, 403p, 412p, 422p, 427p, 435p], [401p, 410p, 417p, 420p, 429p, 439p, 444p, 452p], [416p, 425p, 432p, 435p, 444p, 454p, 459p, 507p], [431p, 440p, 447p, 450p, 459p, 509p, 514p, 522p], [446p, 455p, 502p, 505p, 514p, 524p, 529p, 537p], [501p, 510p, 517p, 520p, 529p, 539p, 544p, 552p], [516p, 525p, 532p, 535p, 544p, 554p, 559p, 605p], [531p, 540p, 547p, 550p, 559p, 607p, 611p, 617p], [546p, 555p, 602p, 605p, 610p, 618p, 622p, 628p], [601p, 609p, 615p, 618p, 623p, 631p, 635p, 641p], [616p, 624p, 630p, 633p, 638p, 646p, 650p, 656p], [631p, 639p, 645p, 648p, 653p, 701p, 705p, 711p], [646p, 654p, 700p, 703p, 708p, 716p, 720p, 726p]]
+time_points: [Gungahlin Market Place, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Railway Station Kingston]
 

--- a/maxious-canberra-transit-feed/output/729-to-cooleman-court.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/729-to-cooleman-court.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: "729"
 stop_times: [[445p, 451p, 513p, 518p, 526p, 532p], [515p, 521p, 543p, 548p, 556p, 602p]]
-time_points: [Citywest, City Interchange - Platform 10, Holder, Duffy, Rivett, Cooleman Court]
+time_points: [Citywest, City Interchange (Platform 10), Holder, Duffy, Rivett, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/729-to-electricity-house.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/729-to-electricity-house.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Electricity House
-between_stops: []
+between_stops: {}
+
 short_name: "729"
 stop_times: [[709a, 715a, 724a, 728a, 749a, 753a, 755a], [739a, 745a, 754a, 758a, 819a, 823a, 825a]]
 time_points: [Cooleman Court, Rivett, Duffy, Holder, Citywest, City Interchange, Electricity House]

--- a/maxious-canberra-transit-feed/output/73-to-cohen-st-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/73-to-cohen-st-bus-station.stop_times.yml
@@ -1,68 +1,11 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 5)-Cohen St Bus Station (Platform 5): []
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 5): []
+short_name: "73"
+stop_times: [[917a, 919a, 923a, 928a, 934a, 938a, 944a, 947a, 954a, 1002a, 1004a, 1008a], [1047a, 1049a, 1053a, 1058a, 1104a, 1108a, 1114a, 1117a, 1124a, 1132a, 1134a, 1138a], [1217p, 1219p, 1223p, 1228p, 1234p, 1238p, 1244p, 1247p, 1254p, 102p, 104p, 108p], [147p, 149p, 153p, 158p, 204p, 208p, 214p, 217p, 224p, 232p, 234p, 238p]]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 5), Cohen St Bus Station (Platform 5), Florey Shops, Page Shops, Hawker, Cook, Jamison Centre, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "73"
-stop_times: 
-- - 917a
-  - 919a
-  - 923a
-  - 928a
-  - 934a
-  - 938a
-  - 944a
-  - 947a
-  - 954a
-  - 1002a
-  - 1004a
-  - 1008a
-- - 1047a
-  - 1049a
-  - 1053a
-  - 1058a
-  - 1104a
-  - 1108a
-  - 1114a
-  - 1117a
-  - 1124a
-  - 1132a
-  - 1134a
-  - 1138a
-- - 1217p
-  - 1219p
-  - 1223p
-  - 1228p
-  - 1234p
-  - 1238p
-  - 1244p
-  - 1247p
-  - 1254p
-  - 102p
-  - 104p
-  - 108p
-- - 147p
-  - 149p
-  - 153p
-  - 158p
-  - 204p
-  - 208p
-  - 214p
-  - 217p
-  - 224p
-  - 232p
-  - 234p
-  - 238p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 5
-  - Cohen St Bus Station - Platform 5
-  - Florey Shops
-  - Page Shops
-  - Hawker
-  - Cook
-  - Jamison Centre
-  - Calvary Hospital
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/732-to-electricity-house.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/732-to-electricity-house.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Electricity House
-between_stops: []
+between_stops: {}
+
 short_name: "732"
 stop_times: [[715a, 724a, 738a, 742a, 744a], [748a, 803a, 814a, 819a, 821a], [818a, 827a, 841a, 845a, 847a]]
-time_points: [Woden Interchange - Platform 4, Curtin, Citywest, City Interchange, Electricity House]
+time_points: [Woden Interchange (Platform 4), Curtin, Citywest, City Interchange, Electricity House]
 

--- a/maxious-canberra-transit-feed/output/732-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/732-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "732"
 stop_times: [[435p, 441p, 453p, 503p], [505p, 511p, 523p, 533p], [535p, 541p, 553p, 603p]]
-time_points: [Citywest, City Interchange - Platform 10, Curtin, Woden Interchange]
+time_points: [Citywest, City Interchange (Platform 10), Curtin, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/737-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/737-to-city-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "737"
 stop_times: [[431p, 441p, 455p, 507p], [445p, 453p, 512p, 527p], [505p, 513p, 532p, 547p], [525p, 533p, 552p, 607p], [545p, 553p, 612p, 627p]]
 time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, City Interchange]

--- a/maxious-canberra-transit-feed/output/737-to-fairbairn-park.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/737-to-fairbairn-park.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Fairbairn Park
-between_stops: []
+between_stops: {}
+
 short_name: "737"
 stop_times: [[643a, 652a, 710a, "-"], [658a, 707a, 725a, "-"], [718a, 727a, 745a, "-"], [738a, 747a, 805a, "-"], [758a, 807a, 825a, 837a], [818a, 827a, 845a, 857a]]
-time_points: [City Interchange - Platform 7, Russell Offices, Brindabella Business Park, Fairbairn Park]
+time_points: [City Interchange (Platform 7), Russell Offices, Brindabella Business Park, Fairbairn Park]
 

--- a/maxious-canberra-transit-feed/output/74-to-cameron-ave-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/74-to-cameron-ave-bus-station.stop_times.yml
@@ -1,68 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "74"
+stop_times: [[954a, 956a, 1000a, 1006a, 1013a, 1016a, 1023a, 1027a, 1033a, 1039a, 1041a, 1045a], [1124a, 1126a, 1130a, 1136a, 1143a, 1146a, 1153a, 1157p, 1203p, 1209p, 1211p, 1215p], [1254p, 1256p, 100p, 106p, 113p, 116p, 123p, 127p, 133p, 139p, 141p, 145p], [224p, 226p, 230p, 236p, 243p, 246p, 253p, 257p, 303p, 309p, 311p, 315p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Calvary Hospital, Jamison Centre, Cook, Hawker, Page Shops, Florey Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "74"
-stop_times: 
-- - 954a
-  - 956a
-  - 1000a
-  - 1006a
-  - 1013a
-  - 1016a
-  - 1023a
-  - 1027a
-  - 1033a
-  - 1039a
-  - 1041a
-  - 1045a
-- - 1124a
-  - 1126a
-  - 1130a
-  - 1136a
-  - 1143a
-  - 1146a
-  - 1153a
-  - 1157p
-  - 1203p
-  - 1209p
-  - 1211p
-  - 1215p
-- - 1254p
-  - 1256p
-  - 100p
-  - 106p
-  - 113p
-  - 116p
-  - 123p
-  - 127p
-  - 133p
-  - 139p
-  - 141p
-  - 145p
-- - 224p
-  - 226p
-  - 230p
-  - 236p
-  - 243p
-  - 246p
-  - 253p
-  - 257p
-  - 303p
-  - 309p
-  - 311p
-  - 315p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Calvary Hospital
-  - Jamison Centre
-  - Cook
-  - Hawker
-  - Page Shops
-  - Florey Shops
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-

--- a/maxious-canberra-transit-feed/output/749-to-cohen-st-bus-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/749-to-cohen-st-bus-station.stop_times.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "749"
 stop_times: [[753a, 817a, 819a, 823a], [436p, 502p, 504p, 508p], [510p, 536p, 538p, 542p], [540p, 606p, 608p, 612p]]
-time_points: [Woden Interchange - Platform 4, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Woden Interchange (Platform 4), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/749-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/749-to-woden-interchange.stop_times.yml
@@ -1,28 +1,9 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 2): []
+short_name: "749"
+stop_times: [[702a, 704a, 708a, 730a], [737a, 739a, 743a, 810a], [807a, 809a, 813a, 840a], [459p, 501p, 505p, 535p]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Woden Interchange]
 
-short_name: "749"
-stop_times: 
-- - 702a
-  - 704a
-  - 708a
-  - 730a
-- - 737a
-  - 739a
-  - 743a
-  - 810a
-- - 807a
-  - 809a
-  - 813a
-  - 840a
-- - 459p
-  - 501p
-  - 505p
-  - 535p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Woden Interchange
-

--- a/maxious-canberra-transit-feed/output/75-to-cooleman-court.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/75-to-cooleman-court.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: "75"
 stop_times: [[1055a, 1108a, 1117a], [1255p, 108p, 117p]]
-time_points: [Woden Interchange - Platform 2, Stromlo High Waramanga, Cooleman Court]
+time_points: [Woden Interchange (Platform 2), Stromlo High Waramanga, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/75-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/75-to-woden-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "75"
 stop_times: [[925a, 934a, 947a], [1125a, 1134a, 1147a], [125p, 134p, 147p]]
 time_points: [Cooleman Court, Stromlo High Waramanga, Woden Interchange]

--- a/maxious-canberra-transit-feed/output/757-to-fairbairn-park.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/757-to-fairbairn-park.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Fairbairn Park
-between_stops: []
+between_stops: {}
+
 short_name: "757"
 stop_times: [[645a, 655a, 706a, 722a, 735a], [705a, 715a, 726a, 742a, 755a]]
 time_points: [Gungahlin Market Place, Dickson College, Russell Offices, Brindabella Business Park, Fairbairn Park]

--- a/maxious-canberra-transit-feed/output/757-to-gungahlin-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/757-to-gungahlin-market-place.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Gungahlin Market Place
-between_stops: []
+between_stops: {}
+
 short_name: "757"
 stop_times: [[433p, 442p, 457p, 510p, 524p], [508p, 522p, 532p, 543p, 556p], [538p, 552p, 602p, 613p, 626p]]
 time_points: [Fairbairn Park, Brindabella Business Park, Russell Offices, Dickson College, Gungahlin Market Place]

--- a/maxious-canberra-transit-feed/output/76-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/76-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "76"
 stop_times: [[1000a, 1007a, 1015a, 1020a, 1028a], [1200p, 1207p, 1215p, 1220p, 1228p], [200p, 207p, 215p, 220p, 228p]]
-time_points: [Woden Interchange - Platform 2, Brindabella Gardens Nursing Home, Saint Andrews Village Hughes, Canberra Hospital, Woden Interchange]
+time_points: [Woden Interchange (Platform 2), Brindabella Gardens Nursing Home, Saint Andrews Village Hughes, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/768-to-calwell-shops.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/768-to-calwell-shops.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Calwell Shops
-between_stops: []
+between_stops: {}
+
 short_name: "768"
 stop_times: [[447p, 453p, 502p, 526p, 537p, 545p], [519p, 525p, 534p, 558p, 609p, 617p]]
-time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Chisholm Shops, Isabella Shops, Calwell Shops]
+time_points: [Citywest, City Interchange (Platform 10), Russell Offices, Chisholm Shops, Isabella Shops, Calwell Shops]
 

--- a/maxious-canberra-transit-feed/output/768-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/768-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
+
 short_name: "768"
 stop_times: [[707a, 715a, 726a, 751a, 800a, 804a], [737a, 745a, 756a, 821a, 830a, 834a]]
-time_points: [Calwell Shops, Isabella Shops, Chisholm Shops, Russell Offices, City Interchange - Platform 11, Citywest]
+time_points: [Calwell Shops, Isabella Shops, Chisholm Shops, Russell Offices, City Interchange (Platform 11), Citywest]
 

--- a/maxious-canberra-transit-feed/output/769-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/769-to-citywest.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
+
 short_name: "769"
 stop_times: [[641a, 646a, 656a, 706a, 733a, 743a, 747a], [721a, 726a, 736a, 746a, 813a, 823a, 827a], [741a, 746a, 756a, 806a, 833a, 843a, 847a]]
-time_points: [Tharwa Drive, Theodore, Calwell Shops, Chisholm Shops, Russell Offices, City Interchange - Platform 11, Citywest]
+time_points: [Tharwa Drive, Theodore, Calwell Shops, Chisholm Shops, Russell Offices, City Interchange (Platform 11), Citywest]
 

--- a/maxious-canberra-transit-feed/output/769-to-tharwa-drive.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/769-to-tharwa-drive.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tharwa Drive
-between_stops: []
+between_stops: {}
+
 short_name: "769"
 stop_times: [[427p, 433p, 442p, 507p, 517p, 527p, 532p], [500p, 506p, 515p, 540p, 550p, 600p, 605p], [537p, 543p, 552p, 617p, 627p, 637p, 642p]]
-time_points: [Citywest, City Interchange - Platform 10, Russell Offices, Chisholm Shops, Calwell Shops, Theodore, Tharwa Drive]
+time_points: [Citywest, City Interchange (Platform 10), Russell Offices, Chisholm Shops, Calwell Shops, Theodore, Tharwa Drive]
 

--- a/maxious-canberra-transit-feed/output/77-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/77-to-woden-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "77"
 stop_times: [[1100a, 1108a, 1113a, 1121a, 1128a], [100p, 108p, 113p, 121p, 128p]]
-time_points: [Woden Interchange - Platform 2, Canberra Hospital, Saint Andrews Village Hughes, Brindabella Gardens Nursing Home, Woden Interchange]
+time_points: [Woden Interchange (Platform 2), Canberra Hospital, Saint Andrews Village Hughes, Brindabella Gardens Nursing Home, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/780-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/780-to-city-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "780"
 stop_times: [[405p, 421p, 440p], [435p, 451p, 510p]]
 time_points: [Fyshwick Terminus, Canberra Times, City Interchange]

--- a/maxious-canberra-transit-feed/output/780-to-fyshwick-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/780-to-fyshwick-terminus.stop_times.yml
@@ -1,17 +1,8 @@
 --- 
 long_name: To Fyshwick Terminus
-between_stops: []
+between_stops: {}
 
 short_name: "780"
-stop_times: 
-- - 648a
-  - 707a
-  - 723a
-- - 719a
-  - 738a
-  - 754a
-time_points: 
-  - City Interchange - Platform 7
-  - Newcastle / Isa Street Fyshwick
-  - Fyshwick Terminus
+stop_times: [[648a, 707a, 723a], [719a, 738a, 754a]]
+time_points: [City Interchange (Platform 7), Newcastle / Isa Street Fyshwick, Fyshwick Terminus]
 

--- a/maxious-canberra-transit-feed/output/785-to-electricity-house.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/785-to-electricity-house.stop_times.yml
@@ -1,26 +1,8 @@
 --- 
 long_name: To Electricity House
-between_stops: []
+between_stops: {}
 
 short_name: "785"
-stop_times: 
-- - 652a
-  - 655a
-  - 713a
-  - 743a
-  - 747a
-  - 749a
-- - 725a
-  - 728a
-  - 746a
-  - 816a
-  - 820a
-  - 822a
-time_points: 
-  - Lanyon Market Place
-  - Tharwa/Pockett
-  - Mentone View/Tharwa Drive
-  - Citywest
-  - City Interchange - Platform 10
-  - Electricity House
+stop_times: [[652a, 655a, 713a, 743a, 747a, 749a], [725a, 728a, 746a, 816a, 820a, 822a]]
+time_points: [Lanyon Market Place, Tharwa/Pockett, Mentone View/Tharwa Drive, Citywest, City Interchange (Platform 10), Electricity House]
 

--- a/maxious-canberra-transit-feed/output/785-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/785-to-lanyon-market-place.stop_times.yml
@@ -1,26 +1,8 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: {}
 
 short_name: "785"
-stop_times: 
-- - 505p
-  - 511p
-  - 513p
-  - 549p
-  - 605p
-  - 607p
-- - 530p
-  - 536p
-  - 538p
-  - 614p
-  - 630p
-  - 632p
-time_points: 
-  - Citywest
-  - City Interchange - Platform 10
-  - Electricity House
-  - Mentone View/Tharwa Drive
-  - Tharwa/Pockett
-  - Lanyon Market Place
+stop_times: [[505p, 511p, 513p, 549p, 605p, 607p], [530p, 536p, 538p, 614p, 630p, 632p]]
+time_points: [Citywest, City Interchange (Platform 10), Electricity House, Mentone View/Tharwa Drive, Tharwa/Pockett, Lanyon Market Place]
 

--- a/maxious-canberra-transit-feed/output/786-to-fairbairn-park.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/786-to-fairbairn-park.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Fairbairn Park
-between_stops: []
+between_stops: {}
+
 short_name: "786"
 stop_times: [[646a, 656a, 730a, 742a], [706a, 716a, 735a, 747a], [727a, 737a, 811a, 823a]]
-time_points: [Tuggeranong Interchange - Platform 7, Chisholm Shops, Brindabella Business Park, Fairbairn Park]
+time_points: [Tuggeranong Interchange (Platform 7), Chisholm Shops, Brindabella Business Park, Fairbairn Park]
 

--- a/maxious-canberra-transit-feed/output/786-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/786-to-tuggeranong-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "786"
 stop_times: [[445p, 453p, 524p, 537p], [515p, 523p, 554p, 607p], [545p, 553p, 624p, 637p]]
 time_points: [Fairbairn Park, Brindabella Business Park, Chisholm Shops, Tuggeranong Interchange]

--- a/maxious-canberra-transit-feed/output/787-to-electricity-house.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/787-to-electricity-house.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Electricity House
-between_stops: []
+between_stops: {}
+
 short_name: "787"
 stop_times: [[647a, 650a, 702a, 728a, 732a, 734a], [720a, 723a, 735a, 801a, 805a, 807a]]
-time_points: [Lanyon Market Place, Tharwa/Knoke, Woodcock/Clare Dennis, Citywest, City Interchange - Platform 10, Electricity House]
+time_points: [Lanyon Market Place, Tharwa/Knoke, Woodcock/Clare Dennis, Citywest, City Interchange (Platform 10), Electricity House]
 

--- a/maxious-canberra-transit-feed/output/787-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/787-to-lanyon-market-place.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: {}
+
 short_name: "787"
 stop_times: [[516p, 522p, 524p, 556p, 607p, 609p], [535p, 541p, 543p, 615p, 626p, 628p]]
-time_points: [Citywest, City Interchange - Platform 10, Electricity House, Woodcock/Clare Dennis, Tharwa/Knoke, Lanyon Market Place]
+time_points: [Citywest, City Interchange (Platform 10), Electricity House, Woodcock/Clare Dennis, Tharwa/Knoke, Lanyon Market Place]
 

--- a/maxious-canberra-transit-feed/output/788-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/788-to-citywest.stop_times.yml
@@ -1,26 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
 
 short_name: "788"
-stop_times: 
-- - 710a
-  - 719a
-  - 734a
-  - 811a
-  - 820a
-  - 824a
-- - 740a
-  - 749a
-  - 804a
-  - 841a
-  - 850a
-  - 854a
-time_points: 
-  - Woodcock/Clare Dennis
-  - Tharwa/Pockett
-  - Mentone View/Tharwa Drive
-  - Russell Offices
-  - City Interchange - Platform 11
-  - Citywest
+stop_times: [[710a, 719a, 734a, 811a, 820a, 824a], [740a, 749a, 804a, 841a, 850a, 854a]]
+time_points: [Woodcock/Clare Dennis, Tharwa/Pockett, Mentone View/Tharwa Drive, Russell Offices, City Interchange (Platform 11), Citywest]
 

--- a/maxious-canberra-transit-feed/output/788-to-woodcock-clare-dennis.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/788-to-woodcock-clare-dennis.stop_times.yml
@@ -1,32 +1,8 @@
 --- 
 long_name: To Woodcock/Clare Dennis
-between_stops: []
+between_stops: {}
 
 short_name: "788"
-stop_times: 
-- - 426p
-  - 432p
-  - 441p
-  - 512p
-  - 526p
-  - 536p
-- - 502p
-  - 507p
-  - 518p
-  - 552p
-  - 606p
-  - 615p
-- - 532p
-  - 538p
-  - 547p
-  - 618p
-  - 632p
-  - 642p
-time_points: 
-  - Citywest
-  - City Interchange - Platform 10
-  - Russell Offices
-  - Mentone View/Tharwa Drive
-  - Tharwa/Pockett
-  - Woodcock/Clare Dennis
+stop_times: [[426p, 432p, 441p, 512p, 526p, 536p], [502p, 507p, 518p, 552p, 606p, 615p], [532p, 538p, 547p, 618p, 632p, 642p]]
+time_points: [Citywest, City Interchange (Platform 10), Russell Offices, Mentone View/Tharwa Drive, Tharwa/Pockett, Woodcock/Clare Dennis]
 

--- a/maxious-canberra-transit-feed/output/8-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/8-to-city-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "8"
 stop_times: [[626a, 632a, 637a, 644a], [657a, 703a, 708a, 715a], [724a, 730a, 737a, 746a], [757a, 804a, 811a, 820a], [831a, 838a, 845a, 854a], [859a, 906a, 913a, 922a], [1004a, 1010a, 1015a, 1022a], [1104a, 1110a, 1115a, 1122a], [1204p, 1210p, 1215p, 1222p], [104p, 110p, 115p, 122p], [159p, 205p, 210p, 217p], [302p, 309p, 316p, 325p], [332p, 339p, 346p, 355p], [407p, 414p, 421p, 430p], [437p, 444p, 451p, 500p], [507p, 514p, 521p, 530p], [537p, 544p, 551p, 600p], [642p, 648p, 653p, 658p], [742p, 748p, 753p, 758p], [842p, 848p, 853p, 858p], [942p, 948p, 953p, 958p], [1042p, 1048p, 1053p, 1058p]]
 time_points: [Dickson Cowper St, Lyneham, Macarthur / Miller O'Connor, City Interchange]

--- a/maxious-canberra-transit-feed/output/8-to-dickson-cowper-st.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/8-to-dickson-cowper-st.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Dickson Cowper St
-between_stops: []
+between_stops: {}
+
 short_name: "8"
 stop_times: [[655a, 702a, 707a, 713a], [714a, 721a, 726a, 732a], [741a, 750a, 757a, 804a], [811a, 820a, 827a, 834a], [841a, 850a, 857a, 904a], [915a, 924a, 931a, 937a], [947a, 954a, 959a, 1005a], [1018a, 1025a, 1030a, 1036a], [1046a, 1053a, 1058a, 1104a], [1146a, 1153a, 1158a, 1204p], [1246p, 1253p, 1258p, 104p], [146p, 153p, 158p, 204p], [246p, 253p, 258p, 305p], [311p, 320p, 327p, 334p], [346p, 355p, 402p, 409p], [411p, 420p, 427p, 434p], [444p, 453p, 500p, 507p], [523p, 532p, 539p, 546p], [553p, 602p, 609p, 616p], [623p, 631p, 636p, 642p], [650p, 655p, 700p, 706p], [705p, 710p, 715p, 721p], [805p, 810p, 815p, 821p], [905p, 910p, 915p, 921p], [1005p, 1010p, 1015p, 1021p], [1105p, 1110p, 1115p, 1121p]]
-time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, Dickson Cowper St]
+time_points: [City Interchange (Platform 4), Macarthur / Miller O'Connor, Lyneham, Dickson Cowper St]
 

--- a/maxious-canberra-transit-feed/output/80-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/80-to-city-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "80"
 stop_times: [[547a, 602a, 611a, 616a, 625a, 632a, 634a, 638a, 642a, 650a], [606a, 621a, 630a, 635a, 644a, 651a, 653a, 657a, 701a, 709a], [633a, 648a, 657a, 702a, 711a, 718a, 720a, 724a, 728a, 738a], [700a, 715a, 724a, 729a, 740a, 748a, 752a, 759a, 803a, 814a], [731a, 747a, 756a, 803a, 814a, 822a, 826a, 833a, 837a, 848a], [801a, 817a, 826a, 833a, 844a, 852a, 856a, 903a, 907a, 918a], [834a, 850a, 859a, 906a, 917a, 925a, 929a, 933a, 937a, 945a], [908a, 923a, 933a, 938a, 947a, 954a, 956a, 1000a, 1004a, 1012a], [938a, 953a, 1002a, 1007a, 1016a, 1023a, 1025a, 1029a, 1033a, 1041a], [1038a, 1053a, 1102a, 1107a, 1116a, 1123a, 1125a, 1129a, 1133a, 1141a], ["-", "-", "-", "-", "-", 1131a, 1133a, 1137a, 1141a, 1149a], [1138a, 1153a, 1202p, 1207p, 1216p, 1223p, 1225p, 1229p, 1233p, 1241p], [1238p, 1253p, 102p, 107p, 116p, 123p, 125p, 129p, 133p, 141p], [138p, 153p, 202p, 207p, 216p, 223p, 225p, 229p, 233p, 241p], [238p, 253p, 302p, 307p, 316p, 323p, 325p, 329p, 333p, 341p], [338p, 354p, 404p, 410p, 420p, 427p, 429p, 434p, 439p, 448p], [408p, 424p, 434p, 440p, 450p, 457p, 459p, 504p, 509p, 518p], [438p, 454p, 504p, 510p, 520p, 527p, 529p, 534p, 539p, 548p], [508p, 524p, 534p, 540p, 550p, 557p, 559p, 604p, 609p, 618p], [538p, 554p, 604p, 610p, 620p, 627p, 629p, 633p, 637p, 645p], [556p, 612p, 622p, 628p, 636p, 642p, 644p, 648p, 652p, 700p], ["-", "-", "-", "-", "-", 742p, 744p, 748p, 752p, 800p], ["-", "-", "-", "-", "-", 842p, 844p, 848p, 852p, 900p], ["-", "-", "-", "-", "-", 942p, 944p, 948p, 952p, 1000p], ["-", "-", "-", "-", "-", 1042p, 1044p, 1048p, 1052p, 1100p]]
-time_points: [Woden Interchange - Platform 4, Geoscience Australia, Eye Hospital, Fyshwick Direct Factory Outlet, Canberra Times, Railway Station Kingston, Causeway, Kings Ave/National Crt, Russell Offices, City Interchange]
+time_points: [Woden Interchange (Platform 4), Geoscience Australia, Eye Hospital, Fyshwick Direct Factory Outlet, Canberra Times, Railway Station Kingston, Causeway, Kings Ave/National Crt, Russell Offices, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/80-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/80-to-woden-interchange.stop_times.yml
@@ -1,258 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "80"
-stop_times: 
-- - 550a
-  - 558a
-  - 602a
-  - 606a
-  - 609a
-  - 617a
-  - 626a
-  - 631a
-  - 640a
-  - 656a
-- - 617a
-  - 625a
-  - 629a
-  - 633a
-  - 636a
-  - 644a
-  - 653a
-  - 658a
-  - 707a
-  - 723a
-- - 648a
-  - 656a
-  - 700a
-  - 704a
-  - 707a
-  - 715a
-  - 724a
-  - 729a
-  - 737a
-  - 753a
-- - 719a
-  - 727a
-  - 731a
-  - 738a
-  - 741a
-  - 750a
-  - 804a
-  - 810a
-  - 818a
-  - 834a
-- - 751a
-  - 800a
-  - 803a
-  - 810a
-  - 813a
-  - 822a
-  - 836a
-  - 842a
-  - 850a
-  - 906a
-- - 828a
-  - 837a
-  - 840a
-  - 847a
-  - 850a
-  - 859a
-  - 913a
-  - 919a
-  - 927a
-  - 944a
-- - 859a
-  - 907a
-  - 911a
-  - 915a
-  - 918a
-  - 930a
-  - 939a
-  - 944a
-  - 952a
-  - 1010a
-- - 927a
-  - 935a
-  - 939a
-  - 943a
-  - 946a
-  - 954a
-  - 1003a
-  - 1008a
-  - 1016a
-  - 1034a
-- - 1027a
-  - 1035a
-  - 1039a
-  - 1043a
-  - 1046a
-  - 1054a
-  - 1103a
-  - 1108a
-  - 1116a
-  - 1134a
-- - 1127a
-  - 1135a
-  - 1139a
-  - 1143a
-  - 1146a
-  - 1154a
-  - 1203p
-  - 1208p
-  - 1216p
-  - 1234p
-- - 1227p
-  - 1235p
-  - 1239p
-  - 1243p
-  - 1246p
-  - 1254p
-  - 103p
-  - 108p
-  - 116p
-  - 134p
-- - 127p
-  - 135p
-  - 139p
-  - 143p
-  - 146p
-  - 154p
-  - 203p
-  - 208p
-  - 216p
-  - 234p
-- - 227p
-  - 235p
-  - 239p
-  - 243p
-  - 246p
-  - 254p
-  - 303p
-  - 308p
-  - 317p
-  - 333p
-- - 330p
-  - 339p
-  - 344p
-  - 349p
-  - 352p
-  - 400p
-  - 410p
-  - 416p
-  - 426p
-  - 444p
-- - 400p
-  - 409p
-  - 414p
-  - 419p
-  - 422p
-  - 430p
-  - 440p
-  - 446p
-  - 456p
-  - 514p
-- - 434p
-  - 443p
-  - 448p
-  - 453p
-  - 456p
-  - 504p
-  - 514p
-  - 520p
-  - 530p
-  - 548p
-- - 504p
-  - 513p
-  - 518p
-  - 523p
-  - 526p
-  - 534p
-  - 544p
-  - 550p
-  - 600p
-  - 618p
-- - 534p
-  - 543p
-  - 548p
-  - 553p
-  - 556p
-  - 604p
-  - 614p
-  - 620p
-  - 630p
-  - 645p
-- - 604p
-  - 613p
-  - 618p
-  - 623p
-  - 626p
-  - 633p
-  - 641p
-  - 646p
-  - 654p
-  - 709p
-- - 704p
-  - 712p
-  - 716p
-  - 720p
-  - 722p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 804p
-  - 812p
-  - 816p
-  - 820p
-  - 822p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 904p
-  - 912p
-  - 916p
-  - 920p
-  - 922p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1004p
-  - 1012p
-  - 1016p
-  - 1020p
-  - 1022p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1104p
-  - 1112p
-  - 1116p
-  - 1120p
-  - 1122p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - City Interchange - Platform 7
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Causeway
-  - Railway Station Kingston
-  - Newcastle / Isa Street Fyshwick
-  - Fyshwick Direct Factory Outlet
-  - Eye Hospital
-  - Geoscience Australia
-  - Woden Interchange
+stop_times: [[550a, 558a, 602a, 606a, 609a, 617a, 626a, 631a, 640a, 656a], [617a, 625a, 629a, 633a, 636a, 644a, 653a, 658a, 707a, 723a], [648a, 656a, 700a, 704a, 707a, 715a, 724a, 729a, 737a, 753a], [719a, 727a, 731a, 738a, 741a, 750a, 804a, 810a, 818a, 834a], [751a, 800a, 803a, 810a, 813a, 822a, 836a, 842a, 850a, 906a], [828a, 837a, 840a, 847a, 850a, 859a, 913a, 919a, 927a, 944a], [859a, 907a, 911a, 915a, 918a, 930a, 939a, 944a, 952a, 1010a], [927a, 935a, 939a, 943a, 946a, 954a, 1003a, 1008a, 1016a, 1034a], [1027a, 1035a, 1039a, 1043a, 1046a, 1054a, 1103a, 1108a, 1116a, 1134a], [1127a, 1135a, 1139a, 1143a, 1146a, 1154a, 1203p, 1208p, 1216p, 1234p], [1227p, 1235p, 1239p, 1243p, 1246p, 1254p, 103p, 108p, 116p, 134p], [127p, 135p, 139p, 143p, 146p, 154p, 203p, 208p, 216p, 234p], [227p, 235p, 239p, 243p, 246p, 254p, 303p, 308p, 317p, 333p], [330p, 339p, 344p, 349p, 352p, 400p, 410p, 416p, 426p, 444p], [400p, 409p, 414p, 419p, 422p, 430p, 440p, 446p, 456p, 514p], [434p, 443p, 448p, 453p, 456p, 504p, 514p, 520p, 530p, 548p], [504p, 513p, 518p, 523p, 526p, 534p, 544p, 550p, 600p, 618p], [534p, 543p, 548p, 553p, 556p, 604p, 614p, 620p, 630p, 645p], [604p, 613p, 618p, 623p, 626p, 633p, 641p, 646p, 654p, 709p], [704p, 712p, 716p, 720p, 722p, "-", "-", "-", "-", "-"], [804p, 812p, 816p, 820p, 822p, "-", "-", "-", "-", "-"], [904p, 912p, 916p, 920p, 922p, "-", "-", "-", "-", "-"], [1004p, 1012p, 1016p, 1020p, 1022p, "-", "-", "-", "-", "-"], [1104p, 1112p, 1116p, 1120p, 1122p, "-", "-", "-", "-", "-"]]
+time_points: [City Interchange (Platform 7), Russell Offices, Kings Ave/National Crt, Causeway, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Fyshwick Direct Factory Outlet, Eye Hospital, Geoscience Australia, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/81-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/81-to-city-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "81"
 stop_times: [[920a, 934a, 942a, 948a, 955a], [1020a, 1034a, 1042a, 1048a, 1055a], [1120a, 1134a, 1142a, 1148a, 1155a], [1220p, 1234p, 1242p, 1248p, 1255p], [120p, 134p, 142p, 148p, 155p], [220p, 234p, 242p, 248p, 255p], [320p, 334p, 342p, 348p, 355p], [420p, 434p, 442p, 448p, 455p]]
-time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
+time_points: [City Interchange (Platform 9), National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/82-to-bimberi-centre.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/82-to-bimberi-centre.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Bimberi Centre
-between_stops: []
+between_stops: {}
+
 short_name: "82"
 stop_times: [[632a, 638a, 640a, 650a], [342p, 348p, 350p, 400p]]
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
 

--- a/maxious-canberra-transit-feed/output/82-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/82-to-city-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "82"
 stop_times: [[715p, 724p, 726p, 733p]]
 time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]

--- a/maxious-canberra-transit-feed/output/88-to-alexander-maconochie-centre-hume.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/88-to-alexander-maconochie-centre-hume.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Alexander Maconochie Centre Hume
-between_stops: []
+between_stops: {}
+
 short_name: "88"
 stop_times: [[826a, 846a], [1240p, 100p], [510p, 530p]]
-time_points: [Woden Interchange - Platform 4, Alexander Maconochie Centre Hume]
+time_points: [Woden Interchange (Platform 4), Alexander Maconochie Centre Hume]
 

--- a/maxious-canberra-transit-feed/output/88-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/88-to-woden-interchange.stop_times.yml
@@ -1,6 +1,7 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "88"
 stop_times: [[1150a, 1210p], [450p, 510p], [805p, 825p]]
 time_points: [Alexander Maconochie Centre Hume, Woden Interchange]

--- a/maxious-canberra-transit-feed/output/9-to-campbell-park-offices.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/9-to-campbell-park-offices.stop_times.yml
@@ -1,128 +1,8 @@
 --- 
 long_name: To Campbell Park Offices
-between_stops: []
+between_stops: {}
 
 short_name: "9"
-stop_times: 
-- - 714a
-  - 726a
-  - 731a
-  - 733a
-  - 741a
-  - 745a
-- - 814a
-  - 829a
-  - 834a
-  - 836a
-  - 844a
-  - 848a
-- - 857a
-  - 911a
-  - 916a
-  - 918a
-  - 926a
-  - 931a
-- - 957a
-  - 1011a
-  - 1016a
-  - 1018a
-  - 1026a
-  - 1029a
-- - 1057a
-  - 1111a
-  - 1116a
-  - 1118a
-  - 1126a
-  - 1129a
-- - 1157a
-  - 1211p
-  - 1216p
-  - 1218p
-  - 1226p
-  - 1229p
-- - 1257p
-  - 111p
-  - 116p
-  - 118p
-  - 126p
-  - 129p
-- - 157p
-  - 211p
-  - 216p
-  - 218p
-  - 226p
-  - 229p
-- - 257p
-  - 312p
-  - 317p
-  - 319p
-  - 327p
-  - 331p
-- - 344p
-  - 359p
-  - 404p
-  - 406p
-  - 414p
-  - 418p
-- - 414p
-  - 429p
-  - 434p
-  - 436p
-  - 444p
-  - 448p
-- - 444p
-  - 459p
-  - 504p
-  - 506p
-  - 514p
-  - 518p
-- - 514p
-  - 529p
-  - 534p
-  - 536p
-  - 544p
-  - 548p
-- - 557p
-  - 612p
-  - 617p
-  - 619p
-  - 627p
-  - 631p
-- - 657p
-  - 708p
-  - 712p
-  - 714p
-  - 720p
-  - 723p
-- - 757p
-  - 808p
-  - 812p
-  - 814p
-  - 820p
-  - 823p
-- - 857p
-  - 908p
-  - 912p
-  - 914p
-  - 920p
-  - 923p
-- - 957p
-  - 1008p
-  - 1012p
-  - 1014p
-  - 1020p
-  - 1023p
-- - 1057p
-  - 1108p
-  - 1112p
-  - 1114p
-  - 1120p
-  - 1123p
-time_points: 
-  - City Interchange - Platform 7
-  - St Thomas More Campbell
-  - Russell Offices
-  - Hospice
-  - ADFA
-  - Campbell Park Offices
+stop_times: [[714a, 726a, 731a, 733a, 741a, 745a], [814a, 829a, 834a, 836a, 844a, 848a], [857a, 911a, 916a, 918a, 926a, 931a], [957a, 1011a, 1016a, 1018a, 1026a, 1029a], [1057a, 1111a, 1116a, 1118a, 1126a, 1129a], [1157a, 1211p, 1216p, 1218p, 1226p, 1229p], [1257p, 111p, 116p, 118p, 126p, 129p], [157p, 211p, 216p, 218p, 226p, 229p], [257p, 312p, 317p, 319p, 327p, 331p], [344p, 359p, 404p, 406p, 414p, 418p], [414p, 429p, 434p, 436p, 444p, 448p], [444p, 459p, 504p, 506p, 514p, 518p], [514p, 529p, 534p, 536p, 544p, 548p], [557p, 612p, 617p, 619p, 627p, 631p], [657p, 708p, 712p, 714p, 720p, 723p], [757p, 808p, 812p, 814p, 820p, 823p], [857p, 908p, 912p, 914p, 920p, 923p], [957p, 1008p, 1012p, 1014p, 1020p, 1023p], [1057p, 1108p, 1112p, 1114p, 1120p, 1123p]]
+time_points: [City Interchange (Platform 7), St Thomas More Campbell, Russell Offices, Hospice, ADFA, Campbell Park Offices]
 

--- a/maxious-canberra-transit-feed/output/9-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/9-to-city-interchange.stop_times.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "9"
 stop_times: [["-", 655a, 701a, 703a, 708a, 720a], [720a, 723a, 729a, 731a, 736a, 751a], [752a, 756a, 804a, 806a, 811a, 826a], [822a, 826a, 834a, 836a, 841a, 856a], [852a, 856a, 904a, 906a, 911a, 926a], [934a, 937a, 945a, 947a, 952a, 1006a], [1034a, 1037a, 1045a, 1047a, 1052a, 1106a], [1134a, 1137a, 1145a, 1147a, 1152a, 1206p], [1234p, 1237p, 1245p, 1247p, 1252p, 106p], [134p, 137p, 145p, 147p, 152p, 206p], [234p, 237p, 245p, 247p, 252p, 306p], [335p, 339p, 347p, 349p, 354p, 409p], [352p, 356p, 404p, 406p, 411p, 426p], [422p, 426p, 434p, 436p, 441p, 456p], [452p, 456p, 504p, 506p, 511p, 526p], [522p, 526p, 534p, 536p, 541p, 556p], [552p, 556p, 604p, 606p, 611p, 626p], [628p, 632p, 638p, 640p, 645p, 656p], [728p, 731p, 737p, 739p, 744p, 755p], [828p, 831p, 837p, 839p, 844p, 855p], [928p, 931p, 937p, 939p, 944p, 955p], [1028p, 1031p, 1037p, 1039p, 1044p, 1055p]]
-time_points: [Campbell Park Offices, ADFA, Menindee Drive - Hospice, Russell Offices, St Thomas More Campbell, City Interchange]
+time_points: [Campbell Park Offices, ADFA, Hospice, Russell Offices, St Thomas More Campbell, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/900-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/900-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  City Interchange (Platform 5)-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[630a, 641a, 657a, 714a, 731a, 733a, 737a], [645a, 656a, 712a, 729a, 746a, 748a, 752a], [700a, 711a, 727a, 744a, 801a, 803a, 807a], [715a, 726a, 742a, 759a, 816a, 818a, 822a], [730a, 741a, 757a, 814a, 831a, 833a, 837a], [745a, 756a, 812a, 829a, 846a, 848a, 852a], [800a, 811a, 827a, 844a, 901a, 903a, 907a], [815a, 826a, 842a, 859a, 916a, 918a, 922a], [830a, 841a, 857a, 914a, 931a, 933a, 937a], [845a, 856a, 912a, 929a, 946a, 948a, 952a], [900a, 911a, 927a, 944a, 1001a, 1003a, 1007a], [915a, 926a, 942a, 959a, 1016a, 1018a, 1022a], [930a, 941a, 957a, 1014a, 1031a, 1033a, 1037a], [945a, 956a, 1012a, 1029a, 1046a, 1048a, 1052a], [1000a, 1011a, 1027a, 1044a, 1101a, 1103a, 1107a], [1015a, 1026a, 1042a, 1059a, 1116a, 1118a, 1122a], [1030a, 1041a, 1057a, 1114a, 1131a, 1133a, 1137a], [1045a, 1056a, 1112a, 1129a, 1146a, 1148a, 1152a], [1100a, 1111a, 1127a, 1144a, 1201p, 1203p, 1207p], [1115a, 1126a, 1142a, 1159a, 1216p, 1218p, 1222p], ["-", "-", 1149a, 1206p, 1223p, 1225p, 1229p], [1130a, 1141a, 1157a, 1214p, 1231p, 1233p, 1237p], [1145a, 1156a, 1212p, 1229p, 1246p, 1248p, 1252p], ["-", "-", 1219p, 1236p, 1253p, 1255p, 1259p], [1200p, 1211p, 1227p, 1244p, 101p, 103p, 107p], [1215p, 1226p, 1242p, 1259p, 116p, 118p, 122p], ["-", "-", 1249p, 106p, 123p, 125p, 129p], [1230p, 1241p, 1257p, 114p, 131p, 133p, 137p], [1245p, 1256p, 112p, 129p, 146p, 148p, 152p], ["-", "-", 119p, 136p, 153p, 155p, 159p], [100p, 111p, 127p, 144p, 201p, 203p, 207p], [115p, 126p, 142p, 159p, 216p, 218p, 222p], ["-", "-", 149p, 206p, 223p, 225p, 229p], [130p, 141p, 157p, 214p, 231p, 233p, 237p], [145p, 156p, 212p, 229p, 246p, 248p, 252p], ["-", "-", 219p, 236p, 253p, 255p, 259p], [200p, 211p, 227p, 244p, 301p, 303p, 307p], [215p, 226p, 242p, 259p, 316p, 318p, 322p], ["-", "-", 249p, 306p, 323p, 325p, 329p], [230p, 241p, 257p, 314p, 331p, 333p, 337p], [245p, 256p, 312p, 329p, 346p, 348p, 352p], ["-", "-", 319p, 336p, 353p, 355p, 359p], [300p, 311p, 327p, 344p, 401p, 403p, 407p], [315p, 326p, 342p, 359p, 416p, 418p, 422p], ["-", "-", 349p, 406p, 423p, 425p, 429p], [330p, 341p, 357p, 414p, 431p, 433p, 437p], [345p, 356p, 412p, 429p, 446p, 448p, 452p], ["-", "-", 419p, 436p, 453p, 455p, 459p], [400p, 411p, 427p, 444p, 501p, 503p, 507p], [415p, 426p, 442p, 459p, 516p, 518p, 522p], ["-", "-", 449p, 506p, 523p, 525p, 529p], [430p, 441p, 457p, 514p, 531p, 533p, 537p], [445p, 456p, 512p, 529p, 546p, 548p, 552p], [500p, 511p, 527p, 544p, 601p, 603p, 607p], [515p, 526p, 542p, 559p, 616p, 618p, 622p], [530p, 541p, 557p, 614p, 631p, 633p, 636p], [545p, 556p, 612p, 629p, 646p, 648p, 651p], [600p, 611p, 627p, 642p, 659p, 701p, 704p], [615p, 626p, 641p, 656p, 713p, 715p, 718p], [630p, 640p, 655p, 710p, 727p, 729p, 732p], [645p, 655p, 710p, 725p, 742p, 744p, 747p], [700p, 710p, 725p, 740p, 757p, 759p, 802p], [715p, 725p, 740p, 755p, 812p, 814p, 817p], [730p, 740p, 755p, 810p, 827p, 829p, 832p], [745p, 755p, 810p, 825p, 842p, 844p, 847p], [800p, 810p, 825p, 840p, 857p, 859p, 902p], [815p, 825p, 840p, 855p, 912p, 914p, 917p], [830p, 840p, 855p, 910p, 927p, 929p, 932p], [845p, 855p, 910p, 925p, 942p, 944p, 947p], [900p, 910p, 925p, 940p, 957p, 959p, 1002p], [915p, 925p, 940p, 955p, 1012p, 1014p, 1017p], [930p, 940p, 955p, 1010p, 1027p, 1029p, 1032p], [945p, 955p, 1010p, 1025p, 1042p, 1044p, 1047p], [1000p, 1010p, 1025p, 1040p, 1057p, 1059p, 1102p], [1015p, 1025p, 1040p, 1055p, 1112p, 1114p, 1117p], [1030p, 1040p, 1055p, 1110p, 1127p, 1129p, 1132p], [1045p, 1055p, 1110p, 1125p, 1142p, 1144p, 1147p], [1100p, 1110p, 1125p, 1140p, 1157p, 1159p, 1202a], [1115p, 1125p, 1140p, 1155p, 1212a, 1214a, 1217a]]
-between_stops: []
 short_name: "900"
-time_points: [Tuggeranong Interchange - Platform 8, Erindale Centre, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Tuggeranong Interchange (Platform 8), Erindale Centre, Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/900-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/900-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  City Interchange (Platform 5)-Cameron Ave Bus Station: [Wjz5F-1, Wjz5FSY, Wjz5GMT, Wjz5GNG, Wjz5GeU, Wjz5G6U, Wjz5G6B, Wjz5maK, Wjz5mbS, Wjz5nwb, Wjz5nw6, Wjz6giR, Wjz6gia, Wjz68W5, Wjz689c, Wjz681S]
+  Woden Interchange (Platform 9)-City Interchange (Platform 5): [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "900"
+time_points: [Tuggeranong Interchange (Platform 8), Erindale Centre, Woden Interchange (Platform 9), City Interchange (Platform 5), Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[730a, 741a, 757a, 814a, 831a, 835a, 837a], [745a, 756a, 812a, 829a, 846a, 850a, 852a], [800a, 811a, 827a, 844a, 901a, 905a, 907a], [815a, 826a, 842a, 859a, 916a, 920a, 922a], [830a, 841a, 857a, 914a, 931a, 935a, 937a], [845a, 856a, 912a, 929a, 946a, 950a, 952a], [900a, 911a, 927a, 944a, 1001a, 1005a, 1007a], [915a, 926a, 942a, 959a, 1016a, 1020a, 1022a], [930a, 941a, 957a, 1014a, 1031a, 1035a, 1037a], [945a, 956a, 1012a, 1029a, 1046a, 1050a, 1052a], [1000a, 1011a, 1027a, 1044a, 1101a, 1105a, 1107a], [1015a, 1026a, 1042a, 1059a, 1116a, 1120a, 1122a], [1030a, 1041a, 1057a, 1114a, 1131a, 1135a, 1137a], [1045a, 1056a, 1112a, 1129a, 1146a, 1150a, 1152a], [1100a, 1111a, 1127a, 1144a, 1201p, 1205p, 1207p], [1115a, 1126a, 1142a, 1159a, 1216p, 1220p, 1222p], [1130a, 1141a, 1157a, 1214p, 1231p, 1235p, 1237p], [1145a, 1156a, 1212p, 1229p, 1246p, 1250p, 1252p], [1200p, 1211p, 1227p, 1244p, 101p, 105p, 107p], [1215p, 1226p, 1242p, 1259p, 116p, 120p, 122p], [1230p, 1241p, 1257p, 114p, 131p, 135p, 137p], [1245p, 1256p, 112p, 129p, 146p, 150p, 152p], [100p, 111p, 127p, 144p, 201p, 205p, 207p], [115p, 126p, 142p, 159p, 216p, 220p, 222p], [130p, 141p, 157p, 214p, 231p, 235p, 237p], [145p, 156p, 212p, 229p, 246p, 250p, 252p], [200p, 211p, 227p, 244p, 301p, 305p, 307p], [215p, 226p, 242p, 259p, 316p, 320p, 322p], [230p, 241p, 257p, 314p, 331p, 335p, 337p], [245p, 256p, 312p, 329p, 346p, 350p, 352p], [300p, 311p, 327p, 344p, 401p, 405p, 407p], [315p, 326p, 342p, 359p, 416p, 420p, 422p], [330p, 341p, 357p, 414p, 431p, 435p, 437p], [345p, 356p, 412p, 429p, 446p, 450p, 452p], [400p, 411p, 427p, 444p, 501p, 505p, 507p], [415p, 426p, 442p, 459p, 516p, 520p, 522p], [430p, 441p, 457p, 514p, 531p, 535p, 537p], [445p, 456p, 512p, 529p, 546p, 550p, 552p], [500p, 511p, 527p, 544p, 601p, 605p, 607p], [515p, 526p, 542p, 559p, 616p, 620p, 622p], [530p, 541p, 557p, 614p, 631p, 634p, 636p], [545p, 556p, 612p, 629p, 646p, 649p, 651p], [600p, 611p, 627p, 642p, 659p, 702p, 704p], [615p, 626p, 641p, 656p, 713p, 716p, 718p], [630p, 640p, 655p, 710p, 727p, 730p, 732p], [645p, 655p, 710p, 725p, 742p, 745p, 747p], [706p, 716p, 731p, 746p, 803p, 806p, 808p]]
-time_points: [Tuggeranong Interchange - Platform 8, Erindale Centre, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/900-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/900-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 1): []
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
 stop_times_saturday: [[634a, 636a, 640a, 657a, 714a, 729a, 735a], [649a, 651a, 655a, 712a, 729a, 744a, 750a], [704a, 706a, 710a, 727a, 744a, 759a, 805a], [719a, 721a, 725a, 742a, 759a, 814a, 820a], [734a, 736a, 740a, 757a, 814a, 829a, 835a], [749a, 751a, 755a, 812a, 829a, 844a, 850a], [804a, 806a, 810a, 827a, 844a, 859a, 905a], [819a, 821a, 825a, 842a, 859a, 914a, 920a], [834a, 836a, 840a, 857a, 914a, 929a, 935a], [849a, 851a, 855a, 912a, 929a, 944a, 950a], [904a, 906a, 910a, 927a, 944a, 959a, 1005a], [919a, 921a, 925a, 942a, 959a, 1014a, 1020a], [934a, 936a, 940a, 957a, 1014a, 1029a, 1035a], [949a, 951a, 955a, 1012a, 1029a, 1044a, 1050a], [1004a, 1006a, 1010a, 1027a, 1044a, 1059a, 1105a], [1019a, 1021a, 1025a, 1042a, 1059a, 1114a, 1120a], [1034a, 1036a, 1040a, 1057a, 1114a, 1129a, 1135a], [1049a, 1051a, 1055a, 1112a, 1129a, 1144a, 1150a], [1056a, 1058a, 1102a, 1119a, "-", "-", "-"], [1104a, 1106a, 1110a, 1127a, 1144a, 1159a, 1205p], [1119a, 1121a, 1125a, 1142a, 1159a, 1214p, 1220p], [1126a, 1128a, 1132a, 1149a, "-", "-", "-"], [1134a, 1136a, 1140a, 1157a, 1214p, 1229p, 1235p], [1149a, 1151a, 1155a, 1212p, 1229p, 1244p, 1250p], [1156a, 1158a, 1202p, 1219p, "-", "-", "-"], [1204p, 1206p, 1210p, 1227p, 1244p, 1259p, 105p], [1219p, 1221p, 1225p, 1242p, 1259p, 114p, 120p], [1226p, 1228p, 1232p, 1249p, "-", "-", "-"], [1234p, 1236p, 1240p, 1257p, 114p, 129p, 135p], [1249p, 1251p, 1255p, 112p, 129p, 144p, 150p], [1256p, 1258p, 102p, 119p, "-", "-", "-"], [104p, 106p, 110p, 127p, 144p, 159p, 205p], [119p, 121p, 125p, 142p, 159p, 214p, 220p], [126p, 128p, 132p, 149p, "-", "-", "-"], [134p, 136p, 140p, 157p, 214p, 229p, 235p], [149p, 151p, 155p, 212p, 229p, 244p, 250p], [156p, 158p, 202p, 219p, "-", "-", "-"], [204p, 206p, 210p, 227p, 244p, 259p, 305p], [219p, 221p, 225p, 242p, 259p, 314p, 320p], [226p, 228p, 232p, 249p, "-", "-", "-"], [234p, 236p, 240p, 257p, 314p, 329p, 335p], [249p, 251p, 255p, 312p, 329p, 344p, 350p], [256p, 258p, 302p, 319p, "-", "-", "-"], [304p, 306p, 310p, 327p, 344p, 359p, 405p], [319p, 321p, 325p, 342p, 359p, 414p, 420p], [326p, 328p, 332p, 349p, "-", "-", "-"], [334p, 336p, 340p, 357p, 414p, 429p, 435p], [349p, 351p, 355p, 412p, 429p, 444p, 450p], [356p, 358p, 402p, 419p, "-", "-", "-"], [404p, 406p, 410p, 427p, 444p, 459p, 505p], [419p, 421p, 425p, 442p, 459p, 514p, 520p], [434p, 436p, 440p, 457p, 514p, 529p, 535p], [449p, 451p, 455p, 512p, 529p, 544p, 550p], [504p, 506p, 510p, 527p, 544p, 559p, 605p], [519p, 521p, 525p, 542p, 559p, 614p, 620p], [534p, 536p, 540p, 557p, 614p, 629p, 635p], [549p, 551p, 555p, 612p, 629p, 643p, 649p], [604p, 606p, 610p, 627p, 642p, 656p, 702p], [619p, 621p, 625p, 640p, 655p, 709p, 715p], [635p, 637p, 640p, 655p, 710p, 724p, 730p], [650p, 652p, 655p, 710p, 725p, 739p, 745p], [705p, 707p, 710p, 725p, 740p, 754p, 800p], [720p, 722p, 725p, 740p, 755p, 809p, 815p], [735p, 737p, 740p, 755p, 810p, 824p, 830p], [750p, 752p, 755p, 810p, 825p, 839p, 845p], [805p, 807p, 810p, 825p, 840p, 854p, 900p], [820p, 822p, 825p, 840p, 855p, 909p, 915p], [835p, 837p, 840p, 855p, 910p, 924p, 930p], [850p, 852p, 855p, 910p, 925p, 939p, 945p], [905p, 907p, 910p, 925p, 940p, 954p, 1000p], [920p, 922p, 925p, 940p, 955p, 1009p, 1015p], [935p, 937p, 940p, 955p, 1010p, 1024p, 1030p], [950p, 952p, 955p, 1010p, 1025p, 1039p, 1045p], [1005p, 1007p, 1010p, 1025p, 1040p, 1054p, 1100p], [1020p, 1022p, 1025p, 1040p, 1055p, 1109p, 1115p], [1035p, 1037p, 1040p, 1055p, 1110p, 1124p, 1130p], [1050p, 1052p, 1055p, 1110p, 1125p, 1139p, 1145p], [1105p, 1107p, 1110p, 1125p, 1140p, 1154p, 1200a]]
-between_stops: []
 short_name: "900"
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Erindale Centre, Tuggeranong Interchange]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/900-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/900-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  City Interchange (Platform 1)-Woden Interchange (Platform 6): [Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+  Cameron Ave Bus Station (Platform 1)-City Interchange (Platform 1): [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 1): []
+  Lathlain St Bus Station (Platform 1)-Cameron Ave Bus Station (Platform 1): []
 short_name: "900"
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 1), Cameron Ave Bus Station (Platform 1), City Interchange (Platform 1), Woden Interchange (Platform 6), Erindale Centre, Tuggeranong Interchange]
 stop_times_sunday: [[734a, 736a, 740a, 757a, 814a, 829a, 835a], [749a, 751a, 755a, 812a, 829a, 844a, 850a], [804a, 806a, 810a, 827a, 844a, 859a, 905a], [819a, 821a, 825a, 842a, 859a, 914a, 920a], [834a, 836a, 840a, 857a, 914a, 929a, 935a], [849a, 851a, 855a, 912a, 929a, 944a, 950a], [904a, 906a, 910a, 927a, 944a, 959a, 1005a], [919a, 921a, 925a, 942a, 959a, 1014a, 1020a], [934a, 936a, 940a, 957a, 1014a, 1029a, 1035a], [949a, 951a, 955a, 1012a, 1029a, 1044a, 1050a], [1004a, 1006a, 1010a, 1027a, 1044a, 1059a, 1105a], [1019a, 1021a, 1025a, 1042a, 1059a, 1114a, 1120a], [1034a, 1036a, 1040a, 1057a, 1114a, 1129a, 1135a], [1049a, 1051a, 1055a, 1112a, 1129a, 1144a, 1150a], [1104a, 1106a, 1110a, 1127a, 1144a, 1159a, 1205p], [1119a, 1121a, 1125a, 1142a, 1159a, 1214p, 1220p], [1134a, 1136a, 1140a, 1157a, 1214p, 1229p, 1235p], [1149a, 1151a, 1155a, 1212p, 1229p, 1244p, 1250p], [1204p, 1206p, 1210p, 1227p, 1244p, 1259p, 105p], [1219p, 1221p, 1225p, 1242p, 1259p, 114p, 120p], [1234p, 1236p, 1240p, 1257p, 114p, 129p, 135p], [1249p, 1251p, 1255p, 112p, 129p, 144p, 150p], [104p, 106p, 110p, 127p, 144p, 159p, 205p], [119p, 121p, 125p, 142p, 159p, 214p, 220p], [134p, 136p, 140p, 157p, 214p, 229p, 235p], [149p, 151p, 155p, 212p, 229p, 244p, 250p], [204p, 206p, 210p, 227p, 244p, 259p, 305p], [219p, 221p, 225p, 242p, 259p, 314p, 320p], [234p, 236p, 240p, 257p, 314p, 329p, 335p], [249p, 251p, 255p, 312p, 329p, 344p, 350p], [304p, 306p, 310p, 327p, 344p, 359p, 405p], [319p, 321p, 325p, 342p, 359p, 414p, 420p], [334p, 336p, 340p, 357p, 414p, 429p, 435p], [349p, 351p, 355p, 412p, 429p, 444p, 450p], [404p, 406p, 410p, 427p, 444p, 459p, 505p], [419p, 421p, 425p, 442p, 459p, 514p, 520p], [434p, 436p, 440p, 457p, 514p, 529p, 535p], [449p, 451p, 455p, 512p, 529p, 544p, 550p], [504p, 506p, 510p, 527p, 544p, 559p, 605p], [519p, 521p, 525p, 542p, 559p, 614p, 620p], [534p, 536p, 540p, 557p, 614p, 629p, 635p], [549p, 551p, 555p, 612p, 629p, 643p, 649p], [604p, 606p, 610p, 627p, 642p, 656p, 702p], [619p, 621p, 625p, 640p, 655p, 709p, 715p], [634p, 636p, 639p, 654p, 709p, 723p, 729p], [649p, 651p, 654p, 709p, 724p, 738p, 744p], [704p, 706p, 709p, 724p, 739p, 753p, 759p]]
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/902-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/902-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", "-", 718a, 723a, 731a, 739a, 741a, 745a], ["-", "-", "-", "-", "-", 818a, 823a, 831a, 839a, 841a, 845a], [852a, 856a, 858a, 905a, 913a, 918a, 923a, 931a, 939a, 941a, 945a], [952a, 956a, 958a, 1005a, 1013a, 1018a, 1023a, 1031a, 1039a, 1041a, 1045a], [1052a, 1056a, 1058a, 1105a, 1113a, 1118a, 1123a, 1131a, 1139a, 1141a, 1145a], [1152a, 1156a, 1158a, 1205p, 1213p, 1218p, 1223p, 1231p, 1239p, 1241p, 1245p], [1252p, 1256p, 1258p, 105p, 113p, 118p, 123p, 131p, 139p, 141p, 145p], [152p, 156p, 158p, 205p, 213p, 218p, 223p, 231p, 239p, 241p, 245p], [252p, 256p, 258p, 305p, 313p, 318p, 323p, 331p, 339p, 341p, 345p], [352p, 356p, 358p, 405p, 413p, 418p, 423p, 431p, 439p, 441p, 445p], [452p, 456p, 458p, 505p, 513p, 518p, 523p, 531p, 539p, 541p, 545p], [552p, 556p, 558p, 605p, 613p, 618p, 623p, 631p, 638p, 640p, 643p], [652p, 655p, 657p, 703p, 710p, 715p, 720p, 728p, 735p, 737p, 740p], [752p, 755p, 757p, 803p, 810p, 815p, 820p, 828p, 835p, 837p, 840p], [852p, 855p, 857p, 903p, 910p, 915p, 920p, 928p, 935p, 937p, 940p], [952p, 955p, 957p, 1003p, 1010p, 1015p, 1020p, 1028p, 1035p, 1037p, 1040p], [1052p, 1055p, 1057p, 1103p, 1110p, 1115p, 1120p, 1128p, 1135p, 1137p, 1140p]]
-between_stops: []
 short_name: "902"
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/902-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/902-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "902"
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [[], [852a, 854a, 858a, 905a, 913a, 918a, 923a, 931a, 939a, 941a, 945a], [952a, 954a, 958a, 1005a, 1013a, 1018a, 1023a, 1031a, 1039a, 1041a, 1045a], [1052a, 1054a, 1058a, 1105a, 1113a, 1118a, 1123a, 1131a, 1139a, 1141a, 1145a], [1152a, 1154a, 1158a, 1205p, 1213p, 1218p, 1223p, 1231p, 1239p, 1241p, 1245p], [1252p, 1254p, 1258p, 105p, 113p, 118p, 123p, 131p, 139p, 141p, 145p], [152p, 154p, 158p, 205p, 213p, 218p, 223p, 231p, 239p, 241p, 245p], [252p, 254p, 258p, 305p, 313p, 318p, 323p, 331p, 339p, 341p, 345p], [352p, 354p, 358p, 405p, 413p, 418p, 423p, 431p, 439p, 441p, 445p], [452p, 454p, 458p, 505p, 513p, 518p, 523p, 531p, 539p, 541p, 545p], [552p, 554p, 558p, 605p, 613p, 618p, 623p, 631p, 638p, 640p, 643p], [652p, 654p, 657p, 703p, 710p, 715p, 720p, 728p, 735p, 737p, 740p]]
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, McKellar, Evatt, Spence Terminus, Evatt, McKellar, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/903-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/903-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", 734a, 748a, 802a, 804a, 808a], [800a, 802a, 806a, 820a, 834a, 848a, 902a, 904a, 908a], [900a, 902a, 906a, 920a, 934a, 948a, 1002a, 1004a, 1008a], [1000a, 1002a, 1006a, 1020a, 1034a, 1048a, 1102a, 1104a, 1108a], [1100a, 1102a, 1106a, 1120a, 1134a, 1148a, 1202p, 1204p, 1208p], [1200p, 1202p, 1206p, 1220p, 1234p, 1248p, 102p, 104p, 108p], [100p, 102p, 106p, 120p, 134p, 148p, 202p, 204p, 208p], [200p, 202p, 206p, 220p, 234p, 248p, 302p, 304p, 308p], [300p, 302p, 306p, 320p, 334p, 348p, 402p, 404p, 408p], [400p, 402p, 406p, 420p, 434p, 448p, 502p, 504p, 508p], [500p, 502p, 506p, 520p, 534p, 548p, 602p, 604p, 608p], [600p, 602p, 606p, 620p, 634p, 648p, 701p, 703p, 706p], [700p, 702p, 705p, 718p, 732p, 746p, 759p, 801p, 804p], [800p, 802p, 805p, 818p, 832p, 846p, 859p, 901p, 904p], [900p, 902p, 905p, 918p, 932p, 946p, 959p, 1001p, 1004p], [1000p, 1002p, 1005p, 1018p, 1032p, 1046p, 1059p, 1101p, 1104p], [1100p, 1102p, 1105p, 1118p, 1132p, "-", "-", "-", "-"]]
-between_stops: []
 short_name: "903"
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 4, Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 4), Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/903-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/903-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "903"
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [[], [900a, 902a, 906a, 920a, 934a, 948a, 1002a, 1004a, 1008a], [1000a, 1002a, 1006a, 1020a, 1034a, 1048a, 1102a, 1104a, 1108a], [1100a, 1102a, 1106a, 1120a, 1134a, 1148a, 1202p, 1204p, 1208p], [1200p, 1202p, 1206p, 1220p, 1234p, 1248p, 102p, 104p, 108p], [100p, 102p, 106p, 120p, 134p, 148p, 202p, 204p, 208p], [200p, 202p, 206p, 220p, 234p, 248p, 302p, 304p, 308p], [300p, 302p, 306p, 320p, 334p, 348p, 402p, 404p, 408p], [400p, 402p, 406p, 420p, 434p, 448p, 502p, 504p, 508p], [500p, 502p, 506p, 520p, 534p, 548p, 602p, 604p, 608p], [600p, 602p, 606p, 620p, 634p, 648p, 701p, 703p, 706p]]
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Fraser West Terminus, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/904-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/904-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", 757a, 807a, 828a, 830a, 834a], [820a, 822a, 826a, 847a, 857a, 907a, 928a, 930a, 934a], [920a, 922a, 926a, 947a, 957a, 1007a, 1028a, 1030a, 1034a], [1020a, 1022a, 1026a, 1047a, 1057a, 1107a, 1128a, 1130a, 1134a], [1120a, 1122a, 1126a, 1147a, 1157a, 1207p, 1228p, 1230p, 1234p], [1220p, 1222p, 1226p, 1247p, 1257p, 107p, 128p, 130p, 134p], [120p, 122p, 126p, 147p, 157p, 207p, 228p, 230p, 234p], [220p, 222p, 226p, 247p, 257p, 307p, 328p, 330p, 334p], [320p, 322p, 326p, 347p, 357p, 407p, 428p, 430p, 434p], [420p, 422p, 426p, 447p, 457p, 507p, 528p, 530p, 534p], [520p, 522p, 526p, 547p, 557p, 607p, 628p, 630p, 633p], [620p, 622p, 626p, 646p, 656p, 706p, 726p, 728p, 731p], [720p, 722p, 725p, 745p, 755p, 805p, 825p, 827p, 830p], [820p, 822p, 825p, 845p, 855p, 905p, 925p, 927p, 930p], [920p, 922p, 925p, 945p, 955p, 1005p, 1025p, 1027p, 1030p], [1020p, 1022p, 1025p, 1045p, 1055p, 1105p, 1125p, 1127p, 1130p], [1120p, 1122p, 1125p, 1145p, 1155p, "-", "-", "-", "-"]]
-between_stops: []
 short_name: "904"
-time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/904-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/904-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "904"
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [[820a, 822a, 826a, 847a, 857a, 907a, 928a, 930a, 934a], [920a, 922a, 926a, 947a, 957a, 1007a, 1028a, 1030a, 1034a], [1020a, 1022a, 1026a, 1047a, 1057a, 1107a, 1128a, 1130a, 1134a], [1120a, 1122a, 1126a, 1147a, 1157a, 1207p, 1228p, 1230p, 1234p], [1220p, 1222p, 1226p, 1247p, 1257p, 107p, 128p, 130p, 134p], [120p, 122p, 126p, 147p, 157p, 207p, 228p, 230p, 234p], [220p, 222p, 226p, 247p, 257p, 307p, 328p, 330p, 334p], [320p, 322p, 326p, 347p, 357p, 407p, 428p, 430p, 434p], [420p, 422p, 426p, 447p, 457p, 507p, 528p, 530p, 534p], [520p, 522p, 526p, 547p, 557p, 607p, 628p, 630p, 633p], [620p, 622p, 626p, 646p, 656p, 706p, 726p, 728p, 731p]]
-time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Higgins, Kippax, Higgins, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/905-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/905-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", "-", "-", 757a, 809a, 816a, 823a, 836a, 838a, 842a], [815a, 817a, 821a, 834a, 840a, 847a, 857a, 909a, 916a, 923a, 936a, 938a, 942a], [915a, 917a, 921a, 934a, 940a, 947a, 957a, 1009a, 1016a, 1023a, 1036a, 1038a, 1042a], [1015a, 1017a, 1021a, 1034a, 1040a, 1047a, 1057a, 1109a, 1116a, 1123a, 1136a, 1138a, 1142a], [1115a, 1117a, 1121a, 1134a, 1140a, 1147a, 1157a, 1209p, 1216p, 1223p, 1236p, 1238p, 1242p], [1215p, 1217p, 1221p, 1234p, 1240p, 1247p, 1257p, 109p, 116p, 123p, 136p, 138p, 142p], [115p, 117p, 121p, 134p, 140p, 147p, 157p, 209p, 216p, 223p, 236p, 238p, 242p], [215p, 217p, 221p, 234p, 240p, 247p, 257p, 309p, 316p, 323p, 336p, 338p, 342p], [315p, 317p, 321p, 334p, 340p, 347p, 357p, 409p, 416p, 423p, 436p, 438p, 442p], [415p, 417p, 421p, 434p, 440p, 447p, 457p, 509p, 516p, 523p, 536p, 538p, 542p], [515p, 517p, 521p, 534p, 540p, 547p, 557p, 609p, 616p, 623p, 636p, 638p, 641p], [615p, 617p, 621p, 634p, 640p, 647p, 656p, 707p, 714p, 721p, 733p, 735p, 738p], [715p, 717p, 720p, 732p, 738p, 745p, 754p, 805p, 812p, 819p, 831p, 833p, 836p], [815p, 817p, 820p, 832p, 838p, 845p, 854p, 905p, 912p, 919p, 931p, 933p, 936p], [915p, 917p, 920p, 932p, 938p, 945p, 954p, 1005p, 1012p, 1019p, 1031p, 1033p, 1036p], [1015p, 1017p, 1020p, 1032p, 1038p, 1045p, 1054p, "-", "-", "-", "-", "-", "-"], [1115p, 1117p, 1120p, 1132p, 1138p, 1145p, 1154p, "-", "-", "-", "-", "-", "-"]]
-between_stops: []
 short_name: "905"
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/905-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/905-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "905"
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [["-", "-", "-", "-", "-", "-", 857a, 909a, 916a, 923a, 936a, 938a, 942a], [915a, 917a, 921a, 934a, 940a, 947a, 957a, 1009a, 1016a, 1023a, 1036a, 1038a, 1042a], [1015a, 1017a, 1021a, 1034a, 1040a, 1047a, 1057a, 1109a, 1116a, 1123a, 1136a, 1138a, 1142a], [1115a, 1117a, 1121a, 1134a, 1140a, 1147a, 1157a, 1209p, 1216p, 1223p, 1236p, 1238p, 1242p], [1215p, 1217p, 1221p, 1234p, 1240p, 1247p, 1257p, 109p, 116p, 123p, 136p, 138p, 142p], [115p, 117p, 121p, 134p, 140p, 147p, 157p, 209p, 216p, 223p, 236p, 238p, 242p], [215p, 217p, 221p, 234p, 240p, 247p, 257p, 309p, 316p, 323p, 336p, 338p, 342p], [315p, 317p, 321p, 334p, 340p, 347p, 357p, 409p, 416p, 423p, 436p, 438p, 442p], [415p, 417p, 421p, 434p, 440p, 447p, 457p, 509p, 516p, 523p, 536p, 538p, 542p], [515p, 517p, 521p, 534p, 540p, 547p, 557p, 609p, 616p, 623p, 636p, 638p, 641p], [615p, 617p, 621p, 634p, 640p, 647p, 656p, "-", "-", "-", "-", "-", "-"]]
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Kippax, Macgregor Shops, Charnwood, Fraser West Terminus, Charnwood, Macgregor Shops, Kippax, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/906-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/906-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", 725a, 738a, 753a, 755a, 759a], [753a, 755a, 759a, 812a, 825a, 838a, 853a, 855a, 859a], [853a, 855a, 859a, 912a, 925a, 938a, 953a, 955a, 959a], [953a, 955a, 959a, 1012a, 1025a, 1038a, 1053a, 1055a, 1059a], [1053a, 1055a, 1059a, 1112a, 1125a, 1138a, 1153a, 1155a, 1159a], [1153a, 1155a, 1159a, 1212p, 1225p, 1238p, 1253p, 1255p, 1259p], [1253p, 1255p, 1259p, 112p, 125p, 138p, 153p, 155p, 159p], [153p, 155p, 159p, 212p, 225p, 238p, 253p, 255p, 259p], [253p, 255p, 259p, 312p, 325p, 338p, 353p, 355p, 359p], [353p, 355p, 359p, 412p, 425p, 438p, 453p, 455p, 459p], [453p, 455p, 459p, 512p, 525p, 538p, 553p, 555p, 559p], [553p, 555p, 559p, 612p, 625p, 638p, 652p, 654p, 657p], [653p, 655p, 658p, 710p, 723p, 736p, 750p, 752p, 755p], [753p, 755p, 758p, 810p, 823p, 836p, 850p, 852p, 855p], [857p, 859p, 902p, 914p, 927p, 940p, 954p, 956p, 959p], [957p, 959p, 1002p, 1014p, 1027p, 1040p, 1054p, 1056p, 1059p], [1057p, 1059p, 1102p, 1114p, 1127p, 1140p, 1154p, 1156p, 1159p]]
-between_stops: []
 short_name: "906"
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/906-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/906-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station (Platform 4)-Cohen St Bus Station (Platform 6): []
+  Cameron Ave Bus Station (Platform 4)-Lathlain St Bus Station (Platform 4): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "906"
+time_points: [Cameron Ave Bus Station (Platform 4), Lathlain St Bus Station (Platform 4), Cohen St Bus Station (Platform 6), Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [[853a, 855a, 859a, 912a, 925a, 938a, 953a, 955a, 959a], [953a, 955a, 959a, 1012a, 1025a, 1038a, 1053a, 1055a, 1059a], [1053a, 1055a, 1059a, 1112a, 1125a, 1138a, 1153a, 1155a, 1159a], [1153a, 1155a, 1159a, 1212p, 1225p, 1238p, 1253p, 1255p, 1259p], [1253p, 1255p, 1259p, 112p, 125p, 138p, 153p, 155p, 159p], [153p, 155p, 159p, 212p, 225p, 238p, 253p, 255p, 259p], [253p, 255p, 259p, 312p, 325p, 338p, 353p, 355p, 359p], [353p, 355p, 359p, 412p, 425p, 438p, 453p, 455p, 459p], [453p, 455p, 459p, 512p, 525p, 538p, 553p, 555p, 559p], [553p, 555p, 559p, 612p, 625p, 638p, 652p, 654p, 657p]]
-time_points: [Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Melba, Spence Terminus, Melba, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/907-to-cameron-ave-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/907-to-cameron-ave-bus-station.stop_times_saturday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 stop_times_saturday: [["-", "-", "-", 708a, 715a, 722a, 736a, 738a, 742a], ["-", "-", "-", 808a, 815a, 822a, 836a, 838a, 842a], [848a, 850a, 854a, 908a, 915a, 922a, 936a, 938a, 942a], [948a, 950a, 954a, 1008a, 1015a, 1022a, 1036a, 1038a, 1042a], [1048a, 1050a, 1054a, 1108a, 1115a, 1122a, 1136a, 1138a, 1142a], [1148a, 1150a, 1154a, 1208p, 1215p, 1222p, 1236p, 1238p, 1242p], [1248p, 1250p, 1254p, 108p, 115p, 122p, 136p, 138p, 142p], [148p, 150p, 154p, 208p, 215p, 222p, 236p, 238p, 242p], [248p, 250p, 254p, 308p, 315p, 322p, 336p, 338p, 342p], [348p, 350p, 354p, 408p, 415p, 422p, 436p, 438p, 442p], [448p, 450p, 454p, 508p, 515p, 522p, 536p, 538p, 542p], [548p, 550p, 554p, 608p, 615p, 622p, 636p, 638p, 641p], [648p, 650p, 653p, 706p, 713p, 720p, 733p, 735p, 738p], [748p, 750p, 753p, 806p, 813p, 820p, 833p, 835p, 838p], [848p, 850p, 853p, 906p, 913p, 920p, 933p, 935p, 938p], [948p, 950p, 953p, 1006p, 1013p, 1020p, 1033p, 1035p, 1038p], [1048p, 1050p, 1053p, 1106p, 1113p, 1120p, 1133p, 1135p, 1138p]]
-between_stops: []
 short_name: "907"
-time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/907-to-cameron-ave-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/907-to-cameron-ave-bus-station.stop_times_sunday.yml
@@ -1,7 +1,11 @@
 --- 
 long_name: To Cameron Ave Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 6)-Cohen St Bus Station (Platform 5): []
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Cameron Ave Bus Station (Platform 5)-Lathlain St Bus Station (Platform 6): []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
 short_name: "907"
+time_points: [Cameron Ave Bus Station (Platform 5), Lathlain St Bus Station (Platform 6), Cohen St Bus Station (Platform 5), Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 stop_times_sunday: [[848a, 850a, 854a, 908a, 915a, 922a, 936a, 938a, 942a], [948a, 950a, 954a, 1008a, 1015a, 1022a, 1036a, 1038a, 1042a], [1048a, 1050a, 1054a, 1108a, 1115a, 1122a, 1136a, 1138a, 1142a], [1148a, 1150a, 1154a, 1208p, 1215p, 1222p, 1236p, 1238p, 1242p], [1248p, 1250p, 1254p, 108p, 115p, 122p, 136p, 138p, 142p], [148p, 150p, 154p, 208p, 215p, 222p, 236p, 238p, 242p], [248p, 250p, 254p, 308p, 315p, 322p, 336p, 338p, 342p], [348p, 350p, 354p, 408p, 415p, 422p, 436p, 438p, 442p], [448p, 450p, 454p, 508p, 515p, 522p, 536p, 538p, 542p], [548p, 550p, 554p, 608p, 615p, 622p, 636p, 638p, 641p], [648p, 650p, 653p, 706p, 713p, 720p, 733p, 735p, 738p]]
-time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Charnwood, Fraser East Terminus, Charnwood, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 

--- a/maxious-canberra-transit-feed/output/912-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/912-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,62 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+stop_times_saturday: [[815a, 825a, 830a, 839a, 846a, 855a], [1015a, 1025a, 1030a, 1039a, 1046a, 1055a], [1215p, 1225p, 1230p, 1239p, 1246p, 1255p], [215p, 225p, 230p, 239p, 246p, 255p], [415p, 425p, 430p, 439p, 446p, 455p], [615p, 625p, 630p, 639p, 646p, 655p], [818p, 828p, 833p, 842p, 849p, 858p], [1018p, 1028p, 1033p, 1042p, 1049p, 1058p]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 815a
-  - 825a
-  - 830a
-  - 839a
-  - 846a
-  - 855a
-- - 1015a
-  - 1025a
-  - 1030a
-  - 1039a
-  - 1046a
-  - 1055a
-- - 1215p
-  - 1225p
-  - 1230p
-  - 1239p
-  - 1246p
-  - 1255p
-- - 215p
-  - 225p
-  - 230p
-  - 239p
-  - 246p
-  - 255p
-- - 415p
-  - 425p
-  - 430p
-  - 439p
-  - 446p
-  - 455p
-- - 615p
-  - 625p
-  - 630p
-  - 639p
-  - 646p
-  - 655p
-- - 818p
-  - 828p
-  - 833p
-  - 842p
-  - 849p
-  - 858p
-- - 1018p
-  - 1028p
-  - 1033p
-  - 1042p
-  - 1049p
-  - 1058p
 short_name: "912"
-time_points: 
-  - Tuggeranong Interchange - Platform 4
-  - Isabella Shops
-  - Calwell Shops
-  - Theodore
-  - Outtrim / Duggan
-  - Tuggeranong Interchange
+time_points: [Tuggeranong Interchange (Platform 4), Isabella Shops, Calwell Shops, Theodore, Outtrim / Duggan, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/912-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/912-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,44 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "912"
-time_points: 
-  - Tuggeranong Interchange - Platform 4
-  - Isabella Shops
-  - Calwell Shops
-  - Theodore
-  - Outtrim / Duggan
-  - Tuggeranong Interchange
-stop_times_sunday: 
-- - 1015a
-  - 1025a
-  - 1030a
-  - 1039a
-  - 1046a
-  - 1055a
-- - 1215p
-  - 1225p
-  - 1230p
-  - 1239p
-  - 1246p
-  - 1255p
-- - 215p
-  - 225p
-  - 230p
-  - 239p
-  - 246p
-  - 255p
-- - 415p
-  - 425p
-  - 430p
-  - 439p
-  - 446p
-  - 455p
-- - 615p
-  - 625p
-  - 630p
-  - 639p
-  - 646p
-  - 655p
+stop_times_sunday: [[1015a, 1025a, 1030a, 1039a, 1046a, 1055a], [1215p, 1225p, 1230p, 1239p, 1246p, 1255p], [215p, 225p, 230p, 239p, 246p, 255p], [415p, 425p, 430p, 439p, 446p, 455p], [615p, 625p, 630p, 639p, 646p, 655p]]
+time_points: [Tuggeranong Interchange (Platform 4), Isabella Shops, Calwell Shops, Theodore, Outtrim / Duggan, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/913-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/913-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[725a, 734a, 738a, 742a, 745a, 748a, 754a, 758a, 804a], [925a, 934a, 938a, 942a, 945a, 948a, 954a, 958a, 1004a], [1125a, 1134a, 1138a, 1142a, 1145a, 1148a, 1154a, 1158a, 1204p], [125p, 134p, 138p, 142p, 145p, 148p, 154p, 158p, 204p], [325p, 334p, 338p, 342p, 345p, 348p, 354p, 358p, 404p], [525p, 534p, 538p, 542p, 545p, 548p, 554p, 558p, 604p], [725p, 734p, 738p, 742p, 745p, 748p, 754p, 758p, 804p], [928p, 937p, 941p, 945p, 948p, 951p, 957p, 1001p, 1007p], [1128p, 1137p, 1141p, 1145p, 1148p, 1151p, 1157p, "-", "-"]]
-between_stops: []
 short_name: "913"
-time_points: [Tuggeranong Interchange - Platform 7, Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
+time_points: [Tuggeranong Interchange (Platform 7), Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/913-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/913-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "913"
+time_points: [Tuggeranong Interchange (Platform 7), Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
 stop_times_sunday: [[925a, 934a, 938a, 942a, 945a, 948a, 954a, 958a, 1004a], [1125a, 1134a, 1138a, 1142a, 1145a, 1148a, 1154a, 1158a, 1204p], [125p, 134p, 138p, 142p, 145p, 148p, 154p, 158p, 204p], [325p, 334p, 338p, 342p, 345p, 348p, 354p, 358p, 404p], [525p, 534p, 538p, 542p, 545p, 548p, 554p, 558p, 604p], [725p, 734p, 738p, 742p, 745p, 748p, 754p, 758p, 804p]]
-time_points: [Tuggeranong Interchange - Platform 7, Bonython, Woodcock/Clare Dennis, Gordon Primary, Tharwa/Knoke, Conder Primary, Lanyon Market Place, Bonython Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/914-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/914-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,98 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+stop_times_saturday: [[625a, 634a, 638a, 644a, 647a, 650a, 654a, 658a, 704a], [825a, 834a, 838a, 844a, 847a, 850a, 854a, 858a, 904a], [1025a, 1034a, 1038a, 1044a, 1047a, 1050a, 1054a, 1058a, 1104a], [1225p, 1234p, 1238p, 1244p, 1247p, 1250p, 1254p, 1258p, 104p], [225p, 234p, 238p, 244p, 247p, 250p, 254p, 258p, 304p], [425p, 434p, 438p, 444p, 447p, 450p, 454p, 458p, 504p], [625p, 634p, 638p, 644p, 647p, 650p, 654p, 658p, 704p], [828p, 837p, 841p, 847p, 850p, 853p, 857p, 901p, 907p], [1028p, 1037p, 1041p, 1047p, 1050p, 1053p, 1057p, 1101p, 1107p]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 625a
-  - 634a
-  - 638a
-  - 644a
-  - 647a
-  - 650a
-  - 654a
-  - 658a
-  - 704a
-- - 825a
-  - 834a
-  - 838a
-  - 844a
-  - 847a
-  - 850a
-  - 854a
-  - 858a
-  - 904a
-- - 1025a
-  - 1034a
-  - 1038a
-  - 1044a
-  - 1047a
-  - 1050a
-  - 1054a
-  - 1058a
-  - 1104a
-- - 1225p
-  - 1234p
-  - 1238p
-  - 1244p
-  - 1247p
-  - 1250p
-  - 1254p
-  - 1258p
-  - 104p
-- - 225p
-  - 234p
-  - 238p
-  - 244p
-  - 247p
-  - 250p
-  - 254p
-  - 258p
-  - 304p
-- - 425p
-  - 434p
-  - 438p
-  - 444p
-  - 447p
-  - 450p
-  - 454p
-  - 458p
-  - 504p
-- - 625p
-  - 634p
-  - 638p
-  - 644p
-  - 647p
-  - 650p
-  - 654p
-  - 658p
-  - 704p
-- - 828p
-  - 837p
-  - 841p
-  - 847p
-  - 850p
-  - 853p
-  - 857p
-  - 901p
-  - 907p
-- - 1028p
-  - 1037p
-  - 1041p
-  - 1047p
-  - 1050p
-  - 1053p
-  - 1057p
-  - 1101p
-  - 1107p
 short_name: "914"
-time_points: 
-  - Tuggeranong Interchange - Platform 7
-  - Bonython Primary
-  - Lanyon Market Place
-  - Conder Primary
-  - Tharwa/Pockett
-  - Gordon Primary
-  - Woodcock/Clare Dennis
-  - Bonython Primary
-  - Tuggeranong Interchange
+time_points: [Tuggeranong Interchange (Platform 7), Bonython Primary, Lanyon Market Place, Conder Primary, Tharwa/Pockett, Gordon Primary, Woodcock/Clare Dennis, Bonython Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/914-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/914-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,62 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "914"
-time_points: 
-  - Tuggeranong Interchange - Platform 7
-  - Bonython Primary
-  - Lanyon Market Place
-  - Conder Primary
-  - Tharwa/Pockett
-  - Gordon Primary
-  - Woodcock/Clare Dennis
-  - Bonython Primary
-  - Tuggeranong Interchange
-stop_times_sunday: 
-- - 1025a
-  - 1034a
-  - 1038a
-  - 1044a
-  - 1047a
-  - 1050a
-  - 1054a
-  - 1058a
-  - 1104a
-- - 1225p
-  - 1234p
-  - 1238p
-  - 1244p
-  - 1247p
-  - 1250p
-  - 1254p
-  - 1258p
-  - 104p
-- - 225p
-  - 234p
-  - 238p
-  - 244p
-  - 247p
-  - 250p
-  - 254p
-  - 258p
-  - 304p
-- - 425p
-  - 434p
-  - 438p
-  - 444p
-  - 447p
-  - 450p
-  - 454p
-  - 458p
-  - 504p
-- - 625p
-  - 634p
-  - 638p
-  - 644p
-  - 647p
-  - 650p
-  - 654p
-  - 658p
-  - 704p
+stop_times_sunday: [[1025a, 1034a, 1038a, 1044a, 1047a, 1050a, 1054a, 1058a, 1104a], [1225p, 1234p, 1238p, 1244p, 1247p, 1250p, 1254p, 1258p, 104p], [225p, 234p, 238p, 244p, 247p, 250p, 254p, 258p, 304p], [425p, 434p, 438p, 444p, 447p, 450p, 454p, 458p, 504p], [625p, 634p, 638p, 644p, 647p, 650p, 654p, 658p, 704p]]
+time_points: [Tuggeranong Interchange (Platform 7), Bonython Primary, Lanyon Market Place, Conder Primary, Tharwa/Pockett, Gordon Primary, Woodcock/Clare Dennis, Bonython Primary, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/915-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/915-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,68 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+stop_times_saturday: [[715a, 725a, 734a, 743a, 746a, 755a], [915a, 925a, 934a, 943a, 946a, 955a], [1115a, 1125a, 1134a, 1143a, 1146a, 1155a], [115p, 125p, 134p, 143p, 146p, 155p], [315p, 325p, 334p, 343p, 346p, 355p], [515p, 525p, 534p, 543p, 546p, 555p], [715p, 725p, 734p, 743p, 746p, 755p], [918p, 928p, 937p, 946p, 949p, 958p], [1118p, 1128p, 1137p, 1146p, 1149p, "-"]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 715a
-  - 725a
-  - 734a
-  - 743a
-  - 746a
-  - 755a
-- - 915a
-  - 925a
-  - 934a
-  - 943a
-  - 946a
-  - 955a
-- - 1115a
-  - 1125a
-  - 1134a
-  - 1143a
-  - 1146a
-  - 1155a
-- - 115p
-  - 125p
-  - 134p
-  - 143p
-  - 146p
-  - 155p
-- - 315p
-  - 325p
-  - 334p
-  - 343p
-  - 346p
-  - 355p
-- - 515p
-  - 525p
-  - 534p
-  - 543p
-  - 546p
-  - 555p
-- - 715p
-  - 725p
-  - 734p
-  - 743p
-  - 746p
-  - 755p
-- - 918p
-  - 928p
-  - 937p
-  - 946p
-  - 949p
-  - 958p
-- - 1118p
-  - 1128p
-  - 1137p
-  - 1146p
-  - 1149p
-  - "-"
 short_name: "915"
-time_points: 
-  - Tuggeranong Interchange - Platform 4
-  - Isabella Shops
-  - Theodore
-  - Calwell Shops
-  - Outtrim / Duggan
-  - Tuggeranong Interchange
+time_points: [Tuggeranong Interchange (Platform 4), Isabella Shops, Theodore, Calwell Shops, Outtrim / Duggan, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/915-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/915-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,50 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "915"
-time_points: 
-  - Tuggeranong Interchange - Platform 4
-  - Isabella Shops
-  - Theodore
-  - Calwell Shops
-  - Outtrim / Duggan
-  - Tuggeranong Interchange
-stop_times_sunday: 
-- - 915a
-  - 925a
-  - 934a
-  - 943a
-  - 946a
-  - 955a
-- - 1115a
-  - 1125a
-  - 1134a
-  - 1143a
-  - 1146a
-  - 1155a
-- - 115p
-  - 125p
-  - 134p
-  - 143p
-  - 146p
-  - 155p
-- - 315p
-  - 325p
-  - 334p
-  - 343p
-  - 346p
-  - 355p
-- - 515p
-  - 525p
-  - 534p
-  - 543p
-  - 546p
-  - 555p
-- - 717p
-  - 727p
-  - 736p
-  - 745p
-  - 748p
-  - 757p
+stop_times_sunday: [[915a, 925a, 934a, 943a, 946a, 955a], [1115a, 1125a, 1134a, 1143a, 1146a, 1155a], [115p, 125p, 134p, 143p, 146p, 155p], [315p, 325p, 334p, 343p, 346p, 355p], [515p, 525p, 534p, 543p, 546p, 555p], [717p, 727p, 736p, 745p, 748p, 757p]]
+time_points: [Tuggeranong Interchange (Platform 4), Isabella Shops, Theodore, Calwell Shops, Outtrim / Duggan, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/921-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/921-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[933a, 936a, 940a, 945a, 951a, 955a, 1001a], [1133a, 1136a, 1140a, 1145a, 1151a, 1155a, 1201p], [133p, 136p, 140p, 145p, 151p, 155p, 201p], [333p, 336p, 340p, 345p, 351p, 355p, 401p], [533p, 536p, 540p, 545p, 551p, 555p, 601p], [733p, 736p, 740p, 745p, 751p, 755p, 801p], [933p, 936p, 940p, 945p, 951p, 955p, 1001p], [1133p, 1136p, 1140p, 1145p, 1151p, 1155p, "-"]]
-between_stops: []
 short_name: "921"
-time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/921-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/921-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "921"
+time_points: [Woden Interchange (Platform 15), Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
 stop_times_sunday: [[933a, 936a, 940a, 945a, 951a, 955a, 1001a], [1133a, 1136a, 1140a, 1145a, 1151a, 1155a, 1201p], [133p, 136p, 140p, 145p, 151p, 155p, 201p], [333p, 336p, 340p, 345p, 351p, 355p, 401p], [533p, 536p, 540p, 545p, 551p, 555p, 601p]]
-time_points: [Woden Interchange - Platform 15, Lyons, Chifley, Torrens Shops, Southlands Mawson, Pearce, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/922-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/922-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[833a, 839a, 843a, 849a, 854a, 858a, 901a], [1033a, 1039a, 1043a, 1049a, 1054a, 1058a, 1101a], [1233p, 1239p, 1243p, 1249p, 1254p, 1258p, 101p], [233p, 239p, 243p, 249p, 254p, 258p, 301p], [433p, 439p, 443p, 449p, 454p, 458p, 501p], [633p, 639p, 643p, 649p, 654p, 658p, 701p], [833p, 839p, 843p, 849p, 854p, 858p, 901p], [1033p, 1039p, 1043p, 1049p, 1054p, 1058p, 1101p]]
-between_stops: []
 short_name: "922"
-time_points: [Woden Interchange - Platform 15, Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/922-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/922-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "922"
+time_points: [Woden Interchange (Platform 15), Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
 stop_times_sunday: [[1033a, 1039a, 1043a, 1049a, 1054a, 1058a, 1101a], [1233p, 1239p, 1243p, 1249p, 1254p, 1258p, 101p], [233p, 239p, 243p, 249p, 254p, 258p, 301p], [433p, 439p, 443p, 449p, 454p, 458p, 501p], [633p, 639p, 643p, 649p, 654p, 658p, 701p]]
-time_points: [Woden Interchange - Platform 15, Pearce, Southlands Mawson, Torrens Shops, Chifley, Lyons, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/923-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/923-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[910a, 916a, 921a, 927a, 933a, 943a], [1110a, 1116a, 1121a, 1127a, 1133a, 1143a], [110p, 116p, 121p, 127p, 133p, 143p], [310p, 316p, 321p, 327p, 333p, 343p], [510p, 516p, 521p, 527p, 533p, 543p], [713p, 718p, 723p, 728p, 734p, 743p], [913p, 918p, 923p, 928p, 934p, 943p], [1113p, 1118p, 1123p, 1128p, 1134p, 1143p]]
-between_stops: []
 short_name: "923"
-time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/923-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/923-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "923"
+time_points: [Woden Interchange (Platform 15), Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
 stop_times_sunday: [[910a, 916a, 921a, 927a, 933a, 943a], [1110a, 1116a, 1121a, 1127a, 1133a, 1143a], [110p, 116p, 121p, 127p, 133p, 143p], [310p, 316p, 321p, 327p, 333p, 343p], [510p, 516p, 521p, 527p, 533p, 543p]]
-time_points: [Woden Interchange - Platform 15, Canberra Hospital, Isaacs, Farrer Primary School, Southlands Mawson, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/924-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/924-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[810a, 819a, 824a, 829a, 833a, 841a], [1010a, 1019a, 1024a, 1029a, 1033a, 1041a], [1210p, 1219p, 1224p, 1229p, 1233p, 1241p], [210p, 219p, 224p, 229p, 233p, 241p], [410p, 419p, 424p, 429p, 433p, 441p], [610p, 619p, 624p, 629p, 633p, 641p], [813p, 821p, 826p, 830p, 834p, 841p], [1013p, 1021p, 1026p, 1030p, 1034p, 1041p]]
-between_stops: []
 short_name: "924"
-time_points: [Woden Interchange - Platform 15, Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
+time_points: [Woden Interchange (Platform 15), Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/924-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/924-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "924"
+time_points: [Woden Interchange (Platform 15), Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
 stop_times_sunday: [[1010a, 1019a, 1024a, 1029a, 1033a, 1041a], [1210p, 1219p, 1224p, 1229p, 1233p, 1241p], [210p, 219p, 224p, 229p, 233p, 241p], [410p, 419p, 424p, 429p, 433p, 441p], [610p, 619p, 624p, 629p, 633p, 641p]]
-time_points: [Woden Interchange - Platform 15, Southlands Mawson, Farrer Primary School, Isaacs, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/925-to-cooleman-court.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/925-to-cooleman-court.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
+between_stops: {}
+
 stop_times_saturday: [[857a, 907a, 909a, 911a, 919a], [957a, 1007a, 1009a, 1011a, 1019a], [1057a, 1107a, 1109a, 1111a, 1119a], [1157a, 1207p, 1209p, 1211p, 1219p], [1257p, 107p, 109p, 111p, 119p], [157p, 207p, 209p, 211p, 219p], [257p, 307p, 309p, 311p, 319p], [357p, 407p, 409p, 411p, 419p], [457p, 507p, 509p, 511p, 519p], [557p, 607p, 609p, 611p, 619p], [657p, 707p, 709p, 711p, 719p], [757p, 807p, 809p, 811p, 819p], [857p, 907p, 909p, 911p, 919p], [957p, 1007p, 1009p, 1011p, 1019p], [1057p, 1107p, 1109p, 1111p, 1119p]]
-between_stops: []
 short_name: "925"
-time_points: [Woden Interchange - Platform 16, Weston Primary, Holder, Duffy, Cooleman Court]
+time_points: [Woden Interchange (Platform 16), Weston Primary, Holder, Duffy, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/925-to-cooleman-court.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/925-to-cooleman-court.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: "925"
+time_points: [Woden Interchange (Platform 16), Weston Primary, Holder, Duffy, Cooleman Court]
 stop_times_sunday: [[957a, 1007a, 1009a, 1011a, 1019a], [1057a, 1107a, 1109a, 1111a, 1119a], [1157a, 1207p, 1209p, 1211p, 1219p], [1257p, 107p, 109p, 111p, 119p], [157p, 207p, 209p, 211p, 219p], [257p, 307p, 309p, 311p, 319p], [357p, 407p, 409p, 411p, 419p], [457p, 507p, 509p, 511p, 519p], [557p, 607p, 609p, 611p, 619p], [657p, 707p, 709p, 711p, 719p]]
-time_points: [Woden Interchange - Platform 16, Weston Primary, Holder, Duffy, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/925-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/925-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[824a, 831a, 834a, 837a, 846a], [924a, 931a, 934a, 937a, 946a], [1024a, 1031a, 1034a, 1037a, 1046a], [1124a, 1131a, 1134a, 1137a, 1146a], [1224p, 1231p, 1234p, 1237p, 1246p], [124p, 131p, 134p, 137p, 146p], [224p, 231p, 234p, 237p, 246p], [324p, 331p, 334p, 337p, 346p], [424p, 431p, 434p, 437p, 446p], [524p, 531p, 534p, 537p, 546p], [624p, 631p, 634p, 637p, 646p], [724p, 731p, 734p, 737p, 746p], [824p, 831p, 834p, 837p, 846p], [924p, 931p, 934p, 937p, 946p], [1024p, 1031p, 1034p, 1037p, 1046p]]
-between_stops: []
 short_name: "925"
 time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/925-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/925-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "925"
+time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
 stop_times_sunday: [[924a, 931a, 934a, 937a, 946a], [1024a, 1031a, 1034a, 1037a, 1046a], [1124a, 1131a, 1134a, 1137a, 1146a], [1224p, 1231p, 1234p, 1237p, 1246p], [124p, 131p, 134p, 137p, 146p], [224p, 231p, 234p, 237p, 246p], [324p, 331p, 334p, 337p, 346p], [424p, 431p, 434p, 437p, 446p], [524p, 531p, 534p, 537p, 546p], [624p, 631p, 634p, 637p, 646p]]
-time_points: [Cooleman Court, Duffy, Holder, Weston Primary, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/927-to-cooleman-court.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/927-to-cooleman-court.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
+between_stops: {}
+
 stop_times_saturday: [[920a, 929a, 932a, 942a, 945a, 950a], [1020a, 1029a, 1032a, 1042a, 1045a, 1050a], [1120a, 1129a, 1132a, 1142a, 1145a, 1150a], [1220p, 1229p, 1232p, 1242p, 1245p, 1250p], [120p, 129p, 132p, 142p, 145p, 150p], [220p, 229p, 232p, 242p, 245p, 250p], [320p, 329p, 332p, 342p, 345p, 350p], [420p, 429p, 432p, 442p, 445p, 450p], [520p, 529p, 532p, 542p, 545p, 550p], [620p, 629p, 632p, 642p, 645p, 650p], [720p, 729p, 732p, 742p, 745p, 750p], [820p, 829p, 832p, 842p, 845p, 850p], [920p, 929p, 932p, 942p, 945p, 950p], [1020p, 1029p, 1032p, 1042p, 1045p, 1050p], [1120p, 1129p, 1132p, 1142p, 1145p, 1150p]]
-between_stops: []
 short_name: "927"
-time_points: [Woden Interchange - Platform 3, Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
+time_points: [Woden Interchange (Platform 3), Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/927-to-cooleman-court.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/927-to-cooleman-court.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Cooleman Court
-between_stops: []
+between_stops: {}
+
 short_name: "927"
+time_points: [Woden Interchange (Platform 3), Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
 stop_times_sunday: [[920a, 929a, 932a, 942a, 945a, 950a], [1020a, 1029a, 1032a, 1042a, 1045a, 1050a], [1120a, 1129a, 1132a, 1142a, 1145a, 1150a], [1220p, 1229p, 1232p, 1242p, 1245p, 1250p], [120p, 129p, 132p, 142p, 145p, 150p], [220p, 229p, 232p, 242p, 245p, 250p], [320p, 329p, 332p, 342p, 345p, 350p], [420p, 429p, 432p, 442p, 445p, 450p], [520p, 529p, 532p, 542p, 545p, 550p], [620p, 629p, 632p, 642p, 645p, 650p]]
-time_points: [Woden Interchange - Platform 3, Waramanga, Fisher, Chapman, Rivett, Cooleman Court]
 

--- a/maxious-canberra-transit-feed/output/927-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/927-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[755a, 803a, 806a, 816a, 819a, 826a], [855a, 903a, 906a, 916a, 919a, 926a], [955a, 1003a, 1006a, 1016a, 1019a, 1026a], [1055a, 1103a, 1106a, 1116a, 1119a, 1126a], [1155a, 1203p, 1206p, 1216p, 1219p, 1226p], [1255p, 103p, 106p, 116p, 119p, 126p], [155p, 203p, 206p, 216p, 219p, 226p], [255p, 303p, 306p, 316p, 319p, 326p], [355p, 403p, 406p, 416p, 419p, 426p], [455p, 503p, 506p, 516p, 519p, 526p], [555p, 603p, 606p, 616p, 619p, 626p], [655p, 703p, 706p, 716p, 719p, 726p], [755p, 803p, 806p, 816p, 819p, 826p], [855p, 903p, 906p, 916p, 919p, 926p], [955p, 1003p, 1006p, 1016p, 1019p, 1026p], [1055p, 1103p, 1106p, 1116p, 1119p, 1126p]]
-between_stops: []
 short_name: "927"
 time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/927-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/927-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "927"
+time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
 stop_times_sunday: [[855a, 903a, 906a, 916a, 919a, 926a], [955a, 1003a, 1006a, 1016a, 1019a, 1026a], [1055a, 1103a, 1106a, 1116a, 1119a, 1126a], [1155a, 1203p, 1206p, 1216p, 1219p, 1226p], [1255p, 103p, 106p, 116p, 119p, 126p], [155p, 203p, 206p, 216p, 219p, 226p], [255p, 303p, 306p, 316p, 319p, 326p], [355p, 403p, 406p, 416p, 419p, 426p], [455p, 503p, 506p, 516p, 519p, 526p], [555p, 603p, 606p, 616p, 619p, 626p], [655p, 703p, 706p, 716p, 719p, 726p]]
-time_points: [Cooleman Court, Rivett, Chapman, Fisher, Waramanga, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/930-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/930-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[1001a, 1013a, 1020a, 1027a, 1041a], [1201p, 1213p, 1220p, 1227p, 1241p], [201p, 213p, 220p, 227p, 241p], [401p, 413p, 420p, 427p, 441p], [601p, 613p, 620p, 627p, 641p], [801p, 813p, 820p, 827p, 841p], [901p, 913p, 920p, 927p, 941p], [1001p, 1013p, 1020p, 1027p, 1041p], [1101p, 1113p, 1120p, 1127p, 1141p]]
-between_stops: []
 short_name: "930"
-time_points: [City Interchange - Platform 8, St Thomas More Campbell, Hospice, ADFA, City Interchange]
+time_points: [City Interchange (Platform 8), St Thomas More Campbell, Hospice, ADFA, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/930-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/930-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "930"
+time_points: [City Interchange (Platform 8), St Thomas More Campbell, Hospice, ADFA, City Interchange]
 stop_times_sunday: [[1001a, 1013a, 1020a, 1027a, 1041a], [1201p, 1213p, 1220p, 1227p, 1241p], [201p, 213p, 220p, 227p, 241p], [401p, 413p, 420p, 427p, 441p], [601p, 613p, 620p, 627p, 641p]]
-time_points: [City Interchange - Platform 8, St Thomas More Campbell, Hospice, ADFA, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/931-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/931-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[801a, 815a, 822a, 829a, 841a], [901a, 915a, 922a, 929a, 941a], [1101a, 1115a, 1122a, 1129a, 1141a], [101p, 115p, 122p, 129p, 141p], [301p, 315p, 322p, 329p, 341p], [501p, 515p, 522p, 529p, 541p], [701p, 715p, 722p, 729p, 741p]]
-between_stops: []
 short_name: "931"
-time_points: [City Interchange - Platform 8, ADFA, Hospice, St Thomas More Campbell, City Interchange]
+time_points: [City Interchange (Platform 8), ADFA, Hospice, St Thomas More Campbell, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/931-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/931-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "931"
+time_points: [City Interchange (Platform 8), ADFA, Hospice, St Thomas More Campbell, City Interchange]
 stop_times_sunday: [[901a, 915a, 922a, 929a, 941a], [1101a, 1115a, 1122a, 1129a, 1141a], [101p, 115p, 122p, 129p, 141p], [301p, 315p, 322p, 329p, 341p], [501p, 515p, 522p, 529p, 541p], [701p, 715p, 722p, 729p, 741p]]
-time_points: [City Interchange - Platform 8, ADFA, Hospice, St Thomas More Campbell, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/932-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/932-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[739a, 750a, 753a, 756a, 809a, 815a, 819a, 828a, 836a, 841a, 847a, 850a, 852a, 856a], [839a, 850a, 853a, 856a, 909a, 915a, 919a, 928a, 936a, 941a, 947a, 950a, 952a, 956a], [939a, 950a, 953a, 956a, 1009a, 1015a, 1019a, 1028a, 1036a, 1041a, 1047a, 1050a, 1052a, 1056a], [1039a, 1050a, 1053a, 1056a, 1109a, 1115a, 1119a, 1128a, 1136a, 1141a, 1147a, 1150a, 1152a, 1156a], [1139a, 1150a, 1153a, 1156a, 1209p, 1215p, 1219p, 1228p, 1236p, 1241p, 1247p, 1250p, 1252p, 1256p], [1239p, 1250p, 1253p, 1256p, 109p, 115p, 119p, 128p, 136p, 141p, 147p, 150p, 152p, 156p], [139p, 150p, 153p, 156p, 209p, 215p, 219p, 228p, 236p, 241p, 247p, 250p, 252p, 256p], [239p, 250p, 253p, 256p, 309p, 315p, 319p, 328p, 336p, 341p, 347p, 350p, 352p, 356p], [339p, 350p, 353p, 356p, 409p, 415p, 419p, 428p, 436p, 441p, 447p, 450p, 452p, 456p], [439p, 450p, 453p, 456p, 509p, 515p, 519p, 528p, 536p, 541p, 547p, 550p, 552p, 556p], [539p, 550p, 553p, 556p, 609p, 615p, 619p, 628p, 635p, 640p, 645p, 647p, 649p, 652p], [639p, 648p, 651p, 654p, 707p, 712p, 716p, 725p, 732p, 737p, 742p, 744p, 746p, 749p], [739p, 748p, 751p, 754p, 807p, 812p, 816p, 825p, 832p, 837p, 842p, 844p, 846p, 849p], [839p, 848p, 851p, 854p, 907p, 912p, 916p, 925p, 932p, 937p, 942p, 944p, 946p, 949p], [939p, 948p, 951p, 954p, 1007p, 1012p, 1016p, 1025p, 1032p, 1037p, 1042p, 1044p, 1046p, 1049p], [1039p, 1048p, 1051p, 1054p, 1107p, 1112p, 1116p, 1125p, 1132p, 1137p, 1142p, 1144p, 1146p, 1149p], [1139p, 1150p, 1153p, 1156p, 1208a, "-", "-", "-", "-", "-", "-", "-", "-", "-"]]
-between_stops: []
 short_name: "932"
-time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, City Interchange - Platform 8, Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Woden Interchange (Platform 4), Curtin, John James Hospital, Yarralumla Shops, City Interchange (Platform 8), Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/932-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/932-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "932"
+time_points: [Woden Interchange (Platform 4), Curtin, John James Hospital, Yarralumla Shops, City Interchange (Platform 8), Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[839a, 850a, 853a, 856a, 909a, 915a, 919a, 928a, 936a, 941a, 947a, 950a, 952a, 956a], [939a, 950a, 953a, 956a, 1009a, 1015a, 1019a, 1028a, 1036a, 1041a, 1047a, 1050a, 1052a, 1056a], [1039a, 1050a, 1053a, 1056a, 1109a, 1115a, 1119a, 1128a, 1136a, 1141a, 1147a, 1150a, 1152a, 1156a], [1139a, 1150a, 1153a, 1156a, 1209p, 1215p, 1219p, 1228p, 1236p, 1241p, 1247p, 1250p, 1252p, 1256p], [1239p, 1250p, 1253p, 1256p, 109p, 115p, 119p, 128p, 136p, 141p, 147p, 150p, 152p, 156p], [139p, 150p, 153p, 156p, 209p, 215p, 219p, 228p, 236p, 241p, 247p, 250p, 252p, 256p], [239p, 250p, 253p, 256p, 309p, 315p, 319p, 328p, 336p, 341p, 347p, 350p, 352p, 356p], [339p, 350p, 353p, 356p, 409p, 415p, 419p, 428p, 436p, 441p, 447p, 450p, 452p, 456p], [439p, 450p, 453p, 456p, 509p, 515p, 519p, 528p, 536p, 541p, 547p, 550p, 552p, 556p], [539p, 550p, 553p, 556p, 609p, 615p, 619p, 628p, 635p, 640p, 645p, 647p, 649p, 652p], [639p, 648p, 651p, 654p, 707p, 712p, 716p, 725p, 732p, 737p, 742p, 744p, 746p, 749p]]
-time_points: [Woden Interchange - Platform 4, Curtin, John James Hospital, Yarralumla Shops, City Interchange - Platform 8, Macarthur / Northbourne, Southwell Park, Giralang, Kaleen Village/Maribyrnong, Gwydir Square Kaleen, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/932-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/932-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Woden Interchange
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
 stop_times_saturday: [[749a, 751a, 755a, 758a, 804a, 809a, 811a, 826a, 831a, 838a, 850a, 853a, 857a, 908a], [849a, 851a, 855a, 858a, 904a, 909a, 911a, 926a, 931a, 938a, 950a, 953a, 957a, 1008a], [949a, 951a, 955a, 958a, 1004a, 1009a, 1011a, 1026a, 1031a, 1038a, 1050a, 1053a, 1057a, 1108a], [1049a, 1051a, 1055a, 1058a, 1104a, 1109a, 1111a, 1126a, 1131a, 1138a, 1150a, 1153a, 1157a, 1208p], [1149a, 1151a, 1155a, 1158a, 1204p, 1209p, 1211p, 1226p, 1231p, 1238p, 1250p, 1253p, 1257p, 108p], [1249p, 1251p, 1255p, 1258p, 104p, 109p, 111p, 126p, 131p, 138p, 150p, 153p, 157p, 208p], [149p, 151p, 155p, 158p, 204p, 209p, 211p, 226p, 231p, 238p, 250p, 253p, 257p, 308p], [249p, 251p, 255p, 258p, 304p, 309p, 311p, 326p, 331p, 338p, 350p, 353p, 357p, 408p], [349p, 351p, 355p, 358p, 404p, 409p, 411p, 426p, 431p, 438p, 450p, 453p, 457p, 508p], [449p, 451p, 455p, 458p, 504p, 509p, 511p, 526p, 531p, 538p, 550p, 553p, 557p, 608p], [549p, 551p, 555p, 558p, 604p, 609p, 611p, 626p, 631p, 637p, 649p, 652p, 655p, 705p], [650p, 652p, 655p, 657p, 702p, 707p, 709p, 724p, 729p, 735p, 747p, 750p, 753p, 803p], [750p, 752p, 755p, 757p, 802p, 807p, 809p, 824p, 829p, 835p, 847p, 850p, 853p, 903p], [850p, 852p, 855p, 857p, 902p, 907p, 909p, 924p, 929p, 935p, 947p, 950p, 953p, 1003p], [950p, 952p, 955p, 957p, 1002p, 1007p, 1009p, 1024p, 1029p, 1035p, 1047p, 1050p, 1053p, 1103p], [1050p, 1052p, 1055p, 1057p, 1102p, 1107p, 1109p, 1124p, 1129p, 1134p, "-", "-", "-", "-"]]
-between_stops: []
 short_name: "932"
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange - Platform 9, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange (Platform 9), Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/932-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/932-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
 short_name: "932"
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange (Platform 9), Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
 stop_times_sunday: [[749a, 751a, 755a, 758a, 804a, 809a, 811a, 826a, 831a, 838a, 850a, 853a, 857a, 908a], [849a, 851a, 855a, 858a, 904a, 909a, 911a, 926a, 931a, 938a, 950a, 953a, 957a, 1008a], [949a, 951a, 955a, 958a, 1004a, 1009a, 1011a, 1026a, 1031a, 1038a, 1050a, 1053a, 1057a, 1108a], [1049a, 1051a, 1055a, 1058a, 1104a, 1109a, 1111a, 1126a, 1131a, 1138a, 1150a, 1153a, 1157a, 1208p], [1149a, 1151a, 1155a, 1158a, 1204p, 1209p, 1211p, 1226p, 1231p, 1238p, 1250p, 1253p, 1257p, 108p], [1249p, 1251p, 1255p, 1258p, 104p, 109p, 111p, 126p, 131p, 138p, 150p, 153p, 157p, 208p], [149p, 151p, 155p, 158p, 204p, 209p, 211p, 226p, 231p, 238p, 250p, 253p, 257p, 308p], [249p, 251p, 255p, 258p, 304p, 309p, 311p, 326p, 331p, 338p, 350p, 353p, 357p, 408p], [349p, 351p, 355p, 358p, 404p, 409p, 411p, 426p, 431p, 438p, 450p, 453p, 457p, 508p], [449p, 451p, 455p, 458p, 504p, 509p, 511p, 526p, 531p, 538p, 550p, 553p, 557p, 608p], [549p, 551p, 555p, 558p, 604p, 609p, 611p, 626p, 631p, 637p, 649p, 652p, 655p, 705p]]
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, University of Canberra, Gwydir Square Kaleen, Kaleen Village/Maribyrnong, Giralang, Southwell Park, Macarthur / Northbourne, City Interchange - Platform 9, Yarralumla Shops, John James Hospital, Curtin, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/934-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/934-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,242 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+stop_times_saturday: [["-", "-", "-", "-", "-", 752a, 759a, 804a, 809a, 816a, 832a, 834a, 838a], [813a, 822a, 826a, 831a, 840a, 852a, 859a, 904a, 909a, 916a, 932a, 934a, 938a], [913a, 922a, 926a, 931a, 940a, 952a, 959a, 1004a, 1009a, 1016a, 1032a, 1034a, 1038a], [1013a, 1022a, 1026a, 1031a, 1040a, 1052a, 1059a, 1104a, 1109a, 1116a, 1132a, 1134a, 1138a], [1113a, 1122a, 1126a, 1131a, 1140a, 1152a, 1159a, 1204p, 1209p, 1216p, 1232p, 1234p, 1238p], [1213p, 1222p, 1226p, 1231p, 1240p, 1252p, 1259p, 104p, 109p, 116p, 132p, 134p, 138p], [113p, 122p, 126p, 131p, 140p, 152p, 159p, 204p, 209p, 216p, 232p, 234p, 238p], [213p, 222p, 226p, 231p, 240p, 252p, 259p, 304p, 309p, 316p, 332p, 334p, 338p], [313p, 322p, 326p, 331p, 340p, 352p, 359p, 404p, 409p, 416p, 432p, 434p, 438p], [413p, 422p, 426p, 431p, 440p, 452p, 459p, 504p, 509p, 516p, 532p, 534p, 538p], [513p, 522p, 526p, 531p, 540p, 552p, 559p, 604p, 609p, 616p, 632p, 634p, 637p], [613p, 622p, 626p, 631p, 640p, 652p, 659p, 704p, 709p, 716p, 732p, 734p, 737p], [713p, 722p, 726p, 731p, 740p, 752p, 759p, 804p, 809p, 816p, 832p, 834p, 837p], [813p, 822p, 826p, 831p, 840p, 852p, 859p, 904p, 909p, 916p, 932p, 934p, 937p], [913p, 922p, 926p, 931p, 940p, 952p, 959p, 1004p, 1009p, 1016p, 1032p, 1034p, 1037p], [1013p, 1022p, 1026p, 1031p, 1040p, 1052p, 1059p, 1104p, 1109p, 1116p, 1132p, 1134p, 1137p], [1113p, 1122p, 1126p, 1131p, 1140p, 1150p, "-", "-", "-", "-", "-", "-", "-"]]
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "934"
+time_points: [Woden Interchange (Platform 14), Garran, Hughes, Deakin, Kings Ave/National Crt, City Interchange (Platform 4), National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-stop_times_saturday: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 752a
-  - 759a
-  - 804a
-  - 809a
-  - 816a
-  - 832a
-  - 834a
-  - 838a
-- - 813a
-  - 822a
-  - 826a
-  - 831a
-  - 840a
-  - 852a
-  - 859a
-  - 904a
-  - 909a
-  - 916a
-  - 932a
-  - 934a
-  - 938a
-- - 913a
-  - 922a
-  - 926a
-  - 931a
-  - 940a
-  - 952a
-  - 959a
-  - 1004a
-  - 1009a
-  - 1016a
-  - 1032a
-  - 1034a
-  - 1038a
-- - 1013a
-  - 1022a
-  - 1026a
-  - 1031a
-  - 1040a
-  - 1052a
-  - 1059a
-  - 1104a
-  - 1109a
-  - 1116a
-  - 1132a
-  - 1134a
-  - 1138a
-- - 1113a
-  - 1122a
-  - 1126a
-  - 1131a
-  - 1140a
-  - 1152a
-  - 1159a
-  - 1204p
-  - 1209p
-  - 1216p
-  - 1232p
-  - 1234p
-  - 1238p
-- - 1213p
-  - 1222p
-  - 1226p
-  - 1231p
-  - 1240p
-  - 1252p
-  - 1259p
-  - 104p
-  - 109p
-  - 116p
-  - 132p
-  - 134p
-  - 138p
-- - 113p
-  - 122p
-  - 126p
-  - 131p
-  - 140p
-  - 152p
-  - 159p
-  - 204p
-  - 209p
-  - 216p
-  - 232p
-  - 234p
-  - 238p
-- - 213p
-  - 222p
-  - 226p
-  - 231p
-  - 240p
-  - 252p
-  - 259p
-  - 304p
-  - 309p
-  - 316p
-  - 332p
-  - 334p
-  - 338p
-- - 313p
-  - 322p
-  - 326p
-  - 331p
-  - 340p
-  - 352p
-  - 359p
-  - 404p
-  - 409p
-  - 416p
-  - 432p
-  - 434p
-  - 438p
-- - 413p
-  - 422p
-  - 426p
-  - 431p
-  - 440p
-  - 452p
-  - 459p
-  - 504p
-  - 509p
-  - 516p
-  - 532p
-  - 534p
-  - 538p
-- - 513p
-  - 522p
-  - 526p
-  - 531p
-  - 540p
-  - 552p
-  - 559p
-  - 604p
-  - 609p
-  - 616p
-  - 632p
-  - 634p
-  - 637p
-- - 613p
-  - 622p
-  - 626p
-  - 631p
-  - 640p
-  - 652p
-  - 659p
-  - 704p
-  - 709p
-  - 716p
-  - 732p
-  - 734p
-  - 737p
-- - 713p
-  - 722p
-  - 726p
-  - 731p
-  - 740p
-  - 752p
-  - 759p
-  - 804p
-  - 809p
-  - 816p
-  - 832p
-  - 834p
-  - 837p
-- - 813p
-  - 822p
-  - 826p
-  - 831p
-  - 840p
-  - 852p
-  - 859p
-  - 904p
-  - 909p
-  - 916p
-  - 932p
-  - 934p
-  - 937p
-- - 913p
-  - 922p
-  - 926p
-  - 931p
-  - 940p
-  - 952p
-  - 959p
-  - 1004p
-  - 1009p
-  - 1016p
-  - 1032p
-  - 1034p
-  - 1037p
-- - 1013p
-  - 1022p
-  - 1026p
-  - 1031p
-  - 1040p
-  - 1052p
-  - 1059p
-  - 1104p
-  - 1109p
-  - 1116p
-  - 1132p
-  - 1134p
-  - 1137p
-- - 1113p
-  - 1122p
-  - 1126p
-  - 1131p
-  - 1140p
-  - 1150p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-short_name: "934"
-time_points: 
-  - Woden Interchange - Platform 14
-  - Garran
-  - Hughes
-  - Deakin
-  - Kings Ave/National Crt
-  - City Interchange - Platform 4
-  - National Museum
-  - Burton & Garran Hall/Daley Road ANU
-  - O'Connor
-  - Calvary Hospital
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-

--- a/maxious-canberra-transit-feed/output/934-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/934-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,164 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+short_name: "934"
+stop_times_sunday: [[813a, 822a, 826a, 831a, 840a, 852a, 859a, 904a, 909a, 916a, 932a, 934a, 938a], [913a, 922a, 926a, 931a, 940a, 952a, 959a, 1004a, 1009a, 1016a, 1032a, 1034a, 1038a], [1013a, 1022a, 1026a, 1031a, 1040a, 1052a, 1059a, 1104a, 1109a, 1116a, 1132a, 1134a, 1138a], [1113a, 1122a, 1126a, 1131a, 1140a, 1152a, 1159a, 1204p, 1209p, 1216p, 1232p, 1234p, 1238p], [1213p, 1222p, 1226p, 1231p, 1240p, 1252p, 1259p, 104p, 109p, 116p, 132p, 134p, 138p], [113p, 122p, 126p, 131p, 140p, 152p, 159p, 204p, 209p, 216p, 232p, 234p, 238p], [213p, 222p, 226p, 231p, 240p, 252p, 259p, 304p, 309p, 316p, 332p, 334p, 338p], [313p, 322p, 326p, 331p, 340p, 352p, 359p, 404p, 409p, 416p, 432p, 434p, 438p], [413p, 422p, 426p, 431p, 440p, 452p, 459p, 504p, 509p, 516p, 532p, 534p, 538p], [513p, 522p, 526p, 531p, 540p, 552p, 559p, 604p, 609p, 616p, 632p, 634p, 637p], [613p, 622p, 626p, 631p, 640p, 652p, 659p, 704p, 709p, 716p, 732p, 734p, 737p]]
+time_points: [Woden Interchange (Platform 14), Garran, Hughes, Deakin, Kings Ave/National Crt, City Interchange (Platform 4), National Museum, Burton & Garran Hall/Daley Road ANU, O'Connor, Calvary Hospital, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: "934"
-time_points: 
-  - Woden Interchange - Platform 14
-  - Garran
-  - Hughes
-  - Deakin
-  - Kings Ave/National Crt
-  - City Interchange - Platform 4
-  - National Museum
-  - Burton & Garran Hall/Daley Road ANU
-  - O'Connor
-  - Calvary Hospital
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-stop_times_sunday: 
-- - 813a
-  - 822a
-  - 826a
-  - 831a
-  - 840a
-  - 852a
-  - 859a
-  - 904a
-  - 909a
-  - 916a
-  - 932a
-  - 934a
-  - 938a
-- - 913a
-  - 922a
-  - 926a
-  - 931a
-  - 940a
-  - 952a
-  - 959a
-  - 1004a
-  - 1009a
-  - 1016a
-  - 1032a
-  - 1034a
-  - 1038a
-- - 1013a
-  - 1022a
-  - 1026a
-  - 1031a
-  - 1040a
-  - 1052a
-  - 1059a
-  - 1104a
-  - 1109a
-  - 1116a
-  - 1132a
-  - 1134a
-  - 1138a
-- - 1113a
-  - 1122a
-  - 1126a
-  - 1131a
-  - 1140a
-  - 1152a
-  - 1159a
-  - 1204p
-  - 1209p
-  - 1216p
-  - 1232p
-  - 1234p
-  - 1238p
-- - 1213p
-  - 1222p
-  - 1226p
-  - 1231p
-  - 1240p
-  - 1252p
-  - 1259p
-  - 104p
-  - 109p
-  - 116p
-  - 132p
-  - 134p
-  - 138p
-- - 113p
-  - 122p
-  - 126p
-  - 131p
-  - 140p
-  - 152p
-  - 159p
-  - 204p
-  - 209p
-  - 216p
-  - 232p
-  - 234p
-  - 238p
-- - 213p
-  - 222p
-  - 226p
-  - 231p
-  - 240p
-  - 252p
-  - 259p
-  - 304p
-  - 309p
-  - 316p
-  - 332p
-  - 334p
-  - 338p
-- - 313p
-  - 322p
-  - 326p
-  - 331p
-  - 340p
-  - 352p
-  - 359p
-  - 404p
-  - 409p
-  - 416p
-  - 432p
-  - 434p
-  - 438p
-- - 413p
-  - 422p
-  - 426p
-  - 431p
-  - 440p
-  - 452p
-  - 459p
-  - 504p
-  - 509p
-  - 516p
-  - 532p
-  - 534p
-  - 538p
-- - 513p
-  - 522p
-  - 526p
-  - 531p
-  - 540p
-  - 552p
-  - 559p
-  - 604p
-  - 609p
-  - 616p
-  - 632p
-  - 634p
-  - 637p
-- - 613p
-  - 622p
-  - 626p
-  - 631p
-  - 640p
-  - 652p
-  - 659p
-  - 704p
-  - 709p
-  - 716p
-  - 732p
-  - 734p
-  - 737p
-

--- a/maxious-canberra-transit-feed/output/934-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/934-to-woden-interchange.stop_times_saturday.yml
@@ -1,229 +1,9 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+stop_times_saturday: [[731a, 733a, 737a, 753a, 800a, 805a, 810a, 819a, 828a, 837a, 842a, 846a, 855a], [831a, 833a, 837a, 853a, 900a, 905a, 910a, 919a, 928a, 937a, 942a, 946a, 955a], [931a, 933a, 937a, 953a, 1000a, 1005a, 1010a, 1019a, 1028a, 1037a, 1042a, 1046a, 1055a], [1031a, 1033a, 1037a, 1053a, 1100a, 1105a, 1110a, 1119a, 1128a, 1137a, 1142a, 1146a, 1155a], [1131a, 1133a, 1137a, 1153a, 1200p, 1205p, 1210p, 1219p, 1228p, 1237p, 1242p, 1246p, 1255p], [1231p, 1233p, 1237p, 1253p, 100p, 105p, 110p, 119p, 128p, 137p, 142p, 146p, 155p], [131p, 133p, 137p, 153p, 200p, 205p, 210p, 219p, 228p, 237p, 242p, 246p, 255p], [231p, 233p, 237p, 253p, 300p, 305p, 310p, 319p, 328p, 337p, 342p, 346p, 355p], [331p, 333p, 337p, 353p, 400p, 405p, 410p, 419p, 428p, 437p, 442p, 446p, 455p], [431p, 433p, 437p, 453p, 500p, 505p, 510p, 519p, 528p, 537p, 542p, 546p, 555p], [531p, 533p, 537p, 553p, 600p, 605p, 610p, 619p, 628p, 637p, 642p, 646p, 655p], [632p, 634p, 637p, 653p, 700p, 705p, 710p, 719p, 728p, 737p, 742p, 746p, 755p], [732p, 734p, 737p, 753p, 800p, 805p, 810p, 819p, 828p, 837p, 842p, 846p, 855p], [832p, 834p, 837p, 853p, 900p, 905p, 910p, 919p, 928p, 937p, 942p, 946p, 955p], [932p, 934p, 937p, 953p, 1000p, 1005p, 1010p, 1019p, 1028p, 1037p, 1042p, 1046p, 1055p], [1032p, 1034p, 1037p, 1053p, 1100p, 1105p, 1110p, 1117p, "-", "-", "-", "-", "-"]]
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
+short_name: "934"
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange (Platform 7), Kings Ave/National Crt, Deakin, Hughes, Garran, Woden Interchange]
 
-stop_times_saturday: 
-- - 731a
-  - 733a
-  - 737a
-  - 753a
-  - 800a
-  - 805a
-  - 810a
-  - 819a
-  - 828a
-  - 837a
-  - 842a
-  - 846a
-  - 855a
-- - 831a
-  - 833a
-  - 837a
-  - 853a
-  - 900a
-  - 905a
-  - 910a
-  - 919a
-  - 928a
-  - 937a
-  - 942a
-  - 946a
-  - 955a
-- - 931a
-  - 933a
-  - 937a
-  - 953a
-  - 1000a
-  - 1005a
-  - 1010a
-  - 1019a
-  - 1028a
-  - 1037a
-  - 1042a
-  - 1046a
-  - 1055a
-- - 1031a
-  - 1033a
-  - 1037a
-  - 1053a
-  - 1100a
-  - 1105a
-  - 1110a
-  - 1119a
-  - 1128a
-  - 1137a
-  - 1142a
-  - 1146a
-  - 1155a
-- - 1131a
-  - 1133a
-  - 1137a
-  - 1153a
-  - 1200p
-  - 1205p
-  - 1210p
-  - 1219p
-  - 1228p
-  - 1237p
-  - 1242p
-  - 1246p
-  - 1255p
-- - 1231p
-  - 1233p
-  - 1237p
-  - 1253p
-  - 100p
-  - 105p
-  - 110p
-  - 119p
-  - 128p
-  - 137p
-  - 142p
-  - 146p
-  - 155p
-- - 131p
-  - 133p
-  - 137p
-  - 153p
-  - 200p
-  - 205p
-  - 210p
-  - 219p
-  - 228p
-  - 237p
-  - 242p
-  - 246p
-  - 255p
-- - 231p
-  - 233p
-  - 237p
-  - 253p
-  - 300p
-  - 305p
-  - 310p
-  - 319p
-  - 328p
-  - 337p
-  - 342p
-  - 346p
-  - 355p
-- - 331p
-  - 333p
-  - 337p
-  - 353p
-  - 400p
-  - 405p
-  - 410p
-  - 419p
-  - 428p
-  - 437p
-  - 442p
-  - 446p
-  - 455p
-- - 431p
-  - 433p
-  - 437p
-  - 453p
-  - 500p
-  - 505p
-  - 510p
-  - 519p
-  - 528p
-  - 537p
-  - 542p
-  - 546p
-  - 555p
-- - 531p
-  - 533p
-  - 537p
-  - 553p
-  - 600p
-  - 605p
-  - 610p
-  - 619p
-  - 628p
-  - 637p
-  - 642p
-  - 646p
-  - 655p
-- - 632p
-  - 634p
-  - 637p
-  - 653p
-  - 700p
-  - 705p
-  - 710p
-  - 719p
-  - 728p
-  - 737p
-  - 742p
-  - 746p
-  - 755p
-- - 732p
-  - 734p
-  - 737p
-  - 753p
-  - 800p
-  - 805p
-  - 810p
-  - 819p
-  - 828p
-  - 837p
-  - 842p
-  - 846p
-  - 855p
-- - 832p
-  - 834p
-  - 837p
-  - 853p
-  - 900p
-  - 905p
-  - 910p
-  - 919p
-  - 928p
-  - 937p
-  - 942p
-  - 946p
-  - 955p
-- - 932p
-  - 934p
-  - 937p
-  - 953p
-  - 1000p
-  - 1005p
-  - 1010p
-  - 1019p
-  - 1028p
-  - 1037p
-  - 1042p
-  - 1046p
-  - 1055p
-- - 1032p
-  - 1034p
-  - 1037p
-  - 1053p
-  - 1100p
-  - 1105p
-  - 1110p
-  - 1117p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-short_name: "934"
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Calvary Hospital
-  - O'Connor
-  - Burton & Garran Hall/Daley Road ANU
-  - National Museum
-  - City Interchange - Platform 7
-  - Kings Ave/National Crt
-  - Deakin
-  - Hughes
-  - Garran
-  - Woden Interchange
-

--- a/maxious-canberra-transit-feed/output/934-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/934-to-woden-interchange.stop_times_sunday.yml
@@ -1,164 +1,9 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
+short_name: "934"
+stop_times_sunday: [[831a, 833a, 837a, 853a, 900a, 905a, 910a, 919a, 928a, 937a, 942a, 946a, 955a], [931a, 933a, 937a, 953a, 1000a, 1005a, 1010a, 1019a, 1028a, 1037a, 1042a, 1046a, 1055a], [1031a, 1033a, 1037a, 1053a, 1100a, 1105a, 1110a, 1119a, 1128a, 1137a, 1142a, 1146a, 1155a], [1131a, 1133a, 1137a, 1153a, 1200p, 1205p, 1210p, 1219p, 1228p, 1237p, 1242p, 1246p, 1255p], [1231p, 1233p, 1237p, 1253p, 100p, 105p, 110p, 119p, 128p, 137p, 142p, 146p, 155p], [131p, 133p, 137p, 153p, 200p, 205p, 210p, 219p, 228p, 237p, 242p, 246p, 255p], [231p, 233p, 237p, 253p, 300p, 305p, 310p, 319p, 328p, 337p, 342p, 346p, 355p], [331p, 333p, 337p, 353p, 400p, 405p, 410p, 419p, 428p, 437p, 442p, 446p, 455p], [431p, 433p, 437p, 453p, 500p, 505p, 510p, 519p, 528p, 537p, 542p, 546p, 555p], [531p, 533p, 537p, 553p, 600p, 605p, 610p, 619p, 628p, 637p, 642p, 646p, 655p], [632p, 634p, 637p, 653p, 700p, 705p, 710p, 719p, 728p, 737p, 742p, 746p, 755p]]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Calvary Hospital, O'Connor, Burton & Garran Hall/Daley Road ANU, National Museum, City Interchange (Platform 7), Kings Ave/National Crt, Deakin, Hughes, Garran, Woden Interchange]
 
-short_name: "934"
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - Calvary Hospital
-  - O'Connor
-  - Burton & Garran Hall/Daley Road ANU
-  - National Museum
-  - City Interchange - Platform 7
-  - Kings Ave/National Crt
-  - Deakin
-  - Hughes
-  - Garran
-  - Woden Interchange
-stop_times_sunday: 
-- - 831a
-  - 833a
-  - 837a
-  - 853a
-  - 900a
-  - 905a
-  - 910a
-  - 919a
-  - 928a
-  - 937a
-  - 942a
-  - 946a
-  - 955a
-- - 931a
-  - 933a
-  - 937a
-  - 953a
-  - 1000a
-  - 1005a
-  - 1010a
-  - 1019a
-  - 1028a
-  - 1037a
-  - 1042a
-  - 1046a
-  - 1055a
-- - 1031a
-  - 1033a
-  - 1037a
-  - 1053a
-  - 1100a
-  - 1105a
-  - 1110a
-  - 1119a
-  - 1128a
-  - 1137a
-  - 1142a
-  - 1146a
-  - 1155a
-- - 1131a
-  - 1133a
-  - 1137a
-  - 1153a
-  - 1200p
-  - 1205p
-  - 1210p
-  - 1219p
-  - 1228p
-  - 1237p
-  - 1242p
-  - 1246p
-  - 1255p
-- - 1231p
-  - 1233p
-  - 1237p
-  - 1253p
-  - 100p
-  - 105p
-  - 110p
-  - 119p
-  - 128p
-  - 137p
-  - 142p
-  - 146p
-  - 155p
-- - 131p
-  - 133p
-  - 137p
-  - 153p
-  - 200p
-  - 205p
-  - 210p
-  - 219p
-  - 228p
-  - 237p
-  - 242p
-  - 246p
-  - 255p
-- - 231p
-  - 233p
-  - 237p
-  - 253p
-  - 300p
-  - 305p
-  - 310p
-  - 319p
-  - 328p
-  - 337p
-  - 342p
-  - 346p
-  - 355p
-- - 331p
-  - 333p
-  - 337p
-  - 353p
-  - 400p
-  - 405p
-  - 410p
-  - 419p
-  - 428p
-  - 437p
-  - 442p
-  - 446p
-  - 455p
-- - 431p
-  - 433p
-  - 437p
-  - 453p
-  - 500p
-  - 505p
-  - 510p
-  - 519p
-  - 528p
-  - 537p
-  - 542p
-  - 546p
-  - 555p
-- - 531p
-  - 533p
-  - 537p
-  - 553p
-  - 600p
-  - 605p
-  - 610p
-  - 619p
-  - 628p
-  - 637p
-  - 642p
-  - 646p
-  - 655p
-- - 632p
-  - 634p
-  - 637p
-  - 653p
-  - 700p
-  - 705p
-  - 710p
-  - 719p
-  - 728p
-  - 737p
-  - 742p
-  - 746p
-  - 755p
-

--- a/maxious-canberra-transit-feed/output/935-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/935-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[756a, 803a, 807a, 814a, 824a, 833a, 839a, 843a, 852a], [856a, 903a, 907a, 914a, 924a, 933a, 939a, 943a, 952a], [956a, 1003a, 1007a, 1014a, 1024a, 1033a, 1039a, 1043a, 1051a], [1056a, 1103a, 1107a, 1114a, 1124a, 1133a, 1139a, 1143a, 1152a], [1156a, 1203p, 1207p, 1214p, 1224p, 1233p, 1239p, 1243p, 1251p], [1256p, 103p, 107p, 114p, 124p, 133p, 139p, 143p, 151p], [156p, 203p, 207p, 214p, 224p, 233p, 239p, 243p, 252p], [256p, 303p, 307p, 314p, 324p, 333p, 339p, 343p, 351p], [356p, 403p, 407p, 414p, 424p, 433p, 439p, 443p, 451p], [456p, 503p, 507p, 514p, 524p, 533p, 539p, 543p, 552p], [556p, 603p, 607p, 614p, 624p, 633p, 639p, 643p, 652p], [656p, 703p, 707p, 714p, 724p, 733p, 739p, 743p, 752p], [756p, 803p, 807p, 814p, 824p, 833p, 839p, 843p, 852p], [856p, 903p, 907p, 914p, 924p, 933p, 939p, 943p, 952p], [956p, 1003p, 1007p, 1014p, 1024p, 1033p, 1039p, 1043p, 1052p], [1056p, 1103p, 1107p, 1114p, 1124p, "-", "-", "-", "-"]]
-between_stops: []
 short_name: "935"
-time_points: [City Interchange - Platform 7, Kings Ave/National Crt, Manuka, Red Hill, Narrabundah Terminus, Red Hill, Manuka, Kings Ave/National Crt, City Interchange]
+time_points: [City Interchange (Platform 7), Kings Ave/National Crt, Manuka, Red Hill, Narrabundah Terminus, Red Hill, Manuka, Kings Ave/National Crt, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/936-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/936-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[718a, 727a, 730a, 735a, 744a, 749a, 757a, 809a], [818a, 827a, 830a, 835a, 844a, 849a, 857a, 909a], [918a, 927a, 930a, 935a, 944a, 949a, 957a, 1009a], [1018a, 1027a, 1030a, 1035a, 1044a, 1049a, 1057a, 1109a], [1118a, 1127a, 1130a, 1135a, 1144a, 1149a, 1157a, 1209p], [1218p, 1227p, 1230p, 1235p, 1244p, 1249p, 1257p, 109p], [118p, 127p, 130p, 135p, 144p, 149p, 157p, 209p], [218p, 227p, 230p, 235p, 244p, 249p, 257p, 309p], [318p, 327p, 330p, 335p, 344p, 349p, 357p, 409p], [418p, 427p, 430p, 435p, 444p, 449p, 457p, 509p], [518p, 527p, 530p, 535p, 544p, 549p, 557p, 609p], [618p, 627p, 630p, 635p, 644p, 649p, 657p, 709p], [718p, 727p, 730p, 735p, 744p, 749p, 757p, 809p], [818p, 827p, 830p, 835p, 844p, 849p, 857p, 909p], [918p, 927p, 930p, 935p, 944p, 949p, 957p, 1009p], [1018p, 1027p, 1030p, 1035p, 1044p, 1049p, 1057p, 1109p], [1118p, 1127p, 1130p, 1135p, 1144p, "-", "-", "-"]]
-between_stops: []
 short_name: "936"
-time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
+time_points: [City Interchange (Platform 4), Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/936-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/936-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "936"
+time_points: [City Interchange (Platform 4), Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
 stop_times_sunday: [[818a, 827a, 830a, 835a, 844a, 849a, 857a, 909a], [918a, 927a, 930a, 935a, 944a, 949a, 957a, 1009a], [1018a, 1027a, 1030a, 1035a, 1044a, 1049a, 1057a, 1109a], [1118a, 1127a, 1130a, 1135a, 1144a, 1149a, 1157a, 1209p], [1218p, 1227p, 1230p, 1235p, 1244p, 1249p, 1257p, 109p], [118p, 127p, 130p, 135p, 144p, 149p, 157p, 209p], [218p, 227p, 230p, 235p, 244p, 249p, 257p, 309p], [318p, 327p, 330p, 335p, 344p, 349p, 357p, 409p], [418p, 427p, 430p, 435p, 444p, 449p, 457p, 509p], [518p, 527p, 530p, 535p, 544p, 549p, 557p, 609p], [618p, 627p, 630p, 635p, 644p, 649p, 657p, 709p], [718p, 727p, 730p, 735p, 744p, 749p, 757p, 809p]]
-time_points: [City Interchange - Platform 4, Macarthur / Miller O'Connor, Lyneham, North Lyneham, Dickson, Hackett, Ainslie, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/937-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/937-to-city-interchange.stop_times_saturday.yml
@@ -1,144 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+stop_times_saturday: [[759a, 811a, 819a, 825a, 834a, 839a, 842a, 851a], [859a, 911a, 919a, 925a, 934a, 939a, 942a, 951a], [959a, 1011a, 1019a, 1025a, 1034a, 1039a, 1042a, 1051a], [1059a, 1111a, 1119a, 1125a, 1134a, 1139a, 1142a, 1151a], [1159a, 1211p, 1219p, 1225p, 1234p, 1239p, 1242p, 1251p], [1259p, 111p, 119p, 125p, 134p, 139p, 142p, 151p], [159p, 211p, 219p, 225p, 234p, 239p, 242p, 251p], [259p, 311p, 319p, 325p, 334p, 339p, 342p, 351p], [359p, 411p, 419p, 425p, 434p, 439p, 442p, 451p], [500p, 512p, 520p, 526p, 535p, 540p, 543p, 552p], [559p, 611p, 619p, 625p, 634p, 639p, 642p, 651p], [659p, 711p, 719p, 725p, 734p, 739p, 742p, 751p], [749p, 801p, 809p, 815p, 824p, 829p, 832p, 841p], [849p, 901p, 909p, 915p, 924p, 929p, 932p, 941p], [949p, 1001p, 1009p, 1015p, 1024p, 1029p, 1032p, 1041p], [1049p, 1101p, 1109p, 1115p, 1124p, 1129p, 1132p, 1141p]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 759a
-  - 811a
-  - 819a
-  - 825a
-  - 834a
-  - 839a
-  - 842a
-  - 851a
-- - 859a
-  - 911a
-  - 919a
-  - 925a
-  - 934a
-  - 939a
-  - 942a
-  - 951a
-- - 959a
-  - 1011a
-  - 1019a
-  - 1025a
-  - 1034a
-  - 1039a
-  - 1042a
-  - 1051a
-- - 1059a
-  - 1111a
-  - 1119a
-  - 1125a
-  - 1134a
-  - 1139a
-  - 1142a
-  - 1151a
-- - 1159a
-  - 1211p
-  - 1219p
-  - 1225p
-  - 1234p
-  - 1239p
-  - 1242p
-  - 1251p
-- - 1259p
-  - 111p
-  - 119p
-  - 125p
-  - 134p
-  - 139p
-  - 142p
-  - 151p
-- - 159p
-  - 211p
-  - 219p
-  - 225p
-  - 234p
-  - 239p
-  - 242p
-  - 251p
-- - 259p
-  - 311p
-  - 319p
-  - 325p
-  - 334p
-  - 339p
-  - 342p
-  - 351p
-- - 359p
-  - 411p
-  - 419p
-  - 425p
-  - 434p
-  - 439p
-  - 442p
-  - 451p
-- - 500p
-  - 512p
-  - 520p
-  - 526p
-  - 535p
-  - 540p
-  - 543p
-  - 552p
-- - 559p
-  - 611p
-  - 619p
-  - 625p
-  - 634p
-  - 639p
-  - 642p
-  - 651p
-- - 659p
-  - 711p
-  - 719p
-  - 725p
-  - 734p
-  - 739p
-  - 742p
-  - 751p
-- - 749p
-  - 801p
-  - 809p
-  - 815p
-  - 824p
-  - 829p
-  - 832p
-  - 841p
-- - 849p
-  - 901p
-  - 909p
-  - 915p
-  - 924p
-  - 929p
-  - 932p
-  - 941p
-- - 949p
-  - 1001p
-  - 1009p
-  - 1015p
-  - 1024p
-  - 1029p
-  - 1032p
-  - 1041p
-- - 1049p
-  - 1101p
-  - 1109p
-  - 1115p
-  - 1124p
-  - 1129p
-  - 1132p
-  - 1141p
 short_name: "937"
-time_points: 
-  - City Interchange - Platform 8
-  - Ainslie
-  - Hackett
-  - Dickson
-  - North Lyneham
-  - Lyneham
-  - Macarthur / Miller O'Connor
-  - City Interchange
+time_points: [City Interchange (Platform 8), Ainslie, Hackett, Dickson, North Lyneham, Lyneham, Macarthur / Miller O'Connor, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/938-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/938-to-city-interchange.stop_times_saturday.yml
@@ -1,127 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+stop_times_saturday: [[800a, 808a, 818a, 833a, 837a, 841a, 849a], [900a, 908a, 918a, 933a, 937a, 941a, 949a], [1000a, 1008a, 1018a, 1033a, 1037a, 1041a, 1049a], [1100a, 1108a, 1118a, 1133a, 1137a, 1141a, 1149a], [1200p, 1208p, 1218p, 1233p, 1237p, 1241p, 1249p], [100p, 108p, 118p, 133p, 137p, 141p, 149p], [200p, 208p, 218p, 233p, 237p, 241p, 249p], [300p, 308p, 318p, 333p, 337p, 341p, 349p], [400p, 408p, 418p, 433p, 437p, 441p, 449p], [500p, 508p, 518p, 533p, 537p, 541p, 549p], [600p, 608p, 618p, 633p, 637p, 641p, 649p], [700p, 707p, 716p, 729p, 733p, 737p, 744p], [800p, 807p, 816p, 829p, 833p, 837p, 844p], [900p, 907p, 916p, 929p, 933p, 937p, 944p], [1000p, 1007p, 1016p, 1029p, 1033p, 1037p, 1044p], [1100p, 1107p, 1116p, 1129p, 1133p, 1137p, 1144p]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 800a
-  - 808a
-  - 818a
-  - 833a
-  - 837a
-  - 841a
-  - 849a
-- - 900a
-  - 908a
-  - 918a
-  - 933a
-  - 937a
-  - 941a
-  - 949a
-- - 1000a
-  - 1008a
-  - 1018a
-  - 1033a
-  - 1037a
-  - 1041a
-  - 1049a
-- - 1100a
-  - 1108a
-  - 1118a
-  - 1133a
-  - 1137a
-  - 1141a
-  - 1149a
-- - 1200p
-  - 1208p
-  - 1218p
-  - 1233p
-  - 1237p
-  - 1241p
-  - 1249p
-- - 100p
-  - 108p
-  - 118p
-  - 133p
-  - 137p
-  - 141p
-  - 149p
-- - 200p
-  - 208p
-  - 218p
-  - 233p
-  - 237p
-  - 241p
-  - 249p
-- - 300p
-  - 308p
-  - 318p
-  - 333p
-  - 337p
-  - 341p
-  - 349p
-- - 400p
-  - 408p
-  - 418p
-  - 433p
-  - 437p
-  - 441p
-  - 449p
-- - 500p
-  - 508p
-  - 518p
-  - 533p
-  - 537p
-  - 541p
-  - 549p
-- - 600p
-  - 608p
-  - 618p
-  - 633p
-  - 637p
-  - 641p
-  - 649p
-- - 700p
-  - 707p
-  - 716p
-  - 729p
-  - 733p
-  - 737p
-  - 744p
-- - 800p
-  - 807p
-  - 816p
-  - 829p
-  - 833p
-  - 837p
-  - 844p
-- - 900p
-  - 907p
-  - 916p
-  - 929p
-  - 933p
-  - 937p
-  - 944p
-- - 1000p
-  - 1007p
-  - 1016p
-  - 1029p
-  - 1033p
-  - 1037p
-  - 1044p
-- - 1100p
-  - 1107p
-  - 1116p
-  - 1129p
-  - 1133p
-  - 1137p
-  - 1144p
 short_name: "938"
-time_points: 
-  - Woden Interchange - Platform 14
-  - Canberra Hospital
-  - Narrabundah College
-  - Kingston
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange
+time_points: [Woden Interchange (Platform 14), Canberra Hospital, Narrabundah College, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/938-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/938-to-city-interchange.stop_times_sunday.yml
@@ -1,99 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "938"
-time_points: 
-  - Woden Interchange - Platform 14
-  - Canberra Hospital
-  - Narrabundah College
-  - Kingston
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange
-stop_times_sunday: 
-- - 800a
-  - 808a
-  - 818a
-  - 833a
-  - 837a
-  - 841a
-  - 849a
-- - 900a
-  - 908a
-  - 918a
-  - 933a
-  - 937a
-  - 941a
-  - 949a
-- - 1000a
-  - 1008a
-  - 1018a
-  - 1033a
-  - 1037a
-  - 1041a
-  - 1049a
-- - 1100a
-  - 1108a
-  - 1118a
-  - 1133a
-  - 1137a
-  - 1141a
-  - 1149a
-- - 1200p
-  - 1208p
-  - 1218p
-  - 1233p
-  - 1237p
-  - 1241p
-  - 1249p
-- - 100p
-  - 108p
-  - 118p
-  - 133p
-  - 137p
-  - 141p
-  - 149p
-- - 200p
-  - 208p
-  - 218p
-  - 233p
-  - 237p
-  - 241p
-  - 249p
-- - 300p
-  - 308p
-  - 318p
-  - 333p
-  - 337p
-  - 341p
-  - 349p
-- - 400p
-  - 408p
-  - 418p
-  - 433p
-  - 437p
-  - 441p
-  - 449p
-- - 500p
-  - 508p
-  - 518p
-  - 533p
-  - 537p
-  - 541p
-  - 549p
-- - 600p
-  - 608p
-  - 618p
-  - 633p
-  - 637p
-  - 641p
-  - 649p
-- - 700p
-  - 707p
-  - 714p
-  - 727p
-  - 731p
-  - 735p
-  - 741p
+stop_times_sunday: [[800a, 808a, 818a, 833a, 837a, 841a, 849a], [900a, 908a, 918a, 933a, 937a, 941a, 949a], [1000a, 1008a, 1018a, 1033a, 1037a, 1041a, 1049a], [1100a, 1108a, 1118a, 1133a, 1137a, 1141a, 1149a], [1200p, 1208p, 1218p, 1233p, 1237p, 1241p, 1249p], [100p, 108p, 118p, 133p, 137p, 141p, 149p], [200p, 208p, 218p, 233p, 237p, 241p, 249p], [300p, 308p, 318p, 333p, 337p, 341p, 349p], [400p, 408p, 418p, 433p, 437p, 441p, 449p], [500p, 508p, 518p, 533p, 537p, 541p, 549p], [600p, 608p, 618p, 633p, 637p, 641p, 649p], [700p, 707p, 714p, 727p, 731p, 735p, 741p]]
+time_points: [Woden Interchange (Platform 14), Canberra Hospital, Narrabundah College, Kingston, Kings Ave/National Crt, Russell Offices, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/938-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/938-to-woden-interchange.stop_times_saturday.yml
@@ -1,127 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+stop_times_saturday: [[746a, 754a, 758a, 802a, 817a, 827a, 834a], [846a, 854a, 858a, 902a, 917a, 927a, 934a], [946a, 954a, 958a, 1002a, 1017a, 1027a, 1034a], [1046a, 1054a, 1058a, 1102a, 1117a, 1127a, 1134a], [1146a, 1154a, 1158a, 1202p, 1217p, 1227p, 1234p], [1246p, 1254p, 1258p, 102p, 117p, 127p, 134p], [146p, 154p, 158p, 202p, 217p, 227p, 234p], [246p, 254p, 258p, 302p, 317p, 327p, 334p], [346p, 354p, 358p, 402p, 417p, 427p, 434p], [446p, 454p, 458p, 502p, 517p, 527p, 534p], [546p, 554p, 558p, 602p, 617p, 627p, 634p], [646p, 654p, 658p, 702p, 715p, 724p, 731p], [746p, 753p, 757p, 801p, 814p, 823p, 830p], [846p, 853p, 857p, 901p, 914p, 923p, 930p], [946p, 953p, 957p, 1001p, 1014p, 1023p, 1030p], [1046p, 1053p, 1057p, 1101p, 1114p, 1123p, 1130p]]
+between_stops: {}
 
-stop_times_saturday: 
-- - 746a
-  - 754a
-  - 758a
-  - 802a
-  - 817a
-  - 827a
-  - 834a
-- - 846a
-  - 854a
-  - 858a
-  - 902a
-  - 917a
-  - 927a
-  - 934a
-- - 946a
-  - 954a
-  - 958a
-  - 1002a
-  - 1017a
-  - 1027a
-  - 1034a
-- - 1046a
-  - 1054a
-  - 1058a
-  - 1102a
-  - 1117a
-  - 1127a
-  - 1134a
-- - 1146a
-  - 1154a
-  - 1158a
-  - 1202p
-  - 1217p
-  - 1227p
-  - 1234p
-- - 1246p
-  - 1254p
-  - 1258p
-  - 102p
-  - 117p
-  - 127p
-  - 134p
-- - 146p
-  - 154p
-  - 158p
-  - 202p
-  - 217p
-  - 227p
-  - 234p
-- - 246p
-  - 254p
-  - 258p
-  - 302p
-  - 317p
-  - 327p
-  - 334p
-- - 346p
-  - 354p
-  - 358p
-  - 402p
-  - 417p
-  - 427p
-  - 434p
-- - 446p
-  - 454p
-  - 458p
-  - 502p
-  - 517p
-  - 527p
-  - 534p
-- - 546p
-  - 554p
-  - 558p
-  - 602p
-  - 617p
-  - 627p
-  - 634p
-- - 646p
-  - 654p
-  - 658p
-  - 702p
-  - 715p
-  - 724p
-  - 731p
-- - 746p
-  - 753p
-  - 757p
-  - 801p
-  - 814p
-  - 823p
-  - 830p
-- - 846p
-  - 853p
-  - 857p
-  - 901p
-  - 914p
-  - 923p
-  - 930p
-- - 946p
-  - 953p
-  - 957p
-  - 1001p
-  - 1014p
-  - 1023p
-  - 1030p
-- - 1046p
-  - 1053p
-  - 1057p
-  - 1101p
-  - 1114p
-  - 1123p
-  - 1130p
 short_name: "938"
-time_points: 
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Narrabundah College
-  - Canberra Hospital
-  - Woden Interchange
+time_points: [City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Kingston, Narrabundah College, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/938-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/938-to-woden-interchange.stop_times_sunday.yml
@@ -1,92 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "938"
-time_points: 
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Narrabundah College
-  - Canberra Hospital
-  - Woden Interchange
-stop_times_sunday: 
-- - 846a
-  - 854a
-  - 858a
-  - 902a
-  - 917a
-  - 927a
-  - 934a
-- - 946a
-  - 954a
-  - 958a
-  - 1002a
-  - 1017a
-  - 1027a
-  - 1034a
-- - 1046a
-  - 1054a
-  - 1058a
-  - 1102a
-  - 1117a
-  - 1127a
-  - 1134a
-- - 1146a
-  - 1154a
-  - 1158a
-  - 1202p
-  - 1217p
-  - 1227p
-  - 1234p
-- - 1246p
-  - 1254p
-  - 1258p
-  - 102p
-  - 117p
-  - 127p
-  - 134p
-- - 146p
-  - 154p
-  - 158p
-  - 202p
-  - 217p
-  - 227p
-  - 234p
-- - 246p
-  - 254p
-  - 258p
-  - 302p
-  - 317p
-  - 327p
-  - 334p
-- - 346p
-  - 354p
-  - 358p
-  - 402p
-  - 417p
-  - 427p
-  - 434p
-- - 446p
-  - 454p
-  - 458p
-  - 502p
-  - 517p
-  - 527p
-  - 534p
-- - 546p
-  - 554p
-  - 558p
-  - 602p
-  - 617p
-  - 627p
-  - 634p
-- - 646p
-  - 654p
-  - 658p
-  - 702p
-  - 714p
-  - 722p
-  - 728p
+stop_times_sunday: [[846a, 854a, 858a, 902a, 917a, 927a, 934a], [946a, 954a, 958a, 1002a, 1017a, 1027a, 1034a], [1046a, 1054a, 1058a, 1102a, 1117a, 1127a, 1134a], [1146a, 1154a, 1158a, 1202p, 1217p, 1227p, 1234p], [1246p, 1254p, 1258p, 102p, 117p, 127p, 134p], [146p, 154p, 158p, 202p, 217p, 227p, 234p], [246p, 254p, 258p, 302p, 317p, 327p, 334p], [346p, 354p, 358p, 402p, 417p, 427p, 434p], [446p, 454p, 458p, 502p, 517p, 527p, 534p], [546p, 554p, 558p, 602p, 617p, 627p, 634p], [646p, 654p, 658p, 702p, 714p, 722p, 728p]]
+time_points: [City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Kingston, Narrabundah College, Canberra Hospital, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/939-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/939-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [["-", "-", "-", 708a, 714a, 719a, 733a], ["-", "-", "-", 808a, 814a, 819a, 833a], [846a, 859a, 904a, 908a, 914a, 919a, 933a], [946a, 959a, 1004a, 1008a, 1014a, 1019a, 1033a], [1046a, 1100a, 1105a, 1110a, 1118a, 1125a, 1139a], [1146a, 1159a, 1204p, 1208p, 1214p, 1219p, 1233p], [1246p, 1259p, 104p, 108p, 114p, 119p, 133p], [146p, 159p, 204p, 208p, 214p, 219p, 233p], [246p, 259p, 304p, 308p, 314p, 319p, 333p], [346p, 359p, 404p, 408p, 414p, 419p, 433p], [446p, 459p, 504p, 508p, 514p, 519p, 533p], [546p, 559p, 604p, 608p, 614p, 619p, 633p], [646p, 659p, 704p, 708p, 714p, 719p, 733p], [746p, 759p, 804p, 808p, 814p, 819p, 833p], [846p, 859p, 904p, 908p, 914p, 919p, 933p], [946p, 959p, 1004p, 1008p, 1014p, 1019p, 1033p], [1046p, 1059p, 1104p, 1108p, 1114p, 1119p, 1133p]]
-between_stops: []
 short_name: "939"
-time_points: [City Interchange - Platform 8, Dickson, Watson, Watson Terminus, Watson, Dickson, City Interchange]
+time_points: [City Interchange (Platform 8), Dickson, Watson, Watson Terminus, Watson, Dickson, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/942-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/942-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
 stop_times_saturday: [[819a, 821a, 825a, 831a, 840a, 844a, 845a, 855a], [919a, 921a, 925a, 931a, 940a, 944a, 945a, 955a], [1019a, 1021a, 1025a, 1031a, 1040a, 1044a, 1045a, 1055a], [1119a, 1121a, 1125a, 1131a, 1140a, 1144a, 1145a, 1155a], [1219p, 1221p, 1225p, 1231p, 1240p, 1244p, 1245p, 1255p], [119p, 121p, 125p, 131p, 140p, 144p, 145p, 155p], [219p, 221p, 225p, 231p, 240p, 244p, 245p, 255p], [319p, 321p, 325p, 331p, 340p, 344p, 345p, 355p], [419p, 421p, 425p, 431p, 440p, 444p, 445p, 455p], [519p, 521p, 525p, 531p, 540p, 544p, 545p, 555p], [619p, 621p, 625p, 631p, 640p, 644p, 645p, 655p], [720p, 722p, 725p, 731p, 740p, 744p, 745p, 755p], [820p, 822p, 825p, 831p, 840p, 844p, 845p, 855p], [920p, 922p, 925p, 931p, 940p, 944p, 945p, 955p], [1020p, 1022p, 1025p, 1031p, 1040p, 1044p, 1045p, 1055p]]
-between_stops: []
 short_name: "942"
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/942-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/942-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 3): []
 short_name: "942"
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
 stop_times_sunday: [[819a, 821a, 825a, 831a, 840a, 844a, 845a, 855a], [919a, 921a, 925a, 931a, 940a, 944a, 945a, 955a], [1019a, 1021a, 1025a, 1031a, 1040a, 1044a, 1045a, 1055a], [1119a, 1121a, 1125a, 1131a, 1140a, 1144a, 1145a, 1155a], [1219p, 1221p, 1225p, 1231p, 1240p, 1244p, 1245p, 1255p], [119p, 121p, 125p, 131p, 140p, 144p, 145p, 155p], [219p, 221p, 225p, 231p, 240p, 244p, 245p, 255p], [319p, 321p, 325p, 331p, 340p, 344p, 345p, 355p], [419p, 421p, 425p, 431p, 440p, 444p, 445p, 455p], [519p, 521p, 525p, 531p, 540p, 544p, 545p, 555p], [619p, 621p, 625p, 631p, 640p, 644p, 645p, 655p]]
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 3, Cameron Ave Bus Station - Platform 3, Jamison Centre, Cook, Aranda, Caswell Drive, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/942-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/942-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[814a, 823a, 824a, 827a, 836a, 843a, 845a, 849a], [914a, 923a, 924a, 927a, 936a, 943a, 945a, 949a], [1014a, 1023a, 1024a, 1027a, 1036a, 1043a, 1045a, 1049a], [1114a, 1123a, 1124a, 1127a, 1136a, 1143a, 1145a, 1149a], [1214p, 1223p, 1224p, 1227p, 1236p, 1243p, 1245p, 1249p], [114p, 123p, 124p, 127p, 136p, 143p, 145p, 149p], [214p, 223p, 224p, 227p, 236p, 243p, 245p, 249p], [314p, 323p, 324p, 327p, 336p, 343p, 345p, 349p], [414p, 423p, 424p, 427p, 436p, 443p, 445p, 449p], [514p, 523p, 524p, 527p, 536p, 543p, 545p, 549p], [614p, 623p, 624p, 627p, 636p, 643p, 645p, 648p], [714p, 723p, 724p, 727p, 736p, 743p, 745p, 748p], [814p, 823p, 824p, 827p, 836p, 843p, 845p, 848p], [914p, 923p, 924p, 927p, 936p, 943p, 945p, 948p], [1014p, 1023p, 1024p, 1027p, 1036p, 1043p, 1045p, 1048p], [1114p, 1123p, 1124p, 1127p, 1136p, 1143p, 1145p, 1148p]]
-between_stops: []
 short_name: "942"
-time_points: [City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [City Interchange (Platform 4), Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/942-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/942-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "942"
+time_points: [City Interchange (Platform 4), Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[914a, 923a, 924a, 927a, 936a, 943a, 945a, 949a], [1014a, 1023a, 1024a, 1027a, 1036a, 1043a, 1045a, 1049a], [1114a, 1123a, 1124a, 1127a, 1136a, 1143a, 1145a, 1149a], [1214p, 1223p, 1224p, 1227p, 1236p, 1243p, 1245p, 1249p], [114p, 123p, 124p, 127p, 136p, 143p, 145p, 149p], [214p, 223p, 224p, 227p, 236p, 243p, 245p, 249p], [314p, 323p, 324p, 327p, 336p, 343p, 345p, 349p], [414p, 423p, 424p, 427p, 436p, 443p, 445p, 449p], [514p, 523p, 524p, 527p, 536p, 543p, 545p, 549p], [614p, 623p, 624p, 627p, 636p, 643p, 645p, 648p]]
-time_points: [City Interchange - Platform 4, Caswell Drive, Aranda, Cook, Jamison Centre, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/951-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/951-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[812a, 821a, 831a, 837a, 842a, 849a, 851a, 855a], [912a, 921a, 931a, 937a, 942a, 949a, 951a, 955a], [1012a, 1021a, 1031a, 1037a, 1042a, 1049a, 1051a, 1055a], [1112a, 1121a, 1131a, 1137a, 1142a, 1149a, 1151a, 1155a], [1212p, 1221p, 1231p, 1237p, 1242p, 1249p, 1251p, 1255p], [112p, 121p, 131p, 137p, 142p, 149p, 151p, 155p], [212p, 221p, 231p, 237p, 242p, 249p, 251p, 255p], [312p, 321p, 331p, 337p, 342p, 349p, 351p, 355p], [412p, 421p, 431p, 437p, 442p, 449p, 451p, 455p], [512p, 521p, 531p, 537p, 542p, 549p, 551p, 555p], [612p, 621p, 631p, 637p, 642p, 649p, 651p, 654p], [712p, 721p, 731p, 737p, 742p, 749p, 751p, 754p], [812p, 821p, 831p, 837p, 842p, 849p, 851p, 854p], [912p, 921p, 931p, 937p, 942p, 949p, 951p, 954p], [1012p, 1021p, 1031p, 1037p, 1042p, 1049p, 1051p, 1054p], [1112p, 1121p, 1131p, 1137p, 1142p, 1149p, 1151p, 1154p]]
-between_stops: []
 short_name: "951"
 time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/951-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/951-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "951"
+time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[912a, 921a, 931a, 937a, 942a, 949a, 951a, 955a], [1012a, 1021a, 1031a, 1037a, 1042a, 1049a, 1051a, 1055a], [1112a, 1121a, 1131a, 1137a, 1142a, 1149a, 1151a, 1155a], [1212p, 1221p, 1231p, 1237p, 1242p, 1249p, 1251p, 1255p], [112p, 121p, 131p, 137p, 142p, 149p, 151p, 155p], [212p, 221p, 231p, 237p, 242p, 249p, 251p, 255p], [312p, 321p, 331p, 337p, 342p, 349p, 351p, 355p], [412p, 421p, 431p, 437p, 442p, 449p, 451p, 455p], [512p, 521p, 531p, 537p, 542p, 549p, 551p, 555p], [612p, 621p, 631p, 637p, 642p, 649p, 651p, 654p]]
-time_points: [Gungahlin Market Place, Ngunnawal Primary, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/951-to-gungahlin-market-place.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/951-to-gungahlin-market-place.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Gungahlin Market Place
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 stop_times_saturday: [[824a, 826a, 830a, 837a, 842a, 847a, 857a, 906a], [924a, 926a, 930a, 937a, 942a, 947a, 957a, 1006a], [1024a, 1026a, 1030a, 1037a, 1042a, 1047a, 1057a, 1106a], [1124a, 1126a, 1130a, 1137a, 1142a, 1147a, 1157a, 1206p], [1224p, 1226p, 1230p, 1237p, 1242p, 1247p, 1257p, 106p], [124p, 126p, 130p, 137p, 142p, 147p, 157p, 206p], [224p, 226p, 230p, 237p, 242p, 247p, 257p, 306p], [324p, 326p, 330p, 337p, 342p, 347p, 357p, 406p], [424p, 426p, 430p, 437p, 442p, 447p, 457p, 506p], [524p, 526p, 530p, 537p, 542p, 547p, 557p, 606p], [624p, 626p, 630p, 637p, 642p, 647p, 657p, 706p], [725p, 727p, 730p, 737p, 742p, 747p, 757p, 806p], [825p, 827p, 830p, 837p, 842p, 847p, 857p, 906p], [925p, 927p, 930p, 937p, 942p, 947p, 957p, 1006p], [1025p, 1027p, 1030p, 1037p, 1042p, 1047p, 1057p, 1106p]]
-between_stops: []
 short_name: "951"
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/951-to-gungahlin-market-place.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/951-to-gungahlin-market-place.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Gungahlin Market Place
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 short_name: "951"
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
 stop_times_sunday: [[924a, 926a, 930a, 937a, 942a, 947a, 957a, 1006a], [1024a, 1026a, 1030a, 1037a, 1042a, 1047a, 1057a, 1106a], [1124a, 1126a, 1130a, 1137a, 1142a, 1147a, 1157a, 1206p], [1224p, 1226p, 1230p, 1237p, 1242p, 1247p, 1257p, 106p], [124p, 126p, 130p, 137p, 142p, 147p, 157p, 206p], [224p, 226p, 230p, 237p, 242p, 247p, 257p, 306p], [324p, 326p, 330p, 337p, 342p, 347p, 357p, 406p], [424p, 426p, 430p, 437p, 442p, 447p, 457p, 506p], [524p, 526p, 530p, 537p, 542p, 547p, 557p, 606p], [624p, 626p, 630p, 637p, 642p, 647p, 657p, 706p]]
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/952-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/952-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[739a, 747a, 800a, 805a, 817a, 819a, 823a], [839a, 847a, 900a, 905a, 917a, 919a, 923a], [939a, 947a, 1000a, 1005a, 1017a, 1019a, 1023a], [1039a, 1047a, 1100a, 1105a, 1117a, 1119a, 1123a], [1139a, 1147a, 1200p, 1205p, 1217p, 1219p, 1223p], [1239p, 1247p, 100p, 105p, 117p, 119p, 123p], [139p, 147p, 200p, 205p, 217p, 219p, 223p], [239p, 247p, 300p, 305p, 317p, 319p, 323p], [339p, 347p, 400p, 405p, 417p, 419p, 423p], [439p, 447p, 500p, 505p, 517p, 519p, 523p], [539p, 547p, 600p, 605p, 617p, 619p, 623p], [639p, 647p, 700p, 705p, 717p, 719p, 722p], [739p, 747p, 800p, 805p, 817p, 819p, 822p], [839p, 847p, 900p, 905p, 917p, 919p, 922p], [939p, 947p, 1000p, 1005p, 1017p, 1019p, 1022p], [1039p, 1047p, 1100p, 1105p, 1117p, 1119p, 1122p]]
-between_stops: []
 short_name: "952"
 time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/952-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/952-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "952"
+time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[839a, 847a, 900a, 905a, 917a, 919a, 923a], [939a, 947a, 1000a, 1005a, 1017a, 1019a, 1023a], [1039a, 1047a, 1100a, 1105a, 1117a, 1119a, 1123a], [1139a, 1147a, 1200p, 1205p, 1217p, 1219p, 1223p], [1239p, 1247p, 100p, 105p, 117p, 119p, 123p], [139p, 147p, 200p, 205p, 217p, 219p, 223p], [239p, 247p, 300p, 305p, 317p, 319p, 323p], [339p, 347p, 400p, 405p, 417p, 419p, 423p], [439p, 447p, 500p, 505p, 517p, 519p, 523p], [539p, 547p, 600p, 605p, 617p, 619p, 623p], [639p, 647p, 700p, 705p, 717p, 719p, 722p]]
-time_points: [Gungahlin Market Place, Nicholls Primary, Federation Square, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/952-to-gungahlin-market-place.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/952-to-gungahlin-market-place.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Gungahlin Market Place
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 stop_times_saturday: [["-", "-", "-", "-", 812a, 825a, 833a], [849a, 851a, 855a, 907a, 912a, 925a, 933a], [949a, 951a, 955a, 1007a, 1012a, 1025a, 1033a], [1049a, 1051a, 1055a, 1107a, 1112a, 1125a, 1133a], [1149a, 1151a, 1155a, 1207p, 1212p, 1225p, 1233p], [1249p, 1251p, 1255p, 107p, 112p, 125p, 133p], [149p, 151p, 155p, 207p, 212p, 225p, 233p], [249p, 251p, 255p, 307p, 312p, 325p, 333p], [349p, 351p, 355p, 407p, 412p, 425p, 433p], [449p, 451p, 455p, 507p, 512p, 525p, 533p], [549p, 551p, 555p, 607p, 612p, 625p, 633p], [650p, 652p, 655p, 707p, 712p, 725p, 733p], [750p, 752p, 755p, 807p, 812p, 825p, 833p], [850p, 852p, 855p, 907p, 912p, 925p, 933p], [950p, 952p, 955p, 1007p, 1012p, 1025p, 1033p], [1050p, 1052p, 1055p, 1107p, 1112p, 1125p, 1133p]]
-between_stops: []
 short_name: "952"
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/952-to-gungahlin-market-place.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/952-to-gungahlin-market-place.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Gungahlin Market Place
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 short_name: "952"
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
 stop_times_sunday: [[949a, 951a, 955a, 1007a, 1012a, 1025a, 1033a], [1049a, 1051a, 1055a, 1107a, 1112a, 1125a, 1133a], [1149a, 1151a, 1155a, 1207p, 1212p, 1225p, 1233p], [1249p, 1251p, 1255p, 107p, 112p, 125p, 133p], [149p, 151p, 155p, 207p, 212p, 225p, 233p], [249p, 251p, 255p, 307p, 312p, 325p, 333p], [349p, 351p, 355p, 407p, 412p, 425p, 433p], [449p, 451p, 455p, 507p, 512p, 525p, 533p], [549p, 551p, 555p, 607p, 612p, 625p, 633p], [650p, 652p, 655p, 707p, 712p, 725p, 733p]]
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Federation Square, Nicholls Primary, Gungahlin Market Place]
 

--- a/maxious-canberra-transit-feed/output/956-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/956-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
+between_stops: 
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 2): []
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 1): []
 stop_times_saturday: [[743a, 745a, 749a, 754a, 759a, 809a, 819a, 826a, 834a, 840a], [843a, 845a, 849a, 854a, 859a, 909a, 919a, 926a, 934a, 940a], [943a, 945a, 949a, 954a, 959a, 1009a, 1019a, 1026a, 1034a, 1040a], [1043a, 1045a, 1049a, 1054a, 1059a, 1109a, 1119a, 1126a, 1134a, 1140a], [1143a, 1145a, 1149a, 1154a, 1159a, 1209p, 1219p, 1226p, 1234p, 1240p], [1243p, 1245p, 1249p, 1254p, 1259p, 109p, 119p, 126p, 134p, 140p], [143p, 145p, 149p, 154p, 159p, 209p, 219p, 226p, 234p, 240p], [243p, 245p, 249p, 254p, 259p, 309p, 319p, 326p, 334p, 340p], [343p, 345p, 349p, 354p, 359p, 409p, 419p, 426p, 434p, 440p], [443p, 445p, 449p, 454p, 459p, 509p, 519p, 526p, 534p, 540p], [543p, 545p, 549p, 554p, 559p, 609p, 619p, 626p, 634p, 640p], [644p, 646p, 649p, 654p, 659p, 709p, 719p, 726p, 734p, 740p], [744p, 746p, 749p, 754p, 759p, 809p, 819p, 826p, 834p, 840p], [844p, 846p, 849p, 854p, 859p, 909p, 919p, 926p, 934p, 940p], [944p, 946p, 949p, 954p, 959p, 1009p, 1019p, 1026p, 1034p, 1040p], [1044p, 1046p, 1049p, 1054p, 1059p, 1109p, 1119p, 1126p, 1134p, 1140p]]
-between_stops: []
 short_name: "956"
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 1, William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 1), William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/956-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/956-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Cohen St Bus Station (Platform 2)-Lathlain St Bus Station (Platform 2): []
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 1): []
 short_name: "956"
+time_points: [Cohen St Bus Station (Platform 2), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 1), William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
 stop_times_sunday: [[843a, 845a, 849a, 854a, 859a, 909a, 919a, 926a, 934a, 940a], [943a, 945a, 949a, 954a, 959a, 1009a, 1019a, 1026a, 1034a, 1040a], [1043a, 1045a, 1049a, 1054a, 1059a, 1109a, 1119a, 1126a, 1134a, 1140a], [1143a, 1145a, 1149a, 1154a, 1159a, 1209p, 1219p, 1226p, 1234p, 1240p], [1243p, 1245p, 1249p, 1254p, 1259p, 109p, 119p, 126p, 134p, 140p], [143p, 145p, 149p, 154p, 159p, 209p, 219p, 226p, 234p, 240p], [243p, 245p, 249p, 254p, 259p, 309p, 319p, 326p, 334p, 340p], [343p, 345p, 349p, 354p, 359p, 409p, 419p, 426p, 434p, 440p], [443p, 445p, 449p, 454p, 459p, 509p, 519p, 526p, 534p, 540p], [543p, 545p, 549p, 554p, 559p, 609p, 619p, 626p, 634p, 640p], [644p, 646p, 649p, 654p, 659p, 709p, 719p, 726p, 734p, 740p]]
-time_points: [Cohen St Bus Station - Platform 2, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 1, William Webb / Ginninderra Drive, Chuculba/William Slim, Gungahlin Market Place, Kosciuszko/Everard, Flemington Rd, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/956-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/956-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [[738a, 744a, 752a, 759a, 809a, 819a, 824a, 829a, 831a, 835a], [838a, 844a, 852a, 859a, 909a, 919a, 924a, 929a, 931a, 935a], [938a, 944a, 952a, 959a, 1009a, 1019a, 1024a, 1029a, 1031a, 1035a], [1038a, 1044a, 1052a, 1059a, 1109a, 1119a, 1124a, 1129a, 1131a, 1135a], [1138a, 1144a, 1152a, 1159a, 1209p, 1219p, 1224p, 1229p, 1231p, 1235p], [1238p, 1244p, 1252p, 1259p, 109p, 119p, 124p, 129p, 131p, 135p], [138p, 144p, 152p, 159p, 209p, 219p, 224p, 229p, 231p, 235p], [238p, 244p, 252p, 259p, 309p, 319p, 324p, 329p, 331p, 335p], [338p, 344p, 352p, 359p, 409p, 419p, 424p, 429p, 431p, 435p], [438p, 444p, 452p, 459p, 509p, 519p, 524p, 529p, 531p, 535p], [538p, 544p, 552p, 559p, 609p, 619p, 624p, 629p, 631p, 634p], [638p, 644p, 652p, 659p, 709p, 719p, 724p, 729p, 731p, 734p], [738p, 744p, 752p, 759p, 809p, 819p, 824p, 829p, 831p, 834p], [838p, 844p, 852p, 859p, 909p, 919p, 924p, 929p, 931p, 934p], [938p, 944p, 952p, 959p, 1009p, 1019p, 1024p, 1029p, 1031p, 1034p], [1038p, 1044p, 1052p, 1059p, 1109p, 1119p, 1124p, 1129p, 1131p, 1134p]]
-between_stops: []
 short_name: "956"
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/956-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/956-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "956"
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[838a, 844a, 852a, 859a, 909a, 919a, 924a, 929a, 931a, 935a], [938a, 944a, 952a, 959a, 1009a, 1019a, 1024a, 1029a, 1031a, 1035a], [1038a, 1044a, 1052a, 1059a, 1109a, 1119a, 1124a, 1129a, 1131a, 1135a], [1138a, 1144a, 1152a, 1159a, 1209p, 1219p, 1224p, 1229p, 1231p, 1235p], [1238p, 1244p, 1252p, 1259p, 109p, 119p, 124p, 129p, 131p, 135p], [138p, 144p, 152p, 159p, 209p, 219p, 224p, 229p, 231p, 235p], [238p, 244p, 252p, 259p, 309p, 319p, 324p, 329p, 331p, 335p], [338p, 344p, 352p, 359p, 409p, 419p, 424p, 429p, 431p, 435p], [438p, 444p, 452p, 459p, 509p, 519p, 524p, 529p, 531p, 535p], [538p, 544p, 552p, 559p, 609p, 619p, 624p, 629p, 631p, 634p], [638p, 644p, 652p, 659p, 709p, 719p, 724p, 729p, 731p, 734p]]
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Kosciuszko/Everard, Gungahlin Market Place, Chuculba/William Slim, William Webb / Ginninderra Drive, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/958-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/958-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 stop_times_saturday: [["-", "-", "-", 709a, 720a, 728a, 736a, 745a, 752a, 759a, 807a, 813a], [753a, 755a, 759a, 809a, 820a, 828a, 836a, 845a, 852a, 859a, 907a, 913a], [853a, 855a, 859a, 909a, 920a, 928a, 936a, 945a, 952a, 959a, 1007a, 1013a], [953a, 955a, 959a, 1009a, 1020a, 1028a, 1036a, 1045a, 1052a, 1059a, 1107a, 1113a], [1053a, 1055a, 1059a, 1109a, 1120a, 1128a, 1136a, 1145a, 1152a, 1159a, 1207p, 1213p], [1153a, 1155a, 1159a, 1209p, 1220p, 1228p, 1236p, 1245p, 1252p, 1259p, 107p, 113p], [1253p, 1255p, 1259p, 109p, 120p, 128p, 136p, 145p, 152p, 159p, 207p, 213p], [153p, 155p, 159p, 209p, 220p, 228p, 236p, 245p, 252p, 259p, 307p, 313p], [253p, 255p, 259p, 309p, 320p, 328p, 336p, 345p, 352p, 359p, 407p, 413p], [353p, 355p, 359p, 409p, 420p, 428p, 436p, 445p, 452p, 459p, 507p, 513p], [453p, 455p, 459p, 509p, 520p, 528p, 536p, 545p, 552p, 559p, 607p, 613p], [553p, 555p, 559p, 609p, 620p, 628p, 636p, 645p, 652p, 659p, 707p, 713p], [654p, 656p, 659p, 709p, 720p, 728p, 736p, 745p, 752p, 759p, 807p, 813p], [754p, 756p, 759p, 809p, 820p, 828p, 836p, 845p, 852p, 859p, 907p, 913p], [854p, 856p, 859p, 909p, 920p, 928p, 936p, 945p, 952p, 959p, 1007p, 1013p], [954p, 956p, 959p, 1009p, 1020p, 1028p, 1036p, 1045p, 1052p, 1059p, 1107p, 1113p], [1054p, 1056p, 1059p, 1109p, 1120p, 1128p, 1136p, 1145p, 1152p, "-", "-", "-"]]
-between_stops: []
 short_name: "958"
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/958-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/958-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
 short_name: "958"
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
 stop_times_sunday: [[853a, 855a, 859a, 909a, 920a, 928a, 936a, 945a, 952a, 959a, 1007a, 1013a], [953a, 955a, 959a, 1009a, 1020a, 1028a, 1036a, 1045a, 1052a, 1059a, 1107a, 1113a], [1053a, 1055a, 1059a, 1109a, 1120a, 1128a, 1136a, 1145a, 1152a, 1159a, 1207p, 1213p], [1153a, 1155a, 1159a, 1209p, 1220p, 1228p, 1236p, 1245p, 1252p, 1259p, 107p, 113p], [1253p, 1255p, 1259p, 109p, 120p, 128p, 136p, 145p, 152p, 159p, 207p, 213p], [153p, 155p, 159p, 209p, 220p, 228p, 236p, 245p, 252p, 259p, 307p, 313p], [253p, 255p, 259p, 309p, 320p, 328p, 336p, 345p, 352p, 359p, 407p, 413p], [353p, 355p, 359p, 409p, 420p, 428p, 436p, 445p, 452p, 459p, 507p, 513p], [453p, 455p, 459p, 509p, 520p, 528p, 536p, 545p, 552p, 559p, 607p, 613p], [553p, 555p, 559p, 609p, 620p, 628p, 636p, 645p, 652p, 659p, 707p, 713p], [654p, 656p, 659p, 709p, 720p, 728p, 736p, 745p, 752p, 759p, 807p, 813p]]
-time_points: [Cohen St Bus Station - Platform 1, Lathlain St Bus Station - Platform 2, Cameron Ave Bus Station - Platform 2, Chuculba/William Slim, Ngunnawal Primary, Shoalhaven / Katherine Ave, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/958-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/958-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [["-", "-", "-", 723a, 730a, 739a, 747a, 755a, 806a, 816a, 818a, 822a], [759a, 805a, 813a, 820a, 827a, 836a, 844a, 852a, 903a, 913a, 915a, 919a], [859a, 905a, 913a, 920a, 927a, 936a, 944a, 952a, 1003a, 1013a, 1015a, 1019a], [959a, 1005a, 1013a, 1020a, 1027a, 1036a, 1044a, 1052a, 1103a, 1113a, 1115a, 1119a], [1059a, 1105a, 1113a, 1120a, 1127a, 1136a, 1144a, 1152a, 1203p, 1213p, 1215p, 1219p], [1159a, 1205p, 1213p, 1220p, 1227p, 1236p, 1244p, 1252p, 103p, 113p, 115p, 119p], [1259p, 105p, 113p, 120p, 127p, 136p, 144p, 152p, 203p, 213p, 215p, 219p], [159p, 205p, 213p, 220p, 227p, 236p, 244p, 252p, 303p, 313p, 315p, 319p], [259p, 305p, 313p, 320p, 327p, 336p, 344p, 352p, 403p, 413p, 415p, 419p], [359p, 405p, 413p, 420p, 427p, 436p, 444p, 452p, 503p, 513p, 515p, 519p], [459p, 505p, 513p, 520p, 527p, 536p, 544p, 552p, 603p, 613p, 615p, 619p], [559p, 605p, 613p, 620p, 627p, 636p, 644p, 652p, 703p, 713p, 715p, 718p], [659p, 705p, 713p, 720p, 727p, 736p, 744p, 752p, 803p, 813p, 815p, 818p], [759p, 805p, 813p, 820p, 827p, 836p, 844p, 852p, 903p, 913p, 915p, 918p], [859p, 905p, 913p, 920p, 927p, 936p, 944p, 952p, 1003p, 1013p, 1015p, 1018p], [959p, 1005p, 1013p, 1020p, 1027p, 1036p, 1044p, 1052p, 1103p, 1113p, 1115p, 1118p], [1059p, 1105p, 1113p, 1120p, 1127p, 1136p, "-", "-", "-", "-", "-", "-"]]
-between_stops: []
 short_name: "958"
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/958-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/958-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "958"
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[859a, 905a, 913a, 920a, 927a, 936a, 944a, 952a, 1003a, 1013a, 1015a, 1019a], [959a, 1005a, 1013a, 1020a, 1027a, 1036a, 1044a, 1052a, 1103a, 1113a, 1115a, 1119a], [1059a, 1105a, 1113a, 1120a, 1127a, 1136a, 1144a, 1152a, 1203p, 1213p, 1215p, 1219p], [1159a, 1205p, 1213p, 1220p, 1227p, 1236p, 1244p, 1252p, 103p, 113p, 115p, 119p], [1259p, 105p, 113p, 120p, 127p, 136p, 144p, 152p, 203p, 213p, 215p, 219p], [159p, 205p, 213p, 220p, 227p, 236p, 244p, 252p, 303p, 313p, 315p, 319p], [259p, 305p, 313p, 320p, 327p, 336p, 344p, 352p, 403p, 413p, 415p, 419p], [359p, 405p, 413p, 420p, 427p, 436p, 444p, 452p, 503p, 513p, 515p, 519p], [459p, 505p, 513p, 520p, 527p, 536p, 544p, 552p, 603p, 613p, 615p, 619p], [559p, 605p, 613p, 620p, 627p, 636p, 644p, 652p, 703p, 713p, 715p, 718p], [659p, 705p, 713p, 720p, 727p, 736p, 744p, 752p, 803p, 813p, 815p, 818p]]
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Flemington Rd, Flemington/Nullabor, Anthony Rolfe/Moonlight, Gungahlin Market Place, Shoalhaven / Katherine Ave, Ngunnawal Primary, Chuculba/William Slim, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/960-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/960-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[850a, 902a, 908a, 918a], [950a, 1002a, 1008a, 1018a], [1050a, 1102a, 1108a, 1118a], [1150a, 1202p, 1208p, 1218p], [1250p, 102p, 108p, 118p], [150p, 202p, 208p, 218p], [250p, 302p, 308p, 318p], [350p, 402p, 408p, 418p], [450p, 502p, 508p, 518p], [550p, 602p, 608p, 618p], [650p, 702p, 708p, 717p], [750p, 800p, 806p, 815p], [850p, 900p, 906p, 915p], [950p, 1000p, 1006p, 1015p], [1050p, 1100p, 1106p, 1115p]]
-between_stops: []
 short_name: "960"
-time_points: [Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 5), Mount Neighbour School, Kambah High, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/960-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/960-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "960"
+time_points: [Woden Interchange (Platform 5), Mount Neighbour School, Kambah High, Tuggeranong Interchange]
 stop_times_sunday: [[850a, 902a, 908a, 918a], [950a, 1002a, 1008a, 1018a], [1050a, 1102a, 1108a, 1118a], [1150a, 1202p, 1208p, 1218p], [1250p, 102p, 108p, 118p], [150p, 202p, 208p, 218p], [250p, 302p, 308p, 318p], [350p, 402p, 408p, 418p], [450p, 502p, 508p, 518p], [550p, 602p, 608p, 618p], [650p, 702p, 708p, 718p]]
-time_points: [Woden Interchange - Platform 5, Mount Neighbour School, Kambah High, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/960-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/960-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[755a, 805a, 811a, 823a], [855a, 905a, 911a, 923a], [955a, 1005a, 1011a, 1023a], [1055a, 1105a, 1111a, 1123a], [1155a, 1205p, 1211p, 1223p], [1255p, 105p, 111p, 123p], [155p, 205p, 211p, 223p], [255p, 305p, 311p, 323p], [355p, 405p, 411p, 423p], [455p, 505p, 511p, 523p], [555p, 605p, 611p, 623p], [655p, 705p, 711p, 721p], [755p, 804p, 810p, 820p], [855p, 904p, 910p, 920p], [955p, 1004p, 1010p, 1020p], [1055p, 1104p, 1110p, 1120p]]
-between_stops: []
 short_name: "960"
-time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 3), Kambah High, Mount Neighbour School, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/960-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/960-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "960"
+time_points: [Tuggeranong Interchange (Platform 3), Kambah High, Mount Neighbour School, Woden Interchange]
 stop_times_sunday: [[755a, 805a, 811a, 823a], [855a, 905a, 911a, 923a], [955a, 1005a, 1011a, 1023a], [1055a, 1105a, 1111a, 1123a], [1155a, 1205p, 1211p, 1223p], [1255p, 105p, 111p, 123p], [155p, 205p, 211p, 223p], [255p, 305p, 311p, 323p], [355p, 405p, 411p, 423p], [455p, 505p, 511p, 523p], [555p, 605p, 611p, 623p], [655p, 705p, 711p, 723p]]
-time_points: [Tuggeranong Interchange - Platform 3, Kambah High, Mount Neighbour School, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/961-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/961-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[831a, 840a, 850a, 903a], [931a, 940a, 950a, 1003a], [1031a, 1040a, 1050a, 1103a], [1131a, 1140a, 1150a, 1203p], [1231p, 1240p, 1250p, 103p], [131p, 140p, 150p, 203p], [231p, 240p, 250p, 303p], [331p, 340p, 350p, 403p], [431p, 440p, 450p, 503p], [531p, 540p, 550p, 603p], [626p, 635p, 645p, 658p], [726p, 735p, 745p, 758p], [826p, 835p, 845p, 858p], [926p, 935p, 945p, 958p], [1026p, 1035p, 1045p, 1058p], [1126p, 1135p, 1145p, 1158p]]
-between_stops: []
 short_name: "961"
-time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 11), Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/961-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/961-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "961"
+time_points: [Woden Interchange (Platform 11), Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 stop_times_sunday: [[931a, 940a, 950a, 1003a], [1031a, 1040a, 1050a, 1103a], [1131a, 1140a, 1150a, 1203p], [1231p, 1240p, 1250p, 103p], [131p, 140p, 150p, 203p], [231p, 240p, 250p, 303p], [331p, 340p, 350p, 403p], [431p, 440p, 450p, 503p], [531p, 540p, 550p, 603p], [631p, 640p, 650p, 703p]]
-time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/961-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/961-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[842a, 856a, 906a, 915a], [942a, 956a, 1006a, 1015a], [1042a, 1056a, 1106a, 1115a], [1142a, 1156a, 1206p, 1215p], [1242p, 1256p, 106p, 115p], [142p, 156p, 206p, 215p], [242p, 256p, 306p, 315p], [342p, 356p, 406p, 415p], [442p, 456p, 506p, 515p], [542p, 556p, 606p, 615p], [642p, 656p, 706p, 715p], [742p, 756p, 806p, 815p], [842p, 856p, 906p, 915p], [942p, 956p, 1006p, 1015p], [1042p, 1056p, 1106p, 1115p]]
-between_stops: []
 short_name: "961"
-time_points: [Tuggeranong Interchange - Platform 3, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 3), Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/961-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/961-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "961"
+time_points: [Tuggeranong Interchange (Platform 3), Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 stop_times_sunday: [[942a, 956a, 1006a, 1015a], [1042a, 1056a, 1106a, 1115a], [1142a, 1156a, 1206p, 1215p], [1242p, 1256p, 106p, 115p], [142p, 156p, 206p, 215p], [242p, 256p, 306p, 315p], [342p, 356p, 406p, 415p], [442p, 456p, 506p, 515p], [542p, 556p, 606p, 615p]]
-time_points: [Tuggeranong Interchange - Platform 3, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/962-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/962-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[851a, 902a, 910a, 917a], [951a, 1002a, 1010a, 1017a], [1051a, 1102a, 1110a, 1117a], [1151a, 1202p, 1210p, 1217p], [1251p, 102p, 110p, 117p], [151p, 202p, 210p, 217p], [251p, 302p, 310p, 317p], [351p, 402p, 410p, 417p], [451p, 502p, 510p, 517p], [551p, 602p, 610p, 617p], [651p, 702p, 710p, 717p], [751p, 802p, 810p, 817p], [851p, 902p, 910p, 917p], [951p, 1002p, 1010p, 1017p], [1051p, 1102p, 1110p, 1117p]]
-between_stops: []
 short_name: "962"
-time_points: [Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 5), Kambah Village, Kambah High, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/962-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/962-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "962"
+time_points: [Woden Interchange (Platform 5), Kambah Village, Kambah High, Tuggeranong Interchange]
 stop_times_sunday: [[951a, 1002a, 1010a, 1017a], [1051a, 1102a, 1110a, 1117a], [1151a, 1202p, 1210p, 1217p], [1251p, 102p, 110p, 117p], [151p, 202p, 210p, 217p], [251p, 302p, 310p, 317p], [351p, 402p, 410p, 417p], [451p, 502p, 510p, 517p], [551p, 602p, 610p, 617p], [651p, 702p, 710p, 717p]]
-time_points: [Woden Interchange - Platform 5, Kambah Village, Kambah High, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/962-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/962-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[824a, 831a, 839a, 852a], [925a, 932a, 940a, 953a], [1025a, 1032a, 1040a, 1053a], [1125a, 1132a, 1140a, 1153a], [1225p, 1232p, 1240p, 1253p], [125p, 132p, 140p, 153p], [225p, 232p, 240p, 253p], [325p, 332p, 340p, 353p], [424p, 431p, 439p, 452p], [524p, 531p, 539p, 552p], [625p, 632p, 639p, 650p], [725p, 731p, 738p, 749p], [825p, 831p, 838p, 849p], [925p, 931p, 938p, 949p], [1025p, 1031p, 1038p, 1049p], [1125p, 1131p, 1138p, 1149p]]
-between_stops: []
 short_name: "962"
-time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 4), Kambah High, Kambah Village, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/962-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/962-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "962"
+time_points: [Tuggeranong Interchange (Platform 4), Kambah High, Kambah Village, Woden Interchange]
 stop_times_sunday: [[925a, 932a, 940a, 953a], [1025a, 1032a, 1040a, 1053a], [1125a, 1132a, 1140a, 1153a], [1225p, 1232p, 1240p, 1253p], [125p, 132p, 140p, 153p], [225p, 232p, 240p, 253p], [325p, 332p, 340p, 353p], [425p, 432p, 440p, 453p], [525p, 532p, 540p, 553p], [625p, 632p, 639p, 650p]]
-time_points: [Tuggeranong Interchange - Platform 4, Kambah High, Kambah Village, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/964-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/964-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[905a, 914a, 926a, 937a], [1005a, 1014a, 1026a, 1037a], [1105a, 1114a, 1126a, 1137a], [1205p, 1214p, 1226p, 1237p], [105p, 114p, 126p, 137p], [205p, 214p, 226p, 237p], [305p, 314p, 326p, 337p], [405p, 414p, 426p, 437p], [505p, 514p, 526p, 537p], [605p, 614p, 626p, 637p], [705p, 714p, 726p, 737p], [805p, 814p, 826p, 837p], [905p, 914p, 926p, 937p], [1005p, 1014p, 1026p, 1037p], [1105p, 1114p, 1126p, 1137p]]
-between_stops: []
 short_name: "964"
-time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
+time_points: [Woden Interchange (Platform 11), Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/964-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/964-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "964"
+time_points: [Woden Interchange (Platform 11), Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 stop_times_sunday: [[905a, 914a, 926a, 937a], [1005a, 1014a, 1026a, 1037a], [1105a, 1114a, 1126a, 1137a], [1205p, 1214p, 1226p, 1237p], [105p, 114p, 126p, 137p], [205p, 214p, 226p, 237p], [305p, 314p, 326p, 337p], [405p, 414p, 426p, 437p], [505p, 514p, 526p, 537p], [605p, 614p, 626p, 637p], [705p, 714p, 726p, 737p]]
-time_points: [Woden Interchange - Platform 11, Athllon/Sulwood Kambah, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/964-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/964-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[825a, 837a, 849a, 858a], [925a, 937a, 949a, 958a], [1025a, 1037a, 1049a, 1058a], [1125a, 1137a, 1149a, 1158a], [1225p, 1237p, 1249p, 1258p], [125p, 137p, 149p, 158p], [225p, 237p, 249p, 258p], [325p, 337p, 349p, 358p], [425p, 437p, 449p, 458p], [525p, 537p, 549p, 558p], [625p, 637p, 649p, 658p], [725p, 737p, 749p, 758p], [825p, 837p, 849p, 858p], [925p, 937p, 949p, 958p], [1025p, 1037p, 1049p, 1058p], [1125p, 1137p, 1149p, "-"]]
-between_stops: []
 short_name: "964"
-time_points: [Tuggeranong Interchange - Platform 5, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
+time_points: [Tuggeranong Interchange (Platform 5), Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/964-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/964-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "964"
+time_points: [Tuggeranong Interchange (Platform 5), Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 stop_times_sunday: [[925a, 937a, 949a, 958a], [1025a, 1037a, 1049a, 1058a], [1125a, 1137a, 1149a, 1158a], [1225p, 1237p, 1249p, 1258p], [125p, 137p, 149p, 158p], [225p, 237p, 249p, 258p], [325p, 337p, 349p, 358p], [425p, 437p, 449p, 458p], [525p, 537p, 549p, 558p], [625p, 637p, 649p, 658p]]
-time_points: [Tuggeranong Interchange - Platform 5, Erindale Centre, Athllon/Sulwood Kambah, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/966-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/966-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [["-", "-", "-", 742a, 755a, 804a, 816a], [808a, 821a, 830a, 842a, 855a, 904a, 916a], [908a, 921a, 930a, 942a, 955a, 1004a, 1016a], [1008a, 1021a, 1030a, 1042a, 1055a, 1104a, 1116a], [1108a, 1121a, 1130a, 1142a, 1155a, 1204p, 1216p], [1208p, 1221p, 1230p, 1242p, 1255p, 104p, 116p], [108p, 121p, 130p, 142p, 155p, 204p, 216p], [208p, 221p, 230p, 242p, 255p, 304p, 316p], [308p, 321p, 330p, 342p, 355p, 404p, 416p], [408p, 421p, 430p, 442p, 455p, 504p, 516p], [508p, 521p, 530p, 542p, 555p, 604p, 616p], [608p, 621p, 630p, 642p, 655p, 704p, 716p], [703p, 716p, 725p, 737p, 750p, 759p, 811p], [803p, 816p, 825p, 837p, 850p, 859p, 911p], [903p, 916p, 925p, 937p, 950p, 959p, 1011p], [1003p, 1016p, 1025p, 1037p, 1050p, 1059p, 1111p], [1103p, 1116p, 1125p, 1137p, "-", "-", "-"]]
-between_stops: []
 short_name: "966"
-time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
+time_points: [Tuggeranong Interchange (Platform 7), Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/966-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/966-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "966"
+time_points: [Tuggeranong Interchange (Platform 7), Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
 stop_times_sunday: [[908a, 921a, 930a, 942a, 955a, 1004a, 1016a], [1008a, 1021a, 1030a, 1042a, 1055a, 1104a, 1116a], [1108a, 1121a, 1130a, 1142a, 1155a, 1204p, 1216p], [1208p, 1221p, 1230p, 1242p, 1255p, 104p, 116p], [108p, 121p, 130p, 142p, 155p, 204p, 216p], [208p, 221p, 230p, 242p, 255p, 304p, 316p], [308p, 321p, 330p, 342p, 355p, 404p, 416p], [408p, 421p, 430p, 442p, 455p, 504p, 516p], [508p, 521p, 530p, 542p, 555p, 604p, 616p], [608p, 621p, 630p, 642p, 655p, 704p, 716p], [708p, 721p, 730p, 742p, 755p, 804p, 816p]]
-time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Gowrie, Chisholm Shops, Gowrie, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/967-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/967-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[903a, 914a, 928a, 937a, 950a], [1103a, 1114a, 1128a, 1137a, 1150a], [103p, 114p, 128p, 137p, 150p], [303p, 314p, 328p, 337p, 350p], [503p, 514p, 528p, 537p, 550p], [703p, 714p, 728p, 737p, 750p], [903p, 914p, 928p, 937p, 950p], [1103p, 1114p, 1128p, 1137p, 1150p]]
-between_stops: []
 short_name: "967"
-time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
+time_points: [Tuggeranong Interchange (Platform 7), Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/967-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/967-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "967"
+time_points: [Tuggeranong Interchange (Platform 7), Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
 stop_times_sunday: [[903a, 914a, 928a, 937a, 950a], [1103a, 1114a, 1128a, 1137a, 1150a], [103p, 114p, 128p, 137p, 150p], [303p, 314p, 328p, 337p, 350p], [503p, 514p, 528p, 537p, 550p], [703p, 714p, 728p, 737p, 750p]]
-time_points: [Tuggeranong Interchange - Platform 7, Erindale Centre, Chisholm Shops, Heagney/Clift Richardson, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/968-to-tuggeranong-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/968-to-tuggeranong-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
+between_stops: {}
+
 stop_times_saturday: [[803a, 816a, 824a, 838a, 848a], [1003a, 1016a, 1024a, 1038a, 1048a], [1203p, 1216p, 1224p, 1238p, 1248p], [203p, 216p, 224p, 238p, 248p], [403p, 416p, 424p, 438p, 448p], [603p, 616p, 624p, 638p, 648p], [803p, 816p, 824p, 838p, 848p], [1003p, 1016p, 1024p, 1038p, 1048p]]
-between_stops: []
 short_name: "968"
-time_points: [Tuggeranong Interchange - Platform 7, Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
+time_points: [Tuggeranong Interchange (Platform 7), Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/968-to-tuggeranong-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/968-to-tuggeranong-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "968"
+time_points: [Tuggeranong Interchange (Platform 7), Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
 stop_times_sunday: [[1003a, 1016a, 1024a, 1038a, 1048a], [1203p, 1216p, 1224p, 1238p, 1248p], [203p, 216p, 224p, 238p, 248p], [403p, 416p, 424p, 438p, 448p], [603p, 616p, 624p, 638p, 648p]]
-time_points: [Tuggeranong Interchange - Platform 7, Heagney/Clift Richardson, Chisholm Shops, Erindale Centre, Tuggeranong Interchange]
 

--- a/maxious-canberra-transit-feed/output/980-to-cohen-st-bus-station.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/980-to-cohen-st-bus-station.stop_times_saturday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 stop_times_saturday: [["-", "-", "-", "-", 809a, 815a, 820a, 824a, 830a, 837a, 839a, 843a], [845a, 904a, 911a, 917a, 928a, 934a, 939a, 943a, 949a, 956a, 958a, 1002a], [945a, 1004a, 1011a, 1017a, 1028a, 1034a, 1039a, 1043a, 1049a, 1056a, 1058a, 1102a], [1045a, 1104a, 1111a, 1117a, 1128a, 1134a, 1139a, 1143a, 1149a, 1156a, 1158a, 1202p], ["-", "-", 1130a, 1136a, 1146p, "-", "-", "-", "-", "-", "-", "-"], [1145a, 1204p, 1211p, 1217p, 1228p, 1234p, 1239p, 1243p, 1249p, 1256p, 1258p, 102p], [1245p, 104p, 111p, 117p, 128p, 134p, 139p, 143p, 149p, 156p, 158p, 202p], [145p, 204p, 211p, 217p, 228p, 234p, 239p, 243p, 249p, 256p, 258p, 302p], [245p, 304p, 311p, 317p, 328p, 334p, 339p, 343p, 349p, 356p, 358p, 402p], [345p, 404p, 411p, 417p, 428p, 434p, 439p, 443p, 449p, 456p, 458p, 502p], ["-", "-", 440p, 446p, 456p, "-", "-", "-", "-", "-", "-", "-"], [445p, 504p, 511p, 517p, 528p, 534p, 539p, 543p, 549p, 556p, 558p, 602p], [545p, 604p, 611p, 617p, 628p, 634p, 639p, 643p, 649p, 656p, 658p, 701p], ["-", "-", "-", "-", 655p, 701p, 706p, 710p, 716p, 723p, 725p, 728p], ["-", "-", "-", "-", 805p, 811p, 816p, 820p, 826p, 833p, 835p, 838p], ["-", "-", "-", "-", 916p, 922p, 927p, 931p, 937p, 944p, 946p, 949p], ["-", "-", "-", "-", 1027p, 1033p, 1038p, 1042p, 1048p, 1055p, 1057p, 1100p], ["-", "-", "-", "-", 1139p, 1145p, 1150p, 1154p, 1200a, 1207a, 1209a, 1212a]]
-between_stops: []
 short_name: "980"
-time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
+time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange (Platform 8), Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/980-to-cohen-st-bus-station.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/980-to-cohen-st-bus-station.stop_times_sunday.yml
@@ -1,7 +1,9 @@
 --- 
 long_name: To Cohen St Bus Station
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
 short_name: "980"
+time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange (Platform 8), Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 stop_times_sunday: [[845a, 904a, 911a, 917a, 928a, 934a, 939a, 943a, 949a, 956a, 958a, 1002a], [945a, 1004a, 1011a, 1017a, 1028a, 1034a, 1039a, 1043a, 1049a, 1056a, 1058a, 1102a], [1045a, 1104a, 1111a, 1117a, 1128a, 1134a, 1139a, 1143a, 1149a, 1156a, 1158a, 1202p], [1145a, 1204p, 1211p, 1217p, 1228p, 1234p, 1239p, 1243p, 1249p, 1256p, 1258p, 102p], [1245p, 104p, 111p, 117p, 128p, 134p, 139p, 143p, 149p, 156p, 158p, 202p], [145p, 204p, 211p, 217p, 228p, 234p, 239p, 243p, 249p, 256p, 258p, 302p], [245p, 304p, 311p, 317p, 328p, 334p, 339p, 343p, 349p, 356p, 358p, 402p], [345p, 404p, 411p, 417p, 428p, 434p, 439p, 443p, 449p, 456p, 458p, 502p], ["-", "-", 440p, 446p, 456p, "-", "-", "-", "-", "-", "-", "-"], [445p, 504p, 511p, 517p, 528p, 534p, 539p, 543p, 549p, 556p, 558p, 602p], [545p, 604p, 611p, 617p, 628p, 634p, 639p, 643p, 649p, 656p, 658p, 701p]]
-time_points: [Lithgow St Terminus Fyshwick, Canberra Times, Railway Station Kingston, Russell Offices, City Interchange - Platform 8, Macarthur / Northbourne, National Hockey Centre Lyneham, Australian Institute Sports Bruce, University of Canberra, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 

--- a/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_saturday.yml
@@ -1,224 +1,9 @@
 --- 
 long_name: To Lithgow St Terminus Fyshwick
-between_stops: []
+stop_times_saturday: [[721a, 723a, 727a, 735a, 741a, 746a, 752a, 759a, 808a, 814a, 822a, 840a], [821a, 823a, 827a, 835a, 841a, 846a, 852a, 859a, 908a, 914a, 922a, 940a], [921a, 923a, 927a, 935a, 941a, 946a, 952a, 959a, 1008a, 1014a, 1022a, 1040a], [1021a, 1023a, 1027a, 1035a, 1041a, 1046a, 1052a, 1059a, 1108a, 1114a, 1122a, 1140a], [1121a, 1123a, 1127a, 1135a, 1141a, 1146a, 1152a, 1159a, 1208p, 1214p, 1222p, 1240p], [1221p, 1223p, 1227p, 1235p, 1241p, 1246p, 1252p, 1259p, 108p, 114p, 122p, 140p], [121p, 123p, 127p, 135p, 141p, 146p, 152p, 159p, 208p, 214p, 222p, 240p], [221p, 223p, 227p, 235p, 241p, 246p, 252p, 259p, 308p, 314p, 322p, 340p], [321p, 323p, 327p, 335p, 341p, 346p, 352p, 359p, 408p, 414p, 422p, 440p], ["-", "-", "-", "-", "-", "-", "-", 415p, 424p, 430p, "-", "-"], [421p, 423p, 427p, 435p, 441p, 446p, 452p, 459p, 508p, 514p, 522p, 540p], [521p, 523p, 527p, 535p, 541p, 546p, 552p, 558p, "-", "-", "-", "-"], [616p, 618p, 622p, 630p, 636p, 641p, 646p, 652p, "-", "-", "-", "-"], [727p, 729p, 732p, 739p, 745p, 750p, 755p, 801p, "-", "-", "-", "-"], [836p, 838p, 841p, 848p, 854p, 859p, 904p, 910p, "-", "-", "-", "-"], [947p, 949p, 952p, 959p, 1005p, 1010p, 1015p, 1021p, "-", "-", "-", "-"], [1059p, 1101p, 1104p, 1111p, 1117p, 1122p, 1127p, 1133p, "-", "-", "-", "-"]]
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+short_name: "980"
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Australian Institute Sports Bruce, National Hockey Centre Lyneham, Macarthur / Northbourne, City Interchange (Platform 9), Russell Offices, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Lithgow St Terminus Fyshwick]
 
-stop_times_saturday: 
-- - 721a
-  - 723a
-  - 727a
-  - 735a
-  - 741a
-  - 746a
-  - 752a
-  - 759a
-  - 808a
-  - 814a
-  - 822a
-  - 840a
-- - 821a
-  - 823a
-  - 827a
-  - 835a
-  - 841a
-  - 846a
-  - 852a
-  - 859a
-  - 908a
-  - 914a
-  - 922a
-  - 940a
-- - 921a
-  - 923a
-  - 927a
-  - 935a
-  - 941a
-  - 946a
-  - 952a
-  - 959a
-  - 1008a
-  - 1014a
-  - 1022a
-  - 1040a
-- - 1021a
-  - 1023a
-  - 1027a
-  - 1035a
-  - 1041a
-  - 1046a
-  - 1052a
-  - 1059a
-  - 1108a
-  - 1114a
-  - 1122a
-  - 1140a
-- - 1121a
-  - 1123a
-  - 1127a
-  - 1135a
-  - 1141a
-  - 1146a
-  - 1152a
-  - 1159a
-  - 1208p
-  - 1214p
-  - 1222p
-  - 1240p
-- - 1221p
-  - 1223p
-  - 1227p
-  - 1235p
-  - 1241p
-  - 1246p
-  - 1252p
-  - 1259p
-  - 108p
-  - 114p
-  - 122p
-  - 140p
-- - 121p
-  - 123p
-  - 127p
-  - 135p
-  - 141p
-  - 146p
-  - 152p
-  - 159p
-  - 208p
-  - 214p
-  - 222p
-  - 240p
-- - 221p
-  - 223p
-  - 227p
-  - 235p
-  - 241p
-  - 246p
-  - 252p
-  - 259p
-  - 308p
-  - 314p
-  - 322p
-  - 340p
-- - 321p
-  - 323p
-  - 327p
-  - 335p
-  - 341p
-  - 346p
-  - 352p
-  - 359p
-  - 408p
-  - 414p
-  - 422p
-  - 440p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 415p
-  - 424p
-  - 430p
-  - "-"
-  - "-"
-- - 421p
-  - 423p
-  - 427p
-  - 435p
-  - 441p
-  - 446p
-  - 452p
-  - 459p
-  - 508p
-  - 514p
-  - 522p
-  - 540p
-- - 521p
-  - 523p
-  - 527p
-  - 535p
-  - 541p
-  - 546p
-  - 552p
-  - 558p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 636p
-  - 641p
-  - 646p
-  - 652p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 727p
-  - 729p
-  - 732p
-  - 739p
-  - 745p
-  - 750p
-  - 755p
-  - 801p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 836p
-  - 838p
-  - 841p
-  - 848p
-  - 854p
-  - 859p
-  - 904p
-  - 910p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 947p
-  - 949p
-  - 952p
-  - 959p
-  - 1005p
-  - 1010p
-  - 1015p
-  - 1021p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1059p
-  - 1101p
-  - 1104p
-  - 1111p
-  - 1117p
-  - 1122p
-  - 1127p
-  - 1133p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-short_name: "980"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - University of Canberra
-  - Australian Institute Sports Bruce
-  - National Hockey Centre Lyneham
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Railway Station Kingston
-  - Newcastle / Isa Street Fyshwick
-  - Lithgow St Terminus Fyshwick
-

--- a/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_sunday.yml
@@ -1,164 +1,9 @@
 --- 
 long_name: To Lithgow St Terminus Fyshwick
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 3)-Cameron Ave Bus Station (Platform 3): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 3): []
+short_name: "980"
+stop_times_sunday: [[821a, 823a, 827a, 835a, 841a, 846a, 852a, 859a, 908a, 914a, 922a, 940a], [921a, 923a, 927a, 935a, 941a, 946a, 952a, 959a, 1008a, 1014a, 1022a, 1040a], [1021a, 1023a, 1027a, 1035a, 1041a, 1046a, 1052a, 1059a, 1108a, 1114a, 1122a, 1140a], [1121a, 1123a, 1127a, 1135a, 1141a, 1146a, 1152a, 1159a, 1208p, 1214p, 1222p, 1240p], [1221p, 1223p, 1227p, 1235p, 1241p, 1246p, 1252p, 1259p, 108p, 114p, 122p, 140p], [121p, 123p, 127p, 135p, 141p, 146p, 152p, 159p, 208p, 214p, 222p, 240p], [221p, 223p, 227p, 235p, 241p, 246p, 252p, 259p, 308p, 314p, 322p, 340p], [321p, 323p, 327p, 335p, 341p, 346p, 352p, 359p, 408p, 414p, 422p, 440p], ["-", "-", "-", "-", "-", "-", "-", 415p, 424p, 430p, "-", "-"], [421p, 423p, 427p, 435p, 441p, 446p, 452p, 459p, 508p, 514p, 522p, 540p], [521p, 523p, 527p, 535p, 541p, 546p, 552p, 558p, "-", "-", "-", "-"], [616p, 618p, 622p, 630p, 636p, 641p, 646p, 652p, "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 3), Cameron Ave Bus Station (Platform 3), University of Canberra, Australian Institute Sports Bruce, National Hockey Centre Lyneham, Macarthur / Northbourne, City Interchange (Platform 9), Russell Offices, Railway Station Kingston, Newcastle / Isa Street Fyshwick, Lithgow St Terminus Fyshwick]
 
-short_name: "980"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - University of Canberra
-  - Australian Institute Sports Bruce
-  - National Hockey Centre Lyneham
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Railway Station Kingston
-  - Newcastle / Isa Street Fyshwick
-  - Lithgow St Terminus Fyshwick
-stop_times_sunday: 
-- - 821a
-  - 823a
-  - 827a
-  - 835a
-  - 841a
-  - 846a
-  - 852a
-  - 859a
-  - 908a
-  - 914a
-  - 922a
-  - 940a
-- - 921a
-  - 923a
-  - 927a
-  - 935a
-  - 941a
-  - 946a
-  - 952a
-  - 959a
-  - 1008a
-  - 1014a
-  - 1022a
-  - 1040a
-- - 1021a
-  - 1023a
-  - 1027a
-  - 1035a
-  - 1041a
-  - 1046a
-  - 1052a
-  - 1059a
-  - 1108a
-  - 1114a
-  - 1122a
-  - 1140a
-- - 1121a
-  - 1123a
-  - 1127a
-  - 1135a
-  - 1141a
-  - 1146a
-  - 1152a
-  - 1159a
-  - 1208p
-  - 1214p
-  - 1222p
-  - 1240p
-- - 1221p
-  - 1223p
-  - 1227p
-  - 1235p
-  - 1241p
-  - 1246p
-  - 1252p
-  - 1259p
-  - 108p
-  - 114p
-  - 122p
-  - 140p
-- - 121p
-  - 123p
-  - 127p
-  - 135p
-  - 141p
-  - 146p
-  - 152p
-  - 159p
-  - 208p
-  - 214p
-  - 222p
-  - 240p
-- - 221p
-  - 223p
-  - 227p
-  - 235p
-  - 241p
-  - 246p
-  - 252p
-  - 259p
-  - 308p
-  - 314p
-  - 322p
-  - 340p
-- - 321p
-  - 323p
-  - 327p
-  - 335p
-  - 341p
-  - 346p
-  - 352p
-  - 359p
-  - 408p
-  - 414p
-  - 422p
-  - 440p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 415p
-  - 424p
-  - 430p
-  - "-"
-  - "-"
-- - 421p
-  - 423p
-  - 427p
-  - 435p
-  - 441p
-  - 446p
-  - 452p
-  - 459p
-  - 508p
-  - 514p
-  - 522p
-  - 540p
-- - 521p
-  - 523p
-  - 527p
-  - 535p
-  - 541p
-  - 546p
-  - 552p
-  - 558p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 636p
-  - 641p
-  - 646p
-  - 652p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-

--- a/maxious-canberra-transit-feed/output/981-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/981-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[1020a, 1034a, 1042a, 1048a, 1055a], [1150a, 1204p, 1212p, 1218p, 1225p], [120p, 134p, 142p, 148p, 155p], [250p, 304p, 312p, 318p, 325p], [420p, 434p, 442p, 448p, 455p]]
-between_stops: []
 short_name: "981"
-time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
+time_points: [City Interchange (Platform 9), National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/981-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/981-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "981"
+time_points: [City Interchange (Platform 9), National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
 stop_times_sunday: [[1020a, 1034a, 1042a, 1048a, 1055a], [1150a, 1204p, 1212p, 1218p, 1225p], [120p, 134p, 142p, 148p, 155p], [250p, 304p, 312p, 318p, 325p], [420p, 434p, 442p, 448p, 455p]]
-time_points: [City Interchange - Platform 9, National Aquarium, Black Mountain Telstra Tower, Botanic Gardens, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/982-to-bimberi-centre.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/982-to-bimberi-centre.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Bimberi Centre
+between_stops: {}
+
 stop_times_saturday: [[632a, 638a, 640a, 650a], [342p, 348p, 350p, 400p]]
-between_stops: []
 short_name: "982"
-time_points: [City Interchange - Platform 8, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
+time_points: [City Interchange (Platform 8), Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
 

--- a/maxious-canberra-transit-feed/output/982-to-bimberi-centre.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/982-to-bimberi-centre.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Bimberi Centre
-between_stops: []
+between_stops: {}
+
 short_name: "982"
+time_points: [City Interchange, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
 stop_times_sunday: [[342p, 348p, 350p, 400p]]
-time_points: [City Interchange, Macarthur / Northbourne, Northbourne Ave/Antill St, Bimberi Centre]
 

--- a/maxious-canberra-transit-feed/output/982-to-city-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/982-to-city-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
+between_stops: {}
+
 stop_times_saturday: [[715p, 724p, 726p, 733p]]
-between_stops: []
 short_name: "982"
 time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/982-to-city-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/982-to-city-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "982"
+time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 stop_times_sunday: [[715p, 724p, 726p, 733p]]
-time_points: [Bimberi Centre, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 

--- a/maxious-canberra-transit-feed/output/988-to-alexander-maconochie-centre-hume.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/988-to-alexander-maconochie-centre-hume.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Alexander Maconochie Centre Hume
+between_stops: {}
+
 stop_times_saturday: [[840a, 900a], [1225p, 1245p], [510p, 530p]]
-between_stops: []
 short_name: "988"
-time_points: [Woden Interchange - Platform 4, Alexander Maconochie Centre Hume]
+time_points: [Woden Interchange (Platform 4), Alexander Maconochie Centre Hume]
 

--- a/maxious-canberra-transit-feed/output/988-to-alexander-maconochie-centre-hume.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/988-to-alexander-maconochie-centre-hume.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Alexander Maconochie Centre Hume
-between_stops: []
+between_stops: {}
+
 short_name: "988"
+time_points: [Woden Interchange, Alexander Maconochie Centre Hume]
 stop_times_sunday: [[840a, 900a], [1225p, 1245p], [510p, 530p]]
-time_points: [Woden Interchange, Alexander Maconochie Centre Hume]
 

--- a/maxious-canberra-transit-feed/output/988-to-woden-interchange.stop_times_saturday.yml
+++ b/maxious-canberra-transit-feed/output/988-to-woden-interchange.stop_times_saturday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
+between_stops: {}
+
 stop_times_saturday: [[1135a, 1155a], [435p, 455p], [735p, 755p]]
-between_stops: []
 short_name: "988"
 time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/output/988-to-woden-interchange.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/988-to-woden-interchange.stop_times_sunday.yml
@@ -1,7 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
+
 short_name: "988"
+time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
 stop_times_sunday: [[1135a, 1155a], [435p, 455p], [735p, 755p]]
-time_points: [Alexander Maconochie Centre Hume, Woden Interchange]
 

--- a/maxious-canberra-transit-feed/parse-times.pl
+++ /dev/null
@@ -1,35 +1,1 @@
-#!/usr/bin/perl
 
-use strict;
-
-my $first = 1;
-my $prev_comment = 0;
-while (<STDIN>) {
-    if ($_ !~ /^\#/) {
-	if (!$first && !$prev_comment) {
-	    print ",\n";
-	} else {
-	    $first = 0;
-	    $prev_comment = 0;
-	}
-	chomp;
-	my @times = split /\ +/;
-	print "  [ ";
-	my $first = 1;
-	foreach (@times) {
-	    if (!$first) {
-		print ", ";
-	    } else {
-		$first = 0;
-	    }
-	    print $_;
-	}
-	print "]";
-    } else {
-	# yes, this conditional is loaded with assumptions...
-	print ",\n" . $_;
-	$prev_comment = 1;
-    }
-}
-
-

--- a/maxious-canberra-transit-feed/source-html/convertPDFtoPNG.sh
+++ b/maxious-canberra-transit-feed/source-html/convertPDFtoPNG.sh
@@ -1,2 +1,3 @@
-gs -q -sDEVICE=pngalpha -dBATCH -dNOPAUSE -dFirstPage=1 -dLastPage=1 -r600 -sOutputFile=test.png test.pdf
+gs -q -sDEVICE=pngalpha -dBATCH -dNOPAUSE -dFirstPage=1 -dLastPage=1 -r400 -sOutputFile=weekday_bus_map.png weekday_bus_map.pdf
+gs -q -sDEVICE=pngalpha -dBATCH -dNOPAUSE -dFirstPage=1 -dLastPage=1 -r400 -sOutputFile=weekend_bus_map.png weekend_bus_map.pdf
 

--- a/maxious-canberra-transit-feed/validate.sh
+++ b/maxious-canberra-transit-feed/validate.sh
@@ -1,2 +1,2 @@
-../origin-src/transitfeed-1.2.5/feedvalidator.py -l 9999 cbrfeed.zip
+python ../origin-src/transitfeed-1.2.5/feedvalidator.py -l 9999 cbrfeed.zip
 

--- a/maxious-canberra-transit-feed/validation-results.html
+++ b/maxious-canberra-transit-feed/validation-results.html
@@ -34,26 +34,25 @@
 <tr><th class="header">Shapes:</th><td class="header">0</td></tr>
 <tr><th class="header">Effective:</th><td class="header">May 25, 2009 to October 01, 2010</td></tr>
 </table>
+
 <br>
-During the upcoming service dates Thu Jun 24 to Sun Aug 22:
-<table>
-<tr><th class="header">Average trips per date:</th><td class="header">2060</td></tr>
-<tr><th class="header">Most trips on a date:</th><td class="header">2620, on 42 service dates (Thu Jun 24, Fri Jun 25, Mon Jun 28, ...)</td></tr>
-<tr><th class="header">Least trips on a date:</th><td class="header">580, on 9 service dates (Sun Jun 27, Sun Jul 04, Sun Jul 11, ...)</td></tr>
-</table>
-<br>
-<span class="fail">Found these problems:</span>
+<span class="fail">
+A new version 1.2.6 of transitfeed is available. Please visit http://code.google.com/p/googletransitdatafeed and download.</span><br><br><span class="fail">Found these problems:</span>
 <table class="count_outside">
-<tr><td><span class="fail">69 warnings</span></td></tr>
+<tr><td><span class="fail">70 warnings</span></td></tr>
 <tr><td>
-<table><tr><td>57</td><td><a href="#WarningInvalidValue">Invalid Values</a></td></tr>
+<table><tr><td>1</td><td><a href="#WarningExpirationDate">Expiration Date</a></td></tr>
+<tr><td>57</td><td><a href="#WarningInvalidValue">Invalid Values</a></td></tr>
 <tr><td>4</td><td><a href="#WarningOtherProblem">Other Problems</a></td></tr>
 <tr><td>8</td><td><a href="#WarningStopsTooClose">Stops Too Closes</a></td></tr>
 </table>
 </td>
 </table>
 <br><br>
-<h3 class="issueHeader">Warnings:</h3><h4 class="issueHeader"><a name="WarningInvalidValue">Invalid Value</a></h4><ul>
+<h3 class="issueHeader">Warnings:</h3><h4 class="issueHeader"><a name="WarningExpirationDate">Expiration Date</a></h4><ul>
+<li><div class="problem">This feed expired on October 01, 2010</div><br></li>
+</ul>
+<h4 class="issueHeader"><a name="WarningInvalidValue">Invalid Value</a></h4><ul>
 <li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "217" and "216".</div><br></li>
 <li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "215" and "214".</div><br></li>
 <li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "213" and "212".</div><br></li>
@@ -119,19 +118,19 @@
 <li><div class="problem">The trip with the trip_id "1921" doesn't have any stop times defined.</div><br></li>
 </ul>
 <h4 class="issueHeader"><a name="WarningStopsTooClose">Stops Too Close</a></h4><ul>
-<li><div class="problem">The stops "Lewis Luxton/Woodcock Dr" (ID 133) and "Woodcock/Clare Dennis" (ID 228) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Erindale Drive/Sternberg" (ID 76) and "Erindale Centre /Sternberg Crescent" (ID 74) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "City Interchange - Platform 1" (ID 39) and "City Interchange" (ID 38) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Cameron Ave Bus Station" (ID 20) and "Cameron Ave Bus Station - Platform 1" (ID 21) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Lathlain St Bus Station - Platform 4" (ID 130) and "Lathlain St Bus Station" (ID 126) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Cohen St Bus Station" (ID 51) and "Cohen St Bus Station - Platform 1" (ID 52) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Flemington/Nullabor" (ID 84) and "Flemington Rd/Sandford St" (ID 86) are 0.00m apart and probably represent the same location.</div><br></li>
-<li><div class="problem">The stops "Fraser East Terminus" (ID 90) and "Fraser" (ID 89) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Woodcock/Clare Dennis" (ID 216) and "Lewis Luxton/Woodcock Dr" (ID 87) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Erindale Centre /Sternberg Crescent" (ID 198) and "Erindale Drive/Sternberg" (ID 61) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "City Interchange" (ID 189) and "City Interchange - Platform 1" (ID 40) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Cameron Ave Bus Station - Platform 1" (ID 6) and "Cameron Ave Bus Station" (ID 5) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Lathlain St Bus Station" (ID 53) and "Lathlain St Bus Station - Platform 4" (ID 144) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Cohen St Bus Station - Platform 1" (ID 18) and "Cohen St Bus Station" (ID 150) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Flemington Rd/Sandford St" (ID 210) and "Flemington/Nullabor" (ID 218) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Fraser East Terminus" (ID 63) and "Fraser" (ID 116) are 0.00m apart and probably represent the same location.</div><br></li>
 </ul>
 
 <div class="footer">
 Generated by <a href="http://code.google.com/p/googletransitdatafeed/wiki/FeedValidator">
-FeedValidator</a> version 1.2.5 on June 24, 2010 at 12:28 AM EST.
+FeedValidator</a> version 1.2.5 on October 29, 2010 at 10:18 PM EST.
 </div>
 </body>
 </html>

--- a/maxious-canberra-transit-feed/view.sh
+++ b/maxious-canberra-transit-feed/view.sh
@@ -4,5 +4,5 @@
 # Hey, can pick destination again from a list filtered to places these stops go if you're curious!
 # http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
 # http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
-../origin-src/transitfeed-1.2.5/schedule_viewer.py --feed=cbrfeed.zip --key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q
+python ../origin-src/transitfeed-1.2.5/schedule_viewer.py --feed=cbrfeed.zip --key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q