--- a/maxious-canberra-transit-feed/output/16-to-kippax.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/16-to-kippax.stop_times.yml
@@ -1,188 +1,9 @@
 --- 
 long_name: To Kippax
-between_stops: []
+between_stops: 
+  Cameron Ave Bus Station - Platform 5-Lathlain St Bus Station - Platform 6: []
+  Lathlain St Bus Station - Platform 6-Cohen St Bus Station - Platform 5: []
+short_name: "16"
+stop_times: [[701a, 703a, 707a, 712a, 718a, 727a], [801a, 803a, 807a, 813a, 819a, 830a], [857a, 859a, 903a, 909a, 915a, 926a], [927a, 929a, 933a, 938a, 944a, 953a], [957a, 959a, 1003a, 1008a, 1014a, 1023a], [1027a, 1029a, 1033a, 1038a, 1044a, 1053a], [1057a, 1059a, 1103a, 1108a, 1114a, 1123a], [1127a, 1129a, 1133a, 1138a, 1144a, 1153a], [1157a, 1159a, 1203p, 1208p, 1214p, 1223p], [1227p, 1229p, 1233p, 1238p, 1244p, 1253p], [1257p, 1259p, 103p, 108p, 114p, 123p], [127p, 129p, 133p, 138p, 144p, 153p], [157p, 159p, 203p, 208p, 214p, 223p], [227p, 229p, 233p, 238p, 244p, 253p], [257p, 259p, 303p, 309p, 315p, 326p], [327p, 329p, 333p, 339p, 345p, 356p], [357p, 359p, 403p, 409p, 415p, 426p], [427p, 429p, 433p, 439p, 445p, 456p], [447p, 449p, 453p, 459p, 505p, 516p], [507p, 509p, 513p, 519p, 525p, 536p], [527p, 529p, 533p, 539p, 545p, 556p], [547p, 549p, 553p, 559p, 605p, 616p], [602p, 604p, 608p, 614p, 620p, 631p], [618p, 620p, 624p, 630p, 636p, 645p], [718p, 720p, 723p, 727p, 733p, 742p], [818p, 820p, 823p, 827p, 833p, 842p], [918p, 920p, 923p, 927p, 933p, 942p], [1018p, 1020p, 1023p, 1027p, 1033p, 1042p], [1118p, 1120p, 1123p, 1127p, 1133p, 1142p]]
+time_points: [Cameron Ave Bus Station - Platform 5, Lathlain St Bus Station - Platform 6, Cohen St Bus Station - Platform 5, Florey Shops, Latham Shops, Kippax]
 
-short_name: "16"
-stop_times: 
-- - 701a
-  - 703a
-  - 707a
-  - 712a
-  - 718a
-  - 727a
-- - 801a
-  - 803a
-  - 807a
-  - 813a
-  - 819a
-  - 830a
-- - 857a
-  - 859a
-  - 903a
-  - 909a
-  - 915a
-  - 926a
-- - 927a
-  - 929a
-  - 933a
-  - 938a
-  - 944a
-  - 953a
-- - 957a
-  - 959a
-  - 1003a
-  - 1008a
-  - 1014a
-  - 1023a
-- - 1027a
-  - 1029a
-  - 1033a
-  - 1038a
-  - 1044a
-  - 1053a
-- - 1057a
-  - 1059a
-  - 1103a
-  - 1108a
-  - 1114a
-  - 1123a
-- - 1127a
-  - 1129a
-  - 1133a
-  - 1138a
-  - 1144a
-  - 1153a
-- - 1157a
-  - 1159a
-  - 1203p
-  - 1208p
-  - 1214p
-  - 1223p
-- - 1227p
-  - 1229p
-  - 1233p
-  - 1238p
-  - 1244p
-  - 1253p
-- - 1257p
-  - 1259p
-  - 103p
-  - 108p
-  - 114p
-  - 123p
-- - 127p
-  - 129p
-  - 133p
-  - 138p
-  - 144p
-  - 153p
-- - 157p
-  - 159p
-  - 203p
-  - 208p
-  - 214p
-  - 223p
-- - 227p
-  - 229p
-  - 233p
-  - 238p
-  - 244p
-  - 253p
-- - 257p
-  - 259p
-  - 303p
-  - 309p
-  - 315p
-  - 326p
-- - 327p
-  - 329p
-  - 333p
-  - 339p
-  - 345p
-  - 356p
-- - 357p
-  - 359p
-  - 403p
-  - 409p
-  - 415p
-  - 426p
-- - 427p
-  - 429p
-  - 433p
-  - 439p
-  - 445p
-  - 456p
-- - 447p
-  - 449p
-  - 453p
-  - 459p
-  - 505p
-  - 516p
-- - 507p
-  - 509p
-  - 513p
-  - 519p
-  - 525p
-  - 536p
-- - 527p
-  - 529p
-  - 533p
-  - 539p
-  - 545p
-  - 556p
-- - 547p
-  - 549p
-  - 553p
-  - 559p
-  - 605p
-  - 616p
-- - 602p
-  - 604p
-  - 608p
-  - 614p
-  - 620p
-  - 631p
-- - 618p
-  - 620p
-  - 624p
-  - 630p
-  - 636p
-  - 645p
-- - 718p
-  - 720p
-  - 723p
-  - 727p
-  - 733p
-  - 742p
-- - 818p
-  - 820p
-  - 823p
-  - 827p
-  - 833p
-  - 842p
-- - 918p
-  - 920p
-  - 923p
-  - 927p
-  - 933p
-  - 942p
-- - 1018p
-  - 1020p
-  - 1023p
-  - 1027p
-  - 1033p
-  - 1042p
-- - 1118p
-  - 1120p
-  - 1123p
-  - 1127p
-  - 1133p
-  - 1142p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 6
-  - Cohen St Bus Station - Platform 5
-  - Florey Shops
-  - Latham Shops
-  - Kippax
-