--- a/maxious-canberra-transit-feed/output/17-to-kippax.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/17-to-kippax.stop_times.yml
@@ -1,256 +1,14 @@
 --- 
+time_points: [Belconnen Community Bus Station (Platform 6), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 5), Weetangera, Hawker, Hawker College, Higgins, Kippax]
 long_name: To Kippax
-between_stops: []
+between_stops: 
+  Higgins-Kippax: [Wjr-zMF, Wjr-yDR, Wjr-yni, Wjr-y7q, Wjr-rUs, Wjr-rQJ]
+  Belconnen Community Bus Station (Platform 6)-Westfield Bus Station (Platform 2): []
+  Weetangera-Hawker: [WjrZTAV, WjrZTua, WjrZTua, Wjr-Mgt, Wjr-Mg6]
+  Hawker College-Higgins: [Wjr-E8A, Wjr-Ekp, Wjr-wDP, Wjr-xEt, Wjr-xZ1, Wjr-xTP, Wjr-yOJ]
+  Hawker-Hawker College: [WjrZT6b, WjrZT5e, WjrZLXY, WjrZS74, WjrZKZn, WjrZKnY, WjrZLbU, WjrZLdA]
+  Cohen Street Bus Station (Platform 5)-Weetangera: [WjrZ_tn, WjrZ_so, WjrZ_o4, WjrZ_o2, WjrZ-ie, WjrZSWs, WjrZSQm, WjrZTMv]
+  Westfield Bus Station (Platform 2)-Cohen Street Bus Station (Platform 5): []
+short_name: "17"
+stop_times: [[706a, 708a, 712a, 716a, 719a, 724a, 729a, 737a], [806a, 808a, 812a, 817a, 820a, 825a, 830a, 838a], [840a, 842a, 846a, 851a, 854a, 859a, 904a, 912a], [854a, 856a, 900a, 905a, 908a, 913a, 918a, 926a], [922a, 924a, 928a, 932a, 935a, 940a, 945a, 951a], [952a, 954a, 958a, 1002a, 1005a, 1010a, 1015a, 1021a], [1022a, 1024a, 1028a, 1032a, 1035a, 1040a, 1045a, 1051a], [1052a, 1054a, 1058a, 1102a, 1105a, 1110a, 1115a, 1121a], [1122a, 1124a, 1128a, 1132a, 1135a, 1140a, 1145a, 1151a], [1152a, 1154a, 1158a, 1202p, 1205p, 1210p, 1215p, 1221p], [1222p, 1224p, 1228p, 1232p, 1235p, 1240p, 1245p, 1251p], [1252p, 1254p, 1258p, 102p, 105p, 110p, 115p, 121p], [122p, 124p, 128p, 132p, 135p, 140p, 145p, 151p], [152p, 154p, 158p, 202p, 205p, 210p, 215p, 221p], [222p, 224p, 228p, 232p, 235p, 240p, 245p, 251p], [249p, 251p, 255p, 259p, 302p, 307p, 313p, 321p], [324p, 326p, 330p, 335p, 338p, 343p, 349p, 357p], [353p, 355p, 359p, 404p, 407p, 412p, 418p, 426p], [412p, 414p, 418p, 423p, 426p, 431p, 437p, 445p], [432p, 434p, 438p, 443p, 446p, 451p, 457p, 505p], [452p, 454p, 458p, 503p, 506p, 511p, 517p, 525p], [512p, 514p, 518p, 523p, 526p, 531p, 537p, 545p], [532p, 534p, 538p, 543p, 546p, 551p, 557p, 605p], [552p, 554p, 558p, 603p, 606p, 611p, 617p, 625p], [612p, 614p, 618p, 623p, 626p, 631p, 636p, 642p], [644p, 646p, 650p, 654p, 657p, 702p, 707p, 713p], [737p, 739p, 743p, 747p, 750p, 755p, 800p, 806p], [837p, 839p, 843p, 847p, 850p, 855p, 900p, 906p], [937p, 939p, 943p, 947p, 950p, 955p, 1000p, 1006p], [1037p, 1039p, 1043p, 1047p, 1050p, 1055p, 1100p, 1106p], [1138p, 1140p, 1144p, 1148p, 1151p, 1156p, 1201a, 1207a]]
 
-short_name: "17"
-stop_times: 
-- - 707a
-  - 709a
-  - 713a
-  - 717a
-  - 720a
-  - 725a
-  - 730a
-  - 737a
-- - 807a
-  - 809a
-  - 813a
-  - 818a
-  - 821a
-  - 826a
-  - 831a
-  - 838a
-- - 837a
-  - 839a
-  - 843a
-  - 848a
-  - 851a
-  - 856a
-  - 901a
-  - 908a
-- - 855a
-  - 857a
-  - 901a
-  - 906a
-  - 909a
-  - 914a
-  - 919a
-  - 926a
-- - 925a
-  - 927a
-  - 931a
-  - 935a
-  - 938a
-  - 943a
-  - 948a
-  - 953a
-- - 955a
-  - 957a
-  - 1001a
-  - 1005a
-  - 1008a
-  - 1013a
-  - 1018a
-  - 1023a
-- - 1025a
-  - 1027a
-  - 1031a
-  - 1035a
-  - 1038a
-  - 1043a
-  - 1048a
-  - 1053a
-- - 1055a
-  - 1057a
-  - 1101a
-  - 1105a
-  - 1108a
-  - 1113a
-  - 1118a
-  - 1123a
-- - 1125a
-  - 1127a
-  - 1131a
-  - 1135a
-  - 1138a
-  - 1143a
-  - 1148a
-  - 1153a
-- - 1155a
-  - 1157a
-  - 1201p
-  - 1205p
-  - 1208p
-  - 1213p
-  - 1218p
-  - 1223p
-- - 1225p
-  - 1227p
-  - 1231p
-  - 1235p
-  - 1238p
-  - 1243p
-  - 1248p
-  - 1253p
-- - 1255p
-  - 1257p
-  - 101p
-  - 105p
-  - 108p
-  - 113p
-  - 118p
-  - 123p
-- - 125p
-  - 127p
-  - 131p
-  - 135p
-  - 138p
-  - 143p
-  - 148p
-  - 153p
-- - 155p
-  - 157p
-  - 201p
-  - 205p
-  - 208p
-  - 213p
-  - 218p
-  - 223p
-- - 225p
-  - 227p
-  - 231p
-  - 235p
-  - 238p
-  - 243p
-  - 248p
-  - 253p
-- - 255p
-  - 257p
-  - 301p
-  - 306p
-  - 309p
-  - 314p
-  - 320p
-  - 327p
-- - 325p
-  - 327p
-  - 331p
-  - 336p
-  - 339p
-  - 344p
-  - 350p
-  - 357p
-- - 354p
-  - 356p
-  - 400p
-  - 405p
-  - 408p
-  - 413p
-  - 419p
-  - 426p
-- - 413p
-  - 415p
-  - 419p
-  - 424p
-  - 427p
-  - 432p
-  - 438p
-  - 445p
-- - 433p
-  - 435p
-  - 439p
-  - 444p
-  - 447p
-  - 452p
-  - 458p
-  - 505p
-- - 453p
-  - 455p
-  - 459p
-  - 504p
-  - 507p
-  - 512p
-  - 518p
-  - 525p
-- - 513p
-  - 515p
-  - 519p
-  - 524p
-  - 527p
-  - 532p
-  - 538p
-  - 545p
-- - 533p
-  - 535p
-  - 539p
-  - 544p
-  - 547p
-  - 552p
-  - 558p
-  - 605p
-- - 553p
-  - 555p
-  - 559p
-  - 604p
-  - 607p
-  - 612p
-  - 618p
-  - 625p
-- - 624p
-  - 626p
-  - 630p
-  - 634p
-  - 637p
-  - 642p
-  - 647p
-  - 652p
-- - 724p
-  - 726p
-  - 729p
-  - 733p
-  - 736p
-  - 741p
-  - 746p
-  - 751p
-- - 824p
-  - 826p
-  - 829p
-  - 833p
-  - 836p
-  - 841p
-  - 846p
-  - 851p
-- - 924p
-  - 926p
-  - 929p
-  - 933p
-  - 936p
-  - 941p
-  - 946p
-  - 951p
-- - 1024p
-  - 1026p
-  - 1029p
-  - 1033p
-  - 1036p
-  - 1041p
-  - 1046p
-  - 1051p
-- - 1124p
-  - 1126p
-  - 1129p
-  - 1133p
-  - 1136p
-  - 1141p
-  - 1146p
-  - 1151p
-time_points: 
-  - Cameron Ave Bus Station - Platform 5
-  - Lathlain St Bus Station - Platform 6
-  - Cohen St Bus Station - Platform 5
-  - Weetangera Shops
-  - Hawker
-  - Hawker College
-  - Higgins
-  - Kippax
-