--- 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,7 @@
 --- 
 long_name: To Kippax
 between_stops: []
+short_name: "16"
+stop_times: [[700a, 702a, 706a, 711a, 717a, 727a], [800a, 802a, 806a, 812a, 818a, 830a], [826a, 828a, 832a, 838a, 844a, 856a], [913a, 915a, 919a, 925a, 931a, 941a], [939a, 941a, 945a, 950a, 956a, 1006a], [1014a, 1016a, 1020a, 1025a, 1031a, 1041a], [1039a, 1041a, 1045a, 1050a, 1056a, 1106a], [1114a, 1116a, 1120a, 1125a, 1131a, 1141a], [1139a, 1141a, 1145a, 1150a, 1156a, 1206p], [1214p, 1216p, 1220p, 1225p, 1231p, 1241p], [1239p, 1241p, 1245p, 1250p, 1256p, 106p], [114p, 116p, 120p, 125p, 131p, 141p], [139p, 141p, 145p, 150p, 156p, 206p], [214p, 216p, 220p, 225p, 231p, 241p], [238p, 240p, 244p, 249p, 255p, 306p], [307p, 309p, 313p, 319p, 325p, 337p], [326p, 328p, 332p, 338p, 344p, 356p], [356p, 358p, 402p, 408p, 414p, 426p], [426p, 428p, 432p, 438p, 444p, 456p], [446p, 448p, 452p, 458p, 504p, 516p], [506p, 508p, 512p, 518p, 524p, 536p], [526p, 528p, 532p, 538p, 544p, 556p], [546p, 548p, 552p, 558p, 604p, 616p], [601p, 603p, 607p, 613p, 619p, 631p], [622p, 624p, 628p, 633p, 639p, 649p], [721p, 723p, 727p, 731p, 737p, 747p], [821p, 823p, 827p, 831p, 837p, 847p], [921p, 923p, 927p, 931p, 937p, 947p], [1021p, 1023p, 1027p, 1031p, 1037p, 1047p], [1121p, 1123p, 1127p, 1131p, 1137p, 1147p]]
+time_points: [Belconnen Community Bus Station (Platform 6), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 5), Florey Shops, Latham Post Office, 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
-