--- a/maxious-canberra-transit-feed/output/19-319-to-cohen-st-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/19-319-to-cohen-st-station.stop_times.yml
@@ -1,348 +1,12 @@
 --- 
 long_name: To Cohen St Station
-between_stops: []
+between_stops: 
+  Woden Interchange - Platform 9-City Interchange - Platform 5: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+  Lathlain St Bus Station-Cohen St Bus Station: []
+  Cameron Ave Bus Station-Lathlain St Bus Station: []
+  City Interchange - Platform 5-Cameron Ave Bus Station: [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: 19/319
+stop_times: [[550a, 556a, 606a, 612a, 625a, 643a, 659a, 716a, 718a, 722a], [620a, 626a, 636a, 642a, 655a, 713a, 729a, 747a, 749a, 753a], [640a, 646a, 656a, 702a, 715a, 733a, 751a, 809a, 811a, 815a], [700a, 706a, 716a, 722a, 735a, 754a, 812a, 830a, 832a, 836a], [717a, 723a, 733a, 741a, 755a, 814a, 832a, 850a, 852a, 856a], [724a, 730a, 740a, 748a, 758a, "-", "-", "-", "-", "-"], [736a, 743a, 753a, 801a, 815a, 834a, 852a, 910a, 912a, 916a], [755a, 802a, 812a, 820a, 834a, 853a, 911a, 929a, 931a, 935a], [816a, 823a, 833a, 841a, 855a, 914a, 932a, 949a, 951a, 955a], [846a, 853a, 903a, 911a, 925a, 943a, 959a, 1016a, 1018a, 1022a], [919a, 926a, 936a, 942a, 955a, 1013a, 1029a, 1046a, 1048a, 1052a], [950a, 956a, 1006a, 1012a, 1025a, 1043a, 1059a, 1116a, 1118a, 1122a], [1020a, 1026a, 1036a, 1042a, 1055a, 1113a, 1129a, 1146a, 1148a, 1152a], [1050a, 1056a, 1106a, 1112a, 1125a, 1143a, 1159a, 1216p, 1218p, 1222p], [1120a, 1126a, 1136a, 1142a, 1155a, 1213p, 1229p, 1246p, 1248p, 1252p], [1150a, 1156a, 1206p, 1212p, 1225p, 1243p, 1259p, 116p, 118p, 122p], [1220p, 1226p, 1236p, 1242p, 1255p, 113p, 129p, 146p, 148p, 152p], [1250p, 1256p, 106p, 112p, 125p, 143p, 159p, 216p, 218p, 222p], [120p, 126p, 136p, 142p, 155p, 213p, 229p, 246p, 248p, 252p], [150p, 156p, 206p, 212p, 225p, 243p, 259p, 317p, 319p, 323p], [219p, 225p, 235p, 241p, 254p, 313p, 331p, 349p, 351p, 355p], [246p, 252p, 302p, 310p, 324p, 343p, 401p, 419p, 421p, 425p], [320p, 327p, 337p, 345p, 355p, "-", "-", "-", "-", "-"], [352p, 359p, 409p, 417p, 427p, "-", "-", "-", "-", "-"], [424p, 431p, 441p, 449p, 459p, "-", "-", "-", "-", "-"], [454p, 501p, 511p, 519p, 529p, "-", "-", "-", "-", "-"], [524p, 531p, 541p, 549p, 559p, "-", "-", "-", "-", "-"], [556p, 603p, 613p, 621p, 631p, "-", "-", "-", "-", "-"], [654p, 700p, 710p, 716p, 725p, "-", "-", "-", "-", "-"], [754p, 800p, 810p, 816p, 825p, "-", "-", "-", "-", "-"], [849p, 855p, 905p, 911p, 920p, "-", "-", "-", "-", "-"], [949p, 955p, 1005p, 1011p, 1020p, "-", "-", "-", "-", "-"], [1049p, 1055p, 1105p, 1111p, 1120p, "-", "-", "-", "-", "-"]]
+time_points: [Lanyon Market Place, Conder Primary, St Clare of Assisi Primary, Bonython Primary, Tuggeranong Interchange - Platform 8, Woden Interchange - Platform 9, City Interchange - Platform 5, Cameron Ave Bus Station, Lathlain St Bus Station, Cohen St Bus Station]
 
-short_name: 19/319
-stop_times: 
-- - 550a
-  - 556a
-  - 606a
-  - 612a
-  - 625a
-  - 643a
-  - 659a
-  - 716a
-  - 718a
-  - 722a
-- - 620a
-  - 626a
-  - 636a
-  - 642a
-  - 655a
-  - 713a
-  - 729a
-  - 747a
-  - 749a
-  - 753a
-- - 640a
-  - 646a
-  - 656a
-  - 702a
-  - 715a
-  - 733a
-  - 751a
-  - 809a
-  - 811a
-  - 815a
-- - 700a
-  - 706a
-  - 716a
-  - 722a
-  - 735a
-  - 754a
-  - 812a
-  - 830a
-  - 832a
-  - 836a
-- - 717a
-  - 723a
-  - 733a
-  - 741a
-  - 755a
-  - 814a
-  - 832a
-  - 850a
-  - 852a
-  - 856a
-- - 724a
-  - 730a
-  - 740a
-  - 748a
-  - 758a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 736a
-  - 743a
-  - 753a
-  - 801a
-  - 815a
-  - 834a
-  - 852a
-  - 910a
-  - 912a
-  - 916a
-- - 755a
-  - 802a
-  - 812a
-  - 820a
-  - 834a
-  - 853a
-  - 911a
-  - 929a
-  - 931a
-  - 935a
-- - 816a
-  - 823a
-  - 833a
-  - 841a
-  - 855a
-  - 914a
-  - 932a
-  - 949a
-  - 951a
-  - 955a
-- - 846a
-  - 853a
-  - 903a
-  - 911a
-  - 925a
-  - 943a
-  - 959a
-  - 1016a
-  - 1018a
-  - 1022a
-- - 919a
-  - 926a
-  - 936a
-  - 942a
-  - 955a
-  - 1013a
-  - 1029a
-  - 1046a
-  - 1048a
-  - 1052a
-- - 950a
-  - 956a
-  - 1006a
-  - 1012a
-  - 1025a
-  - 1043a
-  - 1059a
-  - 1116a
-  - 1118a
-  - 1122a
-- - 1020a
-  - 1026a
-  - 1036a
-  - 1042a
-  - 1055a
-  - 1113a
-  - 1129a
-  - 1146a
-  - 1148a
-  - 1152a
-- - 1050a
-  - 1056a
-  - 1106a
-  - 1112a
-  - 1125a
-  - 1143a
-  - 1159a
-  - 1216p
-  - 1218p
-  - 1222p
-- - 1120a
-  - 1126a
-  - 1136a
-  - 1142a
-  - 1155a
-  - 1213p
-  - 1229p
-  - 1246p
-  - 1248p
-  - 1252p
-- - 1150a
-  - 1156a
-  - 1206p
-  - 1212p
-  - 1225p
-  - 1243p
-  - 1259p
-  - 116p
-  - 118p
-  - 122p
-- - 1220p
-  - 1226p
-  - 1236p
-  - 1242p
-  - 1255p
-  - 113p
-  - 129p
-  - 146p
-  - 148p
-  - 152p
-- - 1250p
-  - 1256p
-  - 106p
-  - 112p
-  - 125p
-  - 143p
-  - 159p
-  - 216p
-  - 218p
-  - 222p
-- - 120p
-  - 126p
-  - 136p
-  - 142p
-  - 155p
-  - 213p
-  - 229p
-  - 246p
-  - 248p
-  - 252p
-- - 150p
-  - 156p
-  - 206p
-  - 212p
-  - 225p
-  - 243p
-  - 259p
-  - 317p
-  - 319p
-  - 323p
-- - 219p
-  - 225p
-  - 235p
-  - 241p
-  - 254p
-  - 313p
-  - 331p
-  - 349p
-  - 351p
-  - 355p
-- - 246p
-  - 252p
-  - 302p
-  - 310p
-  - 324p
-  - 343p
-  - 401p
-  - 419p
-  - 421p
-  - 425p
-- - 320p
-  - 327p
-  - 337p
-  - 345p
-  - 355p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 352p
-  - 359p
-  - 409p
-  - 417p
-  - 427p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 424p
-  - 431p
-  - 441p
-  - 449p
-  - 459p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 454p
-  - 501p
-  - 511p
-  - 519p
-  - 529p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 524p
-  - 531p
-  - 541p
-  - 549p
-  - 559p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 556p
-  - 603p
-  - 613p
-  - 621p
-  - 631p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 654p
-  - 700p
-  - 710p
-  - 716p
-  - 725p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 754p
-  - 800p
-  - 810p
-  - 816p
-  - 825p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 849p
-  - 855p
-  - 905p
-  - 911p
-  - 920p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 949p
-  - 955p
-  - 1005p
-  - 1011p
-  - 1020p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1049p
-  - 1055p
-  - 1105p
-  - 1111p
-  - 1120p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Lanyon Market Place
-  - Conder Primary
-  - St Clare of Assisi Primary
-  - Bonython Primary
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station
-  - Lathlain St Bus Station
-  - Cohen St Bus Station
-