--- 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,7 +1,305 @@
 --- 
 long_name: To Cohen St Station
 between_stops: []
+
 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]
+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