--- 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
-