--- 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: 
+  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]
 
-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
-