--- a/maxious-canberra-transit-feed/output/15-315-to-tuggeranong-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/15-315-to-tuggeranong-interchange.stop_times.yml
@@ -1,371 +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: 15/315
+stop_times: [[535a, 540a, 543a, 545a, 548a, 558a, 600a, 604a, "-", "-", "-"], [605a, 610a, 613a, 615a, 618a, 628a, 630a, 634a, "-", "-", "-"], [635a, 640a, 643a, 645a, 648a, 658a, 700a, 704a, 721a, 738a, 755a], [705a, 710a, 713a, 715a, 718a, 728a, 730a, 734a, 753a, 810a, 827a], [733a, 738a, 741a, 744a, 748a, 758a, 800a, 804a, 823a, 840a, 857a], [753a, 758a, 801a, 804a, 808a, 818a, 820a, 824a, 843a, 900a, 917a], ["-", "-", 821a, 823a, 827a, 837a, 839a, 843a, 900a, "-", "-"], [813a, 818a, 821a, 824a, 828a, 838a, 840a, 844a, 903a, 920a, 936a], [833a, 838a, 841a, 844a, 848a, 858a, 900a, 904a, 923a, 940a, 955a], [903a, 908a, 911a, 914a, 918a, 928a, 930a, 934a, 951a, 1008a, 1023a], [935a, 940a, 943a, 945a, 948a, 958a, 1000a, 1004a, 1021a, 1038a, 1053a], [1005a, 1010a, 1013a, 1015a, 1018a, 1028a, 1030a, 1034a, 1051a, 1108a, 1123a], [1035a, 1040a, 1043a, 1045a, 1048a, 1058a, 1100a, 1104a, 1121a, 1138a, 1153a], [1105a, 1110a, 1113a, 1115a, 1118a, 1128a, 1130a, 1134a, 1151a, 1208p, 1223p], [1135a, 1140a, 1143a, 1145a, 1148a, 1158a, 1200p, 1204p, 1221p, 1238p, 1253p], [1205p, 1210p, 1213p, 1215p, 1218p, 1228p, 1230p, 1234p, 1251p, 108p, 123p], [1235p, 1240p, 1243p, 1245p, 1248p, 1258p, 100p, 104p, 121p, 138p, 153p], [105p, 110p, 113p, 115p, 118p, 128p, 130p, 134p, 151p, 208p, 223p], [135p, 140p, 143p, 145p, 148p, 158p, 200p, 204p, 221p, 238p, 253p], [205p, 210p, 213p, 215p, 218p, 228p, 230p, 234p, 251p, 308p, 327p], [235p, 240p, 243p, 245p, 248p, 258p, 300p, 304p, 323p, 340p, 359p], [303p, 308p, 311p, 314p, 318p, 328p, 330p, 334p, 353p, 410p, 429p], [333p, 338p, 341p, 344p, 348p, 358p, 400p, 404p, 423p, 440p, 459p], [403p, 408p, 411p, 414p, 418p, 428p, 430p, 434p, 453p, 510p, 529p], [443p, 448p, 451p, 454p, 458p, 508p, 510p, 514p, 533p, 550p, 609p], [533p, 538p, 541p, 544p, 548p, 558p, 600p, 604p, 623p, 638p, 653p], [604p, 609p, 612p, 615p, 619p, 629p, 631p, 634p, 650p, 704p, 719p], [623p, 628p, 631p, 633p, 636p, 645p, 647p, 650p, "-", "-", "-"], [723p, 728p, 731p, 733p, 736p, 745p, 747p, 750p, "-", "-", "-"], [823p, 828p, 831p, 833p, 836p, 845p, 847p, 850p, "-", "-", "-"], [923p, 928p, 931p, 933p, 936p, 945p, 947p, 950p, "-", "-", "-"], [1023p, 1028p, 1031p, 1033p, 1036p, 1045p, 1047p, 1050p, "-", "-", "-"]]
+time_points: [Spence Terminus, Spence, Alpen & Clifford St, Melba, Copland College, 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: 15/315
-stop_times: 
-- - 535a
-  - 540a
-  - 543a
-  - 545a
-  - 548a
-  - 558a
-  - 600a
-  - 604a
-  - "-"
-  - "-"
-  - "-"
-- - 605a
-  - 610a
-  - 613a
-  - 615a
-  - 618a
-  - 628a
-  - 630a
-  - 634a
-  - "-"
-  - "-"
-  - "-"
-- - 635a
-  - 640a
-  - 643a
-  - 645a
-  - 648a
-  - 658a
-  - 700a
-  - 704a
-  - 721a
-  - 738a
-  - 755a
-- - 705a
-  - 710a
-  - 713a
-  - 715a
-  - 718a
-  - 728a
-  - 730a
-  - 734a
-  - 753a
-  - 810a
-  - 827a
-- - 733a
-  - 738a
-  - 741a
-  - 744a
-  - 748a
-  - 758a
-  - 800a
-  - 804a
-  - 823a
-  - 840a
-  - 857a
-- - 753a
-  - 758a
-  - 801a
-  - 804a
-  - 808a
-  - 818a
-  - 820a
-  - 824a
-  - 843a
-  - 900a
-  - 917a
-- - "-"
-  - "-"
-  - 821a
-  - 823a
-  - 827a
-  - 837a
-  - 839a
-  - 843a
-  - 900a
-  - "-"
-  - "-"
-- - 813a
-  - 818a
-  - 821a
-  - 824a
-  - 828a
-  - 838a
-  - 840a
-  - 844a
-  - 903a
-  - 920a
-  - 936a
-- - 833a
-  - 838a
-  - 841a
-  - 844a
-  - 848a
-  - 858a
-  - 900a
-  - 904a
-  - 923a
-  - 940a
-  - 955a
-- - 903a
-  - 908a
-  - 911a
-  - 914a
-  - 918a
-  - 928a
-  - 930a
-  - 934a
-  - 951a
-  - 1008a
-  - 1023a
-- - 935a
-  - 940a
-  - 943a
-  - 945a
-  - 948a
-  - 958a
-  - 1000a
-  - 1004a
-  - 1021a
-  - 1038a
-  - 1053a
-- - 1005a
-  - 1010a
-  - 1013a
-  - 1015a
-  - 1018a
-  - 1028a
-  - 1030a
-  - 1034a
-  - 1051a
-  - 1108a
-  - 1123a
-- - 1035a
-  - 1040a
-  - 1043a
-  - 1045a
-  - 1048a
-  - 1058a
-  - 1100a
-  - 1104a
-  - 1121a
-  - 1138a
-  - 1153a
-- - 1105a
-  - 1110a
-  - 1113a
-  - 1115a
-  - 1118a
-  - 1128a
-  - 1130a
-  - 1134a
-  - 1151a
-  - 1208p
-  - 1223p
-- - 1135a
-  - 1140a
-  - 1143a
-  - 1145a
-  - 1148a
-  - 1158a
-  - 1200p
-  - 1204p
-  - 1221p
-  - 1238p
-  - 1253p
-- - 1205p
-  - 1210p
-  - 1213p
-  - 1215p
-  - 1218p
-  - 1228p
-  - 1230p
-  - 1234p
-  - 1251p
-  - 108p
-  - 123p
-- - 1235p
-  - 1240p
-  - 1243p
-  - 1245p
-  - 1248p
-  - 1258p
-  - 100p
-  - 104p
-  - 121p
-  - 138p
-  - 153p
-- - 105p
-  - 110p
-  - 113p
-  - 115p
-  - 118p
-  - 128p
-  - 130p
-  - 134p
-  - 151p
-  - 208p
-  - 223p
-- - 135p
-  - 140p
-  - 143p
-  - 145p
-  - 148p
-  - 158p
-  - 200p
-  - 204p
-  - 221p
-  - 238p
-  - 253p
-- - 205p
-  - 210p
-  - 213p
-  - 215p
-  - 218p
-  - 228p
-  - 230p
-  - 234p
-  - 251p
-  - 308p
-  - 327p
-- - 235p
-  - 240p
-  - 243p
-  - 245p
-  - 248p
-  - 258p
-  - 300p
-  - 304p
-  - 323p
-  - 340p
-  - 359p
-- - 303p
-  - 308p
-  - 311p
-  - 314p
-  - 318p
-  - 328p
-  - 330p
-  - 334p
-  - 353p
-  - 410p
-  - 429p
-- - 333p
-  - 338p
-  - 341p
-  - 344p
-  - 348p
-  - 358p
-  - 400p
-  - 404p
-  - 423p
-  - 440p
-  - 459p
-- - 403p
-  - 408p
-  - 411p
-  - 414p
-  - 418p
-  - 428p
-  - 430p
-  - 434p
-  - 453p
-  - 510p
-  - 529p
-- - 443p
-  - 448p
-  - 451p
-  - 454p
-  - 458p
-  - 508p
-  - 510p
-  - 514p
-  - 533p
-  - 550p
-  - 609p
-- - 533p
-  - 538p
-  - 541p
-  - 544p
-  - 548p
-  - 558p
-  - 600p
-  - 604p
-  - 623p
-  - 638p
-  - 653p
-- - 604p
-  - 609p
-  - 612p
-  - 615p
-  - 619p
-  - 629p
-  - 631p
-  - 634p
-  - 650p
-  - 704p
-  - 719p
-- - 623p
-  - 628p
-  - 631p
-  - 633p
-  - 636p
-  - 645p
-  - 647p
-  - 650p
-  - "-"
-  - "-"
-  - "-"
-- - 723p
-  - 728p
-  - 731p
-  - 733p
-  - 736p
-  - 745p
-  - 747p
-  - 750p
-  - "-"
-  - "-"
-  - "-"
-- - 823p
-  - 828p
-  - 831p
-  - 833p
-  - 836p
-  - 845p
-  - 847p
-  - 850p
-  - "-"
-  - "-"
-  - "-"
-- - 923p
-  - 928p
-  - 931p
-  - 933p
-  - 936p
-  - 945p
-  - 947p
-  - 950p
-  - "-"
-  - "-"
-  - "-"
-- - 1023p
-  - 1028p
-  - 1031p
-  - 1033p
-  - 1036p
-  - 1045p
-  - 1047p
-  - 1050p
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Spence Terminus
-  - Spence
-  - Alpen & Clifford St
-  - Melba
-  - Copland College
-  - 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
-