--- a/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/12-312-to-spence-terminus.stop_times.yml
@@ -1,308 +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: 12/312
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 746a, 752a], ["-", "-", "-", 802a, 804a, 808a, 816a, 820a, 825a, 831a], [726a, 745a, 803a, 821a, 823a, 827a, 835a, 839a, 844a, 850a], [826a, 845a, 903a, 921a, 923a, 927a, 934a, 938a, 942a, 948a], [901a, 920a, 937a, 954a, 956a, 1000a, 1007a, 1011a, 1015a, 1021a], [931a, 949a, 1005a, 1022a, 1024a, 1028a, 1035a, 1039a, 1043a, 1049a], [1001a, 1019a, 1035a, 1052a, 1054a, 1058a, 1105a, 1109a, 1113a, 1119a], [1031a, 1049a, 1105a, 1122a, 1124a, 1128a, 1135a, 1139a, 1143a, 1149a], [1101a, 1119a, 1135a, 1152a, 1154a, 1158a, 1205p, 1209p, 1213p, 1219p], [1131a, 1149a, 1205p, 1222p, 1224p, 1228p, 1235p, 1239p, 1243p, 1249p], [1201p, 1219p, 1235p, 1252p, 1254p, 1258p, 105p, 109p, 113p, 119p], [1231p, 1249p, 105p, 122p, 124p, 128p, 135p, 139p, 143p, 149p], [101p, 119p, 135p, 152p, 154p, 158p, 205p, 209p, 213p, 219p], [131p, 149p, 205p, 222p, 224p, 228p, 235p, 239p, 243p, 249p], [201p, 219p, 235p, 252p, 254p, 258p, 306p, 310p, 315p, 321p], [231p, 249p, 305p, 323p, 325p, 329p, 337p, 341p, 346p, 352p], [301p, 320p, 338p, 356p, 358p, 402p, 410p, 414p, 419p, 425p], [331p, 350p, 408p, 426p, 428p, 432p, 440p, 444p, 449p, 455p], [356p, 415p, 433p, 451p, 453p, 457p, 505p, 509p, 514p, 520p], [416p, 435p, 453p, 511p, 513p, 517p, 525p, 529p, 534p, 540p], [436p, 455p, 513p, 531p, 533p, 537p, 545p, 549p, 554p, 600p], [456p, 515p, 533p, 551p, 553p, 557p, 605p, 609p, 614p, 620p], [516p, 535p, 553p, 611p, 613p, 617p, 625p, 629p, 633p, 639p], [536p, 555p, 613p, 631p, 633p, 636p, 643p, 647p, 651p, 657p], [636p, 653p, 708p, 725p, 727p, 730p, 737p, 741p, 745p, 751p], ["-", "-", "-", 835p, 837p, 840p, 847p, 851p, 855p, 901p], ["-", "-", "-", 935p, 937p, 940p, 947p, 951p, 955p, 1001p], ["-", "-", "-", 1035p, 1037p, 1040p, 1047p, 1051p, 1055p, 1101p], ["-", "-", "-", 1135p, 1137p, 1140p, 1147p, 1151p, 1155p, 1201a]]
+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, McKellar, Copland College, Evatt, Spence Terminus]
 
-short_name: 12/312
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 737a
-  - 741a
-  - 746a
-  - 752a
-- - "-"
-  - "-"
-  - "-"
-  - 802a
-  - 804a
-  - 808a
-  - 816a
-  - 820a
-  - 825a
-  - 831a
-- - 726a
-  - 745a
-  - 803a
-  - 821a
-  - 823a
-  - 827a
-  - 835a
-  - 839a
-  - 844a
-  - 850a
-- - 826a
-  - 845a
-  - 903a
-  - 921a
-  - 923a
-  - 927a
-  - 934a
-  - 938a
-  - 942a
-  - 948a
-- - 901a
-  - 920a
-  - 937a
-  - 954a
-  - 956a
-  - 1000a
-  - 1007a
-  - 1011a
-  - 1015a
-  - 1021a
-- - 931a
-  - 949a
-  - 1005a
-  - 1022a
-  - 1024a
-  - 1028a
-  - 1035a
-  - 1039a
-  - 1043a
-  - 1049a
-- - 1001a
-  - 1019a
-  - 1035a
-  - 1052a
-  - 1054a
-  - 1058a
-  - 1105a
-  - 1109a
-  - 1113a
-  - 1119a
-- - 1031a
-  - 1049a
-  - 1105a
-  - 1122a
-  - 1124a
-  - 1128a
-  - 1135a
-  - 1139a
-  - 1143a
-  - 1149a
-- - 1101a
-  - 1119a
-  - 1135a
-  - 1152a
-  - 1154a
-  - 1158a
-  - 1205p
-  - 1209p
-  - 1213p
-  - 1219p
-- - 1131a
-  - 1149a
-  - 1205p
-  - 1222p
-  - 1224p
-  - 1228p
-  - 1235p
-  - 1239p
-  - 1243p
-  - 1249p
-- - 1201p
-  - 1219p
-  - 1235p
-  - 1252p
-  - 1254p
-  - 1258p
-  - 105p
-  - 109p
-  - 113p
-  - 119p
-- - 1231p
-  - 1249p
-  - 105p
-  - 122p
-  - 124p
-  - 128p
-  - 135p
-  - 139p
-  - 143p
-  - 149p
-- - 101p
-  - 119p
-  - 135p
-  - 152p
-  - 154p
-  - 158p
-  - 205p
-  - 209p
-  - 213p
-  - 219p
-- - 131p
-  - 149p
-  - 205p
-  - 222p
-  - 224p
-  - 228p
-  - 235p
-  - 239p
-  - 243p
-  - 249p
-- - 201p
-  - 219p
-  - 235p
-  - 252p
-  - 254p
-  - 258p
-  - 306p
-  - 310p
-  - 315p
-  - 321p
-- - 231p
-  - 249p
-  - 305p
-  - 323p
-  - 325p
-  - 329p
-  - 337p
-  - 341p
-  - 346p
-  - 352p
-- - 301p
-  - 320p
-  - 338p
-  - 356p
-  - 358p
-  - 402p
-  - 410p
-  - 414p
-  - 419p
-  - 425p
-- - 331p
-  - 350p
-  - 408p
-  - 426p
-  - 428p
-  - 432p
-  - 440p
-  - 444p
-  - 449p
-  - 455p
-- - 356p
-  - 415p
-  - 433p
-  - 451p
-  - 453p
-  - 457p
-  - 505p
-  - 509p
-  - 514p
-  - 520p
-- - 416p
-  - 435p
-  - 453p
-  - 511p
-  - 513p
-  - 517p
-  - 525p
-  - 529p
-  - 534p
-  - 540p
-- - 436p
-  - 455p
-  - 513p
-  - 531p
-  - 533p
-  - 537p
-  - 545p
-  - 549p
-  - 554p
-  - 600p
-- - 456p
-  - 515p
-  - 533p
-  - 551p
-  - 553p
-  - 557p
-  - 605p
-  - 609p
-  - 614p
-  - 620p
-- - 516p
-  - 535p
-  - 553p
-  - 611p
-  - 613p
-  - 617p
-  - 625p
-  - 629p
-  - 633p
-  - 639p
-- - 536p
-  - 555p
-  - 613p
-  - 631p
-  - 633p
-  - 636p
-  - 643p
-  - 647p
-  - 651p
-  - 657p
-- - 636p
-  - 653p
-  - 708p
-  - 725p
-  - 727p
-  - 730p
-  - 737p
-  - 741p
-  - 745p
-  - 751p
-- - "-"
-  - "-"
-  - "-"
-  - 835p
-  - 837p
-  - 840p
-  - 847p
-  - 851p
-  - 855p
-  - 901p
-- - "-"
-  - "-"
-  - "-"
-  - 935p
-  - 937p
-  - 940p
-  - 947p
-  - 951p
-  - 955p
-  - 1001p
-- - "-"
-  - "-"
-  - "-"
-  - 1035p
-  - 1037p
-  - 1040p
-  - 1047p
-  - 1051p
-  - 1055p
-  - 1101p
-- - "-"
-  - "-"
-  - "-"
-  - 1135p
-  - 1137p
-  - 1140p
-  - 1147p
-  - 1151p
-  - 1155p
-  - 1201a
-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
-  - McKellar
-  - Copland College
-  - Evatt
-  - Spence Terminus
-