--- a/maxious-canberra-transit-feed/output/19-319-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/19-319-to-lanyon-market-place.stop_times.yml
@@ -1,338 +1,8 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: {}
 
-short_name: 19/319
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 705a
-  - 711a
-  - 716a
-  - 725a
-  - 731a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 747a
-  - 754a
-  - 803a
-  - 810a
-- - 703a
-  - 705a
-  - 709a
-  - 726a
-  - 743a
-  - 801a
-  - 808a
-  - 815a
-  - 824a
-  - 831a
-- - 733a
-  - 735a
-  - 739a
-  - 758a
-  - 815a
-  - 833a
-  - 840a
-  - 847a
-  - 856a
-  - 903a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 904a
-  - 911a
-  - 918a
-  - 927a
-  - 933a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 933a
-  - 939a
-  - 944a
-  - 953a
-  - 959a
-- - 903a
-  - 905a
-  - 909a
-  - 928a
-  - 945a
-  - 1001a
-  - 1007a
-  - 1012a
-  - 1021a
-  - 1027a
-- - 933a
-  - 935a
-  - 939a
-  - 956a
-  - 1013a
-  - 1029a
-  - 1035a
-  - 1040a
-  - 1049a
-  - 1055a
-- - 1003a
-  - 1005a
-  - 1009a
-  - 1026a
-  - 1043a
-  - 1059a
-  - 1105a
-  - 1110a
-  - 1119a
-  - 1125a
-- - 1033a
-  - 1035a
-  - 1039a
-  - 1056a
-  - 1113a
-  - 1129a
-  - 1135a
-  - 1140a
-  - 1149a
-  - 1155a
-- - 1103a
-  - 1105a
-  - 1109a
-  - 1126a
-  - 1143a
-  - 1159a
-  - 1205p
-  - 1210p
-  - 1219p
-  - 1225p
-- - 1133a
-  - 1135a
-  - 1139a
-  - 1156a
-  - 1213p
-  - 1229p
-  - 1235p
-  - 1240p
-  - 1249p
-  - 1255p
-- - 1203p
-  - 1205p
-  - 1209p
-  - 1226p
-  - 1243p
-  - 1259p
-  - 105p
-  - 110p
-  - 119p
-  - 125p
-- - 1233p
-  - 1235p
-  - 1239p
-  - 1256p
-  - 113p
-  - 129p
-  - 135p
-  - 140p
-  - 149p
-  - 155p
-- - 103p
-  - 105p
-  - 109p
-  - 126p
-  - 143p
-  - 159p
-  - 205p
-  - 210p
-  - 219p
-  - 225p
-- - 133p
-  - 135p
-  - 139p
-  - 156p
-  - 213p
-  - 229p
-  - 235p
-  - 240p
-  - 249p
-  - 255p
-- - 203p
-  - 205p
-  - 209p
-  - 226p
-  - 243p
-  - 259p
-  - 306p
-  - 313p
-  - 322p
-  - 329p
-- - 233p
-  - 235p
-  - 239p
-  - 256p
-  - 313p
-  - 333p
-  - 340p
-  - 347p
-  - 356p
-  - 403p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 330p
-  - 350p
-  - 357p
-  - 404p
-  - 413p
-  - 420p
-- - 303p
-  - 305p
-  - 309p
-  - 328p
-  - 345p
-  - 405p
-  - 412p
-  - 419p
-  - 428p
-  - 435p
-- - 333p
-  - 335p
-  - 339p
-  - 358p
-  - 415p
-  - 435p
-  - 442p
-  - 449p
-  - 458p
-  - 505p
-- - 403p
-  - 405p
-  - 409p
-  - 428p
-  - 445p
-  - 505p
-  - 512p
-  - 519p
-  - 528p
-  - 535p
-- - 433p
-  - 435p
-  - 439p
-  - 458p
-  - 515p
-  - 535p
-  - 542p
-  - 549p
-  - 558p
-  - 605p
-- - 453p
-  - 455p
-  - 459p
-  - 518p
-  - 535p
-  - 555p
-  - 602p
-  - 609p
-  - 618p
-  - 625p
-- - 513p
-  - 515p
-  - 519p
-  - 538p
-  - 555p
-  - 615p
-  - 622p
-  - 629p
-  - 638p
-  - 644p
-- - 533p
-  - 535p
-  - 539p
-  - 558p
-  - 615p
-  - 634p
-  - 640p
-  - 645p
-  - 654p
-  - 700p
-- - 603p
-  - 605p
-  - 609p
-  - 628p
-  - 642p
-  - 658p
-  - 704p
-  - 709p
-  - 718p
-  - 724p
-- - 634p
-  - 636p
-  - 639p
-  - 655p
-  - 709p
-  - 725p
-  - 731p
-  - 736p
-  - 745p
-  - 751p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 818p
-  - 824p
-  - 829p
-  - 838p
-  - 844p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 918p
-  - 924p
-  - 929p
-  - 938p
-  - 944p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1018p
-  - 1024p
-  - 1029p
-  - 1038p
-  - 1044p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1118p
-  - 1124p
-  - 1129p
-  - 1138p
-  - 1144p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange - Platform 4
-  - Bonython Primary
-  - St Clare of Assisi Primary
-  - Conder Primary
-  - Lanyon Market Place
+short_name: 19 319
+stop_times: [["-", "-", "-", "-", "-", 705a, 711a, 716a, 725a, 731a], ["-", "-", "-", "-", "-", 740a, 747a, 754a, 803a, 810a], [700a, 702a, 706a, 726a, 743a, 801a, 808a, 815a, 824a, 831a], [730a, 732a, 736a, 758a, 815a, 833a, 840a, 847a, 856a, 903a], ["-", "-", "-", "-", "-", 901a, 908a, 915a, 924a, 930a], ["-", "-", "-", "-", "-", 930a, 936a, 941a, 950a, 956a], [900a, 902a, 906a, 928a, 945a, 1001a, 1007a, 1012a, 1021a, 1027a], [930a, 932a, 936a, 956a, 1013a, 1029a, 1035a, 1040a, 1049a, 1055a], [1000a, 1002a, 1006a, 1026a, 1043a, 1059a, 1105a, 1110a, 1119a, 1125a], [1030a, 1032a, 1036a, 1056a, 1113a, 1129a, 1135a, 1140a, 1149a, 1155a], [1100a, 1102a, 1106a, 1126a, 1143a, 1159a, 1205p, 1210p, 1219p, 1225p], [1130a, 1132a, 1136a, 1156a, 1213p, 1229p, 1235p, 1240p, 1249p, 1255p], [1200p, 1202p, 1206p, 1226p, 1243p, 1259p, 105p, 110p, 119p, 125p], [1230p, 1232p, 1236p, 1256p, 113p, 129p, 135p, 140p, 149p, 155p], [100p, 102p, 106p, 126p, 143p, 159p, 205p, 210p, 219p, 225p], [130p, 132p, 136p, 156p, 213p, 229p, 235p, 240p, 249p, 255p], [200p, 202p, 206p, 226p, 243p, 259p, 306p, 313p, 322p, 329p], [230p, 232p, 236p, 256p, 313p, 333p, 340p, 347p, 356p, 403p], ["-", "-", "-", "-", 332p, 352p, 359p, 406p, 415p, 422p], [300p, 302p, 306p, 328p, 345p, 405p, 412p, 419p, 428p, 435p], [330p, 332p, 336p, 358p, 415p, 435p, 442p, 449p, 458p, 505p], [400p, 402p, 406p, 428p, 445p, 505p, 512p, 519p, 528p, 535p], [430p, 432p, 436p, 458p, 515p, 535p, 542p, 549p, 558p, 605p], [450p, 452p, 456p, 518p, 535p, 555p, 602p, 609p, 618p, 625p], [510p, 512p, 516p, 538p, 555p, 615p, 622p, 629p, 638p, 644p], [530p, 532p, 536p, 558p, 615p, 634p, 640p, 645p, 654p, 700p], [600p, 602p, 606p, 628p, 642p, 658p, 704p, 709p, 718p, 724p], [630p, 632p, 636p, 655p, 709p, 725p, 731p, 736p, 745p, 751p], ["-", "-", "-", "-", "-", 818p, 824p, 829p, 838p, 844p], ["-", "-", "-", "-", "-", 918p, 924p, 929p, 938p, 944p], ["-", "-", "-", "-", "-", 1018p, 1024p, 1029p, 1038p, 1044p], ["-", "-", "-", "-", "-", 1118p, 1124p, 1129p, 1138p, 1144p]]
+time_points: [Cohen Street Bus Station (Platform 2), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 1), City Bus Station (Platform 1), Woden Bus Station (Platform 6), Tuggeranong Bus Station (Platform 4), Bonython Primary School, St Clare of Assisi, Conder Primary, Lanyon Market Place]