--- a/maxious-canberra-transit-feed/output/17-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/17-to-cameron-ave-station.stop_times.yml
@@ -1,288 +1,9 @@
 --- 
 long_name: To Cameron Ave Station
-between_stops: []
+between_stops: 
+  Cohen St Bus Station-Lathlain St Bus Station: []
+  Lathlain St Bus Station-Cameron Ave Bus Station: []
+short_name: "17"
+stop_times: [[601a, 606a, 612a, 617a, 620a, 625a, 627a, 631a], [631a, 636a, 642a, 647a, 650a, 655a, 657a, 701a], [701a, 706a, 712a, 717a, 720a, 725a, 727a, 731a], [721a, 726a, 732a, 737a, 740a, 746a, 748a, 752a], [741a, 747a, 753a, 758a, 801a, 807a, 809a, 813a], [801a, 807a, 813a, 818a, 821a, 827a, 829a, 833a], [821a, 827a, 833a, 838a, 841a, 847a, 849a, 853a], [841a, 847a, 853a, 858a, 901a, 907a, 909a, 913a], [925a, 931a, 937a, 942a, 945a, 950a, 952a, 956a], [956a, 1001a, 1007a, 1012a, 1015a, 1020a, 1022a, 1026a], [1026a, 1031a, 1037a, 1042a, 1045a, 1050a, 1052a, 1056a], [1056a, 1101a, 1107a, 1112a, 1115a, 1120a, 1122a, 1126a], [1126a, 1131a, 1137a, 1142a, 1145a, 1150a, 1152a, 1156a], [1156a, 1201p, 1207p, 1212p, 1215p, 1220p, 1222p, 1226p], [1226p, 1231p, 1237p, 1242p, 1245p, 1250p, 1252p, 1256p], [1256p, 101p, 107p, 112p, 115p, 120p, 122p, 126p], [126p, 131p, 137p, 142p, 145p, 150p, 152p, 156p], [156p, 201p, 207p, 212p, 215p, 220p, 222p, 226p], [226p, 231p, 237p, 242p, 245p, 250p, 252p, 256p], [255p, 300p, 306p, 311p, 314p, 320p, 322p, 326p], ["-", "-", 325p, 330p, 333p, 339p, 341p, 345p], [326p, 332p, 338p, 343p, 346p, 352p, 354p, 358p], [347p, 353p, 359p, 404p, 407p, 413p, 415p, 419p], ["-", "-", 403p, 408p, 411p, 417p, 419p, 423p], [417p, 423p, 429p, 434p, 437p, 443p, 445p, 449p], [447p, 453p, 459p, 504p, 507p, 513p, 515p, 519p], [517p, 523p, 529p, 534p, 537p, 543p, 545p, 549p], [547p, 553p, 559p, 604p, 607p, 613p, 615p, 619p], [617p, 623p, 629p, 634p, 637p, 641p, 643p, 646p], [657p, 702p, 708p, 713p, 716p, 720p, 722p, 725p], [757p, 802p, 808p, 813p, 816p, 820p, 822p, 825p], [857p, 902p, 908p, 913p, 916p, 920p, 922p, 925p], [957p, 1002p, 1008p, 1013p, 1016p, 1020p, 1022p, 1025p], [1057p, 1102p, 1108p, 1113p, 1116p, 1120p, 1122p, 1125p]]
+time_points: [Kippax, Higgins, Hawker College, Hawker, Weetangera Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "17"
-stop_times: 
-- - 601a
-  - 606a
-  - 612a
-  - 617a
-  - 620a
-  - 625a
-  - 627a
-  - 631a
-- - 631a
-  - 636a
-  - 642a
-  - 647a
-  - 650a
-  - 655a
-  - 657a
-  - 701a
-- - 701a
-  - 706a
-  - 712a
-  - 717a
-  - 720a
-  - 725a
-  - 727a
-  - 731a
-- - 721a
-  - 726a
-  - 732a
-  - 737a
-  - 740a
-  - 746a
-  - 748a
-  - 752a
-- - 741a
-  - 747a
-  - 753a
-  - 758a
-  - 801a
-  - 807a
-  - 809a
-  - 813a
-- - 801a
-  - 807a
-  - 813a
-  - 818a
-  - 821a
-  - 827a
-  - 829a
-  - 833a
-- - 821a
-  - 827a
-  - 833a
-  - 838a
-  - 841a
-  - 847a
-  - 849a
-  - 853a
-- - 841a
-  - 847a
-  - 853a
-  - 858a
-  - 901a
-  - 907a
-  - 909a
-  - 913a
-- - 925a
-  - 931a
-  - 937a
-  - 942a
-  - 945a
-  - 950a
-  - 952a
-  - 956a
-- - 956a
-  - 1001a
-  - 1007a
-  - 1012a
-  - 1015a
-  - 1020a
-  - 1022a
-  - 1026a
-- - 1026a
-  - 1031a
-  - 1037a
-  - 1042a
-  - 1045a
-  - 1050a
-  - 1052a
-  - 1056a
-- - 1056a
-  - 1101a
-  - 1107a
-  - 1112a
-  - 1115a
-  - 1120a
-  - 1122a
-  - 1126a
-- - 1126a
-  - 1131a
-  - 1137a
-  - 1142a
-  - 1145a
-  - 1150a
-  - 1152a
-  - 1156a
-- - 1156a
-  - 1201p
-  - 1207p
-  - 1212p
-  - 1215p
-  - 1220p
-  - 1222p
-  - 1226p
-- - 1226p
-  - 1231p
-  - 1237p
-  - 1242p
-  - 1245p
-  - 1250p
-  - 1252p
-  - 1256p
-- - 1256p
-  - 101p
-  - 107p
-  - 112p
-  - 115p
-  - 120p
-  - 122p
-  - 126p
-- - 126p
-  - 131p
-  - 137p
-  - 142p
-  - 145p
-  - 150p
-  - 152p
-  - 156p
-- - 156p
-  - 201p
-  - 207p
-  - 212p
-  - 215p
-  - 220p
-  - 222p
-  - 226p
-- - 226p
-  - 231p
-  - 237p
-  - 242p
-  - 245p
-  - 250p
-  - 252p
-  - 256p
-- - 255p
-  - 300p
-  - 306p
-  - 311p
-  - 314p
-  - 320p
-  - 322p
-  - 326p
-- - "-"
-  - "-"
-  - 325p
-  - 330p
-  - 333p
-  - 339p
-  - 341p
-  - 345p
-- - 326p
-  - 332p
-  - 338p
-  - 343p
-  - 346p
-  - 352p
-  - 354p
-  - 358p
-- - 347p
-  - 353p
-  - 359p
-  - 404p
-  - 407p
-  - 413p
-  - 415p
-  - 419p
-- - "-"
-  - "-"
-  - 403p
-  - 408p
-  - 411p
-  - 417p
-  - 419p
-  - 423p
-- - 417p
-  - 423p
-  - 429p
-  - 434p
-  - 437p
-  - 443p
-  - 445p
-  - 449p
-- - 447p
-  - 453p
-  - 459p
-  - 504p
-  - 507p
-  - 513p
-  - 515p
-  - 519p
-- - 517p
-  - 523p
-  - 529p
-  - 534p
-  - 537p
-  - 543p
-  - 545p
-  - 549p
-- - 547p
-  - 553p
-  - 559p
-  - 604p
-  - 607p
-  - 613p
-  - 615p
-  - 619p
-- - 617p
-  - 623p
-  - 629p
-  - 634p
-  - 637p
-  - 641p
-  - 643p
-  - 646p
-- - 657p
-  - 702p
-  - 708p
-  - 713p
-  - 716p
-  - 720p
-  - 722p
-  - 725p
-- - 757p
-  - 802p
-  - 808p
-  - 813p
-  - 816p
-  - 820p
-  - 822p
-  - 825p
-- - 857p
-  - 902p
-  - 908p
-  - 913p
-  - 916p
-  - 920p
-  - 922p
-  - 925p
-- - 957p
-  - 1002p
-  - 1008p
-  - 1013p
-  - 1016p
-  - 1020p
-  - 1022p
-  - 1025p
-- - 1057p
-  - 1102p
-  - 1108p
-  - 1113p
-  - 1116p
-  - 1120p
-  - 1122p
-  - 1125p
-time_points: 
-  - Kippax
-  - Higgins
-  - Hawker College
-  - Hawker
-  - Weetangera Shops
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-