--- a/maxious-canberra-transit-feed/output/12-312-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/12-312-to-tuggeranong-interchange.stop_times.yml
@@ -1,338 +1,12 @@
 --- 
 long_name: To Tuggeranong Interchange
-between_stops: []
+between_stops: 
+  Woden Interchange - Platform 6-Tuggeranong Interchange: [Wjz3kAx, Wjz3kyX, Wjz3kwU, Wjz3iFK, Wjz3hL_, Wjz3gK-, Wjz3gQn, Wjz3gMq, Wjz2mTK, Wjz2mGO, Wjz2lDC, Wjz239F, Wjz238T]
+  Cameron Ave Bus Station - Platform 1-City Interchange - Platform 1: [Wjz681S, Wjz689c, Wjz68W5, Wjz6gia, Wjz6giR, Wjz5nw6, Wjz5nwb, Wjz5mbS, Wjz5maK, Wjz5G6B, Wjz5G6U, Wjz5GeU, Wjz5GNG, Wjz5GMT, Wjz5FSY, Wjz5F-1]
+  Lathlain St Bus Station - Platform 1-Cameron Ave Bus Station - Platform 1: []
+  Cohen St Bus Station - Platform 3-Lathlain St Bus Station - Platform 1: []
+  City Interchange - Platform 1-Woden Interchange - Platform 6: ["", Wjz4KNu, Wjz4KO9, Wjz3eZ4, Wjz3eRR, Wjz3m31, Wjz3m3b]
+short_name: 12/312
+stop_times: [[628a, 633a, 636a, 640a, 650a, 652a, 656a, "-", "-", "-"], [656a, 701a, 704a, 708a, 718a, 720a, 724a, 742a, 759a, 816a], [725a, 730a, 734a, 738a, 748a, 750a, 754a, 813a, 830a, 847a], [736a, 741a, 745a, 749a, 759a, 801a, 805a, 824a, 841a, 858a], [750a, 755a, 759a, 803a, 813a, 815a, 819a, 838a, 855a, 912a], [810a, 815a, 819a, 823a, 833a, 835a, 839a, 858a, 915a, 932a], [830a, 835a, 839a, 843a, 853a, 855a, 859a, 918a, 935a, 950a], [855a, 900a, 904a, 908a, 918a, 920a, 924a, 942a, 959a, 1014a], [926a, 931a, 934a, 938a, 948a, 950a, 954a, 1011a, 1028a, 1043a], [956a, 1001a, 1004a, 1008a, 1018a, 1020a, 1024a, 1041a, 1058a, 1113a], [1026a, 1031a, 1034a, 1038a, 1048a, 1050a, 1054a, 1111a, 1128a, 1143a], [1056a, 1101a, 1104a, 1108a, 1118a, 1120a, 1124a, 1141a, 1158a, 1213p], [1126a, 1131a, 1134a, 1138a, 1148a, 1150a, 1154a, 1211p, 1228p, 1243p], [1156a, 1201p, 1204p, 1208p, 1218p, 1220p, 1224p, 1241p, 1258p, 113p], [1226p, 1231p, 1234p, 1238p, 1248p, 1250p, 1254p, 111p, 128p, 143p], [1256p, 101p, 104p, 108p, 118p, 120p, 124p, 141p, 158p, 213p], [126p, 131p, 134p, 138p, 148p, 150p, 154p, 211p, 228p, 243p], [156p, 201p, 204p, 208p, 218p, 220p, 224p, 241p, 258p, 316p], [226p, 231p, 234p, 238p, 248p, 250p, 254p, 312p, 329p, 348p], [255p, 300p, 304p, 308p, 318p, 320p, 324p, 343p, 400p, 419p], [325p, 330p, 334p, 338p, 348p, 350p, 354p, 413p, 430p, 449p], [345p, 350p, 354p, 358p, 408p, 410p, 414p, 433p, 450p, 509p], [415p, 420p, 424p, 428p, 438p, 440p, 444p, 503p, 520p, 539p], [435p, 440p, 444p, 448p, 458p, 500p, 504p, 523p, 540p, 559p], [500p, 505p, 509p, 513p, 523p, 525p, 529p, 548p, 605p, 624p], [525p, 530p, 534p, 538p, 548p, 550p, 554p, 613p, 630p, 645p], [555p, 600p, 604p, 608p, 618p, 620p, 624p, 641p, 655p, 710p], [627p, 632p, 635p, 639p, 649p, 651p, 654p, 710p, 724p, 739p], [707p, 712p, 715p, 719p, 728a, 730a, 734p, "-", "-", "-"], [807p, 812p, 815p, 819p, 828a, 830a, 834p, "-", "-", "-"], [907p, 912p, 915p, 919p, 928a, 930a, 934p, "-", "-", "-"], [1007p, 1012p, 1015p, 1019p, 1028a, 1030a, 1034p, "-", "-", "-"]]
+time_points: [Spence Terminus, Evatt, Copland College, McKellar, Cohen St Bus Station - Platform 3, Lathlain St Bus Station - Platform 1, Cameron Ave Bus Station - Platform 1, City Interchange - Platform 1, Woden Interchange - Platform 6, Tuggeranong Interchange]
 
-short_name: 12/312
-stop_times: 
-- - 628a
-  - 633a
-  - 636a
-  - 640a
-  - 650a
-  - 652a
-  - 656a
-  - "-"
-  - "-"
-  - "-"
-- - 656a
-  - 701a
-  - 704a
-  - 708a
-  - 718a
-  - 720a
-  - 724a
-  - 742a
-  - 759a
-  - 816a
-- - 725a
-  - 730a
-  - 734a
-  - 738a
-  - 748a
-  - 750a
-  - 754a
-  - 813a
-  - 830a
-  - 847a
-- - 736a
-  - 741a
-  - 745a
-  - 749a
-  - 759a
-  - 801a
-  - 805a
-  - 824a
-  - 841a
-  - 858a
-- - 750a
-  - 755a
-  - 759a
-  - 803a
-  - 813a
-  - 815a
-  - 819a
-  - 838a
-  - 855a
-  - 912a
-- - 810a
-  - 815a
-  - 819a
-  - 823a
-  - 833a
-  - 835a
-  - 839a
-  - 858a
-  - 915a
-  - 932a
-- - 830a
-  - 835a
-  - 839a
-  - 843a
-  - 853a
-  - 855a
-  - 859a
-  - 918a
-  - 935a
-  - 950a
-- - 855a
-  - 900a
-  - 904a
-  - 908a
-  - 918a
-  - 920a
-  - 924a
-  - 942a
-  - 959a
-  - 1014a
-- - 926a
-  - 931a
-  - 934a
-  - 938a
-  - 948a
-  - 950a
-  - 954a
-  - 1011a
-  - 1028a
-  - 1043a
-- - 956a
-  - 1001a
-  - 1004a
-  - 1008a
-  - 1018a
-  - 1020a
-  - 1024a
-  - 1041a
-  - 1058a
-  - 1113a
-- - 1026a
-  - 1031a
-  - 1034a
-  - 1038a
-  - 1048a
-  - 1050a
-  - 1054a
-  - 1111a
-  - 1128a
-  - 1143a
-- - 1056a
-  - 1101a
-  - 1104a
-  - 1108a
-  - 1118a
-  - 1120a
-  - 1124a
-  - 1141a
-  - 1158a
-  - 1213p
-- - 1126a
-  - 1131a
-  - 1134a
-  - 1138a
-  - 1148a
-  - 1150a
-  - 1154a
-  - 1211p
-  - 1228p
-  - 1243p
-- - 1156a
-  - 1201p
-  - 1204p
-  - 1208p
-  - 1218p
-  - 1220p
-  - 1224p
-  - 1241p
-  - 1258p
-  - 113p
-- - 1226p
-  - 1231p
-  - 1234p
-  - 1238p
-  - 1248p
-  - 1250p
-  - 1254p
-  - 111p
-  - 128p
-  - 143p
-- - 1256p
-  - 101p
-  - 104p
-  - 108p
-  - 118p
-  - 120p
-  - 124p
-  - 141p
-  - 158p
-  - 213p
-- - 126p
-  - 131p
-  - 134p
-  - 138p
-  - 148p
-  - 150p
-  - 154p
-  - 211p
-  - 228p
-  - 243p
-- - 156p
-  - 201p
-  - 204p
-  - 208p
-  - 218p
-  - 220p
-  - 224p
-  - 241p
-  - 258p
-  - 316p
-- - 226p
-  - 231p
-  - 234p
-  - 238p
-  - 248p
-  - 250p
-  - 254p
-  - 312p
-  - 329p
-  - 348p
-- - 255p
-  - 300p
-  - 304p
-  - 308p
-  - 318p
-  - 320p
-  - 324p
-  - 343p
-  - 400p
-  - 419p
-- - 325p
-  - 330p
-  - 334p
-  - 338p
-  - 348p
-  - 350p
-  - 354p
-  - 413p
-  - 430p
-  - 449p
-- - 345p
-  - 350p
-  - 354p
-  - 358p
-  - 408p
-  - 410p
-  - 414p
-  - 433p
-  - 450p
-  - 509p
-- - 415p
-  - 420p
-  - 424p
-  - 428p
-  - 438p
-  - 440p
-  - 444p
-  - 503p
-  - 520p
-  - 539p
-- - 435p
-  - 440p
-  - 444p
-  - 448p
-  - 458p
-  - 500p
-  - 504p
-  - 523p
-  - 540p
-  - 559p
-- - 500p
-  - 505p
-  - 509p
-  - 513p
-  - 523p
-  - 525p
-  - 529p
-  - 548p
-  - 605p
-  - 624p
-- - 525p
-  - 530p
-  - 534p
-  - 538p
-  - 548p
-  - 550p
-  - 554p
-  - 613p
-  - 630p
-  - 645p
-- - 555p
-  - 600p
-  - 604p
-  - 608p
-  - 618p
-  - 620p
-  - 624p
-  - 641p
-  - 655p
-  - 710p
-- - 627p
-  - 632p
-  - 635p
-  - 639p
-  - 649p
-  - 651p
-  - 654p
-  - 710p
-  - 724p
-  - 739p
-- - 707p
-  - 712p
-  - 715p
-  - 719p
-  - 728a
-  - 730a
-  - 734p
-  - "-"
-  - "-"
-  - "-"
-- - 807p
-  - 812p
-  - 815p
-  - 819p
-  - 828a
-  - 830a
-  - 834p
-  - "-"
-  - "-"
-  - "-"
-- - 907p
-  - 912p
-  - 915p
-  - 919p
-  - 928a
-  - 930a
-  - 934p
-  - "-"
-  - "-"
-  - "-"
-- - 1007p
-  - 1012p
-  - 1015p
-  - 1019p
-  - 1028a
-  - 1030a
-  - 1034p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Spence Terminus
-  - Evatt
-  - Copland College
-  - McKellar
-  - Cohen St Bus Station - Platform 3
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange
-