--- a/maxious-canberra-transit-feed/output/13-313-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/13-313-to-tuggeranong-interchange.stop_times.yml
@@ -1,328 +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: 13/313
+stop_times: [[549a, 553a, 602a, 606a, 613a, 615a, 619a, 636a, 653a, 706a], [619a, 623a, 632a, 636a, 643a, 645a, 649a, 706a, 723a, 738a], [649a, 653a, 702a, 706a, 713a, 715a, 719a, 737a, 754a, 811a], [717a, 721a, 730a, 735a, 743a, 745a, 749a, 808a, 825a, 842a], [740a, 745a, 755a, 800a, 808a, 810a, 814a, 833a, 850a, 907a], [800a, 805a, 815a, 820a, 828a, 830a, 834a, 853a, 910a, 927a], [820a, 825a, 835a, 840a, 848a, 850a, 854a, 913a, 930a, 945a], [845a, 850a, 900a, 905a, 913a, 915a, 919a, 937a, 954a, 1009a], [917a, 922a, 932a, 936a, 943a, 945a, 949a, 1006a, 1023a, 1038a], [949a, 953a, 1002a, 1006a, 1013a, 1015a, 1019a, 1036a, 1053a, 1108a], [1019a, 1023a, 1032a, 1036a, 1043a, 1045a, 1049a, 1106a, 1123a, 1138a], [1049a, 1053a, 1102a, 1106a, 1113a, 1115a, 1119a, 1136a, 1153a, 1208p], [1119a, 1123a, 1132a, 1136a, 1143a, 1145a, 1149a, 1206p, 1223p, 1238p], [1149a, 1153a, 1202p, 1206p, 1213p, 1215p, 1219p, 1236p, 1253p, 108p], [1219p, 1223p, 1232p, 1236p, 1243p, 1245p, 1249p, 106p, 123p, 138p], [1249p, 1253p, 102p, 106p, 113p, 115p, 119p, 136p, 153p, 208p], [119p, 123p, 132p, 136p, 143p, 145p, 149p, 206p, 223p, 238p], [149p, 153p, 202p, 206p, 213p, 215p, 219p, 236p, 253p, 310p], [219p, 223p, 232p, 236p, 243p, 245p, 249p, 307p, 324p, 343p], [248p, 252p, 301p, 305p, 313p, 315p, 319p, 338p, 355p, 414p], [316p, 321p, 331p, 335p, 343p, 345p, 349p, 408p, 425p, 444p], [346p, 351p, 401p, 405p, 413p, 415p, 419p, 438p, 455p, 514p], [421p, 426p, 436p, 440p, 448p, 450p, 454p, "-", "-", "-"], [450p, 455p, 505p, 509p, 517p, 519p, 523p, "-", "-", "-"], [516p, 521p, 531p, 535p, 543p, 545p, 549p, 608p, 625p, 641p], [546p, 551p, 601p, 605p, 613p, 615p, 619p, 636p, 650p, 705p], [619p, 624p, 634p, 638p, 644p, 646p, 649p, 705p, 719p, 734p], [712p, 716p, 725p, 729p, 735p, 737p, 740p, "-", "-", "-"], [812p, 816p, 825p, 829p, 835p, 837p, 840p, "-", "-", "-"], [912p, 916p, 925p, 929p, 935p, 937p, 940p, "-", "-", "-"], [1012p, 1016p, 1025p, 1029p, 1035p, 1037p, 1040p, "-", "-", "-"]]
+time_points: [Fraser West Terminus, Charnwood, Scullin Shops, Page Shops, 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: 13/313
-stop_times: 
-- - 549a
-  - 553a
-  - 602a
-  - 606a
-  - 613a
-  - 615a
-  - 619a
-  - 636a
-  - 653a
-  - 706a
-- - 619a
-  - 623a
-  - 632a
-  - 636a
-  - 643a
-  - 645a
-  - 649a
-  - 706a
-  - 723a
-  - 738a
-- - 649a
-  - 653a
-  - 702a
-  - 706a
-  - 713a
-  - 715a
-  - 719a
-  - 737a
-  - 754a
-  - 811a
-- - 717a
-  - 721a
-  - 730a
-  - 735a
-  - 743a
-  - 745a
-  - 749a
-  - 808a
-  - 825a
-  - 842a
-- - 740a
-  - 745a
-  - 755a
-  - 800a
-  - 808a
-  - 810a
-  - 814a
-  - 833a
-  - 850a
-  - 907a
-- - 800a
-  - 805a
-  - 815a
-  - 820a
-  - 828a
-  - 830a
-  - 834a
-  - 853a
-  - 910a
-  - 927a
-- - 820a
-  - 825a
-  - 835a
-  - 840a
-  - 848a
-  - 850a
-  - 854a
-  - 913a
-  - 930a
-  - 945a
-- - 845a
-  - 850a
-  - 900a
-  - 905a
-  - 913a
-  - 915a
-  - 919a
-  - 937a
-  - 954a
-  - 1009a
-- - 917a
-  - 922a
-  - 932a
-  - 936a
-  - 943a
-  - 945a
-  - 949a
-  - 1006a
-  - 1023a
-  - 1038a
-- - 949a
-  - 953a
-  - 1002a
-  - 1006a
-  - 1013a
-  - 1015a
-  - 1019a
-  - 1036a
-  - 1053a
-  - 1108a
-- - 1019a
-  - 1023a
-  - 1032a
-  - 1036a
-  - 1043a
-  - 1045a
-  - 1049a
-  - 1106a
-  - 1123a
-  - 1138a
-- - 1049a
-  - 1053a
-  - 1102a
-  - 1106a
-  - 1113a
-  - 1115a
-  - 1119a
-  - 1136a
-  - 1153a
-  - 1208p
-- - 1119a
-  - 1123a
-  - 1132a
-  - 1136a
-  - 1143a
-  - 1145a
-  - 1149a
-  - 1206p
-  - 1223p
-  - 1238p
-- - 1149a
-  - 1153a
-  - 1202p
-  - 1206p
-  - 1213p
-  - 1215p
-  - 1219p
-  - 1236p
-  - 1253p
-  - 108p
-- - 1219p
-  - 1223p
-  - 1232p
-  - 1236p
-  - 1243p
-  - 1245p
-  - 1249p
-  - 106p
-  - 123p
-  - 138p
-- - 1249p
-  - 1253p
-  - 102p
-  - 106p
-  - 113p
-  - 115p
-  - 119p
-  - 136p
-  - 153p
-  - 208p
-- - 119p
-  - 123p
-  - 132p
-  - 136p
-  - 143p
-  - 145p
-  - 149p
-  - 206p
-  - 223p
-  - 238p
-- - 149p
-  - 153p
-  - 202p
-  - 206p
-  - 213p
-  - 215p
-  - 219p
-  - 236p
-  - 253p
-  - 310p
-- - 219p
-  - 223p
-  - 232p
-  - 236p
-  - 243p
-  - 245p
-  - 249p
-  - 307p
-  - 324p
-  - 343p
-- - 248p
-  - 252p
-  - 301p
-  - 305p
-  - 313p
-  - 315p
-  - 319p
-  - 338p
-  - 355p
-  - 414p
-- - 316p
-  - 321p
-  - 331p
-  - 335p
-  - 343p
-  - 345p
-  - 349p
-  - 408p
-  - 425p
-  - 444p
-- - 346p
-  - 351p
-  - 401p
-  - 405p
-  - 413p
-  - 415p
-  - 419p
-  - 438p
-  - 455p
-  - 514p
-- - 421p
-  - 426p
-  - 436p
-  - 440p
-  - 448p
-  - 450p
-  - 454p
-  - "-"
-  - "-"
-  - "-"
-- - 450p
-  - 455p
-  - 505p
-  - 509p
-  - 517p
-  - 519p
-  - 523p
-  - "-"
-  - "-"
-  - "-"
-- - 516p
-  - 521p
-  - 531p
-  - 535p
-  - 543p
-  - 545p
-  - 549p
-  - 608p
-  - 625p
-  - 641p
-- - 546p
-  - 551p
-  - 601p
-  - 605p
-  - 613p
-  - 615p
-  - 619p
-  - 636p
-  - 650p
-  - 705p
-- - 619p
-  - 624p
-  - 634p
-  - 638p
-  - 644p
-  - 646p
-  - 649p
-  - 705p
-  - 719p
-  - 734p
-- - 712p
-  - 716p
-  - 725p
-  - 729p
-  - 735p
-  - 737p
-  - 740p
-  - "-"
-  - "-"
-  - "-"
-- - 812p
-  - 816p
-  - 825p
-  - 829p
-  - 835p
-  - 837p
-  - 840p
-  - "-"
-  - "-"
-  - "-"
-- - 912p
-  - 916p
-  - 925p
-  - 929p
-  - 935p
-  - 937p
-  - 940p
-  - "-"
-  - "-"
-  - "-"
-- - 1012p
-  - 1016p
-  - 1025p
-  - 1029p
-  - 1035p
-  - 1037p
-  - 1040p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Fraser West Terminus
-  - Charnwood
-  - Scullin Shops
-  - Page Shops
-  - 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
-