--- a/maxious-canberra-transit-feed/output/11-111-to-city-interchange.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/11-111-to-city-interchange.stop_times.yml
@@ -1,260 +1,8 @@
 --- 
 long_name: To City Interchange
-between_stops: []
+between_stops: 
+  Woden Interchange - Platform 9-City Interchange: [Wjz3m3b, Wjz3m31, Wjz3eRR, Wjz3eZ4, Wjz4KO9, Wjz4KNu]
+short_name: 11/111
+stop_times: [[621a, 627a, 641a, 651a, 657a, 713a, 729a], [641a, 647a, 701a, 711a, 717a, 733a, 751a], [701a, 707a, 721a, 731a, 737a, 754a, 812a], [721a, 727a, 742a, 752a, 758a, 815a, 833a], [741a, 748a, 803a, 813a, 819a, 836a, 854a], [801a, 808a, 823a, 833a, 839a, 856a, 914a], [821a, 828a, 843a, 853a, 859a, 914a, "-"], [841a, 848a, 903a, 913a, 919a, 933a, "-"], [921a, 927a, 940a, 949a, 955a, 1007a, "-"], [951a, 957a, 1010a, 1019a, 1025a, 1037a, "-"], [1021a, 1027a, 1040a, 1049a, 1055a, 1107a, "-"], [1051a, 1057a, 1110a, 1119a, 1125a, 1137a, "-"], [1121a, 1127a, 1140a, 1149a, 1155a, 1207p, "-"], [1151a, 1157a, 1210p, 1219p, 1225p, 1237p, "-"], [1221p, 1227p, 1240p, 1249p, 1255p, 107p, "-"], [1251p, 1257p, 110p, 119p, 125p, 137p, "-"], [121p, 127p, 140p, 149p, 155p, 207p, "-"], [151p, 157p, 210p, 219p, 225p, 237p, "-"], [221p, 227p, 240p, 249p, 255p, 307p, "-"], [251p, 257p, 310p, 319p, 325p, 339p, "-"], [323p, 330p, 345p, 355p, 401p, 416p, "-"], [340p, 347p, 402p, 412p, 418p, 433p, "-"], [400p, 407p, 422p, 432p, 438p, 453p, "-"], [418p, 425p, 440p, 450p, 456p, 511p, "-"], [441p, 448p, 503p, 513p, 519p, "-", "-"], [501p, 508p, 523p, 533p, 539p, "-", "-"], [521p, 528p, 543p, 553p, 559p, 614p, "-"], [541p, 548p, 603p, 613p, 619p, "-", "-"], [601p, 608p, 623p, 633p, 639p, "-", "-"], [625p, 632p, 645p, 654p, 700p, 712p, "-"], [725p, 731p, 744p, 753p, 759p, 811p, "-"], [825p, 831p, 844p, 853p, 859p, 911p, "-"], [925p, 931p, 944p, 953p, 959p, 1011p, "-"], [1025p, 1031p, 1044p, 1053p, 1059p, 1111p, "-"], [1125p, 1131p, 1144p, 1153p, 1159p, "-", "-"]]
+time_points: [Tuggeranong Interchange - Platform 3, MacKillop College Isabella Campus, Theodore, Calwell Shops, Erindale Centre, Woden Interchange - Platform 9, City Interchange]
 
-short_name: 11/111
-stop_times: 
-- - 621a
-  - 627a
-  - 641a
-  - 651a
-  - 657a
-  - 713a
-  - 729a
-- - 641a
-  - 647a
-  - 701a
-  - 711a
-  - 717a
-  - 733a
-  - 751a
-- - 701a
-  - 707a
-  - 721a
-  - 731a
-  - 737a
-  - 754a
-  - 812a
-- - 721a
-  - 727a
-  - 742a
-  - 752a
-  - 758a
-  - 815a
-  - 833a
-- - 741a
-  - 748a
-  - 803a
-  - 813a
-  - 819a
-  - 836a
-  - 854a
-- - 801a
-  - 808a
-  - 823a
-  - 833a
-  - 839a
-  - 856a
-  - 914a
-- - 821a
-  - 828a
-  - 843a
-  - 853a
-  - 859a
-  - 914a
-  - "-"
-- - 841a
-  - 848a
-  - 903a
-  - 913a
-  - 919a
-  - 933a
-  - "-"
-- - 921a
-  - 927a
-  - 940a
-  - 949a
-  - 955a
-  - 1007a
-  - "-"
-- - 951a
-  - 957a
-  - 1010a
-  - 1019a
-  - 1025a
-  - 1037a
-  - "-"
-- - 1021a
-  - 1027a
-  - 1040a
-  - 1049a
-  - 1055a
-  - 1107a
-  - "-"
-- - 1051a
-  - 1057a
-  - 1110a
-  - 1119a
-  - 1125a
-  - 1137a
-  - "-"
-- - 1121a
-  - 1127a
-  - 1140a
-  - 1149a
-  - 1155a
-  - 1207p
-  - "-"
-- - 1151a
-  - 1157a
-  - 1210p
-  - 1219p
-  - 1225p
-  - 1237p
-  - "-"
-- - 1221p
-  - 1227p
-  - 1240p
-  - 1249p
-  - 1255p
-  - 107p
-  - "-"
-- - 1251p
-  - 1257p
-  - 110p
-  - 119p
-  - 125p
-  - 137p
-  - "-"
-- - 121p
-  - 127p
-  - 140p
-  - 149p
-  - 155p
-  - 207p
-  - "-"
-- - 151p
-  - 157p
-  - 210p
-  - 219p
-  - 225p
-  - 237p
-  - "-"
-- - 221p
-  - 227p
-  - 240p
-  - 249p
-  - 255p
-  - 307p
-  - "-"
-- - 251p
-  - 257p
-  - 310p
-  - 319p
-  - 325p
-  - 339p
-  - "-"
-- - 323p
-  - 330p
-  - 345p
-  - 355p
-  - 401p
-  - 416p
-  - "-"
-- - 340p
-  - 347p
-  - 402p
-  - 412p
-  - 418p
-  - 433p
-  - "-"
-- - 400p
-  - 407p
-  - 422p
-  - 432p
-  - 438p
-  - 453p
-  - "-"
-- - 418p
-  - 425p
-  - 440p
-  - 450p
-  - 456p
-  - 511p
-  - "-"
-- - 441p
-  - 448p
-  - 503p
-  - 513p
-  - 519p
-  - "-"
-  - "-"
-- - 501p
-  - 508p
-  - 523p
-  - 533p
-  - 539p
-  - "-"
-  - "-"
-- - 521p
-  - 528p
-  - 543p
-  - 553p
-  - 559p
-  - 614p
-  - "-"
-- - 541p
-  - 548p
-  - 603p
-  - 613p
-  - 619p
-  - "-"
-  - "-"
-- - 601p
-  - 608p
-  - 623p
-  - 633p
-  - 639p
-  - "-"
-  - "-"
-- - 625p
-  - 632p
-  - 645p
-  - 654p
-  - 700p
-  - 712p
-  - "-"
-- - 725p
-  - 731p
-  - 744p
-  - 753p
-  - 759p
-  - 811p
-  - "-"
-- - 825p
-  - 831p
-  - 844p
-  - 853p
-  - 859p
-  - 911p
-  - "-"
-- - 925p
-  - 931p
-  - 944p
-  - 953p
-  - 959p
-  - 1011p
-  - "-"
-- - 1025p
-  - 1031p
-  - 1044p
-  - 1053p
-  - 1059p
-  - 1111p
-  - "-"
-- - 1125p
-  - 1131p
-  - 1144p
-  - 1153p
-  - 1159p
-  - "-"
-  - "-"
-time_points: 
-  - Tuggeranong Interchange - Platform 3
-  - MacKillop College Isabella Campus
-  - Theodore
-  - Calwell Shops
-  - Erindale Centre
-  - Woden Interchange - Platform 9
-  - City Interchange
-