--- a/maxious-canberra-transit-feed/output/58-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/58-to-city-interchange.stop_times.yml
@@ -1,316 +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: "58"
+stop_times: [["-", "-", "-", 543a, 554a, 602a, 609a, 615a, 621a, 623a, 629a], ["-", "-", "-", 623a, 634a, 642a, 649a, 655a, 701a, 703a, 709a], ["-", "-", "-", "-", 654a, 702a, 709a, 715a, 721a, 723a, 729a], ["-", "-", "-", "-", 713a, 721a, 728a, 734a, 740a, 742a, 752a], ["-", "-", "-", "-", 723a, 731a, 738a, 744a, 754a, 759a, 814a], ["-", "-", "-", "-", 740a, 748a, 755a, 803a, 814a, 819a, 834a], [726a, 728a, 732a, 746a, 757a, 806a, 813a, 821a, 833a, 839a, 854a], [747a, 749a, 753a, 808a, 819a, 828a, 835a, 843a, 854a, 859a, 909a], [829a, 831a, 835a, 850a, 901a, 909a, 916a, 923a, 929a, 931a, 937a], [909a, 911a, 915a, 929a, 939a, 947a, 954a, 1001a, 1007a, 1009a, 1015a], [1009a, 1011a, 1015a, 1029a, 1039a, 1047a, 1054a, 1101a, 1107a, 1109a, 1115a], [1109a, 1111a, 1115a, 1129a, 1139a, 1147a, 1154a, 1201p, 1207p, 1209p, 1215p], [1209p, 1211p, 1215p, 1229p, 1239p, 1247p, 1254p, 101p, 107p, 109p, 115p], [109p, 111p, 115p, 129p, 139p, 147p, 154p, 201p, 207p, 209p, 215p], [209p, 211p, 215p, 229p, 239p, 247p, 254p, 301p, 307p, 309p, 315p], [309p, 311p, 315p, 329p, 339p, 347p, 354p, 401p, 408p, 410p, 417p], [409p, 411p, 415p, 430p, 441p, 450p, 457p, 505p, 512p, 514p, 521p], [429p, 431p, 435p, 450p, 501p, 510p, 517p, 525p, 532p, 534p, 541p], [449p, 451p, 455p, 510p, 521p, 530p, 537p, 545p, 552p, 554p, 601p], [509p, 511p, 515p, 530p, 541p, 550p, 557p, 604p, 610p, 612p, 617p], [529p, 531p, 535p, 550p, 601p, 609p, 616p, 622p, 628p, 630p, 635p], [549p, 551p, 555p, 609p, 619p, 627p, 633p, 639p, 645p, 647p, 652p], [609p, 611p, 614p, 628p, 638p, 646p, 653p, 659p, 705p, 707p, 712p], [709p, 711p, 714p, 728p, 738p, 746p, 753p, 759p, 805p, 807p, 812p], [809p, 811p, 814p, 828p, 838p, 846p, 853p, 859p, 905p, 907p, 912p], [909p, 911p, 914p, 928p, 938p, 946p, 953p, 959p, 1005p, 1007p, 1012p], [1009p, 1011p, 1014p, 1028p, 1038p, 1046p, 1053p, 1059p, 1105p, 1107p, 1112p]]
+time_points: [Cohen St Bus Station (Platform 1), Lathlain St Bus Station (Platform 2), Cameron Ave Bus Station (Platform 2), Chuculba/William Slim, Gungahlin Market Place, Anthony Rolfe/Moonlight, Flemington/Nullabor, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange]
 
-short_name: "58"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 543a
-  - 554a
-  - 602a
-  - 609a
-  - 615a
-  - 621a
-  - 623a
-  - 629a
-- - "-"
-  - "-"
-  - "-"
-  - 623a
-  - 634a
-  - 642a
-  - 649a
-  - 655a
-  - 701a
-  - 703a
-  - 709a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 654a
-  - 702a
-  - 709a
-  - 715a
-  - 721a
-  - 723a
-  - 729a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 713a
-  - 721a
-  - 728a
-  - 734a
-  - 740a
-  - 742a
-  - 752a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 731a
-  - 738a
-  - 744a
-  - 754a
-  - 759a
-  - 814a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 748a
-  - 755a
-  - 803a
-  - 814a
-  - 819a
-  - 834a
-- - 726a
-  - 728a
-  - 732a
-  - 746a
-  - 757a
-  - 806a
-  - 813a
-  - 821a
-  - 833a
-  - 839a
-  - 854a
-- - 747a
-  - 749a
-  - 753a
-  - 808a
-  - 819a
-  - 828a
-  - 835a
-  - 843a
-  - 854a
-  - 859a
-  - 909a
-- - 829a
-  - 831a
-  - 835a
-  - 850a
-  - 901a
-  - 909a
-  - 916a
-  - 923a
-  - 929a
-  - 931a
-  - 937a
-- - 909a
-  - 911a
-  - 915a
-  - 929a
-  - 939a
-  - 947a
-  - 954a
-  - 1001a
-  - 1007a
-  - 1009a
-  - 1015a
-- - 1009a
-  - 1011a
-  - 1015a
-  - 1029a
-  - 1039a
-  - 1047a
-  - 1054a
-  - 1101a
-  - 1107a
-  - 1109a
-  - 1115a
-- - 1109a
-  - 1111a
-  - 1115a
-  - 1129a
-  - 1139a
-  - 1147a
-  - 1154a
-  - 1201p
-  - 1207p
-  - 1209p
-  - 1215p
-- - 1209p
-  - 1211p
-  - 1215p
-  - 1229p
-  - 1239p
-  - 1247p
-  - 1254p
-  - 101p
-  - 107p
-  - 109p
-  - 115p
-- - 109p
-  - 111p
-  - 115p
-  - 129p
-  - 139p
-  - 147p
-  - 154p
-  - 201p
-  - 207p
-  - 209p
-  - 215p
-- - 209p
-  - 211p
-  - 215p
-  - 229p
-  - 239p
-  - 247p
-  - 254p
-  - 301p
-  - 307p
-  - 309p
-  - 315p
-- - 309p
-  - 311p
-  - 315p
-  - 329p
-  - 339p
-  - 347p
-  - 354p
-  - 401p
-  - 408p
-  - 410p
-  - 417p
-- - 409p
-  - 411p
-  - 415p
-  - 430p
-  - 441p
-  - 450p
-  - 457p
-  - 505p
-  - 512p
-  - 514p
-  - 521p
-- - 429p
-  - 431p
-  - 435p
-  - 450p
-  - 501p
-  - 510p
-  - 517p
-  - 525p
-  - 532p
-  - 534p
-  - 541p
-- - 449p
-  - 451p
-  - 455p
-  - 510p
-  - 521p
-  - 530p
-  - 537p
-  - 545p
-  - 552p
-  - 554p
-  - 601p
-- - 509p
-  - 511p
-  - 515p
-  - 530p
-  - 541p
-  - 550p
-  - 557p
-  - 604p
-  - 610p
-  - 612p
-  - 617p
-- - 529p
-  - 531p
-  - 535p
-  - 550p
-  - 601p
-  - 609p
-  - 616p
-  - 622p
-  - 628p
-  - 630p
-  - 635p
-- - 549p
-  - 551p
-  - 555p
-  - 609p
-  - 619p
-  - 627p
-  - 633p
-  - 639p
-  - 645p
-  - 647p
-  - 652p
-- - 609p
-  - 611p
-  - 614p
-  - 628p
-  - 638p
-  - 646p
-  - 653p
-  - 659p
-  - 705p
-  - 707p
-  - 712p
-- - 709p
-  - 711p
-  - 714p
-  - 728p
-  - 738p
-  - 746p
-  - 753p
-  - 759p
-  - 805p
-  - 807p
-  - 812p
-- - 809p
-  - 811p
-  - 814p
-  - 828p
-  - 838p
-  - 846p
-  - 853p
-  - 859p
-  - 905p
-  - 907p
-  - 912p
-- - 909p
-  - 911p
-  - 914p
-  - 928p
-  - 938p
-  - 946p
-  - 953p
-  - 959p
-  - 1005p
-  - 1007p
-  - 1012p
-- - 1009p
-  - 1011p
-  - 1014p
-  - 1028p
-  - 1038p
-  - 1046p
-  - 1053p
-  - 1059p
-  - 1105p
-  - 1107p
-  - 1112p
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 2
-  - Cameron Ave Bus Station - Platform 2
-  - Chuculba/William Slim
-  - Gungahlin Market Place
-  - Anthony Rolfe/Moonlight
-  - Flemington/Nullabor
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange
-