--- a/maxious-canberra-transit-feed/output/4-to-geoscience-australia.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/4-to-geoscience-australia.stop_times.yml
@@ -1,256 +1,7 @@
 --- 
 long_name: To Geoscience Australia
 between_stops: []
+short_name: "4"
+stop_times: [[633a, 641a, 645a, 649a, 652a, 700a, "-", 703a], [703a, 711a, 715a, 719a, 722a, 730a, "-", 733a], [733a, 742a, 747a, 752a, 755a, 805a, "-", 808a], [803a, 812a, 817a, 822a, 825a, 835a, "-", 838a], [818a, 827a, 832a, 837a, 840a, 850a, "-", 853a], [833a, 842a, 847a, 852a, 855a, 905a, "-", 908a], [903a, 912a, 917a, 922a, 925a, 935a, "-", 938a], [933a, 941a, 945a, 949a, 952a, 1001a, "-", 1004a], [1003a, 1011a, 1015a, 1019a, 1022a, 1031a, "-", 1034a], [1033a, 1041a, 1045a, 1049a, 1052a, 1101a, "-", 1104a], [1103a, 1111a, 1115a, 1119a, 1122a, 1131a, "-", 1134a], [1133a, 1141a, 1145a, 1149a, 1152a, 1201p, "-", 1204p], [1203p, 1211p, 1215p, 1219p, 1222p, 1231p, "-", 1234p], [1233p, 1241p, 1245p, 1249p, 1252p, 101p, "-", 104p], [103p, 111p, 115p, 119p, 122p, 131p, "-", 134p], [133p, 141p, 145p, 149p, 152p, 201p, "-", 204p], [203p, 211p, 215p, 219p, 222p, 231p, "-", 234p], [233p, 241p, 245p, 249p, 252p, 301p, "-", 304p], [303p, 312p, 317p, 322p, 325p, 334p, "-", 337p], [333p, 342p, 347p, 352p, 355p, 404p, "-", 407p], [405p, 414p, 419p, 424p, 427p, 436p, "-", 439p], [439p, 448p, 453p, 458p, 501p, 510p, "-", 513p], [509p, 518p, 523p, 528p, 531p, 540p, "-", 543p], [539p, 548p, 553p, 558p, 601p, 610p, 613p, "-"], [616p, 625p, 630p, 634p, 637p, 642p, 645p, "-"], [707p, 715p, 719p, 723p, 726p, 731p, 734p, "-"], [810p, 818p, 822p, 826p, 829p, 834p, 837p, "-"], [910p, 918p, 922p, 926p, 929p, 934p, 937p, "-"], [1010p, 1018p, 1022p, 1026p, 1029p, 1034p, 1037p, "-"], [1110p, 1118p, 1122p, 1126p, 1129p, 1134p, 1137p, "-"]]
+time_points: [City Bus Station (Platform 9), Russell Offices, Kings Ave / National Circuit, Kingston, Manuka / Captain Cook Cres, Narrabundah College, Narrabundah Terminus, Geoscience Australia]
 
-short_name: "4"
-stop_times: 
-- - 637a
-  - 645a
-  - 649a
-  - 653a
-  - 656a
-  - 704a
-  - "-"
-  - 707a
-- - 707a
-  - 715a
-  - 719a
-  - 723a
-  - 726a
-  - 735a
-  - "-"
-  - 738a
-- - 737a
-  - 746a
-  - 751a
-  - 756a
-  - 759a
-  - 809a
-  - "-"
-  - 812a
-- - 807a
-  - 816a
-  - 821a
-  - 826a
-  - 829a
-  - 839a
-  - "-"
-  - 842a
-- - 821a
-  - 830a
-  - 835a
-  - 840a
-  - 843a
-  - 853a
-  - "-"
-  - 856a
-- - 837a
-  - 846a
-  - 851a
-  - 856a
-  - 859a
-  - 909a
-  - "-"
-  - 912a
-- - 907a
-  - 916a
-  - 921a
-  - 926a
-  - 929a
-  - 938a
-  - "-"
-  - 941a
-- - 937a
-  - 945a
-  - 949a
-  - 953a
-  - 956a
-  - 1005a
-  - "-"
-  - 1008a
-- - 1007a
-  - 1015a
-  - 1019a
-  - 1023a
-  - 1026a
-  - 1035a
-  - "-"
-  - 1038a
-- - 1037a
-  - 1045a
-  - 1049a
-  - 1053a
-  - 1056a
-  - 1105a
-  - "-"
-  - 1108a
-- - 1107a
-  - 1115a
-  - 1119a
-  - 1123a
-  - 1126a
-  - 1135a
-  - "-"
-  - 1138a
-- - 1137a
-  - 1145a
-  - 1149a
-  - 1153a
-  - 1156a
-  - 1205p
-  - "-"
-  - 1208p
-- - 1207p
-  - 1215p
-  - 1219p
-  - 1223p
-  - 1226p
-  - 1235p
-  - "-"
-  - 1238p
-- - 1237p
-  - 1245p
-  - 1249p
-  - 1253p
-  - 1256p
-  - 105p
-  - "-"
-  - 108p
-- - 107p
-  - 115p
-  - 119p
-  - 123p
-  - 126p
-  - 135p
-  - "-"
-  - 138p
-- - 137p
-  - 145p
-  - 149p
-  - 153p
-  - 156p
-  - 205p
-  - "-"
-  - 208p
-- - 207p
-  - 215p
-  - 219p
-  - 223p
-  - 226p
-  - 235p
-  - "-"
-  - 238p
-- - 237p
-  - 245p
-  - 249p
-  - 253p
-  - 256p
-  - 305p
-  - "-"
-  - 308p
-- - 307p
-  - 316p
-  - 321p
-  - 326p
-  - 329p
-  - 338p
-  - "-"
-  - 341p
-- - 337p
-  - 346p
-  - 351p
-  - 356p
-  - 359p
-  - 408p
-  - "-"
-  - 411p
-- - 407p
-  - 416p
-  - 421p
-  - 426p
-  - 429p
-  - 438p
-  - "-"
-  - 441p
-- - 437p
-  - 446p
-  - 451p
-  - 456p
-  - 459p
-  - 508p
-  - "-"
-  - 511p
-- - 507p
-  - 516p
-  - 521p
-  - 526p
-  - 529p
-  - 538p
-  - "-"
-  - 541p
-- - 537p
-  - 546p
-  - 551p
-  - 556p
-  - 559p
-  - 608p
-  - 611p
-  - "-"
-- - 637p
-  - 645p
-  - 649p
-  - 653p
-  - 656p
-  - 701p
-  - 704p
-  - "-"
-- - 737p
-  - 745p
-  - 749p
-  - 753p
-  - 756p
-  - 801p
-  - 804p
-  - "-"
-- - 837p
-  - 845p
-  - 849p
-  - 853p
-  - 856p
-  - 901p
-  - 904p
-  - "-"
-- - 937p
-  - 945p
-  - 949p
-  - 953p
-  - 956p
-  - 1001p
-  - 1004p
-  - "-"
-- - 1037p
-  - 1045p
-  - 1049p
-  - 1053p
-  - 1056p
-  - 1101p
-  - 1104p
-  - "-"
-- - 1137p
-  - 1145p
-  - 1149p
-  - 1153p
-  - 1156p
-  - 1201a
-  - 1204a
-  - "-"
-time_points: 
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Manuka/Captain Cook
-  - Narrabundah College
-  - Narrabundah Terminus
-  - Geoscience Australia
-