--- a/maxious-canberra-transit-feed/output/52-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/52-to-city-interchange.stop_times.yml
@@ -1,385 +1,9 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Lathlain St Bus Station (Platform 2)-Cameron Ave Bus Station (Platform 2): []
+  Cohen St Bus Station (Platform 1)-Lathlain St Bus Station (Platform 2): []
+short_name: "52"
+stop_times: [["-", "-", "-", "-", 539a, 547a, 555a, 601a, 604a, "-", "-", "-", "-"], ["-", "-", "-", "-", 618a, 626a, 634a, 640a, 643a, "-", "-", "-", "-"], [630a, 632a, 636a, 646a, 651a, 659a, 707a, 713a, 716a, 719a, 726a, 728a, 735a], ["-", "-", "-", "-", 708a, 716a, 724a, 730a, 733a, 736a, 743a, 745a, 800a], ["-", "-", "-", "-", 725a, 733a, 741a, 747a, 750a, 755a, 806a, 811a, 826a], [723a, 725a, 729a, 739a, 744a, 752a, 800a, 807a, 810a, 815a, 826a, 831a, 846a], ["-", "-", "-", "-", 806a, 814a, 822a, 829a, 832a, 837a, 848a, 853a, 905a], [801a, 803a, 807a, 818a, 823a, 831a, 839a, 846a, 849a, 854a, 902a, 907a, 918a], [830a, 832a, 836a, 847a, 852a, 900a, 908a, 914a, 917a, 920a, 927a, 929a, 936a], [916a, 918a, 922a, 932a, 937a, 945a, 953a, 959a, 1002a, "-", "-", "-", "-"], [1016a, 1018a, 1022a, 1032a, 1037a, 1045a, 1053a, 1059a, 1102a, "-", "-", "-", "-"], [1116a, 1118a, 1122a, 1132a, 1137a, 1145a, 1153a, 1159a, 1202p, "-", "-", "-", "-"], [1216p, 1218p, 1222p, 1232p, 1237p, 1245p, 1253p, 1259p, 102p, "-", "-", "-", "-"], [116p, 118p, 122p, 132p, 137p, 145p, 153p, 159p, 202p, "-", "-", "-", "-"], [216p, 218p, 222p, 232p, 237p, 245p, 253p, 259p, 302p, "-", "-", "-", "-"], [233p, 235p, 239p, 249p, 254p, 302p, 310p, 316p, 319p, "-", "-", "-", "-"], [316p, 318p, 322p, 332p, 337p, 345p, 353p, 359p, 402p, "-", "-", "-", "-"], [356p, 358p, 402p, 413p, 418p, 427p, 435p, 442p, 445p, "-", "-", "-", "-"], [416p, 418p, 422p, 433p, 438p, 447p, 455p, 502p, 505p, "-", "-", "-", "-"], [436p, 438p, 442p, 453p, 458p, 507p, 515p, 522p, 525p, "-", "-", "-", "-"], [456p, 458p, 502p, 513p, 518p, 527p, 535p, 542p, 545p, "-", "-", "-", "-"], [516p, 518p, 522p, 533p, 538p, 547p, 555p, 602p, 605p, "-", "-", "-", "-"], [536p, 538p, 542p, 553p, 558p, 606p, 614p, 620p, 623p, "-", "-", "-", "-"], [616p, 618p, 621p, 631p, 636p, 644p, 652p, 658p, 701p, "-", "-", "-", "-"], [716p, 718p, 721p, 731p, 736p, 744p, 752p, 758p, 801p, "-", "-", "-", "-"], [816p, 818p, 821p, 831p, 836p, 844p, 852p, 858p, 901p, "-", "-", "-", "-"], [916p, 918p, 921p, 931p, 936p, 944p, 952p, 958p, 1001p, "-", "-", "-", "-"], [1016p, 1018p, 1021p, 1031p, 1036p, 1044p, 1052p, 1058p, 1101p, "-", "-", "-", "-"]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Federation Square, Nicholls Primary, Ngunnawal Primary, Gungahlin Market Place, Hibberson/Kate Crace, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "52"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 539a
-  - 547a
-  - 555a
-  - 601a
-  - 604a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 618a
-  - 626a
-  - 634a
-  - 640a
-  - 643a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 630a
-  - 632a
-  - 636a
-  - 646a
-  - 651a
-  - 659a
-  - 707a
-  - 713a
-  - 716a
-  - 719a
-  - 726a
-  - 728a
-  - 735a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 708a
-  - 716a
-  - 724a
-  - 730a
-  - 733a
-  - 736a
-  - 743a
-  - 745a
-  - 800a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 725a
-  - 733a
-  - 741a
-  - 747a
-  - 750a
-  - 755a
-  - 806a
-  - 811a
-  - 826a
-- - 723a
-  - 725a
-  - 729a
-  - 739a
-  - 744a
-  - 752a
-  - 800a
-  - 807a
-  - 810a
-  - 815a
-  - 826a
-  - 831a
-  - 846a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 806a
-  - 814a
-  - 822a
-  - 829a
-  - 832a
-  - 837a
-  - 848a
-  - 853a
-  - 905a
-- - 801a
-  - 803a
-  - 807a
-  - 818a
-  - 823a
-  - 831a
-  - 839a
-  - 846a
-  - 849a
-  - 854a
-  - 902a
-  - 907a
-  - 918a
-- - 830a
-  - 832a
-  - 836a
-  - 847a
-  - 852a
-  - 900a
-  - 908a
-  - 914a
-  - 917a
-  - 920a
-  - 927a
-  - 929a
-  - 936a
-- - 916a
-  - 918a
-  - 922a
-  - 932a
-  - 937a
-  - 945a
-  - 953a
-  - 959a
-  - 1002a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1016a
-  - 1018a
-  - 1022a
-  - 1032a
-  - 1037a
-  - 1045a
-  - 1053a
-  - 1059a
-  - 1102a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1116a
-  - 1118a
-  - 1122a
-  - 1132a
-  - 1137a
-  - 1145a
-  - 1153a
-  - 1159a
-  - 1202p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1216p
-  - 1218p
-  - 1222p
-  - 1232p
-  - 1237p
-  - 1245p
-  - 1253p
-  - 1259p
-  - 102p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 116p
-  - 118p
-  - 122p
-  - 132p
-  - 137p
-  - 145p
-  - 153p
-  - 159p
-  - 202p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 216p
-  - 218p
-  - 222p
-  - 232p
-  - 237p
-  - 245p
-  - 253p
-  - 259p
-  - 302p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 233p
-  - 235p
-  - 239p
-  - 249p
-  - 254p
-  - 302p
-  - 310p
-  - 316p
-  - 319p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 316p
-  - 318p
-  - 322p
-  - 332p
-  - 337p
-  - 345p
-  - 353p
-  - 359p
-  - 402p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 356p
-  - 358p
-  - 402p
-  - 413p
-  - 418p
-  - 427p
-  - 435p
-  - 442p
-  - 445p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 416p
-  - 418p
-  - 422p
-  - 433p
-  - 438p
-  - 447p
-  - 455p
-  - 502p
-  - 505p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 436p
-  - 438p
-  - 442p
-  - 453p
-  - 458p
-  - 507p
-  - 515p
-  - 522p
-  - 525p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 456p
-  - 458p
-  - 502p
-  - 513p
-  - 518p
-  - 527p
-  - 535p
-  - 542p
-  - 545p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 516p
-  - 518p
-  - 522p
-  - 533p
-  - 538p
-  - 547p
-  - 555p
-  - 602p
-  - 605p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 536p
-  - 538p
-  - 542p
-  - 553p
-  - 558p
-  - 606p
-  - 614p
-  - 620p
-  - 623p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 616p
-  - 618p
-  - 621p
-  - 631p
-  - 636p
-  - 644p
-  - 652p
-  - 658p
-  - 701p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 716p
-  - 718p
-  - 721p
-  - 731p
-  - 736p
-  - 744p
-  - 752p
-  - 758p
-  - 801p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 816p
-  - 818p
-  - 821p
-  - 831p
-  - 836p
-  - 844p
-  - 852p
-  - 858p
-  - 901p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 916p
-  - 918p
-  - 921p
-  - 931p
-  - 936p
-  - 944p
-  - 952p
-  - 958p
-  - 1001p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1016p
-  - 1018p
-  - 1021p
-  - 1031p
-  - 1036p
-  - 1044p
-  - 1052p
-  - 1058p
-  - 1101p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Federation Square
-  - Nicholls Primary
-  - Ngunnawal Primary
-  - Gungahlin Market Place
-  - Hibberson/Kate Crace
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-