--- a/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_sunday.yml
+++ b/maxious-canberra-transit-feed/output/980-to-lithgow-st-terminus-fyshwick.stop_times_sunday.yml
@@ -1,164 +1,10 @@
 --- 
+time_points: [Cohen Street Bus Station (Platform 1), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 3), University of Canberra, Australian Institute of Sport, National Hockey Centre Lyneham, Macarthur / Northbourne Ave, City Bus Station (Platform 9), Russell Offices, Railway Station Kingston, Newcastle Street after Isa Street, Fyshwick Direct Factory Outlet, Lithgow St Terminus Fyshwick]
 long_name: To Lithgow St Terminus Fyshwick
-between_stops: []
+between_stops: 
+  Westfield Bus Station (Platform 1)-Belconnen Community Bus Station (Platform 3): []
+  Cohen Street Bus Station (Platform 1)-Westfield Bus Station (Platform 1): []
+  Belconnen Community Bus Station (Platform 3)-University of Canberra: [Wjz681S, Wjz689c, Wjz68Ip, Wjz68IH, Wjz68Y0, Wjz68Yy]
+short_name: "980"
+stop_times_sunday: [[820a, 822a, 826a, 834a, 840a, 845a, 851a, 859a, 908a, 914a, 922a, 931a, 940a], [920a, 922a, 926a, 934a, 940a, 945a, 951a, 959a, 1008a, 1014a, 1022a, 1031a, 1040a], [1020a, 1022a, 1026a, 1034a, 1040a, 1045a, 1051a, 1059a, 1108a, 1114a, 1122a, 1131a, 1140a], [1120a, 1122a, 1126a, 1134a, 1140a, 1145a, 1151a, 1159a, 1208p, 1214p, 1222p, 1231p, 1240p], [1220p, 1222p, 1226p, 1234p, 1240p, 1245p, 1251p, 1259p, 108p, 114p, 122p, 131p, 140p], [120p, 122p, 126p, 134p, 140p, 145p, 151p, 159p, 208p, 214p, 222p, 231p, 240p], [220p, 222p, 226p, 234p, 240p, 245p, 251p, 259p, 308p, 314p, 322p, 331p, 340p], [320p, 322p, 326p, 334p, 340p, 345p, 351p, 359p, 408p, 414p, 422p, 431p, 440p], ["-", "-", "-", "-", "-", "-", "-", 415p, 424p, 430p, "-", "-", "-"], [420p, 422p, 426p, 434p, 440p, 445p, 451p, 459p, 508p, 514p, 522p, 531p, 540p], [520p, 522p, 526p, 534p, 540p, 545p, 551p, 558p, "-", "-", "-", "-", "-"], [615p, 617p, 621p, 629p, 635p, 640p, 645p, 652p, "-", "-", "-", "-", "-"]]
 
-short_name: "980"
-time_points: 
-  - Cohen St Bus Station - Platform 1
-  - Lathlain St Bus Station - Platform 3
-  - Cameron Ave Bus Station - Platform 3
-  - University of Canberra
-  - Australian Institute Sports Bruce
-  - National Hockey Centre Lyneham
-  - Macarthur / Northbourne
-  - City Interchange - Platform 9
-  - Russell Offices
-  - Railway Station Kingston
-  - Newcastle / Isa Street Fyshwick
-  - Lithgow St Terminus Fyshwick
-stop_times_sunday: 
-- - 821a
-  - 823a
-  - 827a
-  - 835a
-  - 841a
-  - 846a
-  - 852a
-  - 859a
-  - 908a
-  - 914a
-  - 922a
-  - 940a
-- - 921a
-  - 923a
-  - 927a
-  - 935a
-  - 941a
-  - 946a
-  - 952a
-  - 959a
-  - 1008a
-  - 1014a
-  - 1022a
-  - 1040a
-- - 1021a
-  - 1023a
-  - 1027a
-  - 1035a
-  - 1041a
-  - 1046a
-  - 1052a
-  - 1059a
-  - 1108a
-  - 1114a
-  - 1122a
-  - 1140a
-- - 1121a
-  - 1123a
-  - 1127a
-  - 1135a
-  - 1141a
-  - 1146a
-  - 1152a
-  - 1159a
-  - 1208p
-  - 1214p
-  - 1222p
-  - 1240p
-- - 1221p
-  - 1223p
-  - 1227p
-  - 1235p
-  - 1241p
-  - 1246p
-  - 1252p
-  - 1259p
-  - 108p
-  - 114p
-  - 122p
-  - 140p
-- - 121p
-  - 123p
-  - 127p
-  - 135p
-  - 141p
-  - 146p
-  - 152p
-  - 159p
-  - 208p
-  - 214p
-  - 222p
-  - 240p
-- - 221p
-  - 223p
-  - 227p
-  - 235p
-  - 241p
-  - 246p
-  - 252p
-  - 259p
-  - 308p
-  - 314p
-  - 322p
-  - 340p
-- - 321p
-  - 323p
-  - 327p
-  - 335p
-  - 341p
-  - 346p
-  - 352p
-  - 359p
-  - 408p
-  - 414p
-  - 422p
-  - 440p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 415p
-  - 424p
-  - 430p
-  - "-"
-  - "-"
-- - 421p
-  - 423p
-  - 427p
-  - 435p
-  - 441p
-  - 446p
-  - 452p
-  - 459p
-  - 508p
-  - 514p
-  - 522p
-  - 540p
-- - 521p
-  - 523p
-  - 527p
-  - 535p
-  - 541p
-  - 546p
-  - 552p
-  - 558p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 636p
-  - 641p
-  - 646p
-  - 652p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-