--- a/maxious-canberra-transit-feed/output/16-to-cameron-ave-station.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/16-to-cameron-ave-station.stop_times.yml
@@ -1,200 +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: "16"
+stop_times: [[610a, 619a, 625a, 630a, 632a, 636a], [640a, 649a, 655a, 700a, 702a, 706a], [711a, 720a, 726a, 731a, 733a, 737a], [730a, 741a, 747a, 753a, 755a, 759a], [750a, 801a, 807a, 813a, 815a, 819a], [810a, 821a, 827a, 833a, 835a, 839a], [830a, 841a, 847a, 853a, 855a, 859a], [851a, 902a, 908a, 912a, 914a, 918a], [925a, 935a, 940a, 944a, 946a, 950a], [954a, 1003a, 1009a, 1014a, 1016a, 1020a], [1024a, 1033a, 1039a, 1044a, 1046a, 1050a], [1054a, 1103a, 1109a, 1114a, 1116a, 1120a], [1124a, 1133a, 1139a, 1144a, 1146a, 1150a], [1154a, 1203p, 1209p, 1214p, 1216p, 1220p], [1224p, 1233p, 1239p, 1244p, 1246p, 1250p], [1254p, 103p, 109p, 114p, 116p, 120p], [124p, 133p, 139p, 144p, 146p, 150p], [154p, 203p, 209p, 214p, 216p, 220p], [224p, 233p, 239p, 244p, 246p, 250p], [255p, 304p, 310p, 314p, 316p, 320p], [324p, 335p, 341p, 347p, 349p, 353p], [354p, 405p, 411p, 417p, 419p, 423p], [427p, 438p, 444p, 450p, 452p, 456p], [456p, 507p, 513p, 519p, 521p, 525p], [526p, 537p, 543p, 549p, 551p, 555p], [549p, 600p, 606p, 612p, 614p, 618p], [649p, 658p, 704p, 708p, 710p, 713p], [749p, 758p, 804p, 808p, 810p, 813p], [849p, 858p, 904p, 908p, 910p, 913p], [949p, 958p, 1004p, 1008p, 1010p, 1013p], [1049p, 1058p, 1104p, 1108p, 1110p, 1113p]]
+time_points: [Kippax, Latham Shops, Florey Shops, Cohen St Bus Station, Lathlain St Bus Station, Cameron Ave Bus Station]
 
-short_name: "16"
-stop_times: 
-- - 610a
-  - 619a
-  - 625a
-  - 630a
-  - 632a
-  - 636a
-- - 640a
-  - 649a
-  - 655a
-  - 700a
-  - 702a
-  - 706a
-- - 711a
-  - 720a
-  - 726a
-  - 731a
-  - 733a
-  - 737a
-- - 730a
-  - 741a
-  - 747a
-  - 753a
-  - 755a
-  - 759a
-- - 750a
-  - 801a
-  - 807a
-  - 813a
-  - 815a
-  - 819a
-- - 810a
-  - 821a
-  - 827a
-  - 833a
-  - 835a
-  - 839a
-- - 830a
-  - 841a
-  - 847a
-  - 853a
-  - 855a
-  - 859a
-- - 851a
-  - 902a
-  - 908a
-  - 912a
-  - 914a
-  - 918a
-- - 925a
-  - 935a
-  - 940a
-  - 944a
-  - 946a
-  - 950a
-- - 954a
-  - 1003a
-  - 1009a
-  - 1014a
-  - 1016a
-  - 1020a
-- - 1024a
-  - 1033a
-  - 1039a
-  - 1044a
-  - 1046a
-  - 1050a
-- - 1054a
-  - 1103a
-  - 1109a
-  - 1114a
-  - 1116a
-  - 1120a
-- - 1124a
-  - 1133a
-  - 1139a
-  - 1144a
-  - 1146a
-  - 1150a
-- - 1154a
-  - 1203p
-  - 1209p
-  - 1214p
-  - 1216p
-  - 1220p
-- - 1224p
-  - 1233p
-  - 1239p
-  - 1244p
-  - 1246p
-  - 1250p
-- - 1254p
-  - 103p
-  - 109p
-  - 114p
-  - 116p
-  - 120p
-- - 124p
-  - 133p
-  - 139p
-  - 144p
-  - 146p
-  - 150p
-- - 154p
-  - 203p
-  - 209p
-  - 214p
-  - 216p
-  - 220p
-- - 224p
-  - 233p
-  - 239p
-  - 244p
-  - 246p
-  - 250p
-- - 255p
-  - 304p
-  - 310p
-  - 314p
-  - 316p
-  - 320p
-- - 324p
-  - 335p
-  - 341p
-  - 347p
-  - 349p
-  - 353p
-- - 354p
-  - 405p
-  - 411p
-  - 417p
-  - 419p
-  - 423p
-- - 427p
-  - 438p
-  - 444p
-  - 450p
-  - 452p
-  - 456p
-- - 456p
-  - 507p
-  - 513p
-  - 519p
-  - 521p
-  - 525p
-- - 526p
-  - 537p
-  - 543p
-  - 549p
-  - 551p
-  - 555p
-- - 549p
-  - 600p
-  - 606p
-  - 612p
-  - 614p
-  - 618p
-- - 649p
-  - 658p
-  - 704p
-  - 708p
-  - 710p
-  - 713p
-- - 749p
-  - 758p
-  - 804p
-  - 808p
-  - 810p
-  - 813p
-- - 849p
-  - 858p
-  - 904p
-  - 908p
-  - 910p
-  - 913p
-- - 949p
-  - 958p
-  - 1004p
-  - 1008p
-  - 1010p
-  - 1013p
-- - 1049p
-  - 1058p
-  - 1104p
-  - 1108p
-  - 1110p
-  - 1113p
-time_points: 
-  - Kippax
-  - Latham Shops
-  - Florey Shops
-  - Cohen St Bus Station
-  - Lathlain St Bus Station
-  - Cameron Ave Bus Station
-