--- 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,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: "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]
 
-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
-