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