--- a/maxious-canberra-transit-feed/output/13-313-to-fraser-west-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/13-313-to-fraser-west-terminus.stop_times.yml
@@ -1,298 +1,8 @@
 --- 
 long_name: To Fraser West Terminus
-between_stops: []
+between_stops: {}
 
-short_name: 13/313
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 728a
-  - 730a
-  - 734a
-  - 737a
-  - 741a
-  - 750a
-  - 757a
-- - 711a
-  - 729a
-  - 747a
-  - 805a
-  - 807a
-  - 811a
-  - 814a
-  - 818a
-  - 827a
-  - 834a
-- - 751a
-  - 810a
-  - 828a
-  - 846a
-  - 848a
-  - 852a
-  - 855a
-  - 859a
-  - 908a
-  - 915a
-- - 811a
-  - 830a
-  - 848a
-  - 906a
-  - 908a
-  - 912a
-  - 915a
-  - 919a
-  - 928a
-  - 934a
-- - 851a
-  - 910a
-  - 928a
-  - 945a
-  - 947a
-  - 951a
-  - 953a
-  - 957a
-  - 1005a
-  - 1011a
-- - 921a
-  - 940a
-  - 956a
-  - 1013a
-  - 1015a
-  - 1019a
-  - 1021a
-  - 1025a
-  - 1033a
-  - 1039a
-- - 951a
-  - 1009a
-  - 1025a
-  - 1042a
-  - 1044a
-  - 1048a
-  - 1050a
-  - 1054a
-  - 1102a
-  - 1108a
-- - 1021a
-  - 1039a
-  - 1055a
-  - 1112a
-  - 1114a
-  - 1118a
-  - 1120a
-  - 1124a
-  - 1132a
-  - 1138a
-- - 1051a
-  - 1109a
-  - 1125a
-  - 1142a
-  - 1144a
-  - 1148a
-  - 1150a
-  - 1154a
-  - 1202p
-  - 1208p
-- - 1121a
-  - 1139a
-  - 1155a
-  - 1212p
-  - 1214p
-  - 1218p
-  - 1220p
-  - 1224p
-  - 1232p
-  - 1238p
-- - 1151a
-  - 1209p
-  - 1225p
-  - 1242p
-  - 1244p
-  - 1248p
-  - 1250p
-  - 1254p
-  - 102p
-  - 108p
-- - 1221p
-  - 1239p
-  - 1255p
-  - 112p
-  - 114p
-  - 118p
-  - 120p
-  - 124p
-  - 132p
-  - 138p
-- - 1251p
-  - 109p
-  - 125p
-  - 142p
-  - 144p
-  - 148p
-  - 150p
-  - 154p
-  - 202p
-  - 208p
-- - 121p
-  - 139p
-  - 155p
-  - 212p
-  - 214p
-  - 218p
-  - 220p
-  - 224p
-  - 232p
-  - 238p
-- - 151p
-  - 209p
-  - 225p
-  - 242p
-  - 244p
-  - 248p
-  - 250p
-  - 254p
-  - 303p
-  - 309p
-- - 221p
-  - 239p
-  - 255p
-  - 313p
-  - 315p
-  - 319p
-  - 322p
-  - 327p
-  - 337p
-  - 343p
-- - 250p
-  - 308p
-  - 326p
-  - 344p
-  - 346p
-  - 350p
-  - 353p
-  - 358p
-  - 408p
-  - 414p
-- - 316p
-  - 335p
-  - 353p
-  - 411p
-  - 413p
-  - 417p
-  - 420p
-  - 425p
-  - 435p
-  - 441p
-- - 346p
-  - 405p
-  - 423p
-  - 441p
-  - 443p
-  - 447p
-  - 450p
-  - 455p
-  - 505p
-  - 511p
-- - 406p
-  - 425p
-  - 443p
-  - 501p
-  - 503p
-  - 507p
-  - 510p
-  - 515p
-  - 525p
-  - 531p
-- - 426p
-  - 445p
-  - 503p
-  - 521p
-  - 523p
-  - 527p
-  - 530p
-  - 535p
-  - 545p
-  - 551p
-- - 446p
-  - 505p
-  - 523p
-  - 541p
-  - 543p
-  - 547p
-  - 550p
-  - 555p
-  - 605p
-  - 611p
-- - 526p
-  - 545p
-  - 603p
-  - 621p
-  - 623p
-  - 627p
-  - 630p
-  - 634p
-  - 642p
-  - 648p
-- - 556p
-  - 615p
-  - 632p
-  - 649p
-  - 651p
-  - 654p
-  - 656p
-  - 700p
-  - 708p
-  - 714p
-- - 656p
-  - 713p
-  - 728p
-  - 745p
-  - 747p
-  - 750p
-  - 752p
-  - 756p
-  - 804p
-  - 810p
-- - "-"
-  - "-"
-  - "-"
-  - 840p
-  - 842p
-  - 845p
-  - 847p
-  - 851p
-  - 859p
-  - 905p
-- - "-"
-  - "-"
-  - "-"
-  - 940p
-  - 942p
-  - 945p
-  - 947p
-  - 951p
-  - 959p
-  - 1005p
-- - "-"
-  - "-"
-  - "-"
-  - 1040p
-  - 1042p
-  - 1045p
-  - 1047p
-  - 1051p
-  - 1059p
-  - 1105p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - Page Shops
-  - Scullin Shops
-  - Charnwood
-  - Fraser West Terminus
+short_name: 13 313
+stop_times: [["-", "-", "-", 733a, 735a, 739a, 742a, 746a, 755a, 803a], [710a, 728a, 746a, 807a, 809a, 813a, 816a, 820a, 829a, 837a], [751a, 810a, 828a, 849a, 851a, 855a, 858a, 902a, 911a, 919a], [811a, 830a, 848a, 909a, 911a, 915a, 918a, 922a, 931a, 938a], [850a, 909a, 927a, 947a, 949a, 953a, 955a, 959a, 1007a, 1014a], [921a, 940a, 956a, 1016a, 1018a, 1022a, 1024a, 1028a, 1036a, 1043a], [951a, 1009a, 1025a, 1045a, 1047a, 1051a, 1053a, 1057a, 1105a, 1112a], [1021a, 1039a, 1055a, 1115a, 1117a, 1121a, 1123a, 1127a, 1135a, 1142a], [1051a, 1109a, 1125a, 1145a, 1147a, 1151a, 1153a, 1157a, 1205p, 1212p], [1121a, 1139a, 1155a, 1215p, 1217p, 1221p, 1223p, 1227p, 1235p, 1242p], [1151a, 1209p, 1225p, 1245p, 1247p, 1251p, 1253p, 1257p, 105p, 112p], [1221p, 1239p, 1255p, 115p, 117p, 121p, 123p, 127p, 135p, 142p], [1251p, 109p, 125p, 145p, 147p, 151p, 153p, 157p, 205p, 212p], [121p, 139p, 155p, 215p, 217p, 221p, 223p, 227p, 235p, 242p], [151p, 209p, 225p, 245p, 247p, 251p, 253p, 257p, 306p, 313p], [221p, 239p, 255p, 316p, 318p, 322p, 325p, 330p, 340p, 347p], [250p, 308p, 326p, 347p, 349p, 353p, 356p, 401p, 411p, 418p], [316p, 335p, 353p, 414p, 416p, 420p, 423p, 428p, 438p, 445p], [346p, 405p, 423p, 444p, 446p, 450p, 453p, 458p, 508p, 515p], [406p, 425p, 443p, 504p, 506p, 510p, 513p, 518p, 528p, 535p], [426p, 445p, 503p, 524p, 526p, 530p, 533p, 538p, 548p, 555p], [446p, 505p, 523p, 544p, 546p, 550p, 553p, 558p, 608p, 615p], [526p, 545p, 603p, 624p, 626p, 630p, 632p, 636p, 644p, 651p], [556p, 615p, 632p, 652p, 654p, 658p, 700p, 704p, 712p, 719p], [656p, 713p, 728p, 748p, 750p, 754p, 756p, 800p, 808p, 815p], ["-", "-", "-", 835p, 837p, 841p, 843p, 847p, 855p, 902p], ["-", "-", "-", 935p, 937p, 941p, 943p, 947p, 955p, 1002p], ["-", "-", "-", 1034p, 1036p, 1040p, 1042p, 1046p, 1054p, 1101p]]
+time_points: [Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), Belconnen Community Bus Station (Platform 4), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 6), Page Shops, Scullin Shops, Charnwood Shops, Fraser West Terminus]