--- a/maxious-canberra-transit-feed/output/5-to-woden-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/5-to-woden-interchange.stop_times.yml
@@ -1,464 +1,8 @@
 --- 
 long_name: To Woden Interchange
-between_stops: []
+between_stops: {}
 
 short_name: "5"
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 630a
-  - 638a
-  - 642a
-  - 646a
-  - 649a
-  - 701a
-  - 711a
-  - 719a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 710a
-  - 718a
-  - 722a
-  - 726a
-  - 729a
-  - 741a
-  - 752a
-  - 800a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 730a
-  - 738a
-  - 742a
-  - 746a
-  - 749a
-  - 802a
-  - 814a
-  - 822a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 748a
-  - 753a
-  - 758a
-  - 801a
-  - 814a
-  - 826a
-  - 834a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 755a
-  - 804a
-  - 809a
-  - 814a
-  - 817a
-  - 830a
-  - 842a
-  - 850a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 810a
-  - 819a
-  - 824a
-  - 829a
-  - 832a
-  - 845a
-  - 857a
-  - 905a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 830a
-  - 839a
-  - 844a
-  - 849a
-  - 852a
-  - 905a
-  - 915a
-  - 923a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 840a
-  - 849a
-  - 854a
-  - 859a
-  - 902a
-  - 914a
-  - 924a
-  - 932a
-- - 909a
-  - 915a
-  - 922a
-  - 924a
-  - 932a
-  - 940a
-  - 944a
-  - 948a
-  - 951a
-  - 1003a
-  - 1013a
-  - 1021a
-- - 939a
-  - 945a
-  - 952a
-  - 954a
-  - 1002a
-  - 1010a
-  - 1014a
-  - 1018a
-  - 1021a
-  - 1033a
-  - 1043a
-  - 1051a
-- - 1009a
-  - 1015a
-  - 1022a
-  - 1024a
-  - 1032a
-  - 1040a
-  - 1044a
-  - 1048a
-  - 1051a
-  - 1103a
-  - 1113a
-  - 1121a
-- - 1039a
-  - 1045a
-  - 1052a
-  - 1054a
-  - 1102a
-  - 1110a
-  - 1114a
-  - 1118a
-  - 1121a
-  - 1133a
-  - 1143a
-  - 1151a
-- - 1109a
-  - 1115a
-  - 1122a
-  - 1124a
-  - 1132a
-  - 1140a
-  - 1144a
-  - 1148a
-  - 1151a
-  - 1203p
-  - 1213p
-  - 1221p
-- - 1139a
-  - 1145a
-  - 1152a
-  - 1154a
-  - 1202p
-  - 1210p
-  - 1214p
-  - 1218p
-  - 1221p
-  - 1233p
-  - 1243p
-  - 1251p
-- - 1209p
-  - 1215p
-  - 1222p
-  - 1224p
-  - 1232p
-  - 1240p
-  - 1244p
-  - 1248p
-  - 1251p
-  - 103p
-  - 113p
-  - 121p
-- - 1239p
-  - 1245p
-  - 1252p
-  - 1254p
-  - 102p
-  - 110p
-  - 114p
-  - 118p
-  - 121p
-  - 133p
-  - 143p
-  - 151p
-- - 109p
-  - 115p
-  - 122p
-  - 124p
-  - 132p
-  - 140p
-  - 144p
-  - 148p
-  - 151p
-  - 203p
-  - 213p
-  - 221p
-- - 139p
-  - 145p
-  - 152p
-  - 154p
-  - 202p
-  - 210p
-  - 214p
-  - 218p
-  - 221p
-  - 233p
-  - 243p
-  - 251p
-- - 209p
-  - 215p
-  - 222p
-  - 224p
-  - 232p
-  - 240p
-  - 244p
-  - 248p
-  - 251p
-  - 303p
-  - 313p
-  - 321p
-- - 239p
-  - 245p
-  - 252p
-  - 254p
-  - 302p
-  - 310p
-  - 314p
-  - 318p
-  - 321p
-  - 333p
-  - 343p
-  - 351p
-- - 309p
-  - 315p
-  - 322p
-  - 324p
-  - 332p
-  - 340p
-  - 344p
-  - 348p
-  - 351p
-  - 403p
-  - 415p
-  - 423p
-- - 339p
-  - 345p
-  - 352p
-  - 354p
-  - 403p
-  - 412p
-  - 417p
-  - 422p
-  - 425p
-  - 438p
-  - 450p
-  - 458p
-- - 407p
-  - 415p
-  - 422p
-  - 424p
-  - 433p
-  - 442p
-  - 447p
-  - 452p
-  - 455p
-  - 508p
-  - 520p
-  - 528p
-- - 437p
-  - 445p
-  - 452p
-  - 454p
-  - 503p
-  - 512p
-  - 517p
-  - 522p
-  - 525p
-  - 538p
-  - 550p
-  - 558p
-- - 510p
-  - 518p
-  - 525p
-  - 527p
-  - 536p
-  - 545p
-  - 550p
-  - 554p
-  - 556p
-  - 608p
-  - 617p
-  - 625p
-- - 537p
-  - 545p
-  - 552p
-  - 554p
-  - 602p
-  - 610p
-  - 614p
-  - 618p
-  - 621p
-  - 633p
-  - 642p
-  - 650p
-- - 609p
-  - 615p
-  - 622p
-  - 624p
-  - 632p
-  - 640p
-  - 644p
-  - 648p
-  - 651p
-  - 703p
-  - 712p
-  - 720p
-- - 639p
-  - 645p
-  - 652p
-  - 654p
-  - 702p
-  - 710p
-  - 714p
-  - 718p
-  - 721p
-  - 733p
-  - 742p
-  - 750p
-- - 709p
-  - 715p
-  - 722p
-  - 724p
-  - 732p
-  - 740p
-  - 744p
-  - 748p
-  - 751p
-  - 803p
-  - 812p
-  - 820p
-- - 739p
-  - 745p
-  - 752p
-  - 754p
-  - 801p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 809p
-  - 815p
-  - 822p
-  - 824p
-  - 832p
-  - 840p
-  - 844p
-  - 848p
-  - 851p
-  - 903p
-  - 912p
-  - 920p
-- - 839p
-  - 845p
-  - 852p
-  - 854p
-  - 901p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 909p
-  - 915p
-  - 922p
-  - 924p
-  - 932p
-  - 940p
-  - 944p
-  - 948p
-  - 951p
-  - 1003p
-  - 1012p
-  - 1020p
-- - 939p
-  - 945p
-  - 952p
-  - 954p
-  - 1001p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1009p
-  - 1015p
-  - 1022p
-  - 1024p
-  - 1032p
-  - 1040p
-  - 1044p
-  - 1048p
-  - 1051p
-  - 1103p
-  - 1112p
-  - 1120p
-- - 1039p
-  - 1045p
-  - 1052p
-  - 1054p
-  - 1101p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1109p
-  - 1115p
-  - 1122p
-  - 1124p
-  - 1131p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Gungahlin Market Place
-  - Flemington Rd/Sandford St
-  - Northbourne Ave/Antill St
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Kings Ave/National Crt
-  - Kingston
-  - Manuka/Captain Cook
-  - Narrabundah College
-  - Canberra Hospital
-  - Woden Interchange
+stop_times: [["-", "-", "-", "-", 630a, 638a, 642a, 646a, 649a, 701a, 711a, 719a], ["-", "-", "-", "-", 710a, 718a, 722a, 726a, 729a, 741a, 752a, 800a], ["-", "-", "-", "-", 730a, 738a, 742a, 746a, 749a, 802a, 814a, 822a], ["-", "-", "-", "-", 740a, 748a, 753a, 758a, 801a, 814a, 826a, 834a], ["-", "-", "-", "-", 755a, 804a, 809a, 814a, 817a, 830a, 842a, 850a], ["-", "-", "-", "-", 810a, 819a, 824a, 829a, 832a, 845a, 857a, 905a], ["-", "-", "-", "-", 830a, 839a, 844a, 849a, 852a, 905a, 915a, 923a], ["-", "-", "-", "-", 840a, 849a, 854a, 859a, 902a, 914a, 924a, 932a], [909a, 915a, 922a, 924a, 932a, 940a, 944a, 948a, 951a, 1003a, 1013a, 1021a], [939a, 945a, 952a, 954a, 1002a, 1010a, 1014a, 1018a, 1021a, 1033a, 1043a, 1051a], [1009a, 1015a, 1022a, 1024a, 1032a, 1040a, 1044a, 1048a, 1051a, 1103a, 1113a, 1121a], [1039a, 1045a, 1052a, 1054a, 1102a, 1110a, 1114a, 1118a, 1121a, 1133a, 1143a, 1151a], [1109a, 1115a, 1122a, 1124a, 1132a, 1140a, 1144a, 1148a, 1151a, 1203p, 1213p, 1221p], [1139a, 1145a, 1152a, 1154a, 1202p, 1210p, 1214p, 1218p, 1221p, 1233p, 1243p, 1251p], [1209p, 1215p, 1222p, 1224p, 1232p, 1240p, 1244p, 1248p, 1251p, 103p, 113p, 121p], [1239p, 1245p, 1252p, 1254p, 102p, 110p, 114p, 118p, 121p, 133p, 143p, 151p], [109p, 115p, 122p, 124p, 132p, 140p, 144p, 148p, 151p, 203p, 213p, 221p], [139p, 145p, 152p, 154p, 202p, 210p, 214p, 218p, 221p, 233p, 243p, 251p], [209p, 215p, 222p, 224p, 232p, 240p, 244p, 248p, 251p, 303p, 313p, 321p], [239p, 245p, 252p, 254p, 302p, 310p, 314p, 318p, 321p, 333p, 343p, 351p], [309p, 315p, 322p, 324p, 332p, 340p, 344p, 348p, 351p, 403p, 415p, 423p], [339p, 345p, 352p, 354p, 403p, 412p, 417p, 422p, 425p, 438p, 450p, 458p], [407p, 415p, 422p, 424p, 433p, 442p, 447p, 452p, 455p, 508p, 520p, 528p], [437p, 445p, 452p, 454p, 503p, 512p, 517p, 522p, 525p, 538p, 550p, 558p], [510p, 518p, 525p, 527p, 536p, 545p, 550p, 554p, 556p, 608p, 617p, 625p], [537p, 545p, 552p, 554p, 602p, 610p, 614p, 618p, 621p, 633p, 642p, 650p], [609p, 615p, 622p, 624p, 632p, 640p, 644p, 648p, 651p, 703p, 712p, 720p], [639p, 645p, 652p, 654p, 702p, 710p, 714p, 718p, 721p, 733p, 742p, 750p], [709p, 715p, 722p, 724p, 732p, 740p, 744p, 748p, 751p, 803p, 812p, 820p], [739p, 745p, 752p, 754p, 801p, "-", "-", "-", "-", "-", "-", "-"], [809p, 815p, 822p, 824p, 832p, 840p, 844p, 848p, 851p, 903p, 912p, 920p], [839p, 845p, 852p, 854p, 901p, "-", "-", "-", "-", "-", "-", "-"], [909p, 915p, 922p, 924p, 932p, 940p, 944p, 948p, 951p, 1003p, 1012p, 1020p], [939p, 945p, 952p, 954p, 1001p, "-", "-", "-", "-", "-", "-", "-"], [1009p, 1015p, 1022p, 1024p, 1032p, 1040p, 1044p, 1048p, 1051p, 1103p, 1112p, 1120p], [1039p, 1045p, 1052p, 1054p, 1101p, "-", "-", "-", "-", "-", "-", "-"], [1109p, 1115p, 1122p, 1124p, 1131p, "-", "-", "-", "-", "-", "-", "-"]]
+time_points: [Gungahlin Market Place, Flemington Rd/Sandford St, Northbourne Ave/Antill St, Macarthur / Northbourne, City Interchange (Platform 9), Russell Offices, Kings Ave/National Crt, Kingston, Manuka/Captain Cook, Narrabundah College, Canberra Hospital, Woden Interchange]