--- a/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
@@ -1,298 +1,12 @@
 --- 
 long_name: To Spence Terminus
-between_stops: []
+between_stops: 
+  Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station - Platform 4-Cohen St Bus Station - Platform 6: []
+  Cameron Ave Bus Station - Platform 4-Lathlain St Bus Station - Platform 4: []
+  City Interchange - Platform 5-Cameron Ave Bus Station - Platform 4: [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: 15/315
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 749a, 754a], ["-", "-", "-", 803a, 805a, 809a, 817a, 821a, 829a, 834a], [731a, 750a, 808a, 826a, 828a, 832a, 840a, 844a, 852a, 857a], [831a, 850a, 908a, 926a, 928a, 932a, 939a, 942a, 948a, 953a], [911a, 930a, 946a, 1003a, 1005a, 1009a, 1016a, 1019a, 1025a, 1030a], [941a, 959a, 1015a, 1032a, 1034a, 1038a, 1045a, 1048a, 1054a, 1059a], [1011a, 1029a, 1045a, 1102a, 1104a, 1108a, 1115a, 1118a, 1124a, 1129a], [1041a, 1059a, 1115a, 1132a, 1134a, 1138a, 1145a, 1148a, 1154a, 1159a], [1111a, 1129a, 1145a, 1202p, 1204p, 1208p, 1215p, 1218p, 1224p, 1229p], [1141a, 1159a, 1215p, 1232p, 1234p, 1238p, 1245p, 1248p, 1254p, 1259p], [1211p, 1229p, 1245p, 102p, 104p, 108p, 115p, 118p, 124p, 129p], [1241p, 1259p, 115p, 132p, 134p, 138p, 145p, 148p, 154p, 159p], [111p, 129p, 145p, 202p, 204p, 208p, 215p, 218p, 224p, 229p], [141p, 159p, 215p, 232p, 234p, 238p, 245p, 248p, 254p, 259p], [211p, 229p, 245p, 302p, 304p, 308p, 316p, 320p, 328p, 333p], [241p, 259p, 317p, 335p, 337p, 341p, 349p, 353p, 401p, 406p], ["-", "-", "-", 354p, 356p, 400p, 408p, 412p, 420p, 425p], [311p, 330p, 348p, 406p, 408p, 412p, 420p, 424p, 432p, 437p], [341p, 400p, 418p, 436p, 438p, 442p, 450p, 454p, 502p, 507p], [411p, 430p, 448p, 506p, 508p, 512p, 520p, 524p, 532p, 537p], [441p, 500p, 518p, 536p, 538p, 542p, 550p, 554p, 602p, 607p], [501p, 520p, 538p, 556p, 558p, 602p, 610p, 614p, 622p, 627p], [521p, 540p, 558p, 616p, 618p, 622p, 630p, 633p, 639p, 644p], [601p, 620p, 636p, 653p, 655p, 658p, 705p, 708p, 714p, 719p], ["-", "-", "-", 753p, 755p, 758p, 805p, 808p, 814p, 819p], ["-", "-", "-", 853p, 855p, 858p, 905p, 908p, 914p, 919p], ["-", "-", "-", 953p, 955p, 958p, 1005p, 1008p, 1014p, 1019p], ["-", "-", "-", 1053p, 1055p, 1058p, 1105p, 1108p, 1114p, 1119p]]
+time_points: [Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station - Platform 4, Lathlain St Bus Station - Platform 4, Cohen St Bus Station - Platform 6, Copland College, Melba, Spence, Spence Terminus]
 
-short_name: 15/315
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 737a
-  - 741a
-  - 749a
-  - 754a
-- - "-"
-  - "-"
-  - "-"
-  - 803a
-  - 805a
-  - 809a
-  - 817a
-  - 821a
-  - 829a
-  - 834a
-- - 731a
-  - 750a
-  - 808a
-  - 826a
-  - 828a
-  - 832a
-  - 840a
-  - 844a
-  - 852a
-  - 857a
-- - 831a
-  - 850a
-  - 908a
-  - 926a
-  - 928a
-  - 932a
-  - 939a
-  - 942a
-  - 948a
-  - 953a
-- - 911a
-  - 930a
-  - 946a
-  - 1003a
-  - 1005a
-  - 1009a
-  - 1016a
-  - 1019a
-  - 1025a
-  - 1030a
-- - 941a
-  - 959a
-  - 1015a
-  - 1032a
-  - 1034a
-  - 1038a
-  - 1045a
-  - 1048a
-  - 1054a
-  - 1059a
-- - 1011a
-  - 1029a
-  - 1045a
-  - 1102a
-  - 1104a
-  - 1108a
-  - 1115a
-  - 1118a
-  - 1124a
-  - 1129a
-- - 1041a
-  - 1059a
-  - 1115a
-  - 1132a
-  - 1134a
-  - 1138a
-  - 1145a
-  - 1148a
-  - 1154a
-  - 1159a
-- - 1111a
-  - 1129a
-  - 1145a
-  - 1202p
-  - 1204p
-  - 1208p
-  - 1215p
-  - 1218p
-  - 1224p
-  - 1229p
-- - 1141a
-  - 1159a
-  - 1215p
-  - 1232p
-  - 1234p
-  - 1238p
-  - 1245p
-  - 1248p
-  - 1254p
-  - 1259p
-- - 1211p
-  - 1229p
-  - 1245p
-  - 102p
-  - 104p
-  - 108p
-  - 115p
-  - 118p
-  - 124p
-  - 129p
-- - 1241p
-  - 1259p
-  - 115p
-  - 132p
-  - 134p
-  - 138p
-  - 145p
-  - 148p
-  - 154p
-  - 159p
-- - 111p
-  - 129p
-  - 145p
-  - 202p
-  - 204p
-  - 208p
-  - 215p
-  - 218p
-  - 224p
-  - 229p
-- - 141p
-  - 159p
-  - 215p
-  - 232p
-  - 234p
-  - 238p
-  - 245p
-  - 248p
-  - 254p
-  - 259p
-- - 211p
-  - 229p
-  - 245p
-  - 302p
-  - 304p
-  - 308p
-  - 316p
-  - 320p
-  - 328p
-  - 333p
-- - 241p
-  - 259p
-  - 317p
-  - 335p
-  - 337p
-  - 341p
-  - 349p
-  - 353p
-  - 401p
-  - 406p
-- - "-"
-  - "-"
-  - "-"
-  - 354p
-  - 356p
-  - 400p
-  - 408p
-  - 412p
-  - 420p
-  - 425p
-- - 311p
-  - 330p
-  - 348p
-  - 406p
-  - 408p
-  - 412p
-  - 420p
-  - 424p
-  - 432p
-  - 437p
-- - 341p
-  - 400p
-  - 418p
-  - 436p
-  - 438p
-  - 442p
-  - 450p
-  - 454p
-  - 502p
-  - 507p
-- - 411p
-  - 430p
-  - 448p
-  - 506p
-  - 508p
-  - 512p
-  - 520p
-  - 524p
-  - 532p
-  - 537p
-- - 441p
-  - 500p
-  - 518p
-  - 536p
-  - 538p
-  - 542p
-  - 550p
-  - 554p
-  - 602p
-  - 607p
-- - 501p
-  - 520p
-  - 538p
-  - 556p
-  - 558p
-  - 602p
-  - 610p
-  - 614p
-  - 622p
-  - 627p
-- - 521p
-  - 540p
-  - 558p
-  - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 633p
-  - 639p
-  - 644p
-- - 601p
-  - 620p
-  - 636p
-  - 653p
-  - 655p
-  - 658p
-  - 705p
-  - 708p
-  - 714p
-  - 719p
-- - "-"
-  - "-"
-  - "-"
-  - 753p
-  - 755p
-  - 758p
-  - 805p
-  - 808p
-  - 814p
-  - 819p
-- - "-"
-  - "-"
-  - "-"
-  - 853p
-  - 855p
-  - 858p
-  - 905p
-  - 908p
-  - 914p
-  - 919p
-- - "-"
-  - "-"
-  - "-"
-  - 953p
-  - 955p
-  - 958p
-  - 1005p
-  - 1008p
-  - 1014p
-  - 1019p
-- - "-"
-  - "-"
-  - "-"
-  - 1053p
-  - 1055p
-  - 1058p
-  - 1105p
-  - 1108p
-  - 1114p
-  - 1119p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - Copland College
-  - Melba
-  - Spence
-  - Spence Terminus
-