diff --git a/app-android/src/main/play/release-notes/en-US/default.txt b/app-android/src/main/play/release-notes/en-US/default.txt
index a19a17e2..1ea8c104 100644
--- a/app-android/src/main/play/release-notes/en-US/default.txt
+++ b/app-android/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-Schedule from October 6, 2024 to December 1, 2024.
+Schedule from October 20, 2024 to March 2, 2025.
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_routes b/app-android/src/main/res-current/raw/current_gtfs_rts_routes
index 29f9b88a..a20bebfc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_routes
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_routes
@@ -12,4 +12,6 @@
 30,'30','Penticton / Summerland','77AF99',1629,3
 40,'40','Osoyoos / Penticton','E270AB',1660,3
 41,'41','Osoyoos Local','5D87A1',1661,3
+50,'50','Penticton / Princeton','0073AE',1691,3
 70,'70','Kelowna / Penticton','F49A5D',1753,3
+10001,'PL','Party Loop','B3AA7E',2556,3
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_stops b/app-android/src/main/res-current/raw/current_gtfs_rts_stops
index 0c6854ac..47206124 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_stops
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_stops
@@ -353,7 +353,16 @@
 146369,'146369','Westminster @ Burnaby',49.49692,-119.60866,0,1452510947
 146370,'146370','176 Jermyn',49.49159,-119.58567,0,1452510969
 146373,'146373','Ellis @ Nanaimo',49.49924,-119.59066,0,1452510972
+146374,'146374','Penticton General Hosp',49.48142,-119.57589,0,1452510973
 148000,'148000','Peach Orchard @ Rosedale',49.60466,-119.67653,0,1452567451
 149000,'149000','Kootenay St @ Co-Op Ave',49.17985,-119.55237,0,1452597242
 149001,'149001','Kootenay St & Co-Op Ave',49.17982,-119.55270,0,1452597243
 149002,'149002','Oliver Hosp',49.18361,-119.53894,0,1452597244
+149003,'149003','Hedley - Scott Av Rest Stop',49.35532,-120.07662,0,1452597245
+149004,'149004','Keremeos Mtn Vw Mnr',49.20446,-119.82291,0,1452597246
+149005,'149005','S Similkameen Health Ctr',49.20492,-119.83271,0,1452597247
+149006,'149006','12th Ave @ Mtn Vw Mnr',49.20076,-119.82875,0,1452597248
+149007,'149007','Cawston',49.18225,-119.76087,0,1452597249
+149008,'149008','Olalla',49.26435,-119.82901,0,1452597250
+149009,'149009','Olalla',49.26587,-119.82973,0,1452597251
+150000,'150000','Princeton Chevron',49.45614,-120.50790,0,1453252644
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops b/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
index d6e8b49b..9e514dd2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
@@ -823,6 +823,27 @@
 4100,146329,6,0
 4100,146326,7,0
 4100,146316,8,1
+5000,150000,1,0
+5000,149003,2,0
+5000,149005,3,0
+5000,149006,4,0
+5000,149004,5,0
+5000,149007,6,0
+5000,149008,7,0
+5000,146233,8,0
+5000,146161,9,0
+5000,146047,10,0
+5000,146374,11,1
+5001,146374,1,0
+5001,146047,2,0
+5001,146157,3,0
+5001,146234,4,0
+5001,149009,5,0
+5001,149007,6,0
+5001,149004,7,0
+5001,149005,8,0
+5001,149003,9,0
+5001,150000,10,1
 7000,146156,1,0
 7000,146229,2,0
 7000,146342,3,0
@@ -917,3 +938,53 @@
 7001,146098,43,0
 7001,146268,44,1
 7001,146161,45,1
+1000100,146157,1,0
+1000100,146238,2,0
+1000100,146237,3,0
+1000100,146236,4,0
+1000100,146325,5,0
+1000100,146231,6,0
+1000100,146068,7,0
+1000100,146071,8,0
+1000100,146182,9,0
+1000100,146040,10,0
+1000100,146215,11,0
+1000100,146232,12,0
+1000100,146066,13,0
+1000100,146363,14,0
+1000100,146360,15,0
+1000100,146362,16,0
+1000100,146257,17,0
+1000100,146086,18,0
+1000100,146084,19,0
+1000100,146083,20,0
+1000100,146080,21,0
+1000100,146078,22,0
+1000100,146075,23,0
+1000100,146074,24,0
+1000100,146154,25,0
+1000100,146025,26,0
+1000100,146167,27,0
+1000100,146226,28,0
+1000100,146224,29,0
+1000100,146223,30,0
+1000100,146221,31,0
+1000100,146246,32,0
+1000100,146247,33,0
+1000100,146250,34,0
+1000100,146031,35,0
+1000100,146032,36,0
+1000100,146033,37,0
+1000100,146020,38,0
+1000100,146050,39,0
+1000100,146051,40,0
+1000100,146052,41,0
+1000100,146076,42,0
+1000100,146077,43,0
+1000100,146079,44,0
+1000100,146219,45,0
+1000100,146081,46,0
+1000100,146082,47,0
+1000100,146085,48,0
+1000100,146087,49,0
+1000100,146258,50,0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_trips b/app-android/src/main/res-current/raw/current_gtfs_rts_trips
index 4ba78020..2e3b84f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_trips
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_trips
@@ -24,5 +24,8 @@
 4001,0,'Osoyoos',40
 4000,0,'Penticton',40
 4100,0,'Osoyooos Local',41
+5000,0,'Penticton',50
+5001,0,'Princeton',50
 7000,0,'Kelowna',70
 7001,0,'South Main',70
+1000100,0,'Special',10001
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
index b5ddc411..c93fc953 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,94 +1,241 @@
-'3253',20241006,1
-'3201',20241007,1
-'3495',20241007,1
-'3201',20241008,1
-'3495',20241008,1
-'3201',20241009,1
-'3495',20241009,1
-'3201',20241010,1
-'3495',20241010,1
-'3495',20241011,1
-'3499',20241011,1
-'2375',20241012,1
-'3253',20241013,1
-'3253',20241014,1
-'3201',20241015,1
-'3495',20241015,1
-'3201',20241016,1
-'3495',20241016,1
-'3201',20241017,1
-'3495',20241017,1
-'3495',20241018,1
-'3499',20241018,1
-'2375',20241019,1
-'3253',20241020,1
-'3201',20241021,1
-'3495',20241021,1
-'3201',20241022,1
-'3495',20241022,1
-'3201',20241023,1
-'3495',20241023,1
-'3201',20241024,1
-'3495',20241024,1
-'3495',20241025,1
+'3626',20241020,1
+'3424',20241021,1
+'3624',20241021,1
+'3424',20241022,1
+'3624',20241022,1
+'3424',20241023,1
+'3624',20241023,1
+'3424',20241024,1
+'3624',20241024,1
 '3499',20241025,1
-'2375',20241026,1
-'3253',20241027,1
-'3201',20241028,1
-'3495',20241028,1
-'3201',20241029,1
-'3495',20241029,1
-'3201',20241030,1
-'3495',20241030,1
-'3201',20241031,1
-'3495',20241031,1
-'3495',20241101,1
+'3624',20241025,1
+'3625',20241026,1
+'3626',20241027,1
+'3424',20241028,1
+'3624',20241028,1
+'3424',20241029,1
+'3624',20241029,1
+'3424',20241030,1
+'3624',20241030,1
+'3424',20241031,1
+'3624',20241031,1
 '3499',20241101,1
-'2375',20241102,1
-'3253',20241103,1
-'3201',20241104,1
-'3495',20241104,1
-'3201',20241105,1
-'3495',20241105,1
-'3201',20241106,1
-'3495',20241106,1
-'3201',20241107,1
-'3495',20241107,1
-'3495',20241108,1
+'3624',20241101,1
+'3625',20241102,1
+'3626',20241103,1
+'3424',20241104,1
+'3624',20241104,1
+'3424',20241105,1
+'3624',20241105,1
+'3424',20241106,1
+'3624',20241106,1
+'3424',20241107,1
+'3624',20241107,1
 '3499',20241108,1
-'2375',20241109,1
-'3253',20241110,1
-'3253',20241111,1
-'3201',20241112,1
-'3495',20241112,1
-'3201',20241113,1
-'3495',20241113,1
-'3201',20241114,1
-'3495',20241114,1
-'3495',20241115,1
+'3624',20241108,1
+'3625',20241109,1
+'3626',20241110,1
+'3626',20241111,1
+'3424',20241112,1
+'3624',20241112,1
+'3424',20241113,1
+'3624',20241113,1
+'3424',20241114,1
+'3624',20241114,1
 '3499',20241115,1
-'2375',20241116,1
-'3253',20241117,1
-'3201',20241118,1
-'3495',20241118,1
-'3201',20241119,1
-'3495',20241119,1
-'3201',20241120,1
-'3495',20241120,1
-'3201',20241121,1
-'3495',20241121,1
-'3495',20241122,1
+'3624',20241115,1
+'3625',20241116,1
+'3626',20241117,1
+'3424',20241118,1
+'3624',20241118,1
+'3424',20241119,1
+'3624',20241119,1
+'3424',20241120,1
+'3624',20241120,1
+'3424',20241121,1
+'3624',20241121,1
 '3499',20241122,1
-'2375',20241123,1
-'3253',20241124,1
-'3201',20241125,1
-'3495',20241125,1
-'3201',20241126,1
-'3495',20241126,1
-'3201',20241127,1
-'3495',20241127,1
-'3201',20241128,1
-'3495',20241128,1
-'3501',20241129,1
-'2375',20241130,1
-'3253',20241201,1
+'3624',20241122,1
+'3625',20241123,1
+'3626',20241124,1
+'3424',20241125,1
+'3624',20241125,1
+'3424',20241126,1
+'3624',20241126,1
+'3424',20241127,1
+'3624',20241127,1
+'3424',20241128,1
+'3624',20241128,1
+'3627',20241129,1
+'3625',20241130,1
+'3626',20241201,1
+'3424',20241202,1
+'3624',20241202,1
+'3424',20241203,1
+'3624',20241203,1
+'3424',20241204,1
+'3624',20241204,1
+'3424',20241205,1
+'3624',20241205,1
+'3627',20241206,1
+'3625',20241207,1
+'3626',20241208,1
+'3424',20241209,1
+'3624',20241209,1
+'3424',20241210,1
+'3624',20241210,1
+'3424',20241211,1
+'3624',20241211,1
+'3424',20241212,1
+'3624',20241212,1
+'3627',20241213,1
+'3625',20241214,1
+'3626',20241215,1
+'3424',20241216,1
+'3624',20241216,1
+'3424',20241217,1
+'3624',20241217,1
+'3424',20241218,1
+'3624',20241218,1
+'3424',20241219,1
+'3624',20241219,1
+'3627',20241220,1
+'3625',20241221,1
+'3626',20241222,1
+'3628',20241223,1
+'3629',20241223,1
+'3628',20241224,1
+'3629',20241224,1
+'3626',20241226,1
+'3628',20241227,1
+'3630',20241227,1
+'3625',20241228,1
+'3626',20241229,1
+'3628',20241230,1
+'3629',20241230,1
+'3450',20241231,1
+'3626',20250101,1
+'3628',20250102,1
+'3629',20250102,1
+'3628',20250103,1
+'3630',20250103,1
+'3625',20250104,1
+'3626',20250105,1
+'3631',20250106,1
+'3632',20250106,1
+'3633',20250106,1
+'3631',20250107,1
+'3632',20250107,1
+'3631',20250108,1
+'3632',20250108,1
+'3633',20250108,1
+'3631',20250109,1
+'3632',20250109,1
+'3631',20250110,1
+'3633',20250110,1
+'3634',20250110,1
+'3625',20250111,1
+'3626',20250112,1
+'3631',20250113,1
+'3632',20250113,1
+'3633',20250113,1
+'3631',20250114,1
+'3632',20250114,1
+'3631',20250115,1
+'3632',20250115,1
+'3633',20250115,1
+'3631',20250116,1
+'3632',20250116,1
+'3631',20250117,1
+'3633',20250117,1
+'3634',20250117,1
+'3625',20250118,1
+'3626',20250119,1
+'3631',20250120,1
+'3632',20250120,1
+'3633',20250120,1
+'3631',20250121,1
+'3632',20250121,1
+'3631',20250122,1
+'3632',20250122,1
+'3633',20250122,1
+'3631',20250123,1
+'3632',20250123,1
+'3631',20250124,1
+'3633',20250124,1
+'3634',20250124,1
+'3625',20250125,1
+'3626',20250126,1
+'3631',20250127,1
+'3632',20250127,1
+'3633',20250127,1
+'3631',20250128,1
+'3632',20250128,1
+'3631',20250129,1
+'3632',20250129,1
+'3633',20250129,1
+'3631',20250130,1
+'3632',20250130,1
+'3631',20250131,1
+'3633',20250131,1
+'3634',20250131,1
+'3625',20250201,1
+'3626',20250202,1
+'3631',20250203,1
+'3632',20250203,1
+'3633',20250203,1
+'3631',20250204,1
+'3632',20250204,1
+'3631',20250205,1
+'3632',20250205,1
+'3633',20250205,1
+'3631',20250206,1
+'3632',20250206,1
+'3631',20250207,1
+'3633',20250207,1
+'3634',20250207,1
+'3625',20250208,1
+'3626',20250209,1
+'3631',20250210,1
+'3632',20250210,1
+'3633',20250210,1
+'3631',20250211,1
+'3632',20250211,1
+'3631',20250212,1
+'3632',20250212,1
+'3633',20250212,1
+'3631',20250213,1
+'3632',20250213,1
+'3631',20250214,1
+'3633',20250214,1
+'3634',20250214,1
+'3625',20250215,1
+'3626',20250216,1
+'3626',20250217,1
+'3631',20250218,1
+'3632',20250218,1
+'3631',20250219,1
+'3632',20250219,1
+'3633',20250219,1
+'3631',20250220,1
+'3632',20250220,1
+'3631',20250221,1
+'3633',20250221,1
+'3634',20250221,1
+'3625',20250222,1
+'3626',20250223,1
+'3631',20250224,1
+'3632',20250224,1
+'3633',20250224,1
+'3631',20250225,1
+'3632',20250225,1
+'3631',20250226,1
+'3632',20250226,1
+'3633',20250226,1
+'3631',20250227,1
+'3632',20250227,1
+'3631',20250228,1
+'3633',20250228,1
+'3634',20250228,1
+'3625',20250301,1
+'3626',20250302,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
index f8ca7511..feb095a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
@@ -1,2 +1,5 @@
-'3495',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
-'3501',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3450',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3624',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3627',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3628',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3631',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
index 9b05850b..832465ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
@@ -1,2 +1,5 @@
-'3495',7000,95700,,'',0,66600,,'',0
-'3501',7000,95700,,'',0,66600,,'',0
+'3450',7000,95700,,'',0,66600,,'',0
+'3624',7000,95700,,'',0,66600,,'',0
+'3627',7000,95700,,'',0,66600,,'',0
+'3628',7000,95700,,'',0,66600,,'',0
+'3631',7000,95700,,'',0,66600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
index 09c5a959..6600d756 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
@@ -1,2 +1,5 @@
-'3495',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'3501',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3450',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3624',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3627',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3628',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3631',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
index 9d053ee3..5be9e4fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
@@ -1,2 +1,5 @@
-'3495',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
-'3501',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'3450',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'3624',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'3627',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'3628',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'3631',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
index bed62037..1e9c795e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
@@ -1,2 +1,5 @@
-'3495',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
-'3501',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'3450',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'3624',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'3627',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'3628',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'3631',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
index cc96d608..6fed1651 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
@@ -1,2 +1,5 @@
-'3495',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'3501',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3450',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3624',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3627',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3628',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3631',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
index 58975335..a5e19a2b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
@@ -1,4 +1,10 @@
-'3495',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
-'3495',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'3501',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
-'3501',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3450',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3450',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3624',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3624',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3627',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3627',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3628',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3628',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'3631',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3631',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
index 5f17c560..8832ad7b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
@@ -1,2 +1,5 @@
-'3495',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
-'3501',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3450',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3624',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3627',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3628',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'3631',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
index 9f1d45d4..98646da6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
@@ -1,2 +1,5 @@
-'3495',7000,95500,,'',0,66600,,'',0
-'3501',7000,95500,,'',0,66600,,'',0
+'3450',7000,95500,,'',0,66600,,'',0
+'3624',7000,95500,,'',0,66600,,'',0
+'3627',7000,95500,,'',0,66600,,'',0
+'3628',7000,95500,,'',0,66600,,'',0
+'3631',7000,95500,,'',0,66600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
index 3bd19d4a..4eab06d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
@@ -1,9 +1,18 @@
-'2375',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
index f3a055c4..a6184cc8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
@@ -1,3 +1,6 @@
-'2375',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
index 3cfae4e3..2d7d5a47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
@@ -1,3 +1,6 @@
-'2375',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
index 3cfae4e3..2d7d5a47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
@@ -1,3 +1,6 @@
-'2375',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
index 3cfae4e3..2d7d5a47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
@@ -1,3 +1,6 @@
-'2375',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
index e45e632c..b28d57ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
@@ -1,3 +1,6 @@
-'2375',101,81500,,'',0
-'3495',101,81500,,'',0
-'3501',101,81500,,'',0
+'3450',101,81500,,'',0
+'3624',101,81500,,'',0
+'3625',101,81500,,'',0
+'3627',101,81500,,'',0
+'3628',101,81500,,'',0
+'3631',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
index e45e632c..b28d57ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
@@ -1,3 +1,6 @@
-'2375',101,81500,,'',0
-'3495',101,81500,,'',0
-'3501',101,81500,,'',0
+'3450',101,81500,,'',0
+'3624',101,81500,,'',0
+'3625',101,81500,,'',0
+'3627',101,81500,,'',0
+'3628',101,81500,,'',0
+'3631',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
index e45e632c..b28d57ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
@@ -1,3 +1,6 @@
-'2375',101,81500,,'',0
-'3495',101,81500,,'',0
-'3501',101,81500,,'',0
+'3450',101,81500,,'',0
+'3624',101,81500,,'',0
+'3625',101,81500,,'',0
+'3627',101,81500,,'',0
+'3628',101,81500,,'',0
+'3631',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
index b02e56ce..0d6e392d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
@@ -1,3 +1,6 @@
-'2375',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
index 0a7ef454..31c5d70c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
@@ -1,9 +1,18 @@
-'2375',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
index c875a2ed..5e862cca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
@@ -1,9 +1,18 @@
-'2375',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
index 7923fb26..8a4df80e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
@@ -1,6 +1,12 @@
-'2375',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194600,,'',0,16400,,'',0
-'3495',1501,194600,,'',0,16400,,'',0
-'3501',1501,194600,,'',0,16400,,'',0
+'3450',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194600,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194600,,'',0,16400,,'',0
+'3625',1501,194600,,'',0,16400,,'',0
+'3627',1501,194600,,'',0,16400,,'',0
+'3628',1501,194600,,'',0,16400,,'',0
+'3631',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
index 48a6b474..f0f5688d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
@@ -1,8 +1,18 @@
-'2375',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164800,,'',0
-'3495',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164800,,'',0
+'3450',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164800,,'',0
-'3501',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164800,,'',0
+'3630',1000,164800,,'',0
+'3631',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164800,,'',0
+'3634',1000,164800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
index 285b9cd6..80859538 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
@@ -1,3 +1,6 @@
-'2375',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
index 99913575..8e58da89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
@@ -1,8 +1,18 @@
-'2375',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3495',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3501',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'2375',1001,91000,,'',0,42900,,'',0,40700,,'',0
-'3201',1001,174600,,'',0
-'3495',1001,74400,,'',0,16600,,'',0,42900,,'',0
+'3450',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3624',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3625',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3627',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3628',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3631',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3424',1001,174600,,'',0
+'3450',1001,74400,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
 '3499',1001,174600,,'',0
-'3501',1001,74400,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3624',1001,74400,,'',0,16600,,'',0,42900,,'',0
+'3625',1001,91000,,'',0,42900,,'',0,40700,,'',0
+'3627',1001,74400,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3628',1001,74400,,'',0,16600,,'',0,42900,,'',0
+'3629',1001,174600,,'',0
+'3630',1001,174600,,'',0
+'3631',1001,74400,,'',0,16600,,'',0,42900,,'',0
+'3632',1001,174600,,'',0
+'3634',1001,174600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146016
index d4e4aa99..8c167090 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146016
@@ -1 +1 @@
-'3253',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
index 6e54f6d1..66deca08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
@@ -1,3 +1,6 @@
-'2375',101,81300,,'',0
-'3495',101,81300,,'',0
-'3501',101,81300,,'',0
+'3450',101,81300,,'',0
+'3624',101,81300,,'',0
+'3625',101,81300,,'',0
+'3627',101,81300,,'',0
+'3628',101,81300,,'',0
+'3631',101,81300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
index 19718c70..14ba78c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
@@ -1,3 +1,6 @@
-'2375',101,81600,,'',0
-'3495',101,81600,,'',0
-'3501',101,81600,,'',0
+'3450',101,81600,,'',0
+'3624',101,81600,,'',0
+'3625',101,81600,,'',0
+'3627',101,81600,,'',0
+'3628',101,81600,,'',0
+'3631',101,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
index a775b481..09b7234e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
@@ -1,6 +1,12 @@
-'2375',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,200700,,'',0,12400,,'',0
-'3495',1500,200700,,'',0,12400,,'',0
-'3501',1500,200700,,'',0,12400,,'',0
+'3450',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,200700,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200700,,'',0,12400,,'',0
+'3625',1500,200700,,'',0,12400,,'',0
+'3627',1500,200700,,'',0,12400,,'',0
+'3628',1500,200700,,'',0,12400,,'',0
+'3631',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
index fa204f39..5fe6d7a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
@@ -1,3 +1,7 @@
-'2375',101,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
index a28a5566..6d312e77 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
@@ -1,11 +1,24 @@
-'2375',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1001,91200,,'',0,42900,,'',0,40700,,'',0
-'3201',1001,174800,,'',0
-'3495',1001,74600,,'',0,16600,,'',0,42900,,'',0
+'3450',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1001,174800,,'',0
+'3450',1001,74600,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
 '3499',1001,174800,,'',0
-'3501',1001,74600,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3624',1001,74600,,'',0,16600,,'',0,42900,,'',0
+'3625',1001,91200,,'',0,42900,,'',0,40700,,'',0
+'3627',1001,74600,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3628',1001,74600,,'',0,16600,,'',0,42900,,'',0
+'3629',1001,174800,,'',0
+'3630',1001,174800,,'',0
+'3631',1001,74600,,'',0,16600,,'',0,42900,,'',0
+'3632',1001,174800,,'',0
+'3634',1001,174800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146022
index c245f1e2..ae5b0baa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146022
@@ -1 +1 @@
-'3253',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
index 1a20a05b..e652d063 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
@@ -1,3 +1,6 @@
-'2375',300,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
index 50f5bddf..335d731f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
@@ -1,10 +1,20 @@
-'2375',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',300,81900,0,'School Spcl',0
-'3495',300,81900,0,'School Spcl',0
-'3501',300,81900,0,'School Spcl',0
-'2375',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',300,81900,0,'School Spcl',0
+'3624',300,81900,0,'School Spcl',0
+'3625',300,81900,0,'School Spcl',0
+'3627',300,81900,0,'School Spcl',0
+'3628',300,81900,0,'School Spcl',0
+'3631',300,81900,0,'School Spcl',0
+'3450',500,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
index 8f9a85af..642afd69 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
@@ -1,12 +1,24 @@
-'2375',300,80400,0,'School Spcl',0
-'3495',300,80400,0,'School Spcl',0
-'3501',300,80400,0,'School Spcl',0
-'2375',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,80400,0,'School Spcl',0
+'3624',300,80400,0,'School Spcl',0
+'3625',300,80400,0,'School Spcl',0
+'3627',300,80400,0,'School Spcl',0
+'3628',300,80400,0,'School Spcl',0
+'3631',300,80400,0,'School Spcl',0
+'3450',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193100,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
index a2302f4b..420c9ce9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
@@ -1,14 +1,29 @@
-'2375',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194400,,'',0,16400,,'',0
-'3495',1501,194400,,'',0,16400,,'',0
-'3501',1501,194400,,'',0,16400,,'',0
-'2375',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',4001,94800,,'',0,60000,,'',0
-'3501',4001,94800,,'',0,60000,,'',0
+'3450',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194400,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194400,,'',0,16400,,'',0
+'3625',1501,194400,,'',0,16400,,'',0
+'3627',1501,194400,,'',0,16400,,'',0
+'3628',1501,194400,,'',0,16400,,'',0
+'3631',1501,194400,,'',0,16400,,'',0
+'3450',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3450',4001,94800,,'',0,60000,,'',0
+'3624',4001,94800,,'',0,60000,,'',0
+'3627',4001,94800,,'',0,60000,,'',0
+'3628',4001,94800,,'',0,60000,,'',0
+'3631',4001,94800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
index d00866d2..3db9d186 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
@@ -1,14 +1,29 @@
-'2375',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1500,200900,,'',0,12400,,'',0
-'3495',1500,200900,,'',0,12400,,'',0
-'3501',1500,200900,,'',0,12400,,'',0
-'2375',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',4000,83500,,'',0,51500,,'',0
-'3501',4000,83500,,'',0,51500,,'',0
+'3450',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',1500,200900,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200900,,'',0,12400,,'',0
+'3625',1500,200900,,'',0,12400,,'',0
+'3627',1500,200900,,'',0,12400,,'',0
+'3628',1500,200900,,'',0,12400,,'',0
+'3631',1500,200900,,'',0,12400,,'',0
+'3450',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',4000,83500,,'',0,51500,,'',0
+'3624',4000,83500,,'',0,51500,,'',0
+'3627',4000,83500,,'',0,51500,,'',0
+'3628',4000,83500,,'',0,51500,,'',0
+'3631',4000,83500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146031
index f9febb71..5b08a331 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146031
@@ -1 +1,2 @@
-'3253',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146032
index 020bcd42..27672bff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146032
@@ -1 +1,2 @@
-'3253',1601,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146033
index 020bcd42..27672bff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146033
@@ -1 +1,2 @@
-'3253',1601,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
index 0daa2495..48241027 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
@@ -1,18 +1,40 @@
-'2375',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3201',1101,181400,,'',0
-'3495',1101,124100,,'',0
+'3450',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1101,181400,,'',0
+'3450',1101,124100,,'',0,57300,,'',0
 '3499',1101,181400,,'',0
-'3501',1101,124100,,'',0,57300,,'',0
-'2375',1501,194000,,'',0,16400,,'',0
-'3495',1501,194000,,'',0,16400,,'',0
-'3501',1501,194000,,'',0,16400,,'',0
-'3253',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',4001,94300,,'',0,60000,,'',0
-'3501',4001,94300,,'',0,60000,,'',0
-'3495',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,124100,,'',0
+'3627',1101,124100,,'',0,57300,,'',0
+'3628',1101,124100,,'',0
+'3629',1101,181400,,'',0
+'3630',1101,181400,,'',0
+'3631',1101,124100,,'',0
+'3632',1101,181400,,'',0
+'3634',1101,181400,,'',0
+'3450',1501,194000,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194000,,'',0,16400,,'',0
+'3625',1501,194000,,'',0,16400,,'',0
+'3627',1501,194000,,'',0,16400,,'',0
+'3628',1501,194000,,'',0,16400,,'',0
+'3631',1501,194000,,'',0,16400,,'',0
+'3626',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',4001,94300,,'',0,60000,,'',0
+'3624',4001,94300,,'',0,60000,,'',0
+'3627',4001,94300,,'',0,60000,,'',0
+'3628',4001,94300,,'',0,60000,,'',0
+'3631',4001,94300,,'',0,60000,,'',0
+'3450',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
index 26c6c9d3..6533d3cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
@@ -1,16 +1,35 @@
-'2375',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3201',1101,181400,,'',0
-'3495',1101,124100,,'',0
+'3450',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1101,181400,,'',0
+'3450',1101,124100,,'',0,57300,,'',0
 '3499',1101,181400,,'',0
-'3501',1101,124100,,'',0,57300,,'',0
-'2375',1501,194100,,'',0,16400,,'',0
-'3495',1501,194100,,'',0,16400,,'',0
-'3501',1501,194100,,'',0,16400,,'',0
-'3253',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,124100,,'',0
+'3627',1101,124100,,'',0,57300,,'',0
+'3628',1101,124100,,'',0
+'3629',1101,181400,,'',0
+'3630',1101,181400,,'',0
+'3631',1101,124100,,'',0
+'3632',1101,181400,,'',0
+'3634',1101,181400,,'',0
+'3450',1501,194100,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194100,,'',0,16400,,'',0
+'3625',1501,194100,,'',0,16400,,'',0
+'3627',1501,194100,,'',0,16400,,'',0
+'3628',1501,194100,,'',0,16400,,'',0
+'3631',1501,194100,,'',0,16400,,'',0
+'3626',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
index 9e46eb6f..55a9cd98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
@@ -1,10 +1,22 @@
-'2375',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',1100,95800,,'',0,34700,,'',0
-'3501',1100,95800,,'',0,34700,,'',0
-'2375',1500,201300,,'',0,12400,,'',0
-'3495',1500,201300,,'',0,12400,,'',0
-'3501',1500,201300,,'',0,12400,,'',0
-'3495',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1100,95800,,'',0,34700,,'',0
+'3624',1100,95800,,'',0,34700,,'',0
+'3627',1100,95800,,'',0,34700,,'',0
+'3628',1100,95800,,'',0,34700,,'',0
+'3631',1100,95800,,'',0,34700,,'',0
+'3450',1500,201300,,'',0,12400,,'',0,16400,,'',0,22400,,'',0
+'3624',1500,201300,,'',0,12400,,'',0
+'3625',1500,201300,,'',0,12400,,'',0
+'3627',1500,201300,,'',0,12400,,'',0
+'3628',1500,201300,,'',0,12400,,'',0
+'3631',1500,201300,,'',0,12400,,'',0
+'3450',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
index 50916312..26c9a5dd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
@@ -1,6 +1,12 @@
-'2375',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,200800,,'',0,12400,,'',0
-'3495',1500,200800,,'',0,12400,,'',0
-'3501',1500,200800,,'',0,12400,,'',0
+'3450',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,200800,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200800,,'',0,12400,,'',0
+'3625',1500,200800,,'',0,12400,,'',0
+'3627',1500,200800,,'',0,12400,,'',0
+'3628',1500,200800,,'',0,12400,,'',0
+'3631',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
index d5651468..bd19a17a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
@@ -1,6 +1,12 @@
-'2375',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,200700,,'',0,12400,,'',0
-'3495',1500,200700,,'',0,12400,,'',0
-'3501',1500,200700,,'',0,12400,,'',0
+'3450',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,200700,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200700,,'',0,12400,,'',0
+'3625',1500,200700,,'',0,12400,,'',0
+'3627',1500,200700,,'',0,12400,,'',0
+'3628',1500,200700,,'',0,12400,,'',0
+'3631',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
index f2230bd6..df6d2369 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
@@ -1,6 +1,12 @@
-'2375',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194500,,'',0,16400,,'',0
-'3495',1501,194500,,'',0,16400,,'',0
-'3501',1501,194500,,'',0,16400,,'',0
+'3450',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194500,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194500,,'',0,16400,,'',0
+'3625',1501,194500,,'',0,16400,,'',0
+'3627',1501,194500,,'',0,16400,,'',0
+'3628',1501,194500,,'',0,16400,,'',0
+'3631',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
index 41466ae5..e4e834f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
@@ -1,4 +1,8 @@
-'2375',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1601,94800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,94800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
index 99927030..ec397795 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
@@ -1,5 +1,12 @@
-'2375',1000,83000,,'',0,47200,,'',0,40700,,'',0
-'3201',1000,170900,,'',0
-'3495',1000,71000,,'',0,12000,,'',0,47200,,'',0
+'3424',1000,170900,,'',0
+'3450',1000,71000,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
 '3499',1000,170900,,'',0
-'3501',1000,71000,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3624',1000,71000,,'',0,12000,,'',0,47200,,'',0
+'3625',1000,83000,,'',0,47200,,'',0,40700,,'',0
+'3627',1000,71000,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3628',1000,71000,,'',0,12000,,'',0,47200,,'',0
+'3629',1000,170900,,'',0
+'3630',1000,170900,,'',0
+'3631',1000,71000,,'',0,12000,,'',0,47200,,'',0
+'3632',1000,170900,,'',0
+'3634',1000,170900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
index 7ef4533e..f8dad922 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
@@ -1,15 +1,31 @@
-'2375',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'3495',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'3501',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'2375',400,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
-'3495',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
-'3501',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
-'2375',1001,91300,,'',0,42900,,'',0,40700,,'',0
-'3201',1001,174900,,'',0
-'3495',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3450',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3624',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3625',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3627',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3628',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3631',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3450',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3624',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3625',400,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3627',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3628',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3631',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3424',1001,174900,,'',0
+'3450',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
 '3499',1001,174900,,'',0
-'3501',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
-'3253',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3625',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'3627',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3628',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3629',1001,174900,,'',0
+'3630',1001,174900,,'',0
+'3631',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3632',1001,174900,,'',0
+'3634',1001,174900,,'',0
+'3626',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
index 90cf2d8c..c05980c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
@@ -1,3 +1,6 @@
-'2375',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
-'3495',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
-'3501',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3450',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3624',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3625',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3627',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3628',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3631',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
index b3a26908..06646234 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
@@ -1,3 +1,6 @@
-'2375',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
index 34fd8390..5bf5cb64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
@@ -1,18 +1,40 @@
-'2375',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164700,,'',0
-'3495',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3450',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164700,,'',0
+'3450',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164700,,'',0
-'3501',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
-'2375',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
-'3495',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
-'3501',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
-'3495',4000,84500,4,'',0,55500,4,'',0
-'3501',4000,84500,4,'',0,55500,4,'',0
-'3495',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164700,,'',0
+'3630',1000,164700,,'',0
+'3631',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164700,,'',0
+'3634',1000,164700,,'',0
+'3450',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0,16400,4,'',0,10000,0,'Peachtree',0,12400,4,'',0
+'3624',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'3625',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
+'3627',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'3628',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'3631',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'3450',4000,84500,4,'',0,55500,4,'',0
+'3624',4000,84500,4,'',0,55500,4,'',0
+'3627',4000,84500,4,'',0,55500,4,'',0
+'3628',4000,84500,4,'',0,55500,4,'',0
+'3631',4000,84500,4,'',0,55500,4,'',0
+'3450',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
index 329a8156..167a4df1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
@@ -1,9 +1,19 @@
-'2375',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1001,91300,,'',0,42900,,'',0,40700,,'',0
-'3201',1001,174900,,'',0
-'3495',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3450',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1001,174900,,'',0
+'3450',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
 '3499',1001,174900,,'',0
-'3501',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
-'3253',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3625',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'3627',1001,74700,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3628',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3629',1001,174900,,'',0
+'3630',1001,174900,,'',0
+'3631',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3632',1001,174900,,'',0
+'3634',1001,174900,,'',0
+'3626',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
index d2b0b3d4..b448259a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
@@ -1,14 +1,31 @@
-'2375',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194000,,'',0,16400,,'',0
-'3495',1501,194000,,'',0,16400,,'',0
-'3501',1501,194000,,'',0,16400,,'',0
-'3253',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',4001,94300,,'',0,60000,,'',0
-'3501',4001,94300,,'',0,60000,,'',0
-'3495',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194000,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194000,,'',0,16400,,'',0
+'3625',1501,194000,,'',0,16400,,'',0
+'3627',1501,194000,,'',0,16400,,'',0
+'3628',1501,194000,,'',0,16400,,'',0
+'3631',1501,194000,,'',0,16400,,'',0
+'3626',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',4001,94300,,'',0,60000,,'',0
+'3624',4001,94300,,'',0,60000,,'',0
+'3627',4001,94300,,'',0,60000,,'',0
+'3628',4001,94300,,'',0,60000,,'',0
+'3631',4001,94300,,'',0,60000,,'',0
+'3633',5000,91000,,'',0
+'3633',5001,123000,,'',0
+'3450',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
index db38d938..83a0db51 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
@@ -1,15 +1,34 @@
-'2375',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164700,,'',0
-'3495',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3450',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164700,,'',0
+'3450',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164700,,'',0
-'3501',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
-'2375',1500,201400,,'',0,12400,,'',0
-'3495',1500,201400,,'',0,12400,,'',0
-'3501',1500,201400,,'',0,12400,,'',0
-'3495',4000,84400,,'',0,51500,,'',0
-'3501',4000,84400,,'',0,51500,,'',0
-'3495',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164700,,'',0
+'3630',1000,164700,,'',0
+'3631',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164700,,'',0
+'3634',1000,164700,,'',0
+'3450',1500,201400,,'',0,12400,,'',0,16400,,'',0,22400,,'',0
+'3624',1500,201400,,'',0,12400,,'',0
+'3625',1500,201400,,'',0,12400,,'',0
+'3627',1500,201400,,'',0,12400,,'',0
+'3628',1500,201400,,'',0,12400,,'',0
+'3631',1500,201400,,'',0,12400,,'',0
+'3450',4000,84400,,'',0,51500,,'',0
+'3624',4000,84400,,'',0,51500,,'',0
+'3627',4000,84400,,'',0,51500,,'',0
+'3628',4000,84400,,'',0,51500,,'',0
+'3631',4000,84400,,'',0,51500,,'',0
+'3450',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
index 51c670c0..9df47a48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
@@ -1,11 +1,20 @@
-'2375',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',500,94200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'2375',501,94200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',500,131200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3253',501,121200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,74200,4,'',0,7400,4,'',0,2600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'3495',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',500,74200,4,'',0,7400,4,'',0,2600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'3501',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',500,74200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3450',501,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',500,74200,4,'',0,7400,4,'',0,2600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3624',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',500,94200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3625',501,94200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',500,131200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3626',501,121200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,74200,4,'',0,7400,4,'',0,2600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3627',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',500,74200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3628',501,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',500,74200,4,'',0,7400,4,'',0,2600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3631',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
index 27e57e1e..b8c718cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
@@ -1,7 +1,14 @@
-'2375',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'3501',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'2375',501,94600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,74600,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,0,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,74600,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,0,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3624',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3625',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3628',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3631',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3450',501,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,74600,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,0,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,94600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,74600,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,0,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,74600,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,0,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1000100,192200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
index 4b3d2a0f..a0434f0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
@@ -1,5 +1,9 @@
-'2375',501,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',1601,92900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
index 235bf3d3..fb77cec9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
@@ -1,13 +1,27 @@
-'2375',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91400,,'',0,42900,,'',0,40700,,'',0
-'3201',1001,175000,,'',0
-'3495',1001,74800,,'',0,16600,,'',0,42900,,'',0
+'3450',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175000,,'',0
+'3450',1001,74800,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
 '3499',1001,175000,,'',0
-'3501',1001,74800,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
-'3253',1601,93000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,74800,,'',0,16600,,'',0,42900,,'',0
+'3625',1001,91400,,'',0,42900,,'',0,40700,,'',0
+'3627',1001,74800,,'',0,16600,,'',0,42900,,'',0,40700,,'',0
+'3628',1001,74800,,'',0,16600,,'',0,42900,,'',0
+'3629',1001,175000,,'',0
+'3630',1001,175000,,'',0
+'3631',1001,74800,,'',0,16600,,'',0,42900,,'',0
+'3632',1001,175000,,'',0
+'3634',1001,175000,,'',0
+'3626',1601,93000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
index bc4755ae..ea2f9076 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
@@ -1,5 +1,11 @@
-'2375',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',1100,95900,,'',0,34700,,'',0
-'3501',1100,95900,,'',0,34700,,'',0
+'3450',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1100,95900,,'',0,34700,,'',0
+'3624',1100,95900,,'',0,34700,,'',0
+'3627',1100,95900,,'',0,34700,,'',0
+'3628',1100,95900,,'',0,34700,,'',0
+'3631',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
index 5e1f7254..36ea3340 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
@@ -1,12 +1,29 @@
-'2375',401,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
-'3495',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
-'3501',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
-'2375',1000,80700,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164600,,'',0
-'3495',1000,64700,,'',0,16000,,'',0,43200,,'',0
+'3450',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3624',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3625',401,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3627',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3628',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3631',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3424',1000,164600,,'',0
+'3450',1000,64700,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164600,,'',0
-'3501',1000,64700,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
-'3201',1101,181300,,'',0
-'3495',1101,124000,,'',0
+'3624',1000,64700,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80700,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64700,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64700,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164600,,'',0
+'3630',1000,164600,,'',0
+'3631',1000,64700,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164600,,'',0
+'3634',1000,164600,,'',0
+'3424',1101,181300,,'',0
+'3450',1101,124000,,'',0,57300,,'',0
 '3499',1101,181300,,'',0
-'3501',1101,124000,,'',0,57300,,'',0
+'3624',1101,124000,,'',0
+'3627',1101,124000,,'',0,57300,,'',0
+'3628',1101,124000,,'',0
+'3629',1101,181300,,'',0
+'3630',1101,181300,,'',0
+'3631',1101,124000,,'',0
+'3632',1101,181300,,'',0
+'3634',1101,181300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
index 8973fc00..85a0f211 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
@@ -1,12 +1,29 @@
-'2375',401,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
-'3495',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
-'3501',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
-'2375',1000,80700,,'',0,43100,,'',0,40700,,'',0
-'3201',1000,164500,,'',0
-'3495',1000,64700,,'',0,16000,,'',0,43100,,'',0
+'3450',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3624',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3625',401,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3627',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3628',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3631',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3424',1000,164500,,'',0
+'3450',1000,64700,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
 '3499',1000,164500,,'',0
-'3501',1000,64700,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
-'3201',1101,181200,,'',0
-'3495',1101,123900,,'',0
+'3624',1000,64700,,'',0,16000,,'',0,43100,,'',0
+'3625',1000,80700,,'',0,43100,,'',0,40700,,'',0
+'3627',1000,64700,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
+'3628',1000,64700,,'',0,16000,,'',0,43100,,'',0
+'3629',1000,164500,,'',0
+'3630',1000,164500,,'',0
+'3631',1000,64700,,'',0,16000,,'',0,43100,,'',0
+'3632',1000,164500,,'',0
+'3634',1000,164500,,'',0
+'3424',1101,181200,,'',0
+'3450',1101,123900,,'',0,57300,,'',0
 '3499',1101,181200,,'',0
-'3501',1101,123900,,'',0,57300,,'',0
+'3624',1101,123900,,'',0
+'3627',1101,123900,,'',0,57300,,'',0
+'3628',1101,123900,,'',0
+'3629',1101,181200,,'',0
+'3630',1101,181200,,'',0
+'3631',1101,123900,,'',0
+'3632',1101,181200,,'',0
+'3634',1101,181200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
index 172435a3..f00ecd96 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
@@ -1,5 +1,11 @@
-'2375',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',1100,100100,,'',0,30700,,'',0
-'3501',1100,100100,,'',0,30700,,'',0
+'3450',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1100,100100,,'',0,30700,,'',0
+'3624',1100,100100,,'',0,30700,,'',0
+'3627',1100,100100,,'',0,30700,,'',0
+'3628',1100,100100,,'',0,30700,,'',0
+'3631',1100,100100,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
index d68f4c96..f89c6604 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
@@ -1,7 +1,13 @@
-'2375',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
index 26f81213..23a799ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
@@ -1,3 +1,6 @@
-'2375',101,82100,,'',0
-'3495',101,82100,,'',0
-'3501',101,82100,,'',0
+'3450',101,82100,,'',0
+'3624',101,82100,,'',0
+'3625',101,82100,,'',0
+'3627',101,82100,,'',0
+'3628',101,82100,,'',0
+'3631',101,82100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
index 320988b2..072a0671 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
@@ -1,3 +1,6 @@
-'2375',101,82300,,'',0
-'3495',101,82300,,'',0
-'3501',101,82300,,'',0
+'3450',101,82300,,'',0
+'3624',101,82300,,'',0
+'3625',101,82300,,'',0
+'3627',101,82300,,'',0
+'3628',101,82300,,'',0
+'3631',101,82300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
index d68f4c96..f89c6604 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
@@ -1,7 +1,13 @@
-'2375',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
index bc4755ae..ea2f9076 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
@@ -1,5 +1,11 @@
-'2375',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',1100,95900,,'',0,34700,,'',0
-'3501',1100,95900,,'',0,34700,,'',0
+'3450',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1100,95900,,'',0,34700,,'',0
+'3624',1100,95900,,'',0,34700,,'',0
+'3627',1100,95900,,'',0,34700,,'',0
+'3628',1100,95900,,'',0,34700,,'',0
+'3631',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
index 7cfcd2b1..beebb54b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
@@ -1,5 +1,11 @@
-'2375',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',1100,100000,,'',0,30700,,'',0
-'3501',1100,100000,,'',0,30700,,'',0
+'3450',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1100,100000,,'',0,30700,,'',0
+'3624',1100,100000,,'',0,30700,,'',0
+'3627',1100,100000,,'',0,30700,,'',0
+'3628',1100,100000,,'',0,30700,,'',0
+'3631',1100,100000,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
index 4e42dae4..65496be0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
@@ -1,8 +1,18 @@
-'2375',401,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'3495',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'3501',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'2375',1000,80600,,'',0,43100,,'',0,40700,,'',0
-'3201',1000,164400,,'',0
-'3495',1000,64600,,'',0,16000,,'',0,43100,,'',0
+'3450',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3624',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3625',401,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3627',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3628',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3631',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3424',1000,164400,,'',0
+'3450',1000,64600,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
 '3499',1000,164400,,'',0
-'3501',1000,64600,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
+'3624',1000,64600,,'',0,16000,,'',0,43100,,'',0
+'3625',1000,80600,,'',0,43100,,'',0,40700,,'',0
+'3627',1000,64600,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
+'3628',1000,64600,,'',0,16000,,'',0,43100,,'',0
+'3629',1000,164400,,'',0
+'3630',1000,164400,,'',0
+'3631',1000,64600,,'',0,16000,,'',0,43100,,'',0
+'3632',1000,164400,,'',0
+'3634',1000,164400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
index c7eec007..dd4f36ee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
@@ -1,12 +1,24 @@
-'2375',100,82800,,'',0
-'3495',100,82800,,'',0
-'3501',100,82800,,'',0
-'2375',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,195900,,'',0,16400,,'',0
-'3495',1500,195900,,'',0,16400,,'',0
-'3501',1500,195900,,'',0,16400,,'',0
-'3253',1600,95700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'3495',7000,60100,,'',0
-'3501',7000,60100,,'',0
+'3450',100,82800,,'',0
+'3624',100,82800,,'',0
+'3625',100,82800,,'',0
+'3627',100,82800,,'',0
+'3628',100,82800,,'',0
+'3631',100,82800,,'',0
+'3450',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,195900,,'',0,16400,,'',0,12500,,'',0,26400,,'',0
+'3624',1500,195900,,'',0,16400,,'',0
+'3625',1500,195900,,'',0,16400,,'',0
+'3627',1500,195900,,'',0,16400,,'',0
+'3628',1500,195900,,'',0,16400,,'',0
+'3631',1500,195900,,'',0,16400,,'',0
+'3626',1600,95700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3450',7000,60100,,'',0
+'3624',7000,60100,,'',0
+'3627',7000,60100,,'',0
+'3628',7000,60100,,'',0
+'3631',7000,60100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
index 87a57789..89333953 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
@@ -1,3 +1,7 @@
-'2375',1500,195700,,'',0,16400,,'',0
-'3495',1500,195700,,'',0,16400,,'',0
-'3501',1500,195700,,'',0,16400,,'',0
+'3450',1500,195700,,'',0,16400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,195700,,'',0,16400,,'',0
+'3625',1500,195700,,'',0,16400,,'',0
+'3627',1500,195700,,'',0,16400,,'',0
+'3628',1500,195700,,'',0,16400,,'',0
+'3631',1500,195700,,'',0,16400,,'',0
+'3450',1000100,190600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
index a8567542..9ee0575d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
@@ -1,9 +1,18 @@
-'2375',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',7000,55700,,'',0
-'3501',7000,55700,,'',0
+'3450',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',7000,55700,,'',0
+'3624',7000,55700,,'',0
+'3627',7000,55700,,'',0
+'3628',7000,55700,,'',0
+'3631',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
index fbc3c9b8..7002acd6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
@@ -1,8 +1,18 @@
-'2375',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182300,,'',0
-'3501',7001,182300,,'',0
+'3450',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,191500,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182300,,'',0
+'3624',7001,182300,,'',0
+'3627',7001,182300,,'',0
+'3628',7001,182300,,'',0
+'3631',7001,182300,,'',0
+'3450',1000100,190300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
index 40c42cd0..9e75177d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
@@ -1,9 +1,18 @@
-'2375',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',7000,55700,,'',0
-'3501',7000,55700,,'',0
+'3450',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',7000,55700,,'',0
+'3624',7000,55700,,'',0
+'3627',7000,55700,,'',0
+'3628',7000,55700,,'',0
+'3631',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
index 5301355b..848709f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
@@ -1,9 +1,18 @@
-'2375',500,91200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',7000,55700,,'',0
-'3501',7000,55700,,'',0
+'3450',500,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',7000,55700,,'',0
+'3624',7000,55700,,'',0
+'3627',7000,55700,,'',0
+'3628',7000,55700,,'',0
+'3631',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
index 9e3f55fb..70613803 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
@@ -1,8 +1,18 @@
-'2375',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182400,,'',0
-'3501',7001,182400,,'',0
+'3450',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,191600,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182400,,'',0
+'3624',7001,182400,,'',0
+'3627',7001,182400,,'',0
+'3628',7001,182400,,'',0
+'3631',7001,182400,,'',0
+'3450',1000100,190300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
index 69bae6ac..6c8c6ef2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
@@ -1,5 +1,12 @@
-'2375',1001,84200,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172000,,'',0
-'3495',1001,71800,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172000,,'',0
+'3450',1001,71800,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172000,,'',0
-'3501',1001,71800,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,71800,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,84200,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,71800,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,71800,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172000,,'',0
+'3630',1001,172000,,'',0
+'3631',1001,71800,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172000,,'',0
+'3634',1001,172000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
index 45fd3f6a..c9d928c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
@@ -1,7 +1,14 @@
-'2375',300,81700,0,'School Spcl',0
-'3495',300,81700,0,'School Spcl',0
-'3501',300,81700,0,'School Spcl',0
-'2375',500,93700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',300,81700,0,'School Spcl',0
+'3624',300,81700,0,'School Spcl',0
+'3625',300,81700,0,'School Spcl',0
+'3627',300,81700,0,'School Spcl',0
+'3628',300,81700,0,'School Spcl',0
+'3631',300,81700,0,'School Spcl',0
+'3450',500,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
index a873a25e..a8c408c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
@@ -1,4 +1,8 @@
-'2375',500,93600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73600,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73600,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',500,73600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73600,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73600,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73600,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
index 6979cae7..48631dde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
@@ -1,13 +1,27 @@
-'2375',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91500,,'',0,43000,,'',0,40600,,'',0
-'3201',1001,175100,,'',0
-'3495',1001,74900,,'',0,16600,,'',0,43000,,'',0
+'3450',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175100,,'',0
+'3450',1001,74900,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
 '3499',1001,175100,,'',0
-'3501',1001,74900,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
-'3253',1601,93100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,74900,,'',0,16600,,'',0,43000,,'',0
+'3625',1001,91500,,'',0,43000,,'',0,40600,,'',0
+'3627',1001,74900,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
+'3628',1001,74900,,'',0,16600,,'',0,43000,,'',0
+'3629',1001,175100,,'',0
+'3630',1001,175100,,'',0
+'3631',1001,74900,,'',0,16600,,'',0,43000,,'',0
+'3632',1001,175100,,'',0
+'3634',1001,175100,,'',0
+'3626',1601,93100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
index bd6a4272..a1caa881 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
@@ -1,13 +1,27 @@
-'2375',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91600,,'',0,43000,,'',0,40600,,'',0
-'3201',1001,175200,,'',0
-'3495',1001,75000,,'',0,16600,,'',0,43000,,'',0
+'3450',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175200,,'',0
+'3450',1001,75000,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
 '3499',1001,175200,,'',0
-'3501',1001,75000,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
-'3253',1601,93100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,75000,,'',0,16600,,'',0,43000,,'',0
+'3625',1001,91600,,'',0,43000,,'',0,40600,,'',0
+'3627',1001,75000,,'',0,16600,,'',0,43000,,'',0,40600,,'',0
+'3628',1001,75000,,'',0,16600,,'',0,43000,,'',0
+'3629',1001,175200,,'',0
+'3630',1001,175200,,'',0
+'3631',1001,75000,,'',0,16600,,'',0,43000,,'',0
+'3632',1001,175200,,'',0
+'3634',1001,175200,,'',0
+'3626',1601,93100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
index 8b530053..35d75812 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
@@ -1,4 +1,8 @@
-'2375',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',500,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
index 41b17a4a..6a204370 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
@@ -1,13 +1,27 @@
-'2375',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91600,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175200,,'',0
-'3495',1001,75000,,'',0,16600,,'',0,43100,,'',0
+'3450',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175200,,'',0
+'3450',1001,75000,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175200,,'',0
-'3501',1001,75000,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
-'3253',1601,93200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,75000,,'',0,16600,,'',0,43100,,'',0
+'3625',1001,91600,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75000,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75000,,'',0,16600,,'',0,43100,,'',0
+'3629',1001,175200,,'',0
+'3630',1001,175200,,'',0
+'3631',1001,75000,,'',0,16600,,'',0,43100,,'',0
+'3632',1001,175200,,'',0
+'3634',1001,175200,,'',0
+'3626',1601,93200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
index 8b530053..35d75812 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
@@ -1,4 +1,8 @@
-'2375',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',500,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73500,,'',0,7900,0,'School Spcl',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
index f7da98c4..a21d6877 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
@@ -1,13 +1,27 @@
-'2375',501,85200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91800,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175400,,'',0
-'3495',1001,75200,,'',0,16600,,'',0,43100,,'',0
+'3450',501,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175400,,'',0
+'3450',1001,75200,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175400,,'',0
-'3501',1001,75200,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
-'2375',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,93300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,75200,,'',0,16600,,'',0,43100,,'',0
+'3625',1001,91800,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75200,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75200,,'',0,16600,,'',0,43100,,'',0
+'3629',1001,175400,,'',0
+'3630',1001,175400,,'',0
+'3631',1001,75200,,'',0,16600,,'',0,43100,,'',0
+'3632',1001,175400,,'',0
+'3634',1001,175400,,'',0
+'3450',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,93300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
index 5310d302..e2b77ca2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
@@ -1,13 +1,27 @@
-'2375',501,85300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91900,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175500,,'',0
-'3495',1001,75200,,'',0,16700,,'',0,43100,,'',0
+'3450',501,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175500,,'',0
+'3450',1001,75200,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175500,,'',0
-'3501',1001,75200,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
-'2375',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,93300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,75200,,'',0,16700,,'',0,43100,,'',0
+'3625',1001,91900,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75200,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75200,,'',0,16700,,'',0,43100,,'',0
+'3629',1001,175500,,'',0
+'3630',1001,175500,,'',0
+'3631',1001,75200,,'',0,16700,,'',0,43100,,'',0
+'3632',1001,175500,,'',0
+'3634',1001,175500,,'',0
+'3450',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,93300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
index cfb769a4..f8ed96a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
@@ -1,8 +1,15 @@
-'2375',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1501,192700,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
index cfb769a4..7459aac3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
@@ -1,8 +1,15 @@
-'2375',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73200,,'',0,6900,0,'School Spcl',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1501,192700,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
index 4c602053..2707c134 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
@@ -1,8 +1,15 @@
-'2375',501,85400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,93400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,93400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
index 5d1726ca..a2210a20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
@@ -1,8 +1,15 @@
-'2375',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1501,192600,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
index ed1e4a9c..89b3c9c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
@@ -1,8 +1,15 @@
-'2375',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,93500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,93500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
index 28c95c9d..a2ee8acf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
@@ -1,5 +1,11 @@
-'2375',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182600,,'',0
-'3501',7001,182600,,'',0
+'3450',1501,191800,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182600,,'',0
+'3624',7001,182600,,'',0
+'3627',7001,182600,,'',0
+'3628',7001,182600,,'',0
+'3631',7001,182600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
index 26c5d1ae..9c6edc82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
@@ -1,14 +1,26 @@
-'2375',500,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',501,90900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'3253',500,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',501,123900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3495',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'3501',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'2375',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,55500,,'',0
-'3501',7000,55500,,'',0
+'3450',500,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3624',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3625',500,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',501,90900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3626',500,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',501,123900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3627',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3628',500,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3631',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3450',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,55500,,'',0
+'3624',7000,55500,,'',0
+'3627',7000,55500,,'',0
+'3628',7000,55500,,'',0
+'3631',7000,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
index ac29818d..cd250562 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
@@ -1,5 +1,11 @@
-'2375',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182500,,'',0
-'3501',7001,182500,,'',0
+'3450',1501,191700,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182500,,'',0
+'3624',7001,182500,,'',0
+'3627',7001,182500,,'',0
+'3628',7001,182500,,'',0
+'3631',7001,182500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
index 9f7f1be2..5708dd94 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
@@ -1,5 +1,12 @@
-'2375',1000,83200,,'',0,47200,,'',0,40700,,'',0
-'3201',1000,171100,,'',0
-'3495',1000,71200,,'',0,12000,,'',0,47200,,'',0
+'3424',1000,171100,,'',0
+'3450',1000,71200,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
 '3499',1000,171100,,'',0
-'3501',1000,71200,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3624',1000,71200,,'',0,12000,,'',0,47200,,'',0
+'3625',1000,83200,,'',0,47200,,'',0,40700,,'',0
+'3627',1000,71200,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3628',1000,71200,,'',0,12000,,'',0,47200,,'',0
+'3629',1000,171100,,'',0
+'3630',1000,171100,,'',0
+'3631',1000,71200,,'',0,12000,,'',0,47200,,'',0
+'3632',1000,171100,,'',0
+'3634',1000,171100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
index 855a7c0c..3523a656 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
@@ -1,3 +1,6 @@
-'2375',201,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
index 123fa32d..ca568daa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
@@ -1,3 +1,6 @@
-'2375',201,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
index f25c468a..96cd9072 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
@@ -1,3 +1,6 @@
-'2375',201,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
index a9a114f8..ea687f15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
@@ -1,8 +1,18 @@
-'2375',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164800,,'',0
-'3495',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164800,,'',0
+'3450',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164800,,'',0
-'3501',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164800,,'',0
+'3630',1000,164800,,'',0
+'3631',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164800,,'',0
+'3634',1000,164800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
index 5c3d3868..c1b6e8d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
@@ -1,8 +1,18 @@
-'2375',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164800,,'',0
-'3495',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164800,,'',0
+'3450',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164800,,'',0
-'3501',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164800,,'',0
+'3630',1000,164800,,'',0
+'3631',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164800,,'',0
+'3634',1000,164800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
index b78b91e1..56ecf12e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
@@ -1,10 +1,22 @@
-'2375',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3495',7001,183200,,'',0
-'3501',7001,183200,,'',0
+'3450',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',1501,192100,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',7001,183200,,'',0
+'3624',7001,183200,,'',0
+'3627',7001,183200,,'',0
+'3628',7001,183200,,'',0
+'3631',7001,183200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
index b06632c0..cdca95f5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
@@ -1,11 +1,23 @@
-'2375',101,82000,,'',0
-'3495',101,82000,,'',0
-'3501',101,82000,,'',0
-'2375',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55300,,'',0
-'3501',7000,55300,,'',0
+'3450',101,82000,,'',0
+'3624',101,82000,,'',0
+'3625',101,82000,,'',0
+'3627',101,82000,,'',0
+'3628',101,82000,,'',0
+'3631',101,82000,,'',0
+'3450',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55300,,'',0
+'3624',7000,55300,,'',0
+'3627',7000,55300,,'',0
+'3628',7000,55300,,'',0
+'3631',7000,55300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
index 8b92ad5e..016623cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
@@ -1,7 +1,13 @@
-'2375',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1501,192900,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
index 31810731..3e441831 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
@@ -1,8 +1,18 @@
-'2375',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164900,,'',0
-'3495',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3450',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,164900,,'',0
+'3450',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164900,,'',0
-'3501',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164900,,'',0
+'3630',1000,164900,,'',0
+'3631',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164900,,'',0
+'3634',1000,164900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
index ef7d8a43..24f14b35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
@@ -1,7 +1,13 @@
-'2375',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1501,192900,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
index ef7d8a43..24f14b35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
@@ -1,7 +1,13 @@
-'2375',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1501,192900,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
index 67a0dbef..0c4fa50a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
@@ -1,3 +1,6 @@
-'2375',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
index 3c938b87..6daaf4d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
@@ -1,12 +1,24 @@
-'2375',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',101,81100,,'',0
-'3495',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',101,81100,,'',0
-'3501',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',101,81100,,'',0
-'2375',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',101,81100,,'',0
+'3624',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',101,81100,,'',0
+'3625',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',101,81100,,'',0
+'3627',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',101,81100,,'',0
+'3628',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',101,81100,,'',0
+'3631',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',101,81100,,'',0
+'3450',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
index daf70828..057f1351 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
@@ -1,12 +1,24 @@
-'2375',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',101,81200,,'',0
-'3495',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',101,81200,,'',0
-'3501',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',101,81200,,'',0
-'2375',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',101,81200,,'',0
+'3624',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',101,81200,,'',0
+'3625',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',101,81200,,'',0
+'3627',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',101,81200,,'',0
+'3628',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',101,81200,,'',0
+'3631',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',101,81200,,'',0
+'3450',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
index 0c0db28d..009af28a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
@@ -1,7 +1,12 @@
-'2375',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,80300,0,'School Spcl',0
-'3495',501,152100,0,'School Spcl',0
-'3501',500,80300,0,'School Spcl',0
-'3501',501,152100,0,'School Spcl',0
+'3450',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',500,80300,0,'School Spcl',0
+'3624',501,152100,0,'School Spcl',0
+'3627',500,80300,0,'School Spcl',0
+'3627',501,152100,0,'School Spcl',0
+'3631',500,80300,0,'School Spcl',0
+'3631',501,152100,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
index 6fbd2ada..dab72227 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
@@ -1,16 +1,30 @@
-'2375',300,81400,0,'School Spcl',0
-'3495',300,81400,0,'School Spcl',0
-'3501',300,81400,0,'School Spcl',0
-'2375',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81100,0,'School Spcl',0
-'3495',501,153000,0,'School Spcl',0
-'3501',500,81100,0,'School Spcl',0
-'3501',501,153000,0,'School Spcl',0
-'2375',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,81400,0,'School Spcl',0
+'3624',300,81400,0,'School Spcl',0
+'3625',300,81400,0,'School Spcl',0
+'3627',300,81400,0,'School Spcl',0
+'3628',300,81400,0,'School Spcl',0
+'3631',300,81400,0,'School Spcl',0
+'3450',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81100,0,'School Spcl',0
+'3624',501,153000,0,'School Spcl',0
+'3627',500,81100,0,'School Spcl',0
+'3627',501,153000,0,'School Spcl',0
+'3631',500,81100,0,'School Spcl',0
+'3631',501,153000,0,'School Spcl',0
+'3450',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193400,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
index 0c0db28d..009af28a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
@@ -1,7 +1,12 @@
-'2375',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,80300,0,'School Spcl',0
-'3495',501,152100,0,'School Spcl',0
-'3501',500,80300,0,'School Spcl',0
-'3501',501,152100,0,'School Spcl',0
+'3450',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',500,80300,0,'School Spcl',0
+'3624',501,152100,0,'School Spcl',0
+'3627',500,80300,0,'School Spcl',0
+'3627',501,152100,0,'School Spcl',0
+'3631',500,80300,0,'School Spcl',0
+'3631',501,152100,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
index 7a7d4a3b..d8315b0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
@@ -1,15 +1,29 @@
-'2375',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81200,0,'School Spcl',0
-'3495',501,153100,0,'School Spcl',0
-'3501',500,81200,0,'School Spcl',0
-'3501',501,153100,0,'School Spcl',0
-'2375',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
-'3501',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3450',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81200,0,'School Spcl',0
+'3624',501,153100,0,'School Spcl',0
+'3627',500,81200,0,'School Spcl',0
+'3627',501,153100,0,'School Spcl',0
+'3631',500,81200,0,'School Spcl',0
+'3631',501,153100,0,'School Spcl',0
+'3450',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3624',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3627',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3628',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3631',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
index 971e302b..8add1aca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
@@ -1,3 +1,6 @@
-'2375',101,81800,,'',0
-'3495',101,81800,,'',0
-'3501',101,81800,,'',0
+'3450',101,81800,,'',0
+'3624',101,81800,,'',0
+'3625',101,81800,,'',0
+'3627',101,81800,,'',0
+'3628',101,81800,,'',0
+'3631',101,81800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
index 59a7d01f..7947e1c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
@@ -1,3 +1,6 @@
-'2375',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
index 02846559..10fabc2b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
@@ -1,3 +1,6 @@
-'2375',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
index edfac7d4..8f7fb348 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
@@ -1,3 +1,6 @@
-'2375',200,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146115 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146115
index f81f286c..c849f8d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146115
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146115
@@ -1,4 +1,6 @@
-'3495',500,80500,0,'School Spcl',0
-'3495',501,152300,0,'School Spcl',0
-'3501',500,80500,0,'School Spcl',0
-'3501',501,152300,0,'School Spcl',0
+'3624',500,80500,0,'School Spcl',0
+'3624',501,152300,0,'School Spcl',0
+'3627',500,80500,0,'School Spcl',0
+'3627',501,152300,0,'School Spcl',0
+'3631',500,80500,0,'School Spcl',0
+'3631',501,152300,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146116 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146116
index fec8d293..800a069a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146116
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146116
@@ -1,4 +1,6 @@
-'3495',500,80500,0,'School Spcl',0
-'3495',501,152400,0,'School Spcl',0
-'3501',500,80500,0,'School Spcl',0
-'3501',501,152400,0,'School Spcl',0
+'3624',500,80500,0,'School Spcl',0
+'3624',501,152400,0,'School Spcl',0
+'3627',500,80500,0,'School Spcl',0
+'3627',501,152400,0,'School Spcl',0
+'3631',500,80500,0,'School Spcl',0
+'3631',501,152400,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
index 33ae0b14..896c9f20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
@@ -1,19 +1,36 @@
-'2375',300,81100,0,'School Spcl',0
-'3495',300,81100,0,'School Spcl',0
-'3501',300,81100,0,'School Spcl',0
-'2375',400,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
-'2375',401,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
-'3495',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
-'3501',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,80900,0,'School Spcl',0
-'3495',501,152800,0,'School Spcl',0
-'3501',500,80900,0,'School Spcl',0
-'3501',501,152800,0,'School Spcl',0
-'2375',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,81100,0,'School Spcl',0
+'3624',300,81100,0,'School Spcl',0
+'3625',300,81100,0,'School Spcl',0
+'3627',300,81100,0,'School Spcl',0
+'3628',300,81100,0,'School Spcl',0
+'3631',300,81100,0,'School Spcl',0
+'3450',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3450',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3624',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',400,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3625',401,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3627',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3628',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',400,72800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,11000,4,'',0
+'3631',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,80900,0,'School Spcl',0
+'3624',501,152800,0,'School Spcl',0
+'3627',500,80900,0,'School Spcl',0
+'3627',501,152800,0,'School Spcl',0
+'3631',500,80900,0,'School Spcl',0
+'3631',501,152800,0,'School Spcl',0
+'3450',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193300,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
index 34cbfbab..e896978e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
@@ -1,5 +1,12 @@
-'2375',1001,85900,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,173700,,'',0
-'3495',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,173700,,'',0
+'3450',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,173700,,'',0
-'3501',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,85900,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,173700,,'',0
+'3630',1001,173700,,'',0
+'3631',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,173700,,'',0
+'3634',1001,173700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
index 610d133b..7295d145 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
@@ -1,5 +1,12 @@
-'2375',1000,81800,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,165700,,'',0
-'3495',1000,65800,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,165700,,'',0
+'3450',1000,65800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,165700,,'',0
-'3501',1000,65800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65800,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81800,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65800,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65800,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,165700,,'',0
+'3630',1000,165700,,'',0
+'3631',1000,65800,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,165700,,'',0
+'3634',1000,165700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
index 34cbfbab..e896978e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
@@ -1,5 +1,12 @@
-'2375',1001,85900,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,173700,,'',0
-'3495',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,173700,,'',0
+'3450',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,173700,,'',0
-'3501',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,85900,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,73500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,173700,,'',0
+'3630',1001,173700,,'',0
+'3631',1001,73500,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,173700,,'',0
+'3634',1001,173700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
index 45c15d03..6ee77c3f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
@@ -1,5 +1,12 @@
-'2375',1000,81900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,165800,,'',0
-'3495',1000,65900,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,165800,,'',0
+'3450',1000,65900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,165800,,'',0
-'3501',1000,65900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,165800,,'',0
+'3630',1000,165800,,'',0
+'3631',1000,65900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,165800,,'',0
+'3634',1000,165800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
index e50a6ac0..4052c3a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
@@ -1,5 +1,12 @@
-'2375',1000,81600,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,165500,,'',0
-'3495',1000,65600,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,165500,,'',0
+'3450',1000,65600,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,165500,,'',0
-'3501',1000,65600,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65600,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81600,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65600,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65600,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,165500,,'',0
+'3630',1000,165500,,'',0
+'3631',1000,65600,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,165500,,'',0
+'3634',1000,165500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
index 81f8d897..975369b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
@@ -1,5 +1,12 @@
-'2375',1001,90000,,'',0,43100,,'',0,40700,,'',0
-'3201',1001,173800,,'',0
-'3495',1001,73600,,'',0,16400,,'',0,43100,,'',0
+'3424',1001,173800,,'',0
+'3450',1001,73600,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
 '3499',1001,173800,,'',0
-'3501',1001,73600,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
+'3624',1001,73600,,'',0,16400,,'',0,43100,,'',0
+'3625',1001,90000,,'',0,43100,,'',0,40700,,'',0
+'3627',1001,73600,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
+'3628',1001,73600,,'',0,16400,,'',0,43100,,'',0
+'3629',1001,173800,,'',0
+'3630',1001,173800,,'',0
+'3631',1001,73600,,'',0,16400,,'',0,43100,,'',0
+'3632',1001,173800,,'',0
+'3634',1001,173800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
index 15743c4b..7190b987 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
@@ -1,6 +1,12 @@
-'2375',300,81000,0,'School Spcl',0
-'3495',300,81000,0,'School Spcl',0
-'3501',300,81000,0,'School Spcl',0
-'2375',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,81000,0,'School Spcl',0
+'3624',300,81000,0,'School Spcl',0
+'3625',300,81000,0,'School Spcl',0
+'3627',300,81000,0,'School Spcl',0
+'3628',300,81000,0,'School Spcl',0
+'3631',300,81000,0,'School Spcl',0
+'3450',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
index a76d763a..df491a30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
@@ -1,6 +1,12 @@
-'2375',300,80900,0,'School Spcl',0
-'3495',300,80900,0,'School Spcl',0
-'3501',300,80900,0,'School Spcl',0
-'2375',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,80900,0,'School Spcl',0
+'3624',300,80900,0,'School Spcl',0
+'3625',300,80900,0,'School Spcl',0
+'3627',300,80900,0,'School Spcl',0
+'3628',300,80900,0,'School Spcl',0
+'3631',300,80900,0,'School Spcl',0
+'3450',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
index eec7a414..0620935a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
@@ -1,6 +1,12 @@
-'2375',300,80800,0,'School Spcl',0
-'3495',300,80800,0,'School Spcl',0
-'3501',300,80800,0,'School Spcl',0
-'2375',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,80800,0,'School Spcl',0
+'3624',300,80800,0,'School Spcl',0
+'3625',300,80800,0,'School Spcl',0
+'3627',300,80800,0,'School Spcl',0
+'3628',300,80800,0,'School Spcl',0
+'3631',300,80800,0,'School Spcl',0
+'3450',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146127 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146127
index a0dc3c9d..dd7f5831 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146127
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146127
@@ -1,4 +1,6 @@
-'3495',500,80600,0,'School Spcl',0
-'3495',501,152500,0,'School Spcl',0
-'3501',500,80600,0,'School Spcl',0
-'3501',501,152500,0,'School Spcl',0
+'3624',500,80600,0,'School Spcl',0
+'3624',501,152500,0,'School Spcl',0
+'3627',500,80600,0,'School Spcl',0
+'3627',501,152500,0,'School Spcl',0
+'3631',500,80600,0,'School Spcl',0
+'3631',501,152500,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
index 67a0dbef..0c4fa50a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
@@ -1,3 +1,6 @@
-'2375',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
index bc71aefe..a4498454 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
@@ -1,3 +1,6 @@
-'2375',300,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'3501',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3450',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3624',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3625',300,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3628',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3631',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
index e44ab185..4779f30a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
@@ -1,11 +1,23 @@
-'2375',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
index e3a85e92..18c5b2bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
@@ -1,11 +1,23 @@
-'2375',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
index f162f375..7792bfd2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
@@ -1,11 +1,23 @@
-'2375',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
index bd90b831..9031a8ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
@@ -1,11 +1,23 @@
-'2375',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
index 24a54966..6121d618 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
@@ -1,12 +1,24 @@
-'2375',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'3495',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'3501',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'3253',1600,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193700,0,'Downtown',0,16400,0,'Downtown',0,12400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3625',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3627',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3628',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3631',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3626',1600,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
index 2fa6acae..8b011ef6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
@@ -1,11 +1,23 @@
-'2375',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
index 53280f68..e980ea5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
@@ -1,15 +1,30 @@
-'2375',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',300,81600,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3495',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3501',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3253',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,81600,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193600,0,'Downtown',0,16400,0,'Downtown',0,12400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3625',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3627',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3628',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3631',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3626',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
index 98985900..377fe416 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
@@ -1,11 +1,23 @@
-'2375',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
index 51d4603f..d7650853 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
@@ -1,12 +1,24 @@
-'2375',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3495',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3501',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'3253',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193600,0,'Downtown',0,16400,0,'Downtown',0,12400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3625',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3627',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3628',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3631',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3626',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
index a09e5eab..ded004bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
@@ -1,11 +1,23 @@
-'2375',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
index 1cdb79e7..f1e2e03d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
@@ -1,12 +1,24 @@
-'2375',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3501',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2375',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3624',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3625',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3628',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3631',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3450',1501,193500,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
index 00077d46..39e61a98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
@@ -1,12 +1,24 @@
-'2375',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,81400,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,81400,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193500,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
index 681dfab9..d36fc297 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
@@ -1,11 +1,23 @@
-'2375',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3501',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'3495',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0,26400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3625',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3627',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3628',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3631',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
index 5e364268..178d5549 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
@@ -1,12 +1,24 @@
-'2375',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,81400,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,81400,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193500,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
index bae9d010..dc4148e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
@@ -1,10 +1,19 @@
-'2375',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
index dda5cff1..c6444e1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
@@ -1,12 +1,24 @@
-'2375',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
index 1d54833b..d666e0fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
@@ -1,11 +1,23 @@
-'2375',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'3495',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'3501',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'2375',300,80300,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',4000,82800,,'',0,51500,,'',0
-'3501',4000,82800,,'',0,51500,,'',0
+'3450',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3624',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3625',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3627',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3628',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3631',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3450',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80300,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',4000,82800,,'',0,51500,,'',0
+'3624',4000,82800,,'',0,51500,,'',0
+'3627',4000,82800,,'',0,51500,,'',0
+'3628',4000,82800,,'',0,51500,,'',0
+'3631',4000,82800,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
index 86f8fb27..55a09061 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
@@ -1,11 +1,23 @@
-'2375',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',4001,95400,,'',0,60000,,'',0
-'3501',4001,95400,,'',0,60000,,'',0
+'3450',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',4001,95400,,'',0,60000,,'',0
+'3624',4001,95400,,'',0,60000,,'',0
+'3627',4001,95400,,'',0,60000,,'',0
+'3628',4001,95400,,'',0,60000,,'',0
+'3631',4001,95400,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
index 7801e996..531a3f83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
@@ -1,10 +1,24 @@
-'2375',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
-'2375',1001,84100,,'',0,47100,,'',0,40700,,'',0
-'3201',1000,171200,4,'',0
-'3201',1001,171900,,'',0
-'3495',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0
-'3495',1001,71700,,'',0,12400,,'',0,47100,,'',0
+'3424',1000,171200,4,'',0
+'3424',1001,171900,,'',0
+'3450',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0,40700,4,'',0
+'3450',1001,71700,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1000,171200,4,'',0
 '3499',1001,171900,,'',0
-'3501',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0,40700,4,'',0
-'3501',1001,71700,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0
+'3624',1001,71700,,'',0,12400,,'',0,47100,,'',0
+'3625',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
+'3625',1001,84100,,'',0,47100,,'',0,40700,,'',0
+'3627',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0,40700,4,'',0
+'3627',1001,71700,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0
+'3628',1001,71700,,'',0,12400,,'',0,47100,,'',0
+'3629',1000,171200,4,'',0
+'3629',1001,171900,,'',0
+'3630',1000,171200,4,'',0
+'3630',1001,171900,,'',0
+'3631',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0
+'3631',1001,71700,,'',0,12400,,'',0,47100,,'',0
+'3632',1000,171200,4,'',0
+'3632',1001,171900,,'',0
+'3634',1000,171200,4,'',0
+'3634',1001,171900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
index ef75e0e2..a6565c10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
@@ -1,18 +1,40 @@
-'2375',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1001,92200,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175800,,'',0
-'3495',1001,75500,,'',0,16700,,'',0,43100,,'',0
+'3450',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1001,175800,,'',0
+'3450',1001,75500,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175800,,'',0
-'3501',1001,75500,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
-'3495',1100,100600,,'',0,30700,,'',0
-'3501',1100,100600,,'',0,30700,,'',0
-'2375',1501,195100,,'',0,16400,,'',0
-'3495',1501,195100,,'',0,16400,,'',0
-'3501',1501,195100,,'',0,16400,,'',0
-'3495',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'3501',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3624',1001,75500,,'',0,16700,,'',0,43100,,'',0
+'3625',1001,92200,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75500,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75500,,'',0,16700,,'',0,43100,,'',0
+'3629',1001,175800,,'',0
+'3630',1001,175800,,'',0
+'3631',1001,75500,,'',0,16700,,'',0,43100,,'',0
+'3632',1001,175800,,'',0
+'3634',1001,175800,,'',0
+'3450',1100,100600,,'',0,30700,,'',0
+'3624',1100,100600,,'',0,30700,,'',0
+'3627',1100,100600,,'',0,30700,,'',0
+'3628',1100,100600,,'',0,30700,,'',0
+'3631',1100,100600,,'',0,30700,,'',0
+'3450',1501,195100,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12500,0,'Cherry Ln',0
+'3624',1501,195100,,'',0,16400,,'',0
+'3625',1501,195100,,'',0,16400,,'',0
+'3627',1501,195100,,'',0,16400,,'',0
+'3628',1501,195100,,'',0,16400,,'',0
+'3631',1501,195100,,'',0,16400,,'',0
+'3450',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3624',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3627',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3628',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3631',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
index 12a56185..a4020bba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
@@ -1,20 +1,46 @@
-'2375',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,80100,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,163800,,'',0
-'3495',1000,64100,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,163800,,'',0
+'3450',1000,64100,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,163800,,'',0
-'3501',1000,64100,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'3201',1101,180500,,'',0
-'3495',1101,123200,,'',0
+'3624',1000,64100,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80100,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64100,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64100,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,163800,,'',0
+'3630',1000,163800,,'',0
+'3631',1000,64100,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,163800,,'',0
+'3634',1000,163800,,'',0
+'3424',1101,180500,,'',0
+'3450',1101,123200,,'',0,57300,,'',0
 '3499',1101,180500,,'',0
-'3501',1101,123200,,'',0,57300,,'',0
-'2375',1500,200100,,'',0,12400,,'',0
-'3495',1500,200100,,'',0,12400,,'',0
-'3501',1500,200100,,'',0,12400,,'',0
-'3495',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,123200,,'',0
+'3627',1101,123200,,'',0,57300,,'',0
+'3628',1101,123200,,'',0
+'3629',1101,180500,,'',0
+'3630',1101,180500,,'',0
+'3631',1101,123200,,'',0
+'3632',1101,180500,,'',0
+'3634',1101,180500,,'',0
+'3450',1500,200100,,'',0,12400,,'',0,12500,,'',0,26400,,'',0
+'3624',1500,200100,,'',0,12400,,'',0
+'3625',1500,200100,,'',0,12400,,'',0
+'3627',1500,200100,,'',0,12400,,'',0
+'3628',1500,200100,,'',0,12400,,'',0
+'3631',1500,200100,,'',0,12400,,'',0
+'3450',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
index 8617a806..78cca1a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
@@ -1,11 +1,23 @@
-'2375',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,195100,,'',0,16400,,'',0
-'3495',1501,195100,,'',0,16400,,'',0
-'3501',1501,195100,,'',0,16400,,'',0
-'3495',7001,181900,,'',0
-'3501',7001,181900,,'',0
+'3450',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,195100,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12600,0,'Cherry Ln',0
+'3624',1501,195100,,'',0,16400,,'',0
+'3625',1501,195100,,'',0,16400,,'',0
+'3627',1501,195100,,'',0,16400,,'',0
+'3628',1501,195100,,'',0,16400,,'',0
+'3631',1501,195100,,'',0,16400,,'',0
+'3450',7001,181900,,'',0
+'3624',7001,181900,,'',0
+'3627',7001,181900,,'',0
+'3628',7001,181900,,'',0
+'3631',7001,181900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
index 3bd19d4a..4eab06d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
@@ -1,9 +1,18 @@
-'2375',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
index 0aae24dc..a032c780 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
@@ -1,10 +1,20 @@
-'2375',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',300,81800,0,'School Spcl',0
-'3495',300,81800,0,'School Spcl',0
-'3501',300,81800,0,'School Spcl',0
-'2375',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',300,81800,0,'School Spcl',0
+'3624',300,81800,0,'School Spcl',0
+'3625',300,81800,0,'School Spcl',0
+'3627',300,81800,0,'School Spcl',0
+'3628',300,81800,0,'School Spcl',0
+'3631',300,81800,0,'School Spcl',0
+'3450',500,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
index daecb4fb..c7e59f6f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
@@ -1,12 +1,24 @@
-'2375',300,80500,0,'School Spcl',0
-'3495',300,80500,0,'School Spcl',0
-'3501',300,80500,0,'School Spcl',0
-'2375',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,80500,0,'School Spcl',0
+'3624',300,80500,0,'School Spcl',0
+'3625',300,80500,0,'School Spcl',0
+'3627',300,80500,0,'School Spcl',0
+'3628',300,80500,0,'School Spcl',0
+'3631',300,80500,0,'School Spcl',0
+'3450',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193100,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
index ce8ecb2e..6717ff90 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
@@ -1,11 +1,23 @@
-'2375',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,55100,,'',0
-'3501',7000,55100,,'',0
+'3450',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,55100,,'',0
+'3624',7000,55100,,'',0
+'3627',7000,55100,,'',0
+'3628',7000,55100,,'',0
+'3631',7000,55100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
index 1005f633..f67fe581 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
@@ -1,39 +1,88 @@
-'2375',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,83000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2375',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',401,90000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3201',1100,184200,4,'',0
-'3201',1101,180500,,'',0
-'3495',1100,100800,4,'',0,30700,4,'',0
-'3495',1101,93000,,'',0,30200,,'',0
+'3450',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,83000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,73000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',401,90000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',401,70000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3424',1100,184200,4,'',0
+'3424',1101,180500,,'',0
+'3450',1100,100800,4,'',0,30700,4,'',0,52700,4,'',0
+'3450',1101,93000,,'',0,30200,,'',0,57300,,'',0
 '3499',1100,184400,4,'',0
 '3499',1101,180500,,'',0
-'3501',1100,100800,4,'',0,30700,4,'',0,52900,4,'',0
-'3501',1101,93000,,'',0,30200,,'',0,57300,,'',0
-'2375',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,195200,,'',0,16400,,'',0
-'3495',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,195200,,'',0,16400,,'',0
-'3501',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,195200,,'',0,16400,,'',0
-'3253',1601,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
-'3495',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
-'3501',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',4001,100100,,'',0,60000,,'',0
-'3501',4001,100100,,'',0,32900,,'',0,27100,,'',0
+'3624',1100,100800,4,'',0,30700,4,'',0
+'3624',1101,93000,,'',0,30200,,'',0
+'3627',1100,100800,4,'',0,30700,4,'',0,52900,4,'',0
+'3627',1101,93000,,'',0,30200,,'',0,57300,,'',0
+'3628',1100,100800,4,'',0,30700,4,'',0
+'3628',1101,93000,,'',0,30200,,'',0
+'3629',1100,184200,4,'',0
+'3629',1101,180500,,'',0
+'3630',1100,184400,4,'',0
+'3630',1101,180500,,'',0
+'3631',1100,100800,4,'',0,30700,4,'',0
+'3631',1101,93000,,'',0,30200,,'',0
+'3632',1100,184200,4,'',0
+'3632',1101,180500,,'',0
+'3634',1100,184400,4,'',0
+'3634',1101,180500,,'',0
+'3450',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,195200,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12600,4,'',0
+'3624',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,195200,,'',0,16400,,'',0
+'3625',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,195200,,'',0,16400,,'',0
+'3627',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,195200,,'',0,16400,,'',0
+'3628',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,195200,,'',0,16400,,'',0
+'3631',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,195200,,'',0,16400,,'',0
+'3626',1601,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3450',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3624',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3627',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3628',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3631',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',4001,100100,,'',0,60000,,'',0
+'3624',4001,100100,,'',0,60000,,'',0
+'3627',4001,100100,,'',0,32900,,'',0,27100,,'',0
+'3628',4001,100100,,'',0,60000,,'',0
+'3631',4001,100100,,'',0,60000,,'',0
+'3633',5001,124000,,'',0
+'3450',1000100,190000,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0,4100,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0,4100,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0,4100,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0,14100,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0,4100,,'',0,2900,4,'',0,100,,'',0,2900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
index f3502dc4..9235f7ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
@@ -1,13 +1,28 @@
-'2375',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',1100,100300,,'',0,30700,,'',0
-'3501',1100,100300,,'',0,30700,,'',0
-'2375',1501,194900,,'',0,16400,,'',0
-'3495',1501,194900,,'',0,16400,,'',0
-'3501',1501,194900,,'',0,16400,,'',0
-'3495',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'3501',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3450',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1100,100300,,'',0,30700,,'',0
+'3624',1100,100300,,'',0,30700,,'',0
+'3627',1100,100300,,'',0,30700,,'',0
+'3628',1100,100300,,'',0,30700,,'',0
+'3631',1100,100300,,'',0,30700,,'',0
+'3450',1501,194900,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12500,0,'Cherry Ln',0
+'3624',1501,194900,,'',0,16400,,'',0
+'3625',1501,194900,,'',0,16400,,'',0
+'3627',1501,194900,,'',0,16400,,'',0
+'3628',1501,194900,,'',0,16400,,'',0
+'3631',1501,194900,,'',0,16400,,'',0
+'3450',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3624',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3627',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3628',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3631',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
index d6f1a917..58177749 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
@@ -1,20 +1,46 @@
-'2375',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,80300,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,164000,,'',0
-'3495',1000,64300,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,164000,,'',0
+'3450',1000,64300,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,164000,,'',0
-'3501',1000,64300,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'3201',1101,180700,,'',0
-'3495',1101,123400,,'',0
+'3624',1000,64300,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80300,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64300,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64300,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,164000,,'',0
+'3630',1000,164000,,'',0
+'3631',1000,64300,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,164000,,'',0
+'3634',1000,164000,,'',0
+'3424',1101,180700,,'',0
+'3450',1101,123400,,'',0,57300,,'',0
 '3499',1101,180700,,'',0
-'3501',1101,123400,,'',0,57300,,'',0
-'2375',1500,200300,,'',0,12400,,'',0
-'3495',1500,200300,,'',0,12400,,'',0
-'3501',1500,200300,,'',0,12400,,'',0
-'3495',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,123400,,'',0
+'3627',1101,123400,,'',0,57300,,'',0
+'3628',1101,123400,,'',0
+'3629',1101,180700,,'',0
+'3630',1101,180700,,'',0
+'3631',1101,123400,,'',0
+'3632',1101,180700,,'',0
+'3634',1101,180700,,'',0
+'3450',1500,200300,,'',0,12400,,'',0,12500,,'',0,26400,,'',0
+'3624',1500,200300,,'',0,12400,,'',0
+'3625',1500,200300,,'',0,12400,,'',0
+'3627',1500,200300,,'',0,12400,,'',0
+'3628',1500,200300,,'',0,12400,,'',0
+'3631',1500,200300,,'',0,12400,,'',0
+'3450',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
index 5ad09391..4f132cb2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
@@ -1,44 +1,92 @@
-'2375',100,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',101,81000,,'',0
-'3495',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',101,81000,,'',0
-'3501',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',101,81000,,'',0
-'2375',300,80000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',500,93000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',501,90000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',501,123000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3495',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1000,80000,,'',0,43000,,'',0,40700,,'',0
-'2375',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
-'3201',1000,163700,,'',0
-'3201',1001,175900,4,'',0
-'3495',1000,64000,,'',0,16000,,'',0,43000,,'',0
-'3495',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0
+'3450',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',101,81000,,'',0
+'3624',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',101,81000,,'',0
+'3625',100,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',101,81000,,'',0
+'3627',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',101,81000,,'',0
+'3628',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',101,81000,,'',0
+'3631',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',101,81000,,'',0
+'3450',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',501,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',501,123000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3627',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3424',1000,163700,,'',0
+'3424',1001,175900,4,'',0
+'3450',1000,64000,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3450',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0,40500,4,'',0
 '3499',1000,163700,,'',0
 '3499',1001,175900,4,'',0
-'3501',1000,64000,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'3501',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0,40500,4,'',0
-'2375',1500,200000,,'',0,12400,,'',0
-'2375',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,200000,,'',0,12400,,'',0
-'3495',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,200000,,'',0,12400,,'',0
-'3501',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2375',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2375',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'3495',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'3501',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'3495',4000,82500,,'',0,51500,,'',0
-'3501',4000,82500,,'',0,11500,4,'',0,40000,,'',0
-'3495',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
-'3501',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'3624',1000,64000,,'',0,16000,,'',0,43000,,'',0
+'3624',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0
+'3625',1000,80000,,'',0,43000,,'',0,40700,,'',0
+'3625',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
+'3627',1000,64000,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3627',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0,40500,4,'',0
+'3628',1000,64000,,'',0,16000,,'',0,43000,,'',0
+'3628',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0
+'3629',1000,163700,,'',0
+'3629',1001,175900,4,'',0
+'3630',1000,163700,,'',0
+'3630',1001,175900,4,'',0
+'3631',1000,64000,,'',0,16000,,'',0,43000,,'',0
+'3631',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0
+'3632',1000,163700,,'',0
+'3632',1001,175900,4,'',0
+'3634',1000,163700,,'',0
+'3634',1001,175900,4,'',0
+'3450',1500,200000,,'',0,12400,,'',0,12500,,'',0,26400,,'',0
+'3450',1501,192500,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,200000,,'',0,12400,,'',0
+'3624',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,200000,,'',0,12400,,'',0
+'3625',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,200000,,'',0,12400,,'',0
+'3627',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,200000,,'',0,12400,,'',0
+'3628',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,200000,,'',0,12400,,'',0
+'3631',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3450',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3624',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3625',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3627',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3628',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3631',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3450',4000,82500,,'',0,51500,,'',0
+'3624',4000,82500,,'',0,51500,,'',0
+'3627',4000,82500,,'',0,11500,4,'',0,40000,,'',0
+'3628',4000,82500,,'',0,51500,,'',0
+'3631',4000,82500,,'',0,51500,,'',0
+'3633',5000,90000,,'',0
+'3450',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'3624',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'3627',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'3628',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'3631',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
index 1a46eab4..ea54e6dd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
@@ -1,5 +1,12 @@
-'2375',1001,90200,,'',0,43100,,'',0,40700,,'',0
-'3201',1001,174000,,'',0
-'3495',1001,73800,,'',0,16400,,'',0,43100,,'',0
+'3424',1001,174000,,'',0
+'3450',1001,73800,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
 '3499',1001,174000,,'',0
-'3501',1001,73800,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
+'3624',1001,73800,,'',0,16400,,'',0,43100,,'',0
+'3625',1001,90200,,'',0,43100,,'',0,40700,,'',0
+'3627',1001,73800,,'',0,16400,,'',0,43100,,'',0,40700,,'',0
+'3628',1001,73800,,'',0,16400,,'',0,43100,,'',0
+'3629',1001,174000,,'',0
+'3630',1001,174000,,'',0
+'3631',1001,73800,,'',0,16400,,'',0,43100,,'',0
+'3632',1001,174000,,'',0
+'3634',1001,174000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
index fc74ff3e..e2c4e1d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
@@ -1,12 +1,24 @@
-'2375',100,82500,,'',0
-'3495',100,82500,,'',0
-'3501',100,82500,,'',0
-'2375',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,195800,,'',0,16400,,'',0
-'3495',1500,195800,,'',0,16400,,'',0
-'3501',1500,195800,,'',0,16400,,'',0
-'3253',1600,95400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'3495',7000,60000,,'',0
-'3501',7000,60000,,'',0
+'3450',100,82500,,'',0
+'3624',100,82500,,'',0
+'3625',100,82500,,'',0
+'3627',100,82500,,'',0
+'3628',100,82500,,'',0
+'3631',100,82500,,'',0
+'3450',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,195800,,'',0,16400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,195800,,'',0,16400,,'',0
+'3625',1500,195800,,'',0,16400,,'',0
+'3627',1500,195800,,'',0,16400,,'',0
+'3628',1500,195800,,'',0,16400,,'',0
+'3631',1500,195800,,'',0,16400,,'',0
+'3626',1600,95400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3450',7000,60000,,'',0
+'3624',7000,60000,,'',0
+'3627',7000,60000,,'',0
+'3628',7000,60000,,'',0
+'3631',7000,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
index a16a74c5..b0ccc670 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
@@ -1,3 +1,6 @@
-'2375',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3495',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3501',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3450',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3624',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3625',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3627',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3628',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3631',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
index 2cbf18ba..c3ec762b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
@@ -1,3 +1,6 @@
-'2375',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3495',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3501',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3450',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3624',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3625',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3627',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3628',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3631',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
index 352c5f8e..66954cee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
@@ -1,7 +1,13 @@
-'2375',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',500,94100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,131100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',500,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,94100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,131100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
index cfa3f34c..54abbb97 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
@@ -1,10 +1,20 @@
-'2375',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',300,81900,0,'School Spcl',0
-'3495',300,81900,0,'School Spcl',0
-'3501',300,81900,0,'School Spcl',0
-'2375',500,94000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,131000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',300,81900,0,'School Spcl',0
+'3624',300,81900,0,'School Spcl',0
+'3625',300,81900,0,'School Spcl',0
+'3627',300,81900,0,'School Spcl',0
+'3628',300,81900,0,'School Spcl',0
+'3631',300,81900,0,'School Spcl',0
+'3450',500,74000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,94000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,131000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,74000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,191500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
index 2781a77c..b29a2fb3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
@@ -1,3 +1,6 @@
-'2375',101,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
index 4311822a..581294c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
@@ -1,3 +1,6 @@
-'2375',101,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
index f407c927..4779ad2c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
@@ -1,3 +1,6 @@
-'2375',101,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
index e5da836b..b5cbcb9b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
@@ -1,10 +1,21 @@
-'2375',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '3499',1100,183700,,'',0
-'3501',1100,183700,,'',0
-'2375',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'3495',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'3501',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'3495',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',1100,183700,,'',0
+'3630',1100,183700,,'',0
+'3634',1100,183700,,'',0
+'3450',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3624',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3625',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3627',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3628',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3631',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3450',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
index bb250b03..41922367 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
@@ -1,12 +1,24 @@
-'2375',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3253',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3626',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
index 834a8a9b..e722a034 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
@@ -1,14 +1,30 @@
-'2375',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'3495',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'3501',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'2375',1000,80500,,'',0,43100,,'',0,40700,,'',0
-'3201',1000,164300,,'',0
-'3495',1000,64500,,'',0,16000,,'',0,43100,,'',0
+'3450',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3624',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3625',401,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3627',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3628',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3631',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3424',1000,164300,,'',0
+'3450',1000,64500,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
 '3499',1000,164300,,'',0
-'3501',1000,64500,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
-'2375',1500,200600,,'',0,12400,,'',0
-'3495',1500,200600,,'',0,12400,,'',0
-'3501',1500,200600,,'',0,12400,,'',0
+'3624',1000,64500,,'',0,16000,,'',0,43100,,'',0
+'3625',1000,80500,,'',0,43100,,'',0,40700,,'',0
+'3627',1000,64500,,'',0,16000,,'',0,43100,,'',0,40700,,'',0
+'3628',1000,64500,,'',0,16000,,'',0,43100,,'',0
+'3629',1000,164300,,'',0
+'3630',1000,164300,,'',0
+'3631',1000,64500,,'',0,16000,,'',0,43100,,'',0
+'3632',1000,164300,,'',0
+'3634',1000,164300,,'',0
+'3450',1500,200600,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200600,,'',0,12400,,'',0
+'3625',1500,200600,,'',0,12400,,'',0
+'3627',1500,200600,,'',0,12400,,'',0
+'3628',1500,200600,,'',0,12400,,'',0
+'3631',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
index 24e94b36..f9a587e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
@@ -1,9 +1,18 @@
-'2375',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1501,194700,,'',0,16400,,'',0
-'3495',1501,194700,,'',0,16400,,'',0
-'3501',1501,194700,,'',0,16400,,'',0
+'3450',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1501,194700,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194700,,'',0,16400,,'',0
+'3625',1501,194700,,'',0,16400,,'',0
+'3627',1501,194700,,'',0,16400,,'',0
+'3628',1501,194700,,'',0,16400,,'',0
+'3631',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
index 636e9015..8c3b9527 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
@@ -1,14 +1,30 @@
-'2375',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'2375',1000,80500,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,164200,,'',0
-'3495',1000,64500,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3424',1000,164200,,'',0
+'3450',1000,64500,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,164200,,'',0
-'3501',1000,64500,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'2375',1500,200600,,'',0,12400,,'',0
-'3495',1500,200600,,'',0,12400,,'',0
-'3501',1500,200600,,'',0,12400,,'',0
+'3624',1000,64500,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80500,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64500,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64500,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,164200,,'',0
+'3630',1000,164200,,'',0
+'3631',1000,64500,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,164200,,'',0
+'3634',1000,164200,,'',0
+'3450',1500,200600,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200600,,'',0,12400,,'',0
+'3625',1500,200600,,'',0,12400,,'',0
+'3627',1500,200600,,'',0,12400,,'',0
+'3628',1500,200600,,'',0,12400,,'',0
+'3631',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
index a8380c5e..8cfa6a11 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
@@ -1,9 +1,18 @@
-'2375',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1501,194700,,'',0,16400,,'',0
-'3495',1501,194700,,'',0,16400,,'',0
-'3501',1501,194700,,'',0,16400,,'',0
+'3450',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1501,194700,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194700,,'',0,16400,,'',0
+'3625',1501,194700,,'',0,16400,,'',0
+'3627',1501,194700,,'',0,16400,,'',0
+'3628',1501,194700,,'',0,16400,,'',0
+'3631',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
index 871d3628..720d64a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
@@ -1,12 +1,24 @@
-'2375',100,82700,,'',0
-'3495',100,82700,,'',0
-'3501',100,82700,,'',0
-'2375',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,195800,,'',0,16400,,'',0
-'3495',1500,195800,,'',0,16400,,'',0
-'3501',1500,195800,,'',0,16400,,'',0
-'3253',1600,95500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'3495',7000,60100,,'',0
-'3501',7000,60100,,'',0
+'3450',100,82700,,'',0
+'3624',100,82700,,'',0
+'3625',100,82700,,'',0
+'3627',100,82700,,'',0
+'3628',100,82700,,'',0
+'3631',100,82700,,'',0
+'3450',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,195800,,'',0,16400,,'',0,12500,,'',0,26400,,'',0
+'3624',1500,195800,,'',0,16400,,'',0
+'3625',1500,195800,,'',0,16400,,'',0
+'3627',1500,195800,,'',0,16400,,'',0
+'3628',1500,195800,,'',0,16400,,'',0
+'3631',1500,195800,,'',0,16400,,'',0
+'3626',1600,95500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3450',7000,60100,,'',0
+'3624',7000,60100,,'',0
+'3627',7000,60100,,'',0
+'3628',7000,60100,,'',0
+'3631',7000,60100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
index 2b1df2de..273f165b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
@@ -1,8 +1,17 @@
-'2375',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,195400,,'',0,16400,,'',0
-'3495',1501,195400,,'',0,16400,,'',0
-'3501',1501,195400,,'',0,16400,,'',0
-'3495',7001,182100,,'',0
-'3501',7001,182100,,'',0
+'3450',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,195400,,'',0,16400,,'',0,12400,,'',0,26400,,'',0
+'3624',1501,195400,,'',0,16400,,'',0
+'3625',1501,195400,,'',0,16400,,'',0
+'3627',1501,195400,,'',0,16400,,'',0
+'3628',1501,195400,,'',0,16400,,'',0
+'3631',1501,195400,,'',0,16400,,'',0
+'3450',7001,182100,,'',0
+'3624',7001,182100,,'',0
+'3627',7001,182100,,'',0
+'3628',7001,182100,,'',0
+'3631',7001,182100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
index 3176215f..043112eb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
@@ -1,8 +1,17 @@
-'2375',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,195500,,'',0,16400,,'',0
-'3495',1501,195500,,'',0,16400,,'',0
-'3501',1501,195500,,'',0,16400,,'',0
-'3495',7001,182100,,'',0
-'3501',7001,182100,,'',0
+'3450',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,195500,,'',0,16400,,'',0,12400,,'',0,26400,,'',0
+'3624',1501,195500,,'',0,16400,,'',0
+'3625',1501,195500,,'',0,16400,,'',0
+'3627',1501,195500,,'',0,16400,,'',0
+'3628',1501,195500,,'',0,16400,,'',0
+'3631',1501,195500,,'',0,16400,,'',0
+'3450',7001,182100,,'',0
+'3624',7001,182100,,'',0
+'3627',7001,182100,,'',0
+'3628',7001,182100,,'',0
+'3631',7001,182100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
index 378ba76d..6db06d4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
@@ -1,4 +1,8 @@
-'2375',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
index ac29818d..cd250562 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
@@ -1,5 +1,11 @@
-'2375',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182500,,'',0
-'3501',7001,182500,,'',0
+'3450',1501,191700,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182500,,'',0
+'3624',7001,182500,,'',0
+'3627',7001,182500,,'',0
+'3628',7001,182500,,'',0
+'3631',7001,182500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
index 1873fc48..51429e5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
@@ -1,10 +1,19 @@
-'2375',500,91000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,55600,,'',0
-'3501',7000,55600,,'',0
+'3450',500,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,55600,,'',0
+'3624',7000,55600,,'',0
+'3627',7000,55600,,'',0
+'3628',7000,55600,,'',0
+'3631',7000,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
index 55f971fa..bdd46773 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
@@ -1,10 +1,19 @@
-'2375',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,55600,,'',0
-'3501',7000,55600,,'',0
+'3450',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,55600,,'',0
+'3624',7000,55600,,'',0
+'3627',7000,55600,,'',0
+'3628',7000,55600,,'',0
+'3631',7000,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
index bc88475b..06dae9b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
@@ -1,20 +1,46 @@
-'2375',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,163900,,'',0
-'3495',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,163900,,'',0
+'3450',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,163900,,'',0
-'3501',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'3201',1101,180600,,'',0
-'3495',1101,123300,,'',0
+'3624',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,163900,,'',0
+'3630',1000,163900,,'',0
+'3631',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,163900,,'',0
+'3634',1000,163900,,'',0
+'3424',1101,180600,,'',0
+'3450',1101,123300,,'',0,57300,,'',0
 '3499',1101,180600,,'',0
-'3501',1101,123300,,'',0,57300,,'',0
-'2375',1500,200300,,'',0,12400,,'',0
-'3495',1500,200300,,'',0,12400,,'',0
-'3501',1500,200300,,'',0,12400,,'',0
-'3495',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,123300,,'',0
+'3627',1101,123300,,'',0,57300,,'',0
+'3628',1101,123300,,'',0
+'3629',1101,180600,,'',0
+'3630',1101,180600,,'',0
+'3631',1101,123300,,'',0
+'3632',1101,180600,,'',0
+'3634',1101,180600,,'',0
+'3450',1500,200300,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200300,,'',0,12400,,'',0
+'3625',1500,200300,,'',0,12400,,'',0
+'3627',1500,200300,,'',0,12400,,'',0
+'3628',1500,200300,,'',0,12400,,'',0
+'3631',1500,200300,,'',0,12400,,'',0
+'3450',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
index 165daf66..0c365371 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
@@ -1,20 +1,46 @@
-'2375',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,163900,,'',0
-'3495',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,163900,,'',0
+'3450',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,163900,,'',0
-'3501',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'3201',1101,180600,,'',0
-'3495',1101,123300,,'',0
+'3624',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64200,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,163900,,'',0
+'3630',1000,163900,,'',0
+'3631',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,163900,,'',0
+'3634',1000,163900,,'',0
+'3424',1101,180600,,'',0
+'3450',1101,123300,,'',0,57300,,'',0
 '3499',1101,180600,,'',0
-'3501',1101,123300,,'',0,57300,,'',0
-'2375',1500,200200,,'',0,12400,,'',0
-'3495',1500,200200,,'',0,12400,,'',0
-'3501',1500,200200,,'',0,12400,,'',0
-'3495',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,123300,,'',0
+'3627',1101,123300,,'',0,57300,,'',0
+'3628',1101,123300,,'',0
+'3629',1101,180600,,'',0
+'3630',1101,180600,,'',0
+'3631',1101,123300,,'',0
+'3632',1101,180600,,'',0
+'3634',1101,180600,,'',0
+'3450',1500,200200,,'',0,12400,,'',0,12500,,'',0,26400,,'',0
+'3624',1500,200200,,'',0,12400,,'',0
+'3625',1500,200200,,'',0,12400,,'',0
+'3627',1500,200200,,'',0,12400,,'',0
+'3628',1500,200200,,'',0,12400,,'',0
+'3631',1500,200200,,'',0,12400,,'',0
+'3450',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
index d3accc3b..ff8bb01f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
@@ -1,18 +1,40 @@
-'2375',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1001,92100,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175700,,'',0
-'3495',1001,75400,,'',0,16700,,'',0,43100,,'',0
+'3450',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1001,175700,,'',0
+'3450',1001,75400,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175700,,'',0
-'3501',1001,75400,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
-'3495',1100,100400,,'',0,30700,,'',0
-'3501',1100,100400,,'',0,30700,,'',0
-'2375',1501,195000,,'',0,16400,,'',0
-'3495',1501,195000,,'',0,16400,,'',0
-'3501',1501,195000,,'',0,16400,,'',0
-'3495',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'3501',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3624',1001,75400,,'',0,16700,,'',0,43100,,'',0
+'3625',1001,92100,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75400,,'',0,16700,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75400,,'',0,16700,,'',0,43100,,'',0
+'3629',1001,175700,,'',0
+'3630',1001,175700,,'',0
+'3631',1001,75400,,'',0,16700,,'',0,43100,,'',0
+'3632',1001,175700,,'',0
+'3634',1001,175700,,'',0
+'3450',1100,100400,,'',0,30700,,'',0
+'3624',1100,100400,,'',0,30700,,'',0
+'3627',1100,100400,,'',0,30700,,'',0
+'3628',1100,100400,,'',0,30700,,'',0
+'3631',1100,100400,,'',0,30700,,'',0
+'3450',1501,195000,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12500,0,'Cherry Ln',0
+'3624',1501,195000,,'',0,16400,,'',0
+'3625',1501,195000,,'',0,16400,,'',0
+'3627',1501,195000,,'',0,16400,,'',0
+'3628',1501,195000,,'',0,16400,,'',0
+'3631',1501,195000,,'',0,16400,,'',0
+'3450',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3624',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3627',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3628',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'3631',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
index 0f755541..0722cb50 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
@@ -1,6 +1,12 @@
-'2375',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194800,,'',0,16400,,'',0
-'3495',1501,194800,,'',0,16400,,'',0
-'3501',1501,194800,,'',0,16400,,'',0
+'3450',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194800,,'',0,16400,,'',0,12400,,'',0,26400,,'',0,12400,0,'Cherry Ln',0
+'3624',1501,194800,,'',0,16400,,'',0
+'3625',1501,194800,,'',0,16400,,'',0
+'3627',1501,194800,,'',0,16400,,'',0
+'3628',1501,194800,,'',0,16400,,'',0
+'3631',1501,194800,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
index 9c41d0fc..8041f368 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
@@ -1,19 +1,36 @@
-'2375',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',500,80200,0,'School Spcl',0
-'3495',501,151900,0,'School Spcl',0
-'3501',500,80200,0,'School Spcl',0
-'3501',501,151900,0,'School Spcl',0
-'2375',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',500,80200,0,'School Spcl',0
+'3624',501,151900,0,'School Spcl',0
+'3627',500,80200,0,'School Spcl',0
+'3627',501,151900,0,'School Spcl',0
+'3631',500,80200,0,'School Spcl',0
+'3631',501,151900,0,'School Spcl',0
+'3450',1501,192800,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
index 3ae1e9b4..2fe4f167 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
@@ -1,15 +1,29 @@
-'2375',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81300,0,'School Spcl',0
-'3495',501,153200,0,'School Spcl',0
-'3501',500,81300,0,'School Spcl',0
-'3501',501,153200,0,'School Spcl',0
-'2375',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
-'3501',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3450',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81300,0,'School Spcl',0
+'3624',501,153200,0,'School Spcl',0
+'3627',500,81300,0,'School Spcl',0
+'3627',501,153200,0,'School Spcl',0
+'3631',500,81300,0,'School Spcl',0
+'3631',501,153200,0,'School Spcl',0
+'3450',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3624',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3627',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3628',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'3631',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
index b4c769a3..71042589 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
@@ -1,15 +1,29 @@
-'2375',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81300,0,'School Spcl',0
-'3495',501,153200,0,'School Spcl',0
-'3501',500,81300,0,'School Spcl',0
-'3501',501,153200,0,'School Spcl',0
-'2375',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
-'3501',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'3450',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81300,0,'School Spcl',0
+'3624',501,153200,0,'School Spcl',0
+'3627',500,81300,0,'School Spcl',0
+'3627',501,153200,0,'School Spcl',0
+'3631',500,81300,0,'School Spcl',0
+'3631',501,153200,0,'School Spcl',0
+'3450',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'3624',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'3627',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'3628',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'3631',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
index f9faa543..a0936e4d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
@@ -1,8 +1,18 @@
-'2375',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164900,,'',0
-'3495',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164900,,'',0
+'3450',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164900,,'',0
-'3501',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164900,,'',0
+'3630',1000,164900,,'',0
+'3631',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164900,,'',0
+'3634',1000,164900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
index 2d2ff923..a22902f5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
@@ -1,8 +1,18 @@
-'2375',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164900,,'',0
-'3495',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164900,,'',0
+'3450',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164900,,'',0
-'3501',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164900,,'',0
+'3630',1000,164900,,'',0
+'3631',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164900,,'',0
+'3634',1000,164900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
index 02846559..10fabc2b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
@@ -1,3 +1,6 @@
-'2375',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
index 59a7d01f..7947e1c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
@@ -1,3 +1,6 @@
-'2375',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
index 6396da66..d3f9bfcb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
@@ -1,16 +1,30 @@
-'2375',300,81200,0,'School Spcl',0
-'3495',300,81200,0,'School Spcl',0
-'3501',300,81200,0,'School Spcl',0
-'2375',401,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81000,0,'School Spcl',0
-'3495',501,152900,0,'School Spcl',0
-'3501',500,81000,0,'School Spcl',0
-'3501',501,152900,0,'School Spcl',0
-'2375',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,81200,0,'School Spcl',0
+'3624',300,81200,0,'School Spcl',0
+'3625',300,81200,0,'School Spcl',0
+'3627',300,81200,0,'School Spcl',0
+'3628',300,81200,0,'School Spcl',0
+'3631',300,81200,0,'School Spcl',0
+'3450',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81000,0,'School Spcl',0
+'3624',501,152900,0,'School Spcl',0
+'3627',500,81000,0,'School Spcl',0
+'3627',501,152900,0,'School Spcl',0
+'3631',500,81000,0,'School Spcl',0
+'3631',501,152900,0,'School Spcl',0
+'3450',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193300,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
index 95a313f6..1ec8b795 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
@@ -1,8 +1,17 @@
-'2375',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,195400,,'',0,16400,,'',0
-'3495',1501,195400,,'',0,16400,,'',0
-'3501',1501,195400,,'',0,16400,,'',0
-'3495',7001,182000,,'',0
-'3501',7001,182000,,'',0
+'3450',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,195400,,'',0,16400,,'',0,12400,,'',0,26400,,'',0
+'3624',1501,195400,,'',0,16400,,'',0
+'3625',1501,195400,,'',0,16400,,'',0
+'3627',1501,195400,,'',0,16400,,'',0
+'3628',1501,195400,,'',0,16400,,'',0
+'3631',1501,195400,,'',0,16400,,'',0
+'3450',7001,182000,,'',0
+'3624',7001,182000,,'',0
+'3627',7001,182000,,'',0
+'3628',7001,182000,,'',0
+'3631',7001,182000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
index fedbd67a..8311ab5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
@@ -1,3 +1,6 @@
-'2375',201,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
index a199d70e..506c2074 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
@@ -1,9 +1,18 @@
-'2375',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'3495',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'3501',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'3253',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194000,0,'Downtown',0,16400,0,'Downtown',0,12400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3625',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3627',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3628',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3631',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3626',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
index 56e138a2..05d9d610 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
@@ -1,5 +1,12 @@
-'2375',1001,84300,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172100,,'',0
-'3495',1001,71900,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172100,,'',0
+'3450',1001,71900,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172100,,'',0
-'3501',1001,71900,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,71900,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,84300,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,71900,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,71900,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172100,,'',0
+'3630',1001,172100,,'',0
+'3631',1001,71900,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172100,,'',0
+'3634',1001,172100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
index bf4bd3b7..5e4c6160 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
@@ -1,5 +1,12 @@
-'2375',1001,84400,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172200,,'',0
-'3495',1001,72000,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172200,,'',0
+'3450',1001,72000,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172200,,'',0
-'3501',1001,72000,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,72000,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,84400,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,72000,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,72000,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172200,,'',0
+'3630',1001,172200,,'',0
+'3631',1001,72000,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172200,,'',0
+'3634',1001,172200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
index f8446209..60be8c2f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
@@ -1,12 +1,24 @@
-'2375',300,80300,0,'School Spcl',0
-'3495',300,80300,0,'School Spcl',0
-'3501',300,80300,0,'School Spcl',0
-'2375',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,80300,0,'School Spcl',0
+'3624',300,80300,0,'School Spcl',0
+'3625',300,80300,0,'School Spcl',0
+'3627',300,80300,0,'School Spcl',0
+'3628',300,80300,0,'School Spcl',0
+'3631',300,80300,0,'School Spcl',0
+'3450',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193000,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146205
index ec5c5be5..94fadf84 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146205
@@ -1,4 +1,6 @@
-'3495',500,80400,0,'School Spcl',0
-'3495',501,152200,0,'School Spcl',0
-'3501',500,80400,0,'School Spcl',0
-'3501',501,152200,0,'School Spcl',0
+'3624',500,80400,0,'School Spcl',0
+'3624',501,152200,0,'School Spcl',0
+'3627',500,80400,0,'School Spcl',0
+'3627',501,152200,0,'School Spcl',0
+'3631',500,80400,0,'School Spcl',0
+'3631',501,152200,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
index 9ab8d72e..88e55794 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
@@ -1,12 +1,24 @@
-'2375',300,80600,0,'School Spcl',0
-'3495',300,80600,0,'School Spcl',0
-'3501',300,80600,0,'School Spcl',0
-'2375',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,80600,0,'School Spcl',0
+'3624',300,80600,0,'School Spcl',0
+'3625',300,80600,0,'School Spcl',0
+'3627',300,80600,0,'School Spcl',0
+'3628',300,80600,0,'School Spcl',0
+'3631',300,80600,0,'School Spcl',0
+'3450',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193200,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
index 89269977..585e4a64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
@@ -1,6 +1,12 @@
-'2375',300,80700,0,'School Spcl',0
-'3495',300,80700,0,'School Spcl',0
-'3501',300,80700,0,'School Spcl',0
-'2375',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,80700,0,'School Spcl',0
+'3624',300,80700,0,'School Spcl',0
+'3625',300,80700,0,'School Spcl',0
+'3627',300,80700,0,'School Spcl',0
+'3628',300,80700,0,'School Spcl',0
+'3631',300,80700,0,'School Spcl',0
+'3450',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146208 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146208
index adbdb760..c6049789 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146208
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146208
@@ -1,4 +1,6 @@
-'3495',500,80800,0,'School Spcl',0
-'3495',501,152700,0,'School Spcl',0
-'3501',500,80800,0,'School Spcl',0
-'3501',501,152700,0,'School Spcl',0
+'3624',500,80800,0,'School Spcl',0
+'3624',501,152700,0,'School Spcl',0
+'3627',500,80800,0,'School Spcl',0
+'3627',501,152700,0,'School Spcl',0
+'3631',500,80800,0,'School Spcl',0
+'3631',501,152700,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
index 15743c4b..7190b987 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
@@ -1,6 +1,12 @@
-'2375',300,81000,0,'School Spcl',0
-'3495',300,81000,0,'School Spcl',0
-'3501',300,81000,0,'School Spcl',0
-'2375',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,81000,0,'School Spcl',0
+'3624',300,81000,0,'School Spcl',0
+'3625',300,81000,0,'School Spcl',0
+'3627',300,81000,0,'School Spcl',0
+'3628',300,81000,0,'School Spcl',0
+'3631',300,81000,0,'School Spcl',0
+'3450',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
index 89269977..585e4a64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
@@ -1,6 +1,12 @@
-'2375',300,80700,0,'School Spcl',0
-'3495',300,80700,0,'School Spcl',0
-'3501',300,80700,0,'School Spcl',0
-'2375',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,80700,0,'School Spcl',0
+'3624',300,80700,0,'School Spcl',0
+'3625',300,80700,0,'School Spcl',0
+'3627',300,80700,0,'School Spcl',0
+'3628',300,80700,0,'School Spcl',0
+'3631',300,80700,0,'School Spcl',0
+'3450',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
index feb97c6d..4b77315a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
@@ -1,12 +1,23 @@
-'2375',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,80200,0,'School Spcl',0
-'3495',501,152000,0,'School Spcl',0
-'3501',500,80200,0,'School Spcl',0
-'3501',501,152000,0,'School Spcl',0
-'2375',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',500,80200,0,'School Spcl',0
+'3624',501,152000,0,'School Spcl',0
+'3627',500,80200,0,'School Spcl',0
+'3627',501,152000,0,'School Spcl',0
+'3631',500,80200,0,'School Spcl',0
+'3631',501,152000,0,'School Spcl',0
+'3450',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
index 54d28061..49e8a2c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
@@ -1,6 +1,12 @@
-'2375',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1500,200800,,'',0,12400,,'',0
-'3495',1500,200800,,'',0,12400,,'',0
-'3501',1500,200800,,'',0,12400,,'',0
+'3450',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1500,200800,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200800,,'',0,12400,,'',0
+'3625',1500,200800,,'',0,12400,,'',0
+'3627',1500,200800,,'',0,12400,,'',0
+'3628',1500,200800,,'',0,12400,,'',0
+'3631',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
index c97e5649..4bc2daa8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
@@ -1,5 +1,12 @@
-'2375',1000,82900,,'',0,47200,,'',0,40700,,'',0
-'3201',1000,170800,,'',0
-'3495',1000,70900,,'',0,12000,,'',0,47200,,'',0
+'3424',1000,170800,,'',0
+'3450',1000,70900,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
 '3499',1000,170800,,'',0
-'3501',1000,70900,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3624',1000,70900,,'',0,12000,,'',0,47200,,'',0
+'3625',1000,82900,,'',0,47200,,'',0,40700,,'',0
+'3627',1000,70900,,'',0,12000,,'',0,47200,,'',0,40700,,'',0
+'3628',1000,70900,,'',0,12000,,'',0,47200,,'',0
+'3629',1000,170800,,'',0
+'3630',1000,170800,,'',0
+'3631',1000,70900,,'',0,12000,,'',0,47200,,'',0
+'3632',1000,170800,,'',0
+'3634',1000,170800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
index e6db107e..32b0b9a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
@@ -1,5 +1,12 @@
-'2375',1001,84600,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172400,,'',0
-'3495',1001,72200,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172400,,'',0
+'3450',1001,72200,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172400,,'',0
-'3501',1001,72200,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,72200,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,84600,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,72200,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,72200,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172400,,'',0
+'3630',1001,172400,,'',0
+'3631',1001,72200,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172400,,'',0
+'3634',1001,172400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
index f79d66b1..e88f4f05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
@@ -1,8 +1,15 @@
-'2375',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,84800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3253',1600,94900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'3253',1601,94900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3626',1600,94900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3626',1601,94900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',1000100,190400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
index c8ffccb0..2acd03da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
@@ -1,16 +1,35 @@
-'2375',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3201',1101,181500,,'',0
-'3495',1101,124200,,'',0
+'3450',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1101,181500,,'',0
+'3450',1101,124200,,'',0,57300,,'',0
 '3499',1101,181500,,'',0
-'3501',1101,124200,,'',0,57300,,'',0
-'2375',1501,194100,,'',0,16400,,'',0
-'3495',1501,194100,,'',0,16400,,'',0
-'3501',1501,194100,,'',0,16400,,'',0
-'3253',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',1101,124200,,'',0
+'3627',1101,124200,,'',0,57300,,'',0
+'3628',1101,124200,,'',0
+'3629',1101,181500,,'',0
+'3630',1101,181500,,'',0
+'3631',1101,124200,,'',0
+'3632',1101,181500,,'',0
+'3634',1101,181500,,'',0
+'3450',1501,194100,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194100,,'',0,16400,,'',0
+'3625',1501,194100,,'',0,16400,,'',0
+'3627',1501,194100,,'',0,16400,,'',0
+'3628',1501,194100,,'',0,16400,,'',0
+'3631',1501,194100,,'',0,16400,,'',0
+'3626',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
index 51efa93d..51a4f05a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
@@ -1,10 +1,22 @@
-'2375',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',1100,95700,,'',0,34700,,'',0
-'3501',1100,95700,,'',0,34700,,'',0
-'2375',1500,201200,,'',0,12400,,'',0
-'3495',1500,201200,,'',0,12400,,'',0
-'3501',1500,201200,,'',0,12400,,'',0
-'3495',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3450',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1100,95700,,'',0,34700,,'',0
+'3624',1100,95700,,'',0,34700,,'',0
+'3627',1100,95700,,'',0,34700,,'',0
+'3628',1100,95700,,'',0,34700,,'',0
+'3631',1100,95700,,'',0,34700,,'',0
+'3450',1500,201200,,'',0,12400,,'',0,16400,,'',0,22400,,'',0
+'3624',1500,201200,,'',0,12400,,'',0
+'3625',1500,201200,,'',0,12400,,'',0
+'3627',1500,201200,,'',0,12400,,'',0
+'3628',1500,201200,,'',0,12400,,'',0
+'3631',1500,201200,,'',0,12400,,'',0
+'3450',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
index 611ceb65..f9adb326 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
@@ -1,6 +1,12 @@
-'2375',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194500,,'',0,16400,,'',0
-'3495',1501,194500,,'',0,16400,,'',0
-'3501',1501,194500,,'',0,16400,,'',0
+'3450',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194500,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194500,,'',0,16400,,'',0
+'3625',1501,194500,,'',0,16400,,'',0
+'3627',1501,194500,,'',0,16400,,'',0
+'3628',1501,194500,,'',0,16400,,'',0
+'3631',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
index b1c57cd5..a2760feb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
@@ -1,16 +1,33 @@
-'2375',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2375',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1001,91700,,'',0,43100,,'',0,40500,,'',0
-'3201',1001,175300,,'',0
-'3495',1001,75100,,'',0,16600,,'',0,43100,,'',0
+'3450',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,0,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3424',1001,175300,,'',0
+'3450',1001,75100,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
 '3499',1001,175300,,'',0
-'3501',1001,75100,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
-'3253',1601,93200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1001,75100,,'',0,16600,,'',0,43100,,'',0
+'3625',1001,91700,,'',0,43100,,'',0,40500,,'',0
+'3627',1001,75100,,'',0,16600,,'',0,43100,,'',0,40500,,'',0
+'3628',1001,75100,,'',0,16600,,'',0,43100,,'',0
+'3629',1001,175300,,'',0
+'3630',1001,175300,,'',0
+'3631',1001,75100,,'',0,16600,,'',0,43100,,'',0
+'3632',1001,175300,,'',0
+'3634',1001,175300,,'',0
+'3626',1601,93200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
index 1d2a485d..b862c3e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
@@ -1,9 +1,18 @@
-'2375',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
index 98c1f7b1..33aea668 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
@@ -1,9 +1,19 @@
-'2375',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'3495',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'3501',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'3495',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3624',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3625',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3627',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3628',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3631',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3450',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',1000100,191700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
index 40b1d0fe..9a6137a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
@@ -1,3 +1,6 @@
-'2375',400,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
index 8eb29b3e..f98f660a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
@@ -1,3 +1,7 @@
-'2375',401,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
index 3314e29e..7da470af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
@@ -1,3 +1,7 @@
-'2375',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
index a8e00a6f..0a3d5113 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
@@ -1,3 +1,6 @@
-'2375',400,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
index 3314e29e..7da470af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
@@ -1,3 +1,7 @@
-'2375',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
index 9adb1429..bc850e5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
@@ -1,3 +1,6 @@
-'2375',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
index 99524b47..92d71e3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
@@ -1,7 +1,13 @@
-'2375',300,82100,4,'',0
-'2375',301,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3495',300,82100,4,'',0
-'3495',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3501',300,82100,4,'',0
-'3501',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3253',1601,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,82100,4,'',0
+'3450',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3624',300,82100,4,'',0
+'3624',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3625',300,82100,4,'',0
+'3625',301,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3627',300,82100,4,'',0
+'3627',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3628',300,82100,4,'',0
+'3628',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3631',300,82100,4,'',0
+'3631',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3626',1601,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
index 4a766e41..32e3c486 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
@@ -1,11 +1,23 @@
-'2375',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'2375',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'3495',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'3501',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,55100,,'',0
-'3501',7000,55100,,'',0
+'3450',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3450',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3624',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3625',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3627',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3628',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3631',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,55100,,'',0
+'3624',7000,55100,,'',0
+'3627',7000,55100,,'',0
+'3628',7000,55100,,'',0
+'3631',7000,55100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
index e9846795..874b274a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
@@ -1,9 +1,18 @@
-'2375',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3253',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'3501',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'2375',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',7000,55800,,'',0
-'3501',7000,55800,,'',0
+'3450',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3624',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3625',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3626',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3628',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3631',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3450',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3450',7000,55800,,'',0
+'3624',7000,55800,,'',0
+'3627',7000,55800,,'',0
+'3628',7000,55800,,'',0
+'3631',7000,55800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
index 2273b823..67abe792 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
@@ -1,8 +1,18 @@
-'2375',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'3495',7001,182300,,'',0
-'3501',7001,182300,,'',0
+'3450',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,191500,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3450',7001,182300,,'',0
+'3624',7001,182300,,'',0
+'3627',7001,182300,,'',0
+'3628',7001,182300,,'',0
+'3631',7001,182300,,'',0
+'3450',1000100,190200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
index fa82f824..6cff66fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
@@ -1,3 +1,7 @@
-'2375',300,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
index 7a147a30..ee5988f9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
@@ -1,18 +1,37 @@
-'2375',100,82400,,'',0
-'2375',101,82400,4,'',0
-'3495',100,82400,,'',0
-'3495',101,82400,4,'',0
-'3501',100,82400,,'',0
-'3501',101,82400,4,'',0
-'2375',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',500,92200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
-'3253',500,125200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
-'3501',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
-'3253',1600,95200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'3495',4000,82000,,'',0,51500,,'',0
-'3501',4000,82000,,'',0,11500,,'',0,40000,,'',0
-'3495',7000,55900,,'',0
-'3501',7000,55900,,'',0
+'3450',100,82400,,'',0
+'3450',101,82400,4,'',0
+'3624',100,82400,,'',0
+'3624',101,82400,4,'',0
+'3625',100,82400,,'',0
+'3625',101,82400,4,'',0
+'3627',100,82400,,'',0
+'3627',101,82400,4,'',0
+'3628',100,82400,,'',0
+'3628',101,82400,4,'',0
+'3631',100,82400,,'',0
+'3631',101,82400,4,'',0
+'3450',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,72200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3624',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3625',500,92200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3626',500,125200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3628',500,72200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3631',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3626',1600,95200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3450',4000,82000,,'',0,51500,,'',0
+'3624',4000,82000,,'',0,51500,,'',0
+'3627',4000,82000,,'',0,11500,,'',0,40000,,'',0
+'3628',4000,82000,,'',0,51500,,'',0
+'3631',4000,82000,,'',0,51500,,'',0
+'3633',5000,85500,,'',0
+'3450',7000,55900,,'',0
+'3624',7000,55900,,'',0
+'3627',7000,55900,,'',0
+'3628',7000,55900,,'',0
+'3631',7000,55900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
index b88d08b1..eb0c0100 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
@@ -1,20 +1,42 @@
-'2375',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',101,91600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2375',501,90500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'2375',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'3495',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'3495',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'3501',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'3501',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'3495',4001,100600,,'',0,60000,,'',0
-'3501',4001,100600,,'',0,32800,,'',0,27200,,'',0
-'3495',7001,182200,,'',0
-'3501',7001,182200,,'',0
+'3450',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',101,91600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',101,61600,4,'',0,10000,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0,4400,,'',0,18200,4,'',0,8200,,'',0,4200,4,'',0
+'3450',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0,8200,0,'Downtown',0,4200,4,'',0,18200,0,'Downtown',0,8200,4,'',0,4200,0,'Downtown',0
+'3624',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3624',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3625',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3625',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3627',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3627',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3628',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3628',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3631',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3631',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3450',4001,100600,,'',0,60000,,'',0
+'3624',4001,100600,,'',0,60000,,'',0
+'3627',4001,100600,,'',0,32800,,'',0,27200,,'',0
+'3628',4001,100600,,'',0,60000,,'',0
+'3631',4001,100600,,'',0,60000,,'',0
+'3633',5001,125000,,'',0
+'3450',7001,182200,,'',0
+'3624',7001,182200,,'',0
+'3627',7001,182200,,'',0
+'3628',7001,182200,,'',0
+'3631',7001,182200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
index 20795e53..a594423b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
@@ -1,7 +1,14 @@
-'2375',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,90400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1000100,190200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
index a13078cf..7061d713 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
@@ -1,13 +1,26 @@
-'2375',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,90200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',1000100,190100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
index 2461bc63..404d9c61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
@@ -1,4 +1,8 @@
-'2375',501,85600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
-'3253',501,122600,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0
-'3495',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
-'3501',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3450',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3624',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3625',501,85600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3626',501,122600,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0
+'3627',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3628',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3631',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3450',1000100,190100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
index 3090eb27..679d47cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
@@ -1,11 +1,24 @@
-'2375',300,91600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2375',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164900,,'',0
-'3495',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',300,91600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',300,71600,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3424',1000,164900,,'',0
+'3450',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164900,,'',0
-'3501',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65000,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164900,,'',0
+'3630',1000,164900,,'',0
+'3631',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164900,,'',0
+'3634',1000,164900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
index e1fffa88..d51d1c3e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
@@ -1,5 +1,12 @@
-'2375',1001,85000,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172800,,'',0
-'3495',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172800,,'',0
+'3450',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172800,,'',0
-'3501',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172800,,'',0
+'3630',1001,172800,,'',0
+'3631',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172800,,'',0
+'3634',1001,172800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
index e1fffa88..d51d1c3e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
@@ -1,5 +1,12 @@
-'2375',1001,85000,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172800,,'',0
-'3495',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172800,,'',0
+'3450',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172800,,'',0
-'3501',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,72600,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172800,,'',0
+'3630',1001,172800,,'',0
+'3631',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172800,,'',0
+'3634',1001,172800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
index e3556867..f094dd0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
@@ -1,6 +1,12 @@
-'2375',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2375',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'3495',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'3501',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3450',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3624',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3625',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3627',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3628',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3631',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
index 7c148f59..38c31196 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
@@ -1,8 +1,17 @@
-'2375',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2375',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'3495',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'3501',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3450',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3450',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3624',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3625',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3627',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3628',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3631',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
index 3c938b87..6daaf4d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
@@ -1,12 +1,24 @@
-'2375',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'2375',101,81100,,'',0
-'3495',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3495',101,81100,,'',0
-'3501',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'3501',101,81100,,'',0
-'2375',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3495',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'3501',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3450',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3450',101,81100,,'',0
+'3624',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3624',101,81100,,'',0
+'3625',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3625',101,81100,,'',0
+'3627',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3627',101,81100,,'',0
+'3628',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3628',101,81100,,'',0
+'3631',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3631',101,81100,,'',0
+'3450',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3624',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3625',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3627',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3628',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3631',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
index db2a1d56..830a49ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
@@ -1,4 +1,7 @@
-'2375',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
index b7fbdbcc..221c708a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
@@ -1,4 +1,8 @@
-'2375',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
index 96d90495..13c7e457 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
@@ -1,7 +1,14 @@
-'2375',100,84800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2375',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
index cdc75944..fa8fdd1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
@@ -1,3 +1,6 @@
-'2375',101,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',101,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146250
index 43e05942..bee341d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146250
@@ -1,2 +1,3 @@
-'3253',1600,91800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3253',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3626',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,191900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
index eec7a414..0620935a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
@@ -1,6 +1,12 @@
-'2375',300,80800,0,'School Spcl',0
-'3495',300,80800,0,'School Spcl',0
-'3501',300,80800,0,'School Spcl',0
-'2375',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3495',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'3501',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3450',300,80800,0,'School Spcl',0
+'3624',300,80800,0,'School Spcl',0
+'3625',300,80800,0,'School Spcl',0
+'3627',300,80800,0,'School Spcl',0
+'3628',300,80800,0,'School Spcl',0
+'3631',300,80800,0,'School Spcl',0
+'3450',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3624',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3625',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3627',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3628',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3631',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
index 0d72e4fe..f0aeb5fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
@@ -1,6 +1,12 @@
-'2375',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,194600,,'',0,16400,,'',0
-'3495',1501,194600,,'',0,16400,,'',0
-'3501',1501,194600,,'',0,16400,,'',0
+'3450',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,194600,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194600,,'',0,16400,,'',0
+'3625',1501,194600,,'',0,16400,,'',0
+'3627',1501,194600,,'',0,16400,,'',0
+'3628',1501,194600,,'',0,16400,,'',0
+'3631',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
index 558accc0..ec60768f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
@@ -1,9 +1,19 @@
-'2375',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164800,,'',0
-'3495',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3450',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1000,164800,,'',0
+'3450',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164800,,'',0
-'3501',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
-'3253',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164800,,'',0
+'3630',1000,164800,,'',0
+'3631',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164800,,'',0
+'3634',1000,164800,,'',0
+'3626',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
index 3bc3dd0e..3123f588 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
@@ -1,7 +1,16 @@
-'2375',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'3495',7001,183000,,'',0
-'3501',7001,183000,,'',0
+'3450',1501,192000,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3450',7001,183000,,'',0
+'3624',7001,183000,,'',0
+'3627',7001,183000,,'',0
+'3628',7001,183000,,'',0
+'3631',7001,183000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
index 45240229..7d64745a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
@@ -1,12 +1,24 @@
-'2375',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55400,,'',0
-'3501',7000,55400,,'',0
+'3450',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55400,,'',0
+'3624',7000,55400,,'',0
+'3627',7000,55400,,'',0
+'3628',7000,55400,,'',0
+'3631',7000,55400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
index 1aed585b..32d46482 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
@@ -1,5 +1,12 @@
-'2375',1000,81100,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,165000,,'',0
-'3495',1000,65100,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,165000,,'',0
+'3450',1000,65100,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,165000,,'',0
-'3501',1000,65100,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65100,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81100,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65100,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65100,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,165000,,'',0
+'3630',1000,165000,,'',0
+'3631',1000,65100,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,165000,,'',0
+'3634',1000,165000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
index 5d1726ca..009fccee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
@@ -1,8 +1,15 @@
-'2375',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'3253',1600,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1501,192600,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3626',1600,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
index 5a732525..23f5e9a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
@@ -1,8 +1,15 @@
-'2375',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,93500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,93500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,192800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
index 04e65e5e..9dbe97e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
@@ -1,6 +1,12 @@
-'2375',400,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
index 141629b5..fb5121b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
@@ -1,6 +1,12 @@
-'2375',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3450',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
index 72240171..8a4e089c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
@@ -1,6 +1,12 @@
-'2375',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
index d9b4ece9..6021a72e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
@@ -1,6 +1,12 @@
-'2375',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3450',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
index c1d18d2f..280455e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
@@ -1,6 +1,12 @@
-'2375',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3450',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
index 72240171..8a4e089c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
@@ -1,6 +1,12 @@
-'2375',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
index 81493e72..af3c4c01 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
@@ -1,18 +1,39 @@
-'2375',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3201',1101,181500,,'',0
-'3495',1101,124200,,'',0
+'3450',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3424',1101,181500,,'',0
+'3450',1101,124200,,'',0,57300,,'',0
 '3499',1100,183800,,'',0
 '3499',1101,181500,,'',0
-'3501',1100,183800,,'',0
-'3501',1101,124200,,'',0,57300,,'',0
-'2375',1501,194200,,'',0,16400,,'',0
-'3495',1501,194200,,'',0,16400,,'',0
-'3501',1501,194200,,'',0,16400,,'',0
-'2375',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',1101,124200,,'',0
+'3627',1100,183800,,'',0
+'3627',1101,124200,,'',0,57300,,'',0
+'3628',1101,124200,,'',0
+'3629',1101,181500,,'',0
+'3630',1100,183800,,'',0
+'3630',1101,181500,,'',0
+'3631',1101,124200,,'',0
+'3632',1101,181500,,'',0
+'3634',1100,183800,,'',0
+'3634',1101,181500,,'',0
+'3450',1501,194200,,'',0,16400,,'',0,12400,,'',0,22400,,'',0,16400,0,'Cherry Ln',0
+'3624',1501,194200,,'',0,16400,,'',0
+'3625',1501,194200,,'',0,16400,,'',0
+'3627',1501,194200,,'',0,16400,,'',0
+'3628',1501,194200,,'',0,16400,,'',0
+'3631',1501,194200,,'',0,16400,,'',0
+'3450',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
index f257a3ed..36d66da3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
@@ -1,12 +1,24 @@
-'2375',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3253',1600,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3626',1600,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
index fe33604b..acc78541 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
@@ -1,9 +1,18 @@
-'2375',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3253',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3626',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
index f81eae43..1badefe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
@@ -1,10 +1,22 @@
-'2375',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3495',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'3501',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2375',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3495',7001,183400,4,'',0
-'3501',7001,183400,4,'',0
+'3450',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3624',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3625',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3627',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3628',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3631',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3450',1501,192200,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',7001,183400,4,'',0
+'3624',7001,183400,4,'',0
+'3627',7001,183400,4,'',0
+'3628',7001,183400,4,'',0
+'3631',7001,183400,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
index abdb9589..2df27d23 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
@@ -1,16 +1,30 @@
-'2375',300,81200,0,'School Spcl',0
-'3495',300,81200,0,'School Spcl',0
-'3501',300,81200,0,'School Spcl',0
-'2375',401,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',500,81000,0,'School Spcl',0
-'3495',501,152900,0,'School Spcl',0
-'3501',500,81000,0,'School Spcl',0
-'3501',501,152900,0,'School Spcl',0
-'2375',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2375',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3450',300,81200,0,'School Spcl',0
+'3624',300,81200,0,'School Spcl',0
+'3625',300,81200,0,'School Spcl',0
+'3627',300,81200,0,'School Spcl',0
+'3628',300,81200,0,'School Spcl',0
+'3631',300,81200,0,'School Spcl',0
+'3450',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',500,81000,0,'School Spcl',0
+'3624',501,152900,0,'School Spcl',0
+'3627',500,81000,0,'School Spcl',0
+'3627',501,152900,0,'School Spcl',0
+'3631',500,81000,0,'School Spcl',0
+'3631',501,152900,0,'School Spcl',0
+'3450',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0,26500,0,'Peachtree',0,12400,0,'Peachtree',0
+'3450',1501,193400,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3624',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
index 1e06cc79..7146f015 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
@@ -1,12 +1,24 @@
-'2375',501,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55500,,'',0
-'3501',7000,55500,,'',0
+'3450',501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55500,,'',0
+'3624',7000,55500,,'',0
+'3627',7000,55500,,'',0
+'3628',7000,55500,,'',0
+'3631',7000,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
index d81832ba..9d412575 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
@@ -1,7 +1,16 @@
-'2375',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3495',7001,182800,,'',0
-'3501',7001,182800,,'',0
+'3450',1501,191900,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',7001,182800,,'',0
+'3624',7001,182800,,'',0
+'3627',7001,182800,,'',0
+'3628',7001,182800,,'',0
+'3631',7001,182800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
index 8664a419..a9f5a7f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
@@ -1,12 +1,24 @@
-'2375',501,90700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55300,,'',0
-'3501',7000,55300,,'',0
+'3450',501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55300,,'',0
+'3624',7000,55300,,'',0
+'3627',7000,55300,,'',0
+'3628',7000,55300,,'',0
+'3631',7000,55300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
index ebacfd19..c50b7db8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
@@ -1,7 +1,16 @@
-'2375',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3495',7001,183100,,'',0
-'3501',7001,183100,,'',0
+'3450',1501,192000,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',7001,183100,,'',0
+'3624',7001,183100,,'',0
+'3627',7001,183100,,'',0
+'3628',7001,183100,,'',0
+'3631',7001,183100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
index a1a42e4b..044d6d1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
@@ -1,3 +1,6 @@
-'2375',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
index a1a42e4b..044d6d1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
@@ -1,3 +1,6 @@
-'2375',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
index c349004e..931daab5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
@@ -1,3 +1,6 @@
-'2375',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
index c349004e..931daab5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
@@ -1,3 +1,6 @@
-'2375',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
index 774c5d7f..aa215275 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
@@ -1,3 +1,6 @@
-'2375',200,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
index 296e933d..c1ea225a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
@@ -1,6 +1,12 @@
-'2375',200,85400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2375',201,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3495',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3501',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3450',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3624',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',200,85400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3625',201,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3627',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3628',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',200,65400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3631',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
index fad97c1e..6589fbe3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
@@ -1,12 +1,24 @@
-'2375',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',400,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3495',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'3501',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2375',1500,201100,,'',0,12400,,'',0
-'3495',1500,201100,,'',0,12400,,'',0
-'3501',1500,201100,,'',0,12400,,'',0
-'2375',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3495',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'3501',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3450',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3624',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3625',400,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3627',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3628',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3631',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3450',1500,201100,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,201100,,'',0,12400,,'',0
+'3625',1500,201100,,'',0,12400,,'',0
+'3627',1500,201100,,'',0,12400,,'',0
+'3628',1500,201100,,'',0,12400,,'',0
+'3631',1500,201100,,'',0,12400,,'',0
+'3450',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3624',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3625',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3627',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3628',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3631',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
index b914de26..dd5315c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
@@ -1,5 +1,12 @@
-'2375',1001,84900,,'',0,47100,,'',0,40700,,'',0
-'3201',1001,172700,,'',0
-'3495',1001,72500,,'',0,12400,,'',0,47100,,'',0
+'3424',1001,172700,,'',0
+'3450',1001,72500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
 '3499',1001,172700,,'',0
-'3501',1001,72500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3624',1001,72500,,'',0,12400,,'',0,47100,,'',0
+'3625',1001,84900,,'',0,47100,,'',0,40700,,'',0
+'3627',1001,72500,,'',0,12400,,'',0,47100,,'',0,40700,,'',0
+'3628',1001,72500,,'',0,12400,,'',0,47100,,'',0
+'3629',1001,172700,,'',0
+'3630',1001,172700,,'',0
+'3631',1001,72500,,'',0,12400,,'',0,47100,,'',0
+'3632',1001,172700,,'',0
+'3634',1001,172700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
index 53edcf72..1caf54e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
@@ -1,5 +1,12 @@
-'2375',1000,81300,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,165200,,'',0
-'3495',1000,65300,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,165200,,'',0
+'3450',1000,65300,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,165200,,'',0
-'3501',1000,65300,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,65300,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,81300,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,65300,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,65300,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,165200,,'',0
+'3630',1000,165200,,'',0
+'3631',1000,65300,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,165200,,'',0
+'3634',1000,165200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
index f2198cbe..58cbaf56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
@@ -1,3 +1,6 @@
-'2375',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
index 7145df4a..83d571df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
@@ -1,6 +1,12 @@
-'2375',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2375',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'3495',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'3501',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3450',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3624',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3625',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3627',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3628',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3631',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
index c734050b..0c3d71b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
@@ -1,5 +1,11 @@
-'2375',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3450',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
index 3ee63dff..f49e174b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
@@ -1,6 +1,12 @@
-'2375',3000,113800,,'',0,61000,,'',0
-'2375',3001,83300,,'',0,69000,,'',0
-'3495',3000,113800,,'',0,61000,,'',0
-'3495',3001,73300,,'',0,79000,,'',0
-'3501',3000,113800,,'',0,61000,,'',0
-'3501',3001,73300,,'',0,79000,,'',0
+'3450',3000,113800,,'',0,61000,,'',0
+'3450',3001,73300,,'',0,79000,,'',0
+'3624',3000,113800,,'',0,61000,,'',0
+'3624',3001,73300,,'',0,79000,,'',0
+'3625',3000,113800,,'',0,61000,,'',0
+'3625',3001,83300,,'',0,69000,,'',0
+'3627',3000,113800,,'',0,61000,,'',0
+'3627',3001,73300,,'',0,79000,,'',0
+'3628',3000,113800,,'',0,61000,,'',0
+'3628',3001,73300,,'',0,79000,,'',0
+'3631',3000,113800,,'',0,61000,,'',0
+'3631',3001,73300,,'',0,79000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
index 7e52e3a3..4e9c8dec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
@@ -1,6 +1,12 @@
-'2375',3000,113900,,'',0,61000,,'',0
-'2375',3001,83400,,'',0,69000,,'',0
-'3495',3000,113900,,'',0,61000,,'',0
-'3495',3001,73400,,'',0,79000,,'',0
-'3501',3000,113900,,'',0,61000,,'',0
-'3501',3001,73400,,'',0,79000,,'',0
+'3450',3000,113900,,'',0,61000,,'',0
+'3450',3001,73400,,'',0,79000,,'',0
+'3624',3000,113900,,'',0,61000,,'',0
+'3624',3001,73400,,'',0,79000,,'',0
+'3625',3000,113900,,'',0,61000,,'',0
+'3625',3001,83400,,'',0,69000,,'',0
+'3627',3000,113900,,'',0,61000,,'',0
+'3627',3001,73400,,'',0,79000,,'',0
+'3628',3000,113900,,'',0,61000,,'',0
+'3628',3001,73400,,'',0,79000,,'',0
+'3631',3000,113900,,'',0,61000,,'',0
+'3631',3001,73400,,'',0,79000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
index a932642b..4c0860f9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
@@ -1,5 +1,11 @@
-'2375',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'3495',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'3501',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'3495',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
-'3501',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3450',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3624',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3625',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3627',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3628',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3631',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3450',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3624',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3627',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3628',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3631',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
index 80ffa5c1..cb5b5207 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
@@ -1,6 +1,12 @@
-'2375',3000,93600,,'',0,700,4,'',0,20700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
-'2375',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3495',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
-'3495',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'3501',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
-'3501',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3450',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3450',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3624',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3624',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3625',3000,93600,,'',0,700,4,'',0,20700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3625',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3627',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3627',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3628',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3628',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3631',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3631',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
index 268185c0..7d4eeeec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
@@ -1,2 +1,5 @@
-'3495',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
-'3501',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'3450',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'3624',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'3627',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'3628',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'3631',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
index 98a05275..fc5d29c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
@@ -1,4 +1,10 @@
-'3495',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'3501',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'3495',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
-'3501',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'3450',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3624',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3627',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3628',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3631',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3450',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'3624',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'3627',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'3628',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'3631',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
index 5a6db3b8..b98ad2ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
@@ -1,4 +1,10 @@
-'3495',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
-'3501',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
-'3495',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
-'3501',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'3450',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3624',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3627',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3628',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3631',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3450',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'3624',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'3627',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'3628',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'3631',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
index 74e468fa..3522db4b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
@@ -1,2 +1,5 @@
-'3495',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'3501',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3450',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3624',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3627',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3628',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3631',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
index aba72791..7b0f8f9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
@@ -1,2 +1,5 @@
-'3495',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'3501',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3450',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3624',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3627',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3628',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3631',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
index bb5d9a86..4ed11502 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
@@ -1,2 +1,5 @@
-'3495',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
-'3501',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3450',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3624',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3627',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3628',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3631',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297
index c50c6a6f..5ff5c102 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297
@@ -1,2 +1,5 @@
-'3495',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'3501',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3450',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3624',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3627',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3628',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3631',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298
index 53a99310..ee9f7e2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298
@@ -1,2 +1,5 @@
-'3495',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
-'3501',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3450',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3624',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3627',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3628',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3631',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299
index f8889e8a..075189d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299
@@ -1,2 +1,5 @@
-'3495',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'3501',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3450',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3624',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3627',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3628',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3631',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300
index 07610728..863752db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300
@@ -1,2 +1,5 @@
-'3495',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
-'3501',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3450',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3624',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3627',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3628',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3631',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301
index 4417075f..2ad522a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301
@@ -1,2 +1,5 @@
-'3495',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
-'3501',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3450',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3624',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3627',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3628',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3631',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302
index b353dd3e..21b0377e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302
@@ -1,2 +1,5 @@
-'3495',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3450',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303
index 4417075f..2ad522a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303
@@ -1,2 +1,5 @@
-'3495',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
-'3501',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3450',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3624',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3627',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3628',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3631',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304
index a6cf4ce1..a2b7e81a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304
@@ -1,2 +1,5 @@
-'3495',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3450',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
index ec822c5b..f81f7337 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
@@ -1,2 +1,5 @@
-'3495',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
-'3501',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3450',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3624',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3627',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3628',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3631',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306
index a6cf4ce1..a2b7e81a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306
@@ -1,2 +1,5 @@
-'3495',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3450',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307
index 938b6443..98a676b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307
@@ -1,2 +1,5 @@
-'3495',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3450',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308
index c8f949c6..70d85088 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308
@@ -1,2 +1,5 @@
-'3495',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309
index 75ff367a..c09ff9c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309
@@ -1,2 +1,5 @@
-'3495',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3450',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310
index 09f0806c..344b5a83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310
@@ -1,2 +1,5 @@
-'3495',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
index 178402ed..7aefbf7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
@@ -1,4 +1,10 @@
-'3495',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3495',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3501',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3450',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3624',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3627',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3628',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3631',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
index 15f957db..c3f75cc2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
@@ -1,4 +1,10 @@
-'3495',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3495',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3501',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3450',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3624',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3627',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3628',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3631',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
index 85f05fee..665f28c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
@@ -1,4 +1,10 @@
-'3495',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3495',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3501',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3450',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3624',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3627',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3628',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3631',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
index 9828b0fb..a8edc3cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
@@ -1,4 +1,10 @@
-'3495',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3495',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3501',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3450',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3624',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3627',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3628',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3631',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
index f374d654..a099524c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
@@ -1,4 +1,10 @@
-'3495',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3495',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'3501',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3450',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3624',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3627',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3628',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3631',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
index 89d91b13..34dd771d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
@@ -1,6 +1,15 @@
-'3495',4000,71500,,'',0,51500,,'',0
-'3495',4001,111500,4,'',0,60000,4,'',0
-'3501',4000,71500,,'',0,11500,,'',0,40000,,'',0
-'3501',4001,111500,4,'',0,31500,4,'',0,28500,4,'',0
-'3495',4100,71500,4,'',0,51500,4,'',0
-'3501',4100,71500,4,'',0,51500,4,'',0
+'3450',4000,71500,,'',0,51500,,'',0
+'3450',4001,111500,4,'',0,60000,4,'',0
+'3624',4000,71500,,'',0,51500,,'',0
+'3624',4001,111500,4,'',0,60000,4,'',0
+'3627',4000,71500,,'',0,11500,,'',0,40000,,'',0
+'3627',4001,111500,4,'',0,31500,4,'',0,28500,4,'',0
+'3628',4000,71500,,'',0,51500,,'',0
+'3628',4001,111500,4,'',0,60000,4,'',0
+'3631',4000,71500,,'',0,51500,,'',0
+'3631',4001,111500,4,'',0,60000,4,'',0
+'3450',4100,71500,4,'',0,51500,4,'',0
+'3624',4100,71500,4,'',0,51500,4,'',0
+'3627',4100,71500,4,'',0,51500,4,'',0
+'3628',4100,71500,4,'',0,51500,4,'',0
+'3631',4100,71500,4,'',0,51500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
index b2019d36..aeb1a070 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
@@ -1,18 +1,37 @@
-'2375',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',401,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3495',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'3501',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'2375',500,93300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',500,130300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1000,80400,,'',0,43000,,'',0,40700,,'',0
-'3201',1000,164100,,'',0
-'3495',1000,64400,,'',0,16000,,'',0,43000,,'',0
+'3450',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3624',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3625',401,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3627',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3628',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3631',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3450',500,73300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',500,93300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',500,130300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',500,73300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3424',1000,164100,,'',0
+'3450',1000,64400,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
 '3499',1000,164100,,'',0
-'3501',1000,64400,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
-'2375',1500,200500,,'',0,12400,,'',0
-'3495',1500,200500,,'',0,12400,,'',0
-'3501',1500,200500,,'',0,12400,,'',0
+'3624',1000,64400,,'',0,16000,,'',0,43000,,'',0
+'3625',1000,80400,,'',0,43000,,'',0,40700,,'',0
+'3627',1000,64400,,'',0,16000,,'',0,43000,,'',0,40700,,'',0
+'3628',1000,64400,,'',0,16000,,'',0,43000,,'',0
+'3629',1000,164100,,'',0
+'3630',1000,164100,,'',0
+'3631',1000,64400,,'',0,16000,,'',0,43000,,'',0
+'3632',1000,164100,,'',0
+'3634',1000,164100,,'',0
+'3450',1500,200500,,'',0,12400,,'',0,12400,,'',0,26400,,'',0
+'3624',1500,200500,,'',0,12400,,'',0
+'3625',1500,200500,,'',0,12400,,'',0
+'3627',1500,200500,,'',0,12400,,'',0
+'3628',1500,200500,,'',0,12400,,'',0
+'3631',1500,200500,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
index b9eaf3ea..0c7291fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
@@ -1,4 +1,10 @@
-'3495',4000,81000,,'',0,51500,,'',0
-'3495',4001,101600,,'',0,60000,,'',0
-'3501',4000,81000,,'',0,11500,,'',0,40000,,'',0
-'3501',4001,101600,,'',0,32400,,'',0,27600,,'',0
+'3450',4000,81000,,'',0,51500,,'',0
+'3450',4001,101600,,'',0,60000,,'',0
+'3624',4000,81000,,'',0,51500,,'',0
+'3624',4001,101600,,'',0,60000,,'',0
+'3627',4000,81000,,'',0,11500,,'',0,40000,,'',0
+'3627',4001,101600,,'',0,32400,,'',0,27600,,'',0
+'3628',4000,81000,,'',0,51500,,'',0
+'3628',4001,101600,,'',0,60000,,'',0
+'3631',4000,81000,,'',0,51500,,'',0
+'3631',4001,101600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
index 45240229..7d64745a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
@@ -1,12 +1,24 @@
-'2375',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2375',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55400,,'',0
-'3501',7000,55400,,'',0
+'3450',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55400,,'',0
+'3624',7000,55400,,'',0
+'3627',7000,55400,,'',0
+'3628',7000,55400,,'',0
+'3631',7000,55400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
index 1d9e30d4..9514541f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
@@ -1,3 +1,6 @@
-'2375',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
index 63436b72..eb36d92b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
@@ -1,3 +1,7 @@
-'2375',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1000100,190200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
index b02676bd..8025301e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
@@ -1,2 +1,5 @@
-'3495',4100,71000,,'',0,51500,,'',0
-'3501',4100,71000,,'',0,51500,,'',0
+'3450',4100,71000,,'',0,51500,,'',0
+'3624',4100,71000,,'',0,51500,,'',0
+'3627',4100,71000,,'',0,51500,,'',0
+'3628',4100,71000,,'',0,51500,,'',0
+'3631',4100,71000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
index 37d4ab4a..863370ee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
@@ -1,2 +1,5 @@
-'3495',4100,64900,,'',0,55500,,'',0
-'3501',4100,64900,,'',0,55500,,'',0
+'3450',4100,64900,,'',0,55500,,'',0
+'3624',4100,64900,,'',0,55500,,'',0
+'3627',4100,64900,,'',0,55500,,'',0
+'3628',4100,64900,,'',0,55500,,'',0
+'3631',4100,64900,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
index b353f1a9..d081c51d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
@@ -1,2 +1,5 @@
-'3495',4100,64500,,'',0,55500,,'',0
-'3501',4100,64500,,'',0,55500,,'',0
+'3450',4100,64500,,'',0,55500,,'',0
+'3624',4100,64500,,'',0,55500,,'',0
+'3627',4100,64500,,'',0,55500,,'',0
+'3628',4100,64500,,'',0,55500,,'',0
+'3631',4100,64500,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
index 558961fc..02198916 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
@@ -1,2 +1,5 @@
-'3495',4100,70700,,'',0,51500,,'',0
-'3501',4100,70700,,'',0,51500,,'',0
+'3450',4100,70700,,'',0,51500,,'',0
+'3624',4100,70700,,'',0,51500,,'',0
+'3627',4100,70700,,'',0,51500,,'',0
+'3628',4100,70700,,'',0,51500,,'',0
+'3631',4100,70700,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
index 8ccff2cc..37593b64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
@@ -1,2 +1,5 @@
-'3495',4100,70500,,'',0,51500,,'',0
-'3501',4100,70500,,'',0,51500,,'',0
+'3450',4100,70500,,'',0,51500,,'',0
+'3624',4100,70500,,'',0,51500,,'',0
+'3627',4100,70500,,'',0,51500,,'',0
+'3628',4100,70500,,'',0,51500,,'',0
+'3631',4100,70500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
index 0a417461..3574dee9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
@@ -1,2 +1,5 @@
-'3495',4100,70100,,'',0,51500,,'',0
-'3501',4100,70100,,'',0,51500,,'',0
+'3450',4100,70100,,'',0,51500,,'',0
+'3624',4100,70100,,'',0,51500,,'',0
+'3627',4100,70100,,'',0,51500,,'',0
+'3628',4100,70100,,'',0,51500,,'',0
+'3631',4100,70100,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
index 18c1a8c8..61a38da3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
@@ -1,2 +1,5 @@
-'3495',4100,70000,,'',0,51500,,'',0
-'3501',4100,70000,,'',0,51500,,'',0
+'3450',4100,70000,,'',0,51500,,'',0
+'3624',4100,70000,,'',0,51500,,'',0
+'3627',4100,70000,,'',0,51500,,'',0
+'3628',4100,70000,,'',0,51500,,'',0
+'3631',4100,70000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
index 59d39249..64ee7633 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
@@ -1,2 +1,5 @@
-'3495',1100,95800,,'',0,34700,,'',0
-'3501',1100,95800,,'',0,34700,,'',0
+'3450',1100,95800,,'',0,34700,,'',0
+'3624',1100,95800,,'',0,34700,,'',0
+'3627',1100,95800,,'',0,34700,,'',0
+'3628',1100,95800,,'',0,34700,,'',0
+'3631',1100,95800,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
index b8d6a7b1..3ac9e0c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
@@ -1,4 +1,11 @@
-'3201',1101,181900,,'',0
-'3495',1101,93900,,'',0,30700,,'',0
+'3424',1101,181900,,'',0
+'3450',1101,93900,,'',0,30700,,'',0,57300,,'',0
 '3499',1101,181900,,'',0
-'3501',1101,93900,,'',0,30700,,'',0,57300,,'',0
+'3624',1101,93900,,'',0,30700,,'',0
+'3627',1101,93900,,'',0,30700,,'',0,57300,,'',0
+'3628',1101,93900,,'',0,30700,,'',0
+'3629',1101,181900,,'',0
+'3630',1101,181900,,'',0
+'3631',1101,93900,,'',0,30700,,'',0
+'3632',1101,181900,,'',0
+'3634',1101,181900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
index 09a32cce..c24b2d3c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
@@ -1,4 +1,11 @@
-'3201',1101,182000,,'',0
-'3495',1101,94000,,'',0,30700,,'',0
+'3424',1101,182000,,'',0
+'3450',1101,94000,,'',0,30700,,'',0,57300,,'',0
 '3499',1101,182000,,'',0
-'3501',1101,94000,,'',0,30700,,'',0,57300,,'',0
+'3624',1101,94000,,'',0,30700,,'',0
+'3627',1101,94000,,'',0,30700,,'',0,57300,,'',0
+'3628',1101,94000,,'',0,30700,,'',0
+'3629',1101,182000,,'',0
+'3630',1101,182000,,'',0
+'3631',1101,94000,,'',0,30700,,'',0
+'3632',1101,182000,,'',0
+'3634',1101,182000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
index 0ca44680..c9df59b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
@@ -1,8 +1,22 @@
-'3201',1100,182200,,'',0
-'3201',1101,182200,4,'',0
-'3495',1100,94200,,'',0,30700,,'',0
-'3495',1101,94200,4,'',0,30700,4,'',0
+'3424',1100,182200,,'',0
+'3424',1101,182200,4,'',0
+'3450',1100,94200,,'',0,30700,,'',0,57300,,'',0
+'3450',1101,94200,4,'',0,30700,4,'',0,57300,4,'',0
 '3499',1100,182200,,'',0
 '3499',1101,182200,4,'',0
-'3501',1100,94200,,'',0,30700,,'',0,57300,,'',0
-'3501',1101,94200,4,'',0,30700,4,'',0,57300,4,'',0
+'3624',1100,94200,,'',0,30700,,'',0
+'3624',1101,94200,4,'',0,30700,4,'',0
+'3627',1100,94200,,'',0,30700,,'',0,57300,,'',0
+'3627',1101,94200,4,'',0,30700,4,'',0,57300,4,'',0
+'3628',1100,94200,,'',0,30700,,'',0
+'3628',1101,94200,4,'',0,30700,4,'',0
+'3629',1100,182200,,'',0
+'3629',1101,182200,4,'',0
+'3630',1100,182200,,'',0
+'3630',1101,182200,4,'',0
+'3631',1100,94200,,'',0,30700,,'',0
+'3631',1101,94200,4,'',0,30700,4,'',0
+'3632',1100,182200,,'',0
+'3632',1101,182200,4,'',0
+'3634',1100,182200,,'',0
+'3634',1101,182200,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
index 4de9150a..5124fdc4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
@@ -1,4 +1,11 @@
-'3201',1100,182600,,'',0
-'3495',1100,94600,,'',0,30700,,'',0
+'3424',1100,182600,,'',0
+'3450',1100,94600,,'',0,30700,,'',0,57300,,'',0
 '3499',1100,182600,,'',0
-'3501',1100,94600,,'',0,30700,,'',0,57300,,'',0
+'3624',1100,94600,,'',0,30700,,'',0
+'3627',1100,94600,,'',0,30700,,'',0,57300,,'',0
+'3628',1100,94600,,'',0,30700,,'',0
+'3629',1100,182600,,'',0
+'3630',1100,182600,,'',0
+'3631',1100,94600,,'',0,30700,,'',0
+'3632',1100,182600,,'',0
+'3634',1100,182600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
index f87441b4..23990ed5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
@@ -1,4 +1,11 @@
-'3201',1100,182800,,'',0
-'3495',1100,94800,,'',0,30700,,'',0
+'3424',1100,182800,,'',0
+'3450',1100,94800,,'',0,30700,,'',0,57300,,'',0
 '3499',1100,182800,,'',0
-'3501',1100,94800,,'',0,30700,,'',0,57300,,'',0
+'3624',1100,94800,,'',0,30700,,'',0
+'3627',1100,94800,,'',0,30700,,'',0,57300,,'',0
+'3628',1100,94800,,'',0,30700,,'',0
+'3629',1100,182800,,'',0
+'3630',1100,182800,,'',0
+'3631',1100,94800,,'',0,30700,,'',0
+'3632',1100,182800,,'',0
+'3634',1100,182800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
index ccb47cd6..060d0006 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
@@ -1,4 +1,11 @@
-'3201',1100,182900,,'',0
-'3495',1100,94900,,'',0,30700,,'',0
+'3424',1100,182900,,'',0
+'3450',1100,94900,,'',0,30700,,'',0,57300,,'',0
 '3499',1100,182900,,'',0
-'3501',1100,94900,,'',0,30700,,'',0,57300,,'',0
+'3624',1100,94900,,'',0,30700,,'',0
+'3627',1100,94900,,'',0,30700,,'',0,57300,,'',0
+'3628',1100,94900,,'',0,30700,,'',0
+'3629',1100,182900,,'',0
+'3630',1100,182900,,'',0
+'3631',1100,94900,,'',0,30700,,'',0
+'3632',1100,182900,,'',0
+'3634',1100,182900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
index ccb47cd6..060d0006 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
@@ -1,4 +1,11 @@
-'3201',1100,182900,,'',0
-'3495',1100,94900,,'',0,30700,,'',0
+'3424',1100,182900,,'',0
+'3450',1100,94900,,'',0,30700,,'',0,57300,,'',0
 '3499',1100,182900,,'',0
-'3501',1100,94900,,'',0,30700,,'',0,57300,,'',0
+'3624',1100,94900,,'',0,30700,,'',0
+'3627',1100,94900,,'',0,30700,,'',0,57300,,'',0
+'3628',1100,94900,,'',0,30700,,'',0
+'3629',1100,182900,,'',0
+'3630',1100,182900,,'',0
+'3631',1100,94900,,'',0,30700,,'',0
+'3632',1100,182900,,'',0
+'3634',1100,182900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
index 59ea1c75..35c876fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
@@ -1,4 +1,11 @@
-'3201',1100,183100,,'',0
-'3495',1100,95100,,'',0,30700,,'',0
+'3424',1100,183100,,'',0
+'3450',1100,95100,,'',0,30700,,'',0,57300,,'',0
 '3499',1100,183100,,'',0
-'3501',1100,95100,,'',0,30700,,'',0,57300,,'',0
+'3624',1100,95100,,'',0,30700,,'',0
+'3627',1100,95100,,'',0,30700,,'',0,57300,,'',0
+'3628',1100,95100,,'',0,30700,,'',0
+'3629',1100,183100,,'',0
+'3630',1100,183100,,'',0
+'3631',1100,95100,,'',0,30700,,'',0
+'3632',1100,183100,,'',0
+'3634',1100,183100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
index 584dc6e6..0fc070ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
@@ -1,11 +1,23 @@
-'2375',101,81900,,'',0
-'3495',101,81900,,'',0
-'3501',101,81900,,'',0
-'2375',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3495',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3501',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'3253',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3501',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'3495',7000,55200,,'',0
-'3501',7000,55200,,'',0
+'3450',101,81900,,'',0
+'3624',101,81900,,'',0
+'3625',101,81900,,'',0
+'3627',101,81900,,'',0
+'3628',101,81900,,'',0
+'3631',101,81900,,'',0
+'3450',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0,26600,0,'Peachtree',0,12400,0,'Peachtree',0
+'3624',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3625',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3627',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3628',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3631',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3626',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3624',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3627',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3628',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3631',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3450',7000,55200,,'',0
+'3624',7000,55200,,'',0
+'3627',7000,55200,,'',0
+'3628',7000,55200,,'',0
+'3631',7000,55200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
index 8baff504..2f321c07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
@@ -1,6 +1,15 @@
-'3495',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'3501',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'3495',4000,80000,,'',0,51500,,'',0
-'3495',4001,102600,,'',0,60000,,'',0
-'3501',4000,80000,,'',0,11500,,'',0,40000,,'',0
-'3501',4001,102600,,'',0,32400,,'',0,27600,,'',0
+'3450',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3624',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3627',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3628',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3631',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3450',4000,80000,,'',0,51500,,'',0
+'3450',4001,102600,,'',0,60000,,'',0
+'3624',4000,80000,,'',0,51500,,'',0
+'3624',4001,102600,,'',0,60000,,'',0
+'3627',4000,80000,,'',0,11500,,'',0,40000,,'',0
+'3627',4001,102600,,'',0,32400,,'',0,27600,,'',0
+'3628',4000,80000,,'',0,51500,,'',0
+'3628',4001,102600,,'',0,60000,,'',0
+'3631',4000,80000,,'',0,51500,,'',0
+'3631',4001,102600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
index 6d4d8ed1..c1289b99 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
@@ -1,2 +1,5 @@
-'3495',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
-'3501',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3450',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3624',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3627',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3628',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'3631',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
index 96365e82..05383932 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
@@ -1,2 +1,5 @@
-'3495',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'3501',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3450',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3624',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3627',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3628',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3631',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
index 924b11be..66fadc12 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
@@ -1,2 +1,5 @@
-'3495',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
-'3501',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3450',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3624',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3627',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3628',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3631',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
index 31643497..71ba403d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
@@ -1,2 +1,5 @@
-'3495',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'3501',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3450',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3624',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3627',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3628',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3631',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
index 26787c6e..3287c53c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
@@ -1,2 +1,5 @@
-'3495',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
-'3501',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3450',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3624',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3627',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3628',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'3631',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
index 0772fccb..8d54e220 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
@@ -1,2 +1,5 @@
-'3495',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'3501',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3450',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3624',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3627',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3628',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3631',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
index 4f7a25dd..639741d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
@@ -1,2 +1,5 @@
-'3495',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'3501',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3450',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3624',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3627',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3628',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3631',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
index cfa3dc95..6b37b5cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
@@ -1,2 +1,5 @@
-'3495',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'3501',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3450',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3624',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3627',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3628',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3631',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
index 0d2bdd4d..a66966c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
@@ -1,2 +1,5 @@
-'3495',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
-'3501',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3450',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3624',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3627',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3628',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3631',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
index bffd8373..7e07991f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
@@ -1,2 +1,5 @@
-'3495',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'3501',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3450',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3624',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3627',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3628',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'3631',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
index e760332f..fc28f420 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
@@ -1,2 +1,5 @@
-'3495',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
-'3501',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3450',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3624',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3627',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3628',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'3631',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
index 8774704c..06cf4778 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
@@ -1,9 +1,19 @@
-'2375',500,92600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',500,125600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',500,72600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',500,92600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',500,125600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',500,72600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1501,192300,0,'Downtown',0,12400,0,'Downtown',0,16300,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',1000100,190700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
index 73f503c9..9a9c9141 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
@@ -1,7 +1,13 @@
-'2375',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',501,90300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3253',501,123300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3501',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3450',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3624',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3625',501,90300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3626',501,123300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3628',501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3631',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,0,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
index 101f0c5b..59384bf7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
@@ -1,9 +1,19 @@
-'2375',500,92700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',500,125700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2375',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3501',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'3495',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'3501',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',500,72700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',500,92700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',500,125700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',500,72700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1501,192300,0,'Downtown',0,12400,0,'Downtown',0,16400,0,'Downtown',0,22400,0,'Downtown',0,12400,0,'Downtown',0
+'3624',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3625',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3627',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3628',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3631',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3450',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3624',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3627',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3628',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3631',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3450',1000100,190800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
index cb01428e..426e7036 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
@@ -1,4 +1,8 @@
-'2375',500,92400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3253',500,125400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3501',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',500,72400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3624',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3625',500,92400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3626',500,125400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3628',500,72400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3631',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3450',1000100,190700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
index bdd7af39..f5d19840 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
@@ -1,5 +1,12 @@
-'2375',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'3201',1000,164800,,'',0
-'3495',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3424',1000,164800,,'',0
+'3450',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
 '3499',1000,164800,,'',0
-'3501',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3624',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3625',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3627',1000,64900,,'',0,16000,,'',0,43200,,'',0,40700,,'',0
+'3628',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3629',1000,164800,,'',0
+'3630',1000,164800,,'',0
+'3631',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3632',1000,164800,,'',0
+'3634',1000,164800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
index 7f451c1d..e6608b20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
@@ -1,12 +1,24 @@
-'2375',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3501',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2375',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'3495',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'3501',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'3253',1600,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3495',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'3501',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3450',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3624',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3625',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3627',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3628',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3631',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',1501,193800,0,'Downtown',0,16400,0,'Downtown',0,12400,0,'Downtown',0,22400,0,'Downtown',0,16400,0,'Downtown',0
+'3624',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3625',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3627',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3628',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3631',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3626',1600,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3624',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3627',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3628',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'3631',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
index 64ba54c3..be54bc71 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
@@ -1,7 +1,15 @@
 '3499',1100,183600,,'',0
-'3501',1100,183600,,'',0
-'2375',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',1100,183600,,'',0
+'3630',1100,183600,,'',0
+'3634',1100,183600,,'',0
+'3450',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3450',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
index 3814b72d..578674e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
@@ -1,7 +1,15 @@
 '3499',1100,183700,,'',0
-'3501',1100,183700,,'',0
-'2375',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3501',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'3495',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'3501',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',1100,183700,,'',0
+'3630',1100,183700,,'',0
+'3634',1100,183700,,'',0
+'3450',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3624',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3625',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3627',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3628',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3631',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3450',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3624',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3627',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3628',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'3631',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
index 74900ac3..26f3338f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
@@ -1,3 +1,6 @@
-'2375',300,81700,0,'School Spcl',0
-'3495',300,81700,0,'School Spcl',0
-'3501',300,81700,0,'School Spcl',0
+'3450',300,81700,0,'School Spcl',0
+'3624',300,81700,0,'School Spcl',0
+'3625',300,81700,0,'School Spcl',0
+'3627',300,81700,0,'School Spcl',0
+'3628',300,81700,0,'School Spcl',0
+'3631',300,81700,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146373 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146373
index 901019e5..2f6adfdc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146373
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146373
@@ -1,4 +1,7 @@
-'2375',301,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3495',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3501',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'3253',1601,92700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3450',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3624',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3625',301,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3627',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3628',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3631',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3626',1601,92700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146374 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146374
new file mode 100644
index 00000000..e2b7c8dd
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146374
@@ -0,0 +1,2 @@
+'3633',5000,92000,4,'',0
+'3633',5001,122000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
index 733dabfd..e4b8aae3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
@@ -1,2 +1,5 @@
-'3495',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
-'3501',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3450',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3624',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3627',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3628',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'3631',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
index 809eb4c9..193c3bd2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
@@ -1,2 +1,5 @@
-'3495',4000,73300,,'',0,51500,,'',0
-'3501',4000,73300,,'',0,11500,,'',0,40000,,'',0
+'3450',4000,73300,,'',0,51500,,'',0
+'3624',4000,73300,,'',0,51500,,'',0
+'3627',4000,73300,,'',0,11500,,'',0,40000,,'',0
+'3628',4000,73300,,'',0,51500,,'',0
+'3631',4000,73300,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
index 6a08cf74..609f3b0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
@@ -1,2 +1,5 @@
-'3495',4001,105000,,'',0,60000,,'',0
-'3501',4001,105000,,'',0,35900,,'',0,24100,,'',0
+'3450',4001,105000,,'',0,60000,,'',0
+'3624',4001,105000,,'',0,60000,,'',0
+'3627',4001,105000,,'',0,35900,,'',0,24100,,'',0
+'3628',4001,105000,,'',0,60000,,'',0
+'3631',4001,105000,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
index 6b329961..f54de578 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
@@ -1,4 +1,10 @@
-'3495',4000,73800,,'',0,51500,,'',0
-'3495',4001,104600,,'',0,60000,,'',0
-'3501',4000,73800,,'',0,11500,,'',0,40000,,'',0
-'3501',4001,104600,,'',0,35900,,'',0,24100,,'',0
+'3450',4000,73800,,'',0,51500,,'',0
+'3450',4001,104600,,'',0,60000,,'',0
+'3624',4000,73800,,'',0,51500,,'',0
+'3624',4001,104600,,'',0,60000,,'',0
+'3627',4000,73800,,'',0,11500,,'',0,40000,,'',0
+'3627',4001,104600,,'',0,35900,,'',0,24100,,'',0
+'3628',4000,73800,,'',0,51500,,'',0
+'3628',4001,104600,,'',0,60000,,'',0
+'3631',4000,73800,,'',0,51500,,'',0
+'3631',4001,104600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149003
new file mode 100644
index 00000000..905d3162
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149003
@@ -0,0 +1,2 @@
+'3633',5000,74500,,'',0
+'3633',5001,135000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149004
new file mode 100644
index 00000000..9439e151
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149004
@@ -0,0 +1,2 @@
+'3633',5000,81500,,'',0
+'3633',5001,133000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149005
new file mode 100644
index 00000000..031fa92f
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149005
@@ -0,0 +1,2 @@
+'3633',5000,80500,,'',0
+'3633',5001,133500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149006
new file mode 100644
index 00000000..4e70b3bc
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149006
@@ -0,0 +1 @@
+'3633',5000,81000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149007
new file mode 100644
index 00000000..70709de1
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149007
@@ -0,0 +1,2 @@
+'3633',5000,82000,,'',0
+'3633',5001,132500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149008
new file mode 100644
index 00000000..418975de
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149008
@@ -0,0 +1 @@
+'3633',5000,82500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149009
new file mode 100644
index 00000000..07b65ec6
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149009
@@ -0,0 +1 @@
+'3633',5001,132000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_150000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_150000
new file mode 100644
index 00000000..8acfa712
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_150000
@@ -0,0 +1,2 @@
+'3633',5000,71500,,'',0
+'3633',5001,142000,4,'',0
diff --git a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index b998d51b..5732bb0c 100644
--- a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -4,8 +4,8 @@
     <bool name="current_gtfs_rts_frequency_available">false</bool>
     <string name="current_gtfs_rts_area_min_lat">49.02001</string>
     <string name="current_gtfs_rts_area_max_lat">49.88713</string>
-    <string name="current_gtfs_rts_area_min_lng">-119.73523</string>
+    <string name="current_gtfs_rts_area_min_lng">-120.5079</string>
     <string name="current_gtfs_rts_area_max_lng">-119.44801</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1728230400</integer><!-- 2024/10/06 09:00:00 PDT -->
-    <integer name="current_gtfs_rts_last_departure_in_sec">1733104800</integer><!-- 2024/12/01 18:00:00 PST -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1729440000</integer><!-- 2024/10/20 09:00:00 PDT -->
+    <integer name="current_gtfs_rts_last_departure_in_sec">1740967200</integer><!-- 2025/03/02 18:00:00 PST -->
 </resources>
diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml
index cdeb82ae..1d597761 100644
--- a/app-android/src/main/res/values/gtfs_rts_values.xml
+++ b/app-android/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20241008</integer>
+    <integer name="gtfs_rts_db_version">20241022</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_south_okanagan_similkameen_transit_system_bus.gtfs</string>
     <string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
     <string name="gtfs_rts_contact_us">https://www.bctransit.com/contact</string>