--- 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,7 +1,200 @@
 --- 
 long_name: To City Interchange
 between_stops: []
+
 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