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 58702245..45460e14 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 July 28, 2024 to September 2, 2024.
+Schedule from August 11, 2024 to September 2, 2024.
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 22cae5a7..015add74 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
@@ -343,7 +343,6 @@
 146361,'146361','Skaha Lk & Galt',49.46850,-119.58493,0,1452510939
 146362,'146362','Skaha Lk & Kinney',49.47132,-119.58292,0,1452510940
 146363,'146363','Skaha Lk & Brandon',49.46625,-119.58596,0,1452510941
-146364,'146364','Veterans Wy @ Lakeshore Dr',49.50262,-119.59310,0,1452510942
 146365,'146365','Vancouver & Abbott',49.50317,-119.58836,0,1452510943
 146367,'146367','Gov @ Papineau',49.49709,-119.58616,0,1452510945
 146368,'146368','Westminster @ Wylie',49.49611,-119.61234,0,1452510946
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 48311e8c..f6d6af46 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
@@ -336,8 +336,7 @@
 500,146025,23,0
 500,146167,24,0
 500,146166,25,0
-500,146364,26,0
-500,146049,27,1
+500,146049,26,1
 501,146049,1,0
 501,146050,2,0
 501,146051,3,0
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 29d4e935..81aa6435 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,61 +1,38 @@
-'2919',20240728,1
-'2922',20240729,1
-'2923',20240729,1
-'2922',20240730,1
-'2923',20240730,1
-'2922',20240731,1
-'2923',20240731,1
-'2922',20240801,1
-'2923',20240801,1
-'2922',20240802,1
-'2924',20240802,1
-'2920',20240803,1
-'2919',20240804,1
-'2919',20240805,1
-'2922',20240806,1
-'2923',20240806,1
-'2925',20240807,1
-'2926',20240807,1
-'2925',20240808,1
-'2926',20240808,1
-'2926',20240809,1
-'2927',20240809,1
-'2928',20240810,1
 '2919',20240811,1
-'2922',20240812,1
-'2923',20240812,1
-'2922',20240813,1
-'2923',20240813,1
-'2922',20240814,1
-'2923',20240814,1
-'2922',20240815,1
-'2923',20240815,1
-'2922',20240816,1
-'2924',20240816,1
-'2920',20240817,1
+'1798',20240812,1
+'1799',20240812,1
+'1798',20240813,1
+'1799',20240813,1
+'1798',20240814,1
+'1799',20240814,1
+'1798',20240815,1
+'1799',20240815,1
+'1579',20240816,1
+'1798',20240816,1
+'1803',20240817,1
 '2919',20240818,1
-'2922',20240819,1
-'2923',20240819,1
-'2922',20240820,1
-'2923',20240820,1
-'2922',20240821,1
-'2923',20240821,1
-'2922',20240822,1
-'2923',20240822,1
-'2922',20240823,1
-'2924',20240823,1
-'2920',20240824,1
+'1798',20240819,1
+'1799',20240819,1
+'1798',20240820,1
+'1799',20240820,1
+'1798',20240821,1
+'1799',20240821,1
+'1798',20240822,1
+'1799',20240822,1
+'1579',20240823,1
+'1798',20240823,1
+'1803',20240824,1
 '2919',20240825,1
-'2922',20240826,1
-'2923',20240826,1
-'2922',20240827,1
-'2923',20240827,1
-'2922',20240828,1
-'2923',20240828,1
-'2922',20240829,1
-'2923',20240829,1
-'2922',20240830,1
-'2924',20240830,1
-'2920',20240831,1
+'1798',20240826,1
+'1799',20240826,1
+'1798',20240827,1
+'1799',20240827,1
+'1798',20240828,1
+'1799',20240828,1
+'1798',20240829,1
+'1799',20240829,1
+'1579',20240830,1
+'1798',20240830,1
+'1803',20240831,1
 '2919',20240901,1
 '2919',20240902,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 7c72aa54..4f4b4625 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 @@
-'2922',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
-'2926',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'1798',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 85ea4033..40911284 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 @@
-'2922',7000,95700,,'',0,66600,,'',0
-'2926',7000,95700,,'',0,66600,,'',0
+'1798',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 40819699..e9972a8c 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 @@
-'2922',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'2926',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'1798',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 bfedcc5a..06f627b1 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 @@
-'2922',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
-'2926',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
+'1798',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 f65d0fba..5a5d4764 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 @@
-'2922',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
-'2926',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',0
+'1798',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 0b3cbd4a..4d918368 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 @@
-'2922',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'2926',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'1798',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 40c5812c..e391474d 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,2 @@
-'2922',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
-'2922',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
-'2926',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
-'2926',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
+'1798',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'1798',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 63c78e26..db9fd528 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 @@
-'2922',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
-'2926',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',0
+'1798',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 93e401d0..839a0355 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 @@
-'2922',7000,95500,,'',0,66600,,'',0
-'2926',7000,95500,,'',0,66600,,'',0
+'1798',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 f7c9069d..6b976be1 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,12 +1,6 @@
-'2920',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85600,,'',0,25000,,'',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 a166f9d4..364404f9 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,4 +1,2 @@
-'2920',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,92000,,'',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 f2e3d1f3..094c81c6 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,4 +1,2 @@
-'2920',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,92100,,'',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 f2e3d1f3..094c81c6 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,4 +1,2 @@
-'2920',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,92100,,'',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 f2e3d1f3..094c81c6 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,4 +1,2 @@
-'2920',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,92100,,'',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 f22c9147..cd700af2 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,4 +1,2 @@
-'2920',101,81500,,'',0
-'2922',101,81500,,'',0
-'2926',101,81500,,'',0
-'2928',101,81500,,'',0
+'1798',101,81500,,'',0
+'1803',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 f22c9147..cd700af2 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,4 +1,2 @@
-'2920',101,81500,,'',0
-'2922',101,81500,,'',0
-'2926',101,81500,,'',0
-'2928',101,81500,,'',0
+'1798',101,81500,,'',0
+'1803',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 f22c9147..cd700af2 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,4 +1,2 @@
-'2920',101,81500,,'',0
-'2922',101,81500,,'',0
-'2926',101,81500,,'',0
-'2928',101,81500,,'',0
+'1798',101,81500,,'',0
+'1803',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 66e96ad5..730ec3c6 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,4 +1,2 @@
-'2920',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,92200,,'',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 27192a34..69082af9 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,12 +1,6 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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
+'1803',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
+'1798',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
+'1803',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
+'1798',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90700,,'',0,21000,,'',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 3df7fb81..8a1d9460 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,12 +1,6 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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
+'1803',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
+'1798',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
+'1803',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
+'1798',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90800,,'',0,21000,,'',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 b1a7da11..5a4b8202 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,8 +1,4 @@
-'2920',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194600,,'',0,16400,,'',0
-'2922',1501,194600,,'',0,16400,,'',0
-'2926',1501,194600,,'',0,16400,,'',0
-'2928',1501,194600,,'',0,16400,,'',0
+'1798',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
+'1803',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194600,,'',0,16400,,'',0
+'1803',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 304532c0..ae8af9fc 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,12 +1,6 @@
-'2920',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164800,,'',0
-'2924',1000,164800,,'',0
-'2925',1000,164800,,'',0
-'2926',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164800,,'',0
-'2928',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164800,,'',0
+'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164800,,'',0
+'1803',1000,80900,,'',0,43200,,'',0,40700,,'',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 542de576..132c7693 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,4 +1,2 @@
-'2920',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'1798',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
+'1803',301,91700,,'',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 920f0cbd..16294bf7 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,12 +1,6 @@
-'2920',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'2920',1001,91000,,'',0,42900,,'',0,40700,,'',0
-'2922',1001,74400,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2923',1001,174600,,'',0
-'2924',1001,174600,,'',0
-'2925',1001,174600,,'',0
-'2926',1001,74400,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2927',1001,174600,,'',0
-'2928',1001,91000,,'',0,42900,,'',0,40700,,'',0
+'1798',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
+'1803',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'1579',1001,174600,,'',0
+'1798',1001,74400,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
+'1799',1001,174600,,'',0
+'1803',1001,91000,,'',0,42900,,'',0,40700,,'',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 dd88bf94..97ffbe0d 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,4 +1,2 @@
-'2920',101,81300,,'',0
-'2922',101,81300,,'',0
-'2926',101,81300,,'',0
-'2928',101,81300,,'',0
+'1798',101,81300,,'',0
+'1803',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 d93d77b2..7ca5be34 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,4 +1,2 @@
-'2920',101,81600,,'',0
-'2922',101,81600,,'',0
-'2926',101,81600,,'',0
-'2928',101,81600,,'',0
+'1798',101,81600,,'',0
+'1803',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 85345621..a7c1693f 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,8 +1,4 @@
-'2920',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,200700,,'',0,12400,,'',0
-'2922',1500,200700,,'',0,12400,,'',0
-'2926',1500,200700,,'',0,12400,,'',0
-'2928',1500,200700,,'',0,12400,,'',0
+'1798',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
+'1803',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,200700,,'',0,12400,,'',0
+'1803',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 e5e7677f..4f6d3fa8 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,4 +1,2 @@
-'2920',101,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',101,85300,,'',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_146021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
index 50def177..f89bb286 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,16 +1,8 @@
-'2920',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1001,91200,,'',0,42900,,'',0,40700,,'',0
-'2922',1001,74600,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2923',1001,174800,,'',0
-'2924',1001,174800,,'',0
-'2925',1001,174800,,'',0
-'2926',1001,74600,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2927',1001,174800,,'',0
-'2928',1001,91200,,'',0,42900,,'',0,40700,,'',0
+'1798',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
+'1803',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1001,174800,,'',0
+'1798',1001,74600,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
+'1799',1001,174800,,'',0
+'1803',1001,91200,,'',0,42900,,'',0,40700,,'',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 17081e7f..1f6e70c9 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,4 +1,2 @@
-'2920',300,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91100,,'',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_146024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
index e5b997c3..8885ab28 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
@@ -1,5 +1,3 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',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
 '2919',1601,92700,,'',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_146025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
index 4227ed96..47d40f5c 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,13 +1,7 @@
-'2920',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,81900,0,'School Spcl',0
-'2922',300,81900,0,'School Spcl',0
-'2926',300,81900,0,'School Spcl',0
-'2928',300,81900,0,'School Spcl',0
+'1798',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
+'1803',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,81900,0,'School Spcl',0
+'1803',300,81900,0,'School Spcl',0
+'1798',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
+'1803',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
 '2919',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 b065c614..35fc9199 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,16 +1,8 @@
-'2920',300,80400,0,'School Spcl',0
-'2922',300,80400,0,'School Spcl',0
-'2926',300,80400,0,'School Spcl',0
-'2928',300,80400,0,'School Spcl',0
-'2920',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,80400,0,'School Spcl',0
+'1803',300,80400,0,'School Spcl',0
+'1798',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
+'1803',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 4c8ce6fc..5647658a 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,18 +1,9 @@
-'2920',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194400,,'',0,16400,,'',0
-'2922',1501,194400,,'',0,16400,,'',0
-'2926',1501,194400,,'',0,16400,,'',0
-'2928',1501,194400,,'',0,16400,,'',0
-'2920',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',4001,94800,,'',0,60000,,'',0
-'2926',4001,94800,,'',0,60000,,'',0
+'1798',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
+'1803',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194400,,'',0,16400,,'',0
+'1803',1501,194400,,'',0,16400,,'',0
+'1798',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 1220cfd6..f7880792 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,18 +1,9 @@
-'2920',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,200900,,'',0,12400,,'',0
-'2922',1500,200900,,'',0,12400,,'',0
-'2926',1500,200900,,'',0,12400,,'',0
-'2928',1500,200900,,'',0,12400,,'',0
-'2920',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',4000,83500,,'',0,51500,,'',0
-'2926',4000,83500,,'',0,51500,,'',0
+'1798',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
+'1803',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1500,200900,,'',0,12400,,'',0
+'1803',1500,200900,,'',0,12400,,'',0
+'1798',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',4000,83500,,'',0,51500,,'',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 918f1568..85fb423a 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,23 +1,12 @@
-'2920',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1101,124100,,'',0
-'2923',1101,181400,,'',0
-'2924',1101,181400,,'',0
-'2925',1101,181400,,'',0
-'2926',1101,124100,,'',0
-'2927',1101,181400,,'',0
-'2920',1501,194000,,'',0,16400,,'',0
-'2922',1501,194000,,'',0,16400,,'',0
-'2926',1501,194000,,'',0,16400,,'',0
-'2928',1501,194000,,'',0,16400,,'',0
+'1798',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
+'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1101,181400,,'',0
+'1798',1101,124100,,'',0
+'1799',1101,181400,,'',0
+'1798',1501,194000,,'',0,16400,,'',0
+'1803',1501,194000,,'',0,16400,,'',0
 '2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',4001,94300,,'',0,60000,,'',0
-'2926',4001,94300,,'',0,60000,,'',0
-'2922',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',4001,94300,,'',0,60000,,'',0
+'1798',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 8412147a..58751ca8 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,21 +1,11 @@
-'2920',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1101,124100,,'',0
-'2923',1101,181400,,'',0
-'2924',1101,181400,,'',0
-'2925',1101,181400,,'',0
-'2926',1101,124100,,'',0
-'2927',1101,181400,,'',0
-'2920',1501,194100,,'',0,16400,,'',0
-'2922',1501,194100,,'',0,16400,,'',0
-'2926',1501,194100,,'',0,16400,,'',0
-'2928',1501,194100,,'',0,16400,,'',0
+'1798',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
+'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1101,181400,,'',0
+'1798',1101,124100,,'',0
+'1799',1101,181400,,'',0
+'1798',1501,194100,,'',0,16400,,'',0
+'1803',1501,194100,,'',0,16400,,'',0
 '2919',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 402dddd5..a9119276 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,12 +1,6 @@
-'2920',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1100,95800,,'',0,34700,,'',0
-'2926',1100,95800,,'',0,34700,,'',0
-'2920',1500,201300,,'',0,12400,,'',0
-'2922',1500,201300,,'',0,12400,,'',0
-'2926',1500,201300,,'',0,12400,,'',0
-'2928',1500,201300,,'',0,12400,,'',0
-'2922',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1100,95800,,'',0,34700,,'',0
+'1798',1500,201300,,'',0,12400,,'',0
+'1803',1500,201300,,'',0,12400,,'',0
+'1798',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 d7f15557..5df7b26f 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,8 +1,4 @@
-'2920',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,200800,,'',0,12400,,'',0
-'2922',1500,200800,,'',0,12400,,'',0
-'2926',1500,200800,,'',0,12400,,'',0
-'2928',1500,200800,,'',0,12400,,'',0
+'1798',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
+'1803',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,200800,,'',0,12400,,'',0
+'1803',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 3f39ad7d..6f487da4 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,8 +1,4 @@
-'2920',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,200700,,'',0,12400,,'',0
-'2922',1500,200700,,'',0,12400,,'',0
-'2926',1500,200700,,'',0,12400,,'',0
-'2928',1500,200700,,'',0,12400,,'',0
+'1798',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
+'1803',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,200700,,'',0,12400,,'',0
+'1803',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 05570297..71bd5e5b 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,8 +1,4 @@
-'2920',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194500,,'',0,16400,,'',0
-'2922',1501,194500,,'',0,16400,,'',0
-'2926',1501,194500,,'',0,16400,,'',0
-'2928',1501,194500,,'',0,16400,,'',0
+'1798',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
+'1803',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194500,,'',0,16400,,'',0
+'1803',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 d6064fcb..0794c92e 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,5 +1,3 @@
-'2920',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1601,94800,,'',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_146041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
index 26b89d91..0b070bd9 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,8 +1,4 @@
-'2920',1000,83100,,'',0,47200,,'',0,40700,,'',0
-'2922',1000,71100,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2923',1000,171000,,'',0
-'2924',1000,171000,,'',0
-'2925',1000,171000,,'',0
-'2926',1000,71100,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2927',1000,171000,,'',0
-'2928',1000,83100,,'',0,47200,,'',0,40700,,'',0
+'1579',1000,171000,,'',0
+'1798',1000,71100,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
+'1799',1000,171000,,'',0
+'1803',1000,83100,,'',0,47200,,'',0,40700,,'',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 455c7940..f20f8258 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,21 +1,11 @@
-'2920',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'2922',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
-'2926',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
-'2928',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1001,91300,,'',0,42900,,'',0,40700,,'',0
-'2922',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2923',1001,174900,,'',0
-'2924',1001,174900,,'',0
-'2925',1001,174900,,'',0
-'2926',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2927',1001,174900,,'',0
-'2928',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'1798',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
+'1803',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'1798',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
+'1803',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
+'1579',1001,174900,,'',0
+'1798',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
+'1799',1001,174900,,'',0
+'1803',1001,91300,,'',0,42900,,'',0,40700,,'',0
 '2919',1601,92900,,'',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_146043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
index f928b410..3893b77d 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,4 +1,2 @@
-'2920',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
-'2922',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
-'2926',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
-'2928',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'1798',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
+'1803',401,84200,,'',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 efbb18ed..4a857fc4 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,4 +1,2 @@
-'2920',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84200,,'',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 2d3cd205..75a8a07a 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,24 +1,12 @@
-'2920',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164700,,'',0
-'2924',1000,164700,,'',0
-'2925',1000,164700,,'',0
-'2926',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164700,,'',0
-'2928',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'2920',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
-'2922',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
-'2926',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
-'2928',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
-'2922',4000,84500,4,'',0,55500,4,'',0
-'2926',4000,84500,4,'',0,55500,4,'',0
-'2922',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164700,,'',0
+'1798',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164700,,'',0
+'1803',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'1798',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'1803',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
+'1798',4000,84500,4,'',0,55500,4,'',0
+'1798',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 326fcb15..8592487b 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,13 +1,7 @@
-'2920',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1001,91300,,'',0,42900,,'',0,40700,,'',0
-'2922',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2923',1001,174900,,'',0
-'2924',1001,174900,,'',0
-'2925',1001,174900,,'',0
-'2926',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2927',1001,174900,,'',0
-'2928',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'1798',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
+'1803',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1001,174900,,'',0
+'1798',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
+'1799',1001,174900,,'',0
+'1803',1001,91300,,'',0,42900,,'',0,40700,,'',0
 '2919',1601,92900,,'',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_146047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
index 8330a48a..2c0a51fb 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,17 +1,9 @@
-'2920',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194000,,'',0,16400,,'',0
-'2922',1501,194000,,'',0,16400,,'',0
-'2926',1501,194000,,'',0,16400,,'',0
-'2928',1501,194000,,'',0,16400,,'',0
+'1798',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
+'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194000,,'',0,16400,,'',0
+'1803',1501,194000,,'',0,16400,,'',0
 '2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',4001,94300,,'',0,60000,,'',0
-'2926',4001,94300,,'',0,60000,,'',0
-'2922',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',4001,94300,,'',0,60000,,'',0
+'1798',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 f0a288e4..7140a2ef 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,20 +1,10 @@
-'2920',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164700,,'',0
-'2924',1000,164700,,'',0
-'2925',1000,164700,,'',0
-'2926',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164700,,'',0
-'2928',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'2920',1500,201400,,'',0,12400,,'',0
-'2922',1500,201400,,'',0,12400,,'',0
-'2926',1500,201400,,'',0,12400,,'',0
-'2928',1500,201400,,'',0,12400,,'',0
-'2922',4000,84400,,'',0,51500,,'',0
-'2926',4000,84400,,'',0,51500,,'',0
-'2922',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164700,,'',0
+'1798',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164700,,'',0
+'1803',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'1798',1500,201400,,'',0,12400,,'',0
+'1803',1500,201400,,'',0,12400,,'',0
+'1798',4000,84400,,'',0,51500,,'',0
+'1798',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 0503953f..fed19119 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,14 +1,8 @@
-'2920',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1798',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
+'1803',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
+'1803',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
 '2919',500,131200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2919',501,121200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2920',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
-'2922',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
-'2922',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
-'2926',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,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',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 d27747a4..29aeb761 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,9 +1,5 @@
-'2920',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',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 94098447..404215b8 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,6 +1,4 @@
+'1798',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
+'1803',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
 '2919',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
 '2919',1601,92900,,'',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_146052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
index 00f50b65..a884cfd6 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,18 +1,10 @@
-'2920',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91400,,'',0,42900,,'',0,40700,,'',0
-'2922',1001,74800,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2923',1001,175000,,'',0
-'2924',1001,175000,,'',0
-'2925',1001,175000,,'',0
-'2926',1001,74800,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'2927',1001,175000,,'',0
-'2928',1001,91400,,'',0,42900,,'',0,40700,,'',0
+'1579',1001,175000,,'',0
+'1798',1001,74800,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
+'1799',1001,175000,,'',0
+'1803',1001,91400,,'',0,42900,,'',0,40700,,'',0
 '2919',1601,93000,,'',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_146053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
index dd17b059..9c85e9b4 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,6 +1,3 @@
-'2920',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',1100,95900,,'',0,34700,,'',0
-'2926',1100,95900,,'',0,34700,,'',0
+'1798',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
+'1803',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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 0c6d6d4a..968c1499 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,18 +1,9 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80700,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64700,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164600,,'',0
-'2924',1000,164600,,'',0
-'2925',1000,164600,,'',0
-'2926',1000,64700,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164600,,'',0
-'2928',1000,80700,,'',0,43200,,'',0,40700,,'',0
-'2922',1101,124000,,'',0
-'2923',1101,181300,,'',0
-'2924',1101,181300,,'',0
-'2925',1101,181300,,'',0
-'2926',1101,124000,,'',0
-'2927',1101,181300,,'',0
+'1798',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
+'1803',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
+'1579',1000,164600,,'',0
+'1798',1000,64700,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164600,,'',0
+'1803',1000,80700,,'',0,43200,,'',0,40700,,'',0
+'1579',1101,181300,,'',0
+'1798',1101,124000,,'',0
+'1799',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 169c6243..baaaa611 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,18 +1,9 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80700,,'',0,43100,,'',0,40700,,'',0
-'2922',1000,64700,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2923',1000,164500,,'',0
-'2924',1000,164500,,'',0
-'2925',1000,164500,,'',0
-'2926',1000,64700,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2927',1000,164500,,'',0
-'2928',1000,80700,,'',0,43100,,'',0,40700,,'',0
-'2922',1101,123900,,'',0
-'2923',1101,181200,,'',0
-'2924',1101,181200,,'',0
-'2925',1101,181200,,'',0
-'2926',1101,123900,,'',0
-'2927',1101,181200,,'',0
+'1798',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
+'1803',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
+'1579',1000,164500,,'',0
+'1798',1000,64700,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
+'1799',1000,164500,,'',0
+'1803',1000,80700,,'',0,43100,,'',0,40700,,'',0
+'1579',1101,181200,,'',0
+'1798',1101,123900,,'',0
+'1799',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 050a1c72..f764d910 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,6 +1,3 @@
-'2920',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',1100,100100,,'',0,30700,,'',0
-'2926',1100,100100,,'',0,30700,,'',0
+'1798',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
+'1803',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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 e0b7b921..ff0105b7 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,9 +1,5 @@
-'2920',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',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
 '2919',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 2871be08..2c42074a 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,4 +1,2 @@
-'2920',101,82100,,'',0
-'2922',101,82100,,'',0
-'2926',101,82100,,'',0
-'2928',101,82100,,'',0
+'1798',101,82100,,'',0
+'1803',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 2452e42c..e055c4de 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,4 +1,2 @@
-'2920',101,82300,,'',0
-'2922',101,82300,,'',0
-'2926',101,82300,,'',0
-'2928',101,82300,,'',0
+'1798',101,82300,,'',0
+'1803',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 e0b7b921..ff0105b7 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,9 +1,5 @@
-'2920',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',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
+'1803',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
 '2919',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 dd17b059..9c85e9b4 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,6 +1,3 @@
-'2920',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',1100,95900,,'',0,34700,,'',0
-'2926',1100,95900,,'',0,34700,,'',0
+'1798',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
+'1803',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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 1e0255ff..43d9b8be 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,6 +1,3 @@
-'2920',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',1100,100000,,'',0,30700,,'',0
-'2926',1100,100000,,'',0,30700,,'',0
+'1798',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
+'1803',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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 6e01e372..b8a98836 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,12 +1,6 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80600,,'',0,43100,,'',0,40700,,'',0
-'2922',1000,64600,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2923',1000,164400,,'',0
-'2924',1000,164400,,'',0
-'2925',1000,164400,,'',0
-'2926',1000,64600,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2927',1000,164400,,'',0
-'2928',1000,80600,,'',0,43100,,'',0,40700,,'',0
+'1798',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
+'1803',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
+'1579',1000,164400,,'',0
+'1798',1000,64600,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
+'1799',1000,164400,,'',0
+'1803',1000,80600,,'',0,43100,,'',0,40700,,'',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 8070c9dd..0214bceb 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,15 +1,8 @@
-'2920',100,82800,,'',0
-'2922',100,82800,,'',0
-'2926',100,82800,,'',0
-'2928',100,82800,,'',0
-'2920',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,195900,,'',0,16400,,'',0
-'2922',1500,195900,,'',0,16400,,'',0
-'2926',1500,195900,,'',0,16400,,'',0
-'2928',1500,195900,,'',0,16400,,'',0
+'1798',100,82800,,'',0
+'1803',100,82800,,'',0
+'1798',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
+'1803',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,195900,,'',0,16400,,'',0
+'1803',1500,195900,,'',0,16400,,'',0
 '2919',1600,95800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'2922',7000,60100,,'',0
-'2926',7000,60100,,'',0
+'1798',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 254e7ad9..47758cb4 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,4 +1,2 @@
-'2920',1500,195700,,'',0,16400,,'',0
-'2922',1500,195700,,'',0,16400,,'',0
-'2926',1500,195700,,'',0,16400,,'',0
-'2928',1500,195700,,'',0,16400,,'',0
+'1798',1500,195700,,'',0,16400,,'',0
+'1803',1500,195700,,'',0,16400,,'',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 3568e783..9ee53d02 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',7000,55700,,'',0
-'2926',7000,55700,,'',0
+'1798',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',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 0c1b25a4..a2fa04b5 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,10 +1,5 @@
-'2920',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182300,,'',0
-'2926',7001,182300,,'',0
+'1798',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
+'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'1798',7001,182300,,'',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 81c99df7..6e2cdbd1 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',7000,55700,,'',0
-'2926',7000,55700,,'',0
+'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',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 26352033..145cae09 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,124200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',7000,55700,,'',0
-'2926',7000,55700,,'',0
+'1798',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',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 a21e03d5..973f96d1 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,10 +1,5 @@
-'2920',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182400,,'',0
-'2926',7001,182400,,'',0
+'1798',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
+'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'1798',7001,182400,,'',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 69e65282..463d100e 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,8 +1,4 @@
-'2920',1001,84200,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,71800,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172000,,'',0
-'2924',1001,172000,,'',0
-'2925',1001,172000,,'',0
-'2926',1001,71800,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172000,,'',0
-'2928',1001,84200,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172000,,'',0
+'1798',1001,71800,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172000,,'',0
+'1803',1001,84200,,'',0,47100,,'',0,40700,,'',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 22cb95cd..c09605fc 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,9 +1,5 @@
-'2920',300,81700,0,'School Spcl',0
-'2922',300,81700,0,'School Spcl',0
-'2926',300,81700,0,'School Spcl',0
-'2928',300,81700,0,'School Spcl',0
+'1798',300,81700,0,'School Spcl',0
+'1803',300,81700,0,'School Spcl',0
+'1798',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
+'1803',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
 '2919',500,130700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 ee33e95e..c638b8c6 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,5 +1,3 @@
+'1798',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
+'1803',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
 '2919',500,130600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 abafb4ea..e595c455 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,18 +1,10 @@
-'2920',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91500,,'',0,43000,,'',0,40600,,'',0
-'2922',1001,74900,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'2923',1001,175100,,'',0
-'2924',1001,175100,,'',0
-'2925',1001,175100,,'',0
-'2926',1001,74900,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'2927',1001,175100,,'',0
-'2928',1001,91500,,'',0,43000,,'',0,40600,,'',0
+'1579',1001,175100,,'',0
+'1798',1001,74900,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
+'1799',1001,175100,,'',0
+'1803',1001,91500,,'',0,43000,,'',0,40600,,'',0
 '2919',1601,93100,,'',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_146077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
index 0c57e17e..c3f88c58 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,18 +1,10 @@
-'2920',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91600,,'',0,43000,,'',0,40600,,'',0
-'2922',1001,75000,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'2923',1001,175200,,'',0
-'2924',1001,175200,,'',0
-'2925',1001,175200,,'',0
-'2926',1001,75000,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'2927',1001,175200,,'',0
-'2928',1001,91600,,'',0,43000,,'',0,40600,,'',0
+'1579',1001,175200,,'',0
+'1798',1001,75000,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
+'1799',1001,175200,,'',0
+'1803',1001,91600,,'',0,43000,,'',0,40600,,'',0
 '2919',1601,93100,,'',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_146078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
index 70a43652..80691f1e 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,5 +1,3 @@
+'1798',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
+'1803',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
 '2919',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 c261bc91..d8dce681 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,18 +1,10 @@
-'2920',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91600,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75000,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175200,,'',0
-'2924',1001,175200,,'',0
-'2925',1001,175200,,'',0
-'2926',1001,75000,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175200,,'',0
-'2928',1001,91600,,'',0,43100,,'',0,40500,,'',0
+'1579',1001,175200,,'',0
+'1798',1001,75000,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175200,,'',0
+'1803',1001,91600,,'',0,43100,,'',0,40500,,'',0
 '2919',1601,93200,,'',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_146080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
index c3185390..80691f1e 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,5 +1,3 @@
+'1798',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
+'1803',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
 '2919',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 08ee7ab1..65059bfa 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,18 +1,10 @@
+'1798',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
+'1803',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
 '2919',501,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91800,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75200,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175400,,'',0
-'2924',1001,175400,,'',0
-'2925',1001,175400,,'',0
-'2926',1001,75200,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175400,,'',0
-'2928',1001,91800,,'',0,43100,,'',0,40500,,'',0
-'2920',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1579',1001,175400,,'',0
+'1798',1001,75200,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175400,,'',0
+'1803',1001,91800,,'',0,43100,,'',0,40500,,'',0
+'1798',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,93300,,'',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_146082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
index b73a28e0..1e3cfc50 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,18 +1,10 @@
+'1798',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
+'1803',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
 '2919',501,122300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91900,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75200,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175500,,'',0
-'2924',1001,175500,,'',0
-'2925',1001,175500,,'',0
-'2926',1001,75200,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175500,,'',0
-'2928',1001,91900,,'',0,43100,,'',0,40500,,'',0
-'2920',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1579',1001,175500,,'',0
+'1798',1001,75200,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175500,,'',0
+'1803',1001,91900,,'',0,43100,,'',0,40500,,'',0
+'1798',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,93300,,'',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_146083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
index e9f52d2b..1de87fc3 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'1798',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90200,,'',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_146084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
index e9f52d2b..1de87fc3 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'1798',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90200,,'',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_146085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
index 2e3bd1db..164e8d3c 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',501,122400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,93400,,'',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_146086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
index 8cd93631..69200420 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'1798',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90100,,'',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_146087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
index d3c8192f..c8716016 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,93500,,'',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_146088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
index 4e3a6800..c3006f6f 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,6 +1,3 @@
-'2920',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182600,,'',0
-'2926',7001,182600,,'',0
+'1798',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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 0f98c155..50c61e21 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,17 +1,10 @@
+'1798',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
+'1798',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
+'1803',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
+'1803',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
 '2919',500,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',501,123900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2920',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
-'2920',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
-'2922',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',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,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2920',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,55500,,'',0
-'2926',7000,55500,,'',0
+'1798',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 6ef4e7e8..016635e4 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,6 +1,3 @@
-'2920',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182500,,'',0
-'2926',7001,182500,,'',0
+'1798',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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 d201c7f0..58b8a0e5 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,8 +1,4 @@
-'2920',1000,83200,,'',0,47200,,'',0,40700,,'',0
-'2922',1000,71200,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2923',1000,171100,,'',0
-'2924',1000,171100,,'',0
-'2925',1000,171100,,'',0
-'2926',1000,71200,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2927',1000,171100,,'',0
-'2928',1000,83200,,'',0,47200,,'',0,40700,,'',0
+'1579',1000,171100,,'',0
+'1798',1000,71200,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
+'1799',1000,171100,,'',0
+'1803',1000,83200,,'',0,47200,,'',0,40700,,'',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 761ce51b..651835e3 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,4 +1,2 @@
-'2920',201,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,80200,,'',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_146093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
index 3468d9e9..4dbbc069 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,4 +1,2 @@
-'2920',201,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,80100,,'',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_146094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
index 24dfb455..20762765 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,4 +1,2 @@
-'2920',201,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,80000,,'',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_146095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
index 2dd8eb87..ae44c274 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,12 +1,6 @@
-'2920',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164800,,'',0
-'2924',1000,164800,,'',0
-'2925',1000,164800,,'',0
-'2926',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164800,,'',0
-'2928',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164800,,'',0
+'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164800,,'',0
+'1803',1000,80900,,'',0,43200,,'',0,40700,,'',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 41905e88..49d644ae 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,12 +1,6 @@
-'2920',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164800,,'',0
-'2924',1000,164800,,'',0
-'2925',1000,164800,,'',0
-'2926',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164800,,'',0
-'2928',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164800,,'',0
+'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164800,,'',0
+'1803',1000,80900,,'',0,43200,,'',0,40700,,'',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 a9f806a4..0f197ab1 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,12 +1,6 @@
-'2920',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2920',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2922',7001,183200,,'',0
-'2926',7001,183200,,'',0
+'1798',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
+'1803',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 c82a2bc6..bc2b5e0a 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,13 +1,7 @@
-'2920',101,82000,,'',0
-'2922',101,82000,,'',0
-'2926',101,82000,,'',0
-'2928',101,82000,,'',0
-'2920',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',101,82000,,'',0
+'1803',101,82000,,'',0
+'1798',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55300,,'',0
-'2926',7000,55300,,'',0
+'1798',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
+'1798',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 8b673e85..aadf0e85 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,9 +1,5 @@
-'2920',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90400,,'',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_146101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
index 0f0660b0..e65e92f8 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,12 +1,6 @@
-'2920',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2920',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164900,,'',0
-'2924',1000,164900,,'',0
-'2925',1000,164900,,'',0
-'2926',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164900,,'',0
-'2928',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'1798',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
+'1803',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'1579',1000,164900,,'',0
+'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164900,,'',0
+'1803',1000,81000,,'',0,43200,,'',0,40700,,'',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 6af54b6b..5ae178f7 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,9 +1,5 @@
-'2920',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90600,,'',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_146103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
index 6af54b6b..5ae178f7 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,9 +1,5 @@
-'2920',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90600,,'',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_146104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
index 7827718c..e730512f 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,4 +1,2 @@
-'2920',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75800,,'',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_146105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
index 39a2a9c1..c77f4704 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,16 +1,8 @@
-'2920',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
-'2920',101,81100,,'',0
-'2922',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
-'2922',101,81100,,'',0
-'2926',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
-'2926',101,81100,,'',0
-'2928',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
-'2928',101,81100,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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
+'1798',101,81100,,'',0
+'1803',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
+'1803',101,81100,,'',0
+'1798',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
+'1803',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
+'1798',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90600,,'',0,21000,,'',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 c295710e..3d0477b6 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,16 +1,8 @@
-'2920',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
-'2920',101,81200,,'',0
-'2922',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
-'2922',101,81200,,'',0
-'2926',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
-'2926',101,81200,,'',0
-'2928',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
-'2928',101,81200,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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
+'1798',101,81200,,'',0
+'1803',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
+'1803',101,81200,,'',0
+'1798',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
+'1803',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
+'1798',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90700,,'',0,21000,,'',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 a8e0e0fe..23c6d79e 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,4 +1,2 @@
-'2920',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84900,,'',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_146108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
index 0c9909c0..1160c01a 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,8 @@
-'2920',300,81400,0,'School Spcl',0
-'2922',300,81400,0,'School Spcl',0
-'2926',300,81400,0,'School Spcl',0
-'2928',300,81400,0,'School Spcl',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,81400,0,'School Spcl',0
+'1803',300,81400,0,'School Spcl',0
+'1798',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
+'1803',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
+'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 a8e0e0fe..23c6d79e 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,4 +1,2 @@
-'2920',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,84900,,'',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_146110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
index 89605196..e6711fc8 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,14 +1,7 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
-'2926',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'1798',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
+'1803',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
+'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 44f0717d..43d6b9ad 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,4 +1,2 @@
-'2920',101,81800,,'',0
-'2922',101,81800,,'',0
-'2926',101,81800,,'',0
-'2928',101,81800,,'',0
+'1798',101,81800,,'',0
+'1803',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 d6b30f85..6fb058c9 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,4 +1,2 @@
-'2920',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75700,,'',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_146113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
index b9df7c88..2a0023cb 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,4 +1,2 @@
-'2920',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85100,,'',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 dd4cad14..57fb615c 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,4 +1,2 @@
-'2920',200,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85000,,'',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_146117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
index abea086c..ad3766fb 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,20 +1,10 @@
-'2920',300,81100,0,'School Spcl',0
-'2922',300,81100,0,'School Spcl',0
-'2926',300,81100,0,'School Spcl',0
-'2928',300,81100,0,'School Spcl',0
-'2920',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
-'2920',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
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',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
-'2928',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
-'2920',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,81100,0,'School Spcl',0
+'1803',300,81100,0,'School Spcl',0
+'1798',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
+'1798',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
+'1803',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
+'1803',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
+'1798',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 a8f042ae..534a102c 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,8 +1,4 @@
-'2920',1001,85600,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,173400,,'',0
-'2924',1001,173400,,'',0
-'2925',1001,173400,,'',0
-'2926',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,173400,,'',0
-'2928',1001,85600,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,173400,,'',0
+'1798',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,173400,,'',0
+'1803',1001,85600,,'',0,47100,,'',0,40700,,'',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 6df0a20e..14555ca4 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,8 +1,4 @@
-'2920',1000,82300,,'',0,43200,,'',0,44700,,'',0
-'2922',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,170200,,'',0
-'2924',1000,170200,,'',0
-'2925',1000,170200,,'',0
-'2926',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,170200,,'',0
-'2928',1000,82300,,'',0,43200,,'',0,44700,,'',0
+'1579',1000,170200,,'',0
+'1798',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,170200,,'',0
+'1803',1000,82300,,'',0,43200,,'',0,44700,,'',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 a8f042ae..534a102c 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,8 +1,4 @@
-'2920',1001,85600,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,173400,,'',0
-'2924',1001,173400,,'',0
-'2925',1001,173400,,'',0
-'2926',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,173400,,'',0
-'2928',1001,85600,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,173400,,'',0
+'1798',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,173400,,'',0
+'1803',1001,85600,,'',0,47100,,'',0,40700,,'',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 6df0a20e..14555ca4 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,8 +1,4 @@
-'2920',1000,82300,,'',0,43200,,'',0,44700,,'',0
-'2922',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,170200,,'',0
-'2924',1000,170200,,'',0
-'2925',1000,170200,,'',0
-'2926',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,170200,,'',0
-'2928',1000,82300,,'',0,43200,,'',0,44700,,'',0
+'1579',1000,170200,,'',0
+'1798',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,170200,,'',0
+'1803',1000,82300,,'',0,43200,,'',0,44700,,'',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 83aea01e..b267e06f 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,8 +1,4 @@
-'2920',1000,81900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,165800,,'',0
-'2924',1000,165800,,'',0
-'2925',1000,165800,,'',0
-'2926',1000,65900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,165800,,'',0
-'2928',1000,81900,,'',0,43200,,'',0,40700,,'',0
+'1579',1000,165800,,'',0
+'1798',1000,65900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,165800,,'',0
+'1803',1000,81900,,'',0,43200,,'',0,40700,,'',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 f1b52967..57d2e386 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,8 +1,4 @@
-'2920',1001,85800,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,73400,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,173600,,'',0
-'2924',1001,173600,,'',0
-'2925',1001,173600,,'',0
-'2926',1001,73400,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,173600,,'',0
-'2928',1001,85800,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,173600,,'',0
+'1798',1001,73400,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,173600,,'',0
+'1803',1001,85800,,'',0,47100,,'',0,40700,,'',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 fd573830..39d9fcc9 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,8 +1,4 @@
-'2920',300,81000,0,'School Spcl',0
-'2922',300,81000,0,'School Spcl',0
-'2926',300,81000,0,'School Spcl',0
-'2928',300,81000,0,'School Spcl',0
-'2920',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,81000,0,'School Spcl',0
+'1803',300,81000,0,'School Spcl',0
+'1798',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
+'1803',400,82700,,'',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 d69efe51..8c932836 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,8 +1,4 @@
-'2920',300,80900,0,'School Spcl',0
-'2922',300,80900,0,'School Spcl',0
-'2926',300,80900,0,'School Spcl',0
-'2928',300,80900,0,'School Spcl',0
-'2920',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,80900,0,'School Spcl',0
+'1803',300,80900,0,'School Spcl',0
+'1798',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
+'1803',400,82600,,'',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 a1353b51..5346ae5d 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,8 +1,4 @@
-'2920',300,80800,0,'School Spcl',0
-'2922',300,80800,0,'School Spcl',0
-'2926',300,80800,0,'School Spcl',0
-'2928',300,80800,0,'School Spcl',0
-'2920',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,80800,0,'School Spcl',0
+'1803',300,80800,0,'School Spcl',0
+'1798',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
+'1803',400,82500,,'',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_146128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
index 7827718c..e730512f 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,4 +1,2 @@
-'2920',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75800,,'',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_146129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
index 5e3f0b7c..e70f9662 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,4 +1,2 @@
-'2920',300,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2926',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2928',300,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'1803',300,91000,,'',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_146130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
index 1acfed42..132a2a37 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,14 +1,7 @@
-'2920',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 58f7b038..a0fc2d05 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,14 +1,7 @@
-'2920',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 94e3da7b..05f63575 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,14 +1,7 @@
-'2920',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 a7d8d715..af6a18fa 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,14 +1,7 @@
-'2920',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 cde3a12d..6ff1ea2d 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,15 +1,8 @@
-'2920',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'2922',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'2926',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
-'2928',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'1798',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
+'1803',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'1803',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
 '2919',1600,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 4029a99c..d1909336 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,14 +1,7 @@
-'2920',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 1e1fcaa5..fb0eb636 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,19 +1,10 @@
-'2920',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2922',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2926',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2928',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'1798',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
+'1803',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'1803',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
 '2919',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 ea57092a..6b735342 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,14 +1,7 @@
-'2920',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 b3303b62..e1a9030a 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,15 +1,8 @@
-'2920',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2922',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2926',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
-'2928',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'1798',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
+'1803',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'1803',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
 '2919',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 92fc1453..3d918311 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,14 +1,7 @@
-'2920',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 e5ca0bd4..53191d56 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,15 +1,8 @@
-'2920',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 b73cc0cc..ec8abb5a 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,15 +1,8 @@
-'2920',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 a579cd00..a6b5cf77 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,14 +1,7 @@
-'2920',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2926',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2928',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'2922',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1803',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'1798',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 1b672480..546b3e93 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,15 +1,8 @@
-'2920',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 478cdfe5..549e0127 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,13 +1,7 @@
-'2920',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90900,,'',0,21000,,'',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 a7e2f98e..9fbc1eaa 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,16 +1,8 @@
-'2920',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85300,,'',0,25000,,'',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 bbe14cd1..ae805448 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,14 +1,7 @@
-'2920',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'2922',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
-'2926',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
-'2928',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',4000,82800,,'',0,51500,,'',0
-'2926',4000,82800,,'',0,51500,,'',0
+'1798',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
+'1803',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'1798',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
+'1803',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
+'1798',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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 010ce2f6..ddf0ab1d 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,14 +1,7 @@
-'2920',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',4001,95400,,'',0,60000,,'',0
-'2926',4001,95400,,'',0,60000,,'',0
+'1798',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
+'1803',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 a92a6bc5..c40e1535 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,16 +1,8 @@
-'2920',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
-'2920',1001,84100,,'',0,47100,,'',0,40700,,'',0
-'2922',1000,71300,4,'',0,12000,4,'',0,12000,4,'',0,35200,4,'',0
-'2922',1001,71700,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1000,171200,4,'',0
-'2923',1001,171900,,'',0
-'2924',1000,171200,4,'',0
-'2924',1001,171900,,'',0
-'2925',1000,171200,4,'',0
-'2925',1001,171900,,'',0
-'2926',1000,71300,4,'',0,12000,4,'',0,12000,4,'',0,35200,4,'',0
-'2926',1001,71700,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1000,171200,4,'',0
-'2927',1001,171900,,'',0
-'2928',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
-'2928',1001,84100,,'',0,47100,,'',0,40700,,'',0
+'1579',1000,171200,4,'',0
+'1579',1001,171900,,'',0
+'1798',1000,71300,4,'',0,12000,4,'',0,12000,4,'',0,35200,4,'',0
+'1798',1001,71700,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1000,171200,4,'',0
+'1799',1001,171900,,'',0
+'1803',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
+'1803',1001,84100,,'',0,47100,,'',0,40700,,'',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 52c6bea0..b2e14310 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,24 +1,12 @@
-'2920',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1001,92200,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75500,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175800,,'',0
-'2924',1001,175800,,'',0
-'2925',1001,175800,,'',0
-'2926',1001,75500,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175800,,'',0
-'2928',1001,92200,,'',0,43100,,'',0,40500,,'',0
-'2922',1100,100600,,'',0,30700,,'',0
-'2926',1100,100600,,'',0,30700,,'',0
-'2920',1501,195100,,'',0,16400,,'',0
-'2922',1501,195100,,'',0,16400,,'',0
-'2926',1501,195100,,'',0,16400,,'',0
-'2928',1501,195100,,'',0,16400,,'',0
-'2922',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'2926',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'1798',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
+'1803',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1001,175800,,'',0
+'1798',1001,75500,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175800,,'',0
+'1803',1001,92200,,'',0,43100,,'',0,40500,,'',0
+'1798',1100,100600,,'',0,30700,,'',0
+'1798',1501,195100,,'',0,16400,,'',0
+'1803',1501,195100,,'',0,16400,,'',0
+'1798',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 ccd70f0d..0baec359 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,28 +1,14 @@
-'2920',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80100,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64100,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,163800,,'',0
-'2924',1000,163800,,'',0
-'2925',1000,163800,,'',0
-'2926',1000,64100,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,163800,,'',0
-'2928',1000,80100,,'',0,43000,,'',0,40700,,'',0
-'2922',1101,123200,,'',0
-'2923',1101,180500,,'',0
-'2924',1101,180500,,'',0
-'2925',1101,180500,,'',0
-'2926',1101,123200,,'',0
-'2927',1101,180500,,'',0
-'2920',1500,200100,,'',0,12400,,'',0
-'2922',1500,200100,,'',0,12400,,'',0
-'2926',1500,200100,,'',0,12400,,'',0
-'2928',1500,200100,,'',0,12400,,'',0
-'2922',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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
+'1803',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,163800,,'',0
+'1798',1000,64100,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,163800,,'',0
+'1803',1000,80100,,'',0,43000,,'',0,40700,,'',0
+'1579',1101,180500,,'',0
+'1798',1101,123200,,'',0
+'1799',1101,180500,,'',0
+'1798',1500,200100,,'',0,12400,,'',0
+'1803',1500,200100,,'',0,12400,,'',0
+'1798',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 4581c798..8359b3c4 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,14 +1,7 @@
-'2920',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,195100,,'',0,16400,,'',0
-'2922',1501,195100,,'',0,16400,,'',0
-'2926',1501,195100,,'',0,16400,,'',0
-'2928',1501,195100,,'',0,16400,,'',0
-'2922',7001,181900,,'',0
-'2926',7001,181900,,'',0
+'1798',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
+'1803',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,195100,,'',0,16400,,'',0
+'1803',1501,195100,,'',0,16400,,'',0
+'1798',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 f7c9069d..6b976be1 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,12 +1,6 @@
-'2920',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85600,,'',0,25000,,'',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 710457ff..592b9960 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,13 +1,7 @@
-'2920',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,81800,0,'School Spcl',0
-'2922',300,81800,0,'School Spcl',0
-'2926',300,81800,0,'School Spcl',0
-'2928',300,81800,0,'School Spcl',0
+'1798',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
+'1803',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,81800,0,'School Spcl',0
+'1803',300,81800,0,'School Spcl',0
+'1798',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
+'1803',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
 '2919',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 a1d3a856..95624144 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,16 +1,8 @@
-'2920',300,80500,0,'School Spcl',0
-'2922',300,80500,0,'School Spcl',0
-'2926',300,80500,0,'School Spcl',0
-'2928',300,80500,0,'School Spcl',0
-'2920',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,80500,0,'School Spcl',0
+'1803',300,80500,0,'School Spcl',0
+'1798',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
+'1803',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 5041d9a5..50c774d4 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,14 +1,7 @@
-'2920',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2920',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2928',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,55100,,'',0
-'2926',7000,55100,,'',0
+'1798',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
+'1798',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
+'1803',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1803',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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 77a2525f..6e0d08fe 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,51 +1,26 @@
-'2920',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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
-'2920',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2920',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
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',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
-'2928',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
-'2922',1100,100800,4,'',0,30700,4,'',0
-'2922',1101,93000,,'',0,30200,,'',0
-'2923',1100,184200,4,'',0
-'2923',1101,180500,,'',0
-'2924',1100,184400,4,'',0
-'2924',1101,180500,,'',0
-'2925',1100,184200,4,'',0
-'2925',1101,180500,,'',0
-'2926',1100,100800,4,'',0,30700,4,'',0
-'2926',1101,93000,,'',0,30200,,'',0
-'2927',1100,184400,4,'',0
-'2927',1101,180500,,'',0
-'2920',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,195200,,'',0,16400,,'',0
-'2922',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,195200,,'',0,16400,,'',0
-'2926',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,195200,,'',0,16400,,'',0
-'2928',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,195200,,'',0,16400,,'',0
+'1798',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
+'1803',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1798',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
+'1803',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',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
+'1798',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
+'1803',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1798',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
+'1803',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
+'1803',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
+'1579',1100,184400,4,'',0
+'1579',1101,180500,,'',0
+'1798',1100,100800,4,'',0,30700,4,'',0
+'1798',1101,93000,,'',0,30200,,'',0
+'1799',1100,184200,4,'',0
+'1799',1101,180500,,'',0
+'1798',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,195200,,'',0,16400,,'',0
+'1803',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1501,195200,,'',0,16400,,'',0
 '2919',1601,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
-'2922',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
-'2926',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
-'2926',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
-'2922',4001,100100,,'',0,60000,,'',0
-'2926',4001,100100,,'',0,60000,,'',0
+'1798',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'1798',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
+'1798',4001,100100,,'',0,60000,,'',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 927fd950..4639cb23 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,16 +1,8 @@
-'2920',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1100,100300,,'',0,30700,,'',0
-'2926',1100,100300,,'',0,30700,,'',0
-'2920',1501,194900,,'',0,16400,,'',0
-'2922',1501,194900,,'',0,16400,,'',0
-'2926',1501,194900,,'',0,16400,,'',0
-'2928',1501,194900,,'',0,16400,,'',0
-'2922',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'2926',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'1798',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
+'1803',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1100,100300,,'',0,30700,,'',0
+'1798',1501,194900,,'',0,16400,,'',0
+'1803',1501,194900,,'',0,16400,,'',0
+'1798',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 dcb0205b..f84fc751 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,28 +1,14 @@
-'2920',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80300,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64300,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,164000,,'',0
-'2924',1000,164000,,'',0
-'2925',1000,164000,,'',0
-'2926',1000,64300,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,164000,,'',0
-'2928',1000,80300,,'',0,43000,,'',0,40700,,'',0
-'2922',1101,123400,,'',0
-'2923',1101,180700,,'',0
-'2924',1101,180700,,'',0
-'2925',1101,180700,,'',0
-'2926',1101,123400,,'',0
-'2927',1101,180700,,'',0
-'2920',1500,200300,,'',0,12400,,'',0
-'2922',1500,200300,,'',0,12400,,'',0
-'2926',1500,200300,,'',0,12400,,'',0
-'2928',1500,200300,,'',0,12400,,'',0
-'2922',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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
+'1803',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,164000,,'',0
+'1798',1000,64300,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,164000,,'',0
+'1803',1000,80300,,'',0,43000,,'',0,40700,,'',0
+'1579',1101,180700,,'',0
+'1798',1101,123400,,'',0
+'1799',1101,180700,,'',0
+'1798',1500,200300,,'',0,12400,,'',0
+'1803',1500,200300,,'',0,12400,,'',0
+'1798',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 efbce956..fdaf0777 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,59 +1,31 @@
-'2920',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
-'2920',101,81000,,'',0
-'2922',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
-'2922',101,81000,,'',0
-'2926',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
-'2926',101,81000,,'',0
-'2928',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
-'2928',101,81000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1798',101,81000,,'',0
+'1803',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
+'1803',101,81000,,'',0
+'1798',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
+'1803',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
+'1798',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
+'1798',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
+'1803',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
+'1803',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
 '2919',500,130000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',501,123000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2920',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
-'2922',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2920',1000,80000,,'',0,43000,,'',0,40700,,'',0
-'2920',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
-'2922',1000,64000,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2922',1001,75600,4,'',0,16700,4,'',0,11700,4,'',0,31400,4,'',0
-'2923',1000,163700,,'',0
-'2923',1001,175900,4,'',0
-'2924',1000,163700,,'',0
-'2924',1001,175900,4,'',0
-'2925',1000,163700,,'',0
-'2925',1001,175900,4,'',0
-'2926',1000,64000,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2926',1001,75600,4,'',0,16700,4,'',0,11700,4,'',0,31400,4,'',0
-'2927',1000,163700,,'',0
-'2927',1001,175900,4,'',0
-'2928',1000,80000,,'',0,43000,,'',0,40700,,'',0
-'2928',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
-'2920',1500,200000,,'',0,12400,,'',0
-'2920',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,200000,,'',0,12400,,'',0
-'2922',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,200000,,'',0,12400,,'',0
-'2926',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,200000,,'',0,12400,,'',0
-'2928',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'1579',1000,163700,,'',0
+'1579',1001,175900,4,'',0
+'1798',1000,64000,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1798',1001,75600,4,'',0,16700,4,'',0,11700,4,'',0,31400,4,'',0
+'1799',1000,163700,,'',0
+'1799',1001,175900,4,'',0
+'1803',1000,80000,,'',0,43000,,'',0,40700,,'',0
+'1803',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
+'1798',1500,200000,,'',0,12400,,'',0
+'1798',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,200000,,'',0,12400,,'',0
+'1803',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'2920',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2920',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'2922',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'2926',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'2928',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'2922',4000,82500,,'',0,51500,,'',0
-'2926',4000,82500,,'',0,51500,,'',0
-'2922',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
-'2926',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
+'1798',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'1803',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'1798',4000,82500,,'',0,51500,,'',0
+'1798',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 952fe986..f08b5c60 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,8 +1,4 @@
-'2920',1001,90200,,'',0,43100,,'',0,40700,,'',0
-'2922',1001,73800,,'',0,16400,,'',0,11900,,'',0,31200,,'',0
-'2923',1001,174000,,'',0
-'2924',1001,174000,,'',0
-'2925',1001,174000,,'',0
-'2926',1001,73800,,'',0,16400,,'',0,11900,,'',0,31200,,'',0
-'2927',1001,174000,,'',0
-'2928',1001,90200,,'',0,43100,,'',0,40700,,'',0
+'1579',1001,174000,,'',0
+'1798',1001,73800,,'',0,16400,,'',0,11900,,'',0,31200,,'',0
+'1799',1001,174000,,'',0
+'1803',1001,90200,,'',0,43100,,'',0,40700,,'',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 f9e3d0f7..ac19b260 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,15 +1,8 @@
-'2920',100,82500,,'',0
-'2922',100,82500,,'',0
-'2926',100,82500,,'',0
-'2928',100,82500,,'',0
-'2920',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,195800,,'',0,16400,,'',0
-'2922',1500,195800,,'',0,16400,,'',0
-'2926',1500,195800,,'',0,16400,,'',0
-'2928',1500,195800,,'',0,16400,,'',0
+'1798',100,82500,,'',0
+'1803',100,82500,,'',0
+'1798',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
+'1803',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,195800,,'',0,16400,,'',0
+'1803',1500,195800,,'',0,16400,,'',0
 '2919',1600,95500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'2922',7000,60000,,'',0
-'2926',7000,60000,,'',0
+'1798',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 3ee69d92..0b2d5374 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,4 +1,2 @@
-'2920',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'1798',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
+'1803',301,91900,,'',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 10addaaa..dd1b6ec1 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,4 +1,2 @@
-'2920',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'1798',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
+'1803',301,91800,,'',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 0f64007b..5cf528ff 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,9 +1,5 @@
-'2920',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',500,131100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
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 82450351..372e358e 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,13 +1,7 @@
-'2920',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,81900,0,'School Spcl',0
-'2922',300,81900,0,'School Spcl',0
-'2926',300,81900,0,'School Spcl',0
-'2928',300,81900,0,'School Spcl',0
+'1798',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
+'1803',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,81900,0,'School Spcl',0
+'1803',300,81900,0,'School Spcl',0
+'1798',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
+'1803',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
 '2919',500,131000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 c86172f1..d50d8f9b 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,4 +1,2 @@
-'2920',101,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',101,85100,,'',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 5fa1c023..cab20c88 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,4 +1,2 @@
-'2920',101,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',101,85200,,'',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 df3ccdf1..d542d5c4 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,4 +1,2 @@
-'2920',101,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',101,85000,,'',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 feda921f..24bd31e7 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,12 +1,6 @@
-'2920',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2924',1100,183700,,'',0
-'2927',1100,183700,,'',0
-'2920',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'2922',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'2926',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'2928',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'2922',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1100,183700,,'',0
+'1798',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'1803',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'1798',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 dd837c99..949cbceb 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,15 +1,8 @@
-'2920',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 0acfbe2e..61569000 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,20 +1,10 @@
-'2920',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80500,,'',0,43100,,'',0,40700,,'',0
-'2922',1000,64500,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2923',1000,164300,,'',0
-'2924',1000,164300,,'',0
-'2925',1000,164300,,'',0
-'2926',1000,64500,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'2927',1000,164300,,'',0
-'2928',1000,80500,,'',0,43100,,'',0,40700,,'',0
-'2920',1500,200600,,'',0,12400,,'',0
-'2922',1500,200600,,'',0,12400,,'',0
-'2926',1500,200600,,'',0,12400,,'',0
-'2928',1500,200600,,'',0,12400,,'',0
+'1798',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
+'1803',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,164300,,'',0
+'1798',1000,64500,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
+'1799',1000,164300,,'',0
+'1803',1000,80500,,'',0,43100,,'',0,40700,,'',0
+'1798',1500,200600,,'',0,12400,,'',0
+'1803',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 793266bc..dc0dd9a1 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,12 +1,6 @@
-'2920',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,194700,,'',0,16400,,'',0
-'2922',1501,194700,,'',0,16400,,'',0
-'2926',1501,194700,,'',0,16400,,'',0
-'2928',1501,194700,,'',0,16400,,'',0
+'1798',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
+'1803',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,194700,,'',0,16400,,'',0
+'1803',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 d125bf30..8489c072 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,20 +1,10 @@
-'2920',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80500,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64500,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,164200,,'',0
-'2924',1000,164200,,'',0
-'2925',1000,164200,,'',0
-'2926',1000,64500,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,164200,,'',0
-'2928',1000,80500,,'',0,43000,,'',0,40700,,'',0
-'2920',1500,200600,,'',0,12400,,'',0
-'2922',1500,200600,,'',0,12400,,'',0
-'2926',1500,200600,,'',0,12400,,'',0
-'2928',1500,200600,,'',0,12400,,'',0
+'1798',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
+'1803',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,164200,,'',0
+'1798',1000,64500,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,164200,,'',0
+'1803',1000,80500,,'',0,43000,,'',0,40700,,'',0
+'1798',1500,200600,,'',0,12400,,'',0
+'1803',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 518eaacf..2fe868c0 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,12 +1,6 @@
-'2920',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,194700,,'',0,16400,,'',0
-'2922',1501,194700,,'',0,16400,,'',0
-'2926',1501,194700,,'',0,16400,,'',0
-'2928',1501,194700,,'',0,16400,,'',0
+'1798',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
+'1803',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,194700,,'',0,16400,,'',0
+'1803',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 15cbfa99..1a70e4f6 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,15 +1,8 @@
-'2920',100,82700,,'',0
-'2922',100,82700,,'',0
-'2926',100,82700,,'',0
-'2928',100,82700,,'',0
-'2920',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,195800,,'',0,16400,,'',0
-'2922',1500,195800,,'',0,16400,,'',0
-'2926',1500,195800,,'',0,16400,,'',0
-'2928',1500,195800,,'',0,16400,,'',0
+'1798',100,82700,,'',0
+'1803',100,82700,,'',0
+'1798',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
+'1803',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,195800,,'',0,16400,,'',0
+'1803',1500,195800,,'',0,16400,,'',0
 '2919',1600,95700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'2922',7000,60100,,'',0
-'2926',7000,60100,,'',0
+'1798',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 7dfec2a4..aec9e0ab 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,10 +1,5 @@
-'2920',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,195400,,'',0,16400,,'',0
-'2922',1501,195400,,'',0,16400,,'',0
-'2926',1501,195400,,'',0,16400,,'',0
-'2928',1501,195400,,'',0,16400,,'',0
-'2922',7001,182100,,'',0
-'2926',7001,182100,,'',0
+'1798',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
+'1803',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,195400,,'',0,16400,,'',0
+'1803',1501,195400,,'',0,16400,,'',0
+'1798',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 a47f86cb..adf08643 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,10 +1,5 @@
-'2920',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,195500,,'',0,16400,,'',0
-'2922',1501,195500,,'',0,16400,,'',0
-'2926',1501,195500,,'',0,16400,,'',0
-'2928',1501,195500,,'',0,16400,,'',0
-'2922',7001,182100,,'',0
-'2926',7001,182100,,'',0
+'1798',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
+'1803',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,195500,,'',0,16400,,'',0
+'1803',1501,195500,,'',0,16400,,'',0
+'1798',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 2565c59d..f85c0312 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,5 +1,3 @@
-'2920',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1601,94700,,'',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_146183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
index 6ef4e7e8..016635e4 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,6 +1,3 @@
-'2920',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182500,,'',0
-'2926',7001,182500,,'',0
+'1798',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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 8ce3b91a..65eb92be 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,12 +1,7 @@
+'1798',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
+'1803',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
 '2919',500,124000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,55600,,'',0
-'2926',7000,55600,,'',0
+'1798',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 bd0d7636..a06de6e5 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,12 +1,7 @@
+'1798',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
+'1803',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
 '2919',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,55600,,'',0
-'2926',7000,55600,,'',0
+'1798',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 eb70879f..76bc5ff7 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,28 +1,14 @@
-'2920',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,163900,,'',0
-'2924',1000,163900,,'',0
-'2925',1000,163900,,'',0
-'2926',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,163900,,'',0
-'2928',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'2922',1101,123300,,'',0
-'2923',1101,180600,,'',0
-'2924',1101,180600,,'',0
-'2925',1101,180600,,'',0
-'2926',1101,123300,,'',0
-'2927',1101,180600,,'',0
-'2920',1500,200300,,'',0,12400,,'',0
-'2922',1500,200300,,'',0,12400,,'',0
-'2926',1500,200300,,'',0,12400,,'',0
-'2928',1500,200300,,'',0,12400,,'',0
-'2922',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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
+'1803',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,163900,,'',0
+'1798',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,163900,,'',0
+'1803',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'1579',1101,180600,,'',0
+'1798',1101,123300,,'',0
+'1799',1101,180600,,'',0
+'1798',1500,200300,,'',0,12400,,'',0
+'1803',1500,200300,,'',0,12400,,'',0
+'1798',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 7caec2b2..bee0dff9 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,28 +1,14 @@
-'2920',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,163900,,'',0
-'2924',1000,163900,,'',0
-'2925',1000,163900,,'',0
-'2926',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,163900,,'',0
-'2928',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'2922',1101,123300,,'',0
-'2923',1101,180600,,'',0
-'2924',1101,180600,,'',0
-'2925',1101,180600,,'',0
-'2926',1101,123300,,'',0
-'2927',1101,180600,,'',0
-'2920',1500,200200,,'',0,12400,,'',0
-'2922',1500,200200,,'',0,12400,,'',0
-'2926',1500,200200,,'',0,12400,,'',0
-'2928',1500,200200,,'',0,12400,,'',0
-'2922',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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
+'1803',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1579',1000,163900,,'',0
+'1798',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,163900,,'',0
+'1803',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'1579',1101,180600,,'',0
+'1798',1101,123300,,'',0
+'1799',1101,180600,,'',0
+'1798',1500,200200,,'',0,12400,,'',0
+'1803',1500,200200,,'',0,12400,,'',0
+'1798',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 d13a00fe..edaa81d4 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,24 +1,12 @@
-'2920',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1001,92100,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75400,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175700,,'',0
-'2924',1001,175700,,'',0
-'2925',1001,175700,,'',0
-'2926',1001,75400,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175700,,'',0
-'2928',1001,92100,,'',0,43100,,'',0,40500,,'',0
-'2922',1100,100400,,'',0,30700,,'',0
-'2926',1100,100400,,'',0,30700,,'',0
-'2920',1501,195000,,'',0,16400,,'',0
-'2922',1501,195000,,'',0,16400,,'',0
-'2926',1501,195000,,'',0,16400,,'',0
-'2928',1501,195000,,'',0,16400,,'',0
-'2922',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
-'2926',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
+'1798',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
+'1803',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1001,175700,,'',0
+'1798',1001,75400,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175700,,'',0
+'1803',1001,92100,,'',0,43100,,'',0,40500,,'',0
+'1798',1100,100400,,'',0,30700,,'',0
+'1798',1501,195000,,'',0,16400,,'',0
+'1803',1501,195000,,'',0,16400,,'',0
+'1798',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 a3d020eb..b3c3d6aa 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,8 +1,4 @@
-'2920',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194800,,'',0,16400,,'',0
-'2922',1501,194800,,'',0,16400,,'',0
-'2926',1501,194800,,'',0,16400,,'',0
-'2928',1501,194800,,'',0,16400,,'',0
+'1798',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
+'1803',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194800,,'',0,16400,,'',0
+'1803',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 17978b16..e1d8db42 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,10 @@
-'2920',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'1798',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
+'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 52189299..cab50d36 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,14 +1,7 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
-'2926',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
+'1798',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
+'1803',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
+'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 13c251e4..b2cf6b2d 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,14 +1,7 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
-'2926',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
+'1798',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
+'1803',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
+'1798',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 ddc921ca..91973606 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,12 +1,6 @@
-'2920',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164900,,'',0
-'2924',1000,164900,,'',0
-'2925',1000,164900,,'',0
-'2926',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164900,,'',0
-'2928',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164900,,'',0
+'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164900,,'',0
+'1803',1000,81000,,'',0,43200,,'',0,40700,,'',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 670ec91d..7eab47ef 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,12 +1,6 @@
-'2920',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164900,,'',0
-'2924',1000,164900,,'',0
-'2925',1000,164900,,'',0
-'2926',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164900,,'',0
-'2928',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164900,,'',0
+'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164900,,'',0
+'1803',1000,81000,,'',0,43200,,'',0,40700,,'',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 b9df7c88..2a0023cb 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,4 +1,2 @@
-'2920',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85100,,'',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 d6b30f85..6fb058c9 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,4 +1,2 @@
-'2920',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75700,,'',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_146198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
index bd46dc3d..681da584 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,8 @@
-'2920',300,81200,0,'School Spcl',0
-'2922',300,81200,0,'School Spcl',0
-'2926',300,81200,0,'School Spcl',0
-'2928',300,81200,0,'School Spcl',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,81200,0,'School Spcl',0
+'1803',300,81200,0,'School Spcl',0
+'1798',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
+'1803',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
+'1798',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 00ad5f50..2d005d57 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,10 +1,5 @@
-'2920',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,195400,,'',0,16400,,'',0
-'2922',1501,195400,,'',0,16400,,'',0
-'2926',1501,195400,,'',0,16400,,'',0
-'2928',1501,195400,,'',0,16400,,'',0
-'2922',7001,182000,,'',0
-'2926',7001,182000,,'',0
+'1798',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
+'1803',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,195400,,'',0,16400,,'',0
+'1803',1501,195400,,'',0,16400,,'',0
+'1798',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 dd7d6f91..a8400c06 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,4 +1,2 @@
-'2920',201,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75600,,'',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_146201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
index cc54f7e6..d7e895cd 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,11 +1,6 @@
-'2920',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'2922',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'2926',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
-'2928',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'1798',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
+'1803',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'1803',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
 '2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 f7b3155c..d16a486b 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,8 +1,4 @@
-'2920',1001,84300,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,71900,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172100,,'',0
-'2924',1001,172100,,'',0
-'2925',1001,172100,,'',0
-'2926',1001,71900,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172100,,'',0
-'2928',1001,84300,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172100,,'',0
+'1798',1001,71900,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172100,,'',0
+'1803',1001,84300,,'',0,47100,,'',0,40700,,'',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 468f5d20..5df8e3da 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,8 +1,4 @@
-'2920',1001,84400,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,72000,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172200,,'',0
-'2924',1001,172200,,'',0
-'2925',1001,172200,,'',0
-'2926',1001,72000,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172200,,'',0
-'2928',1001,84400,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172200,,'',0
+'1798',1001,72000,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172200,,'',0
+'1803',1001,84400,,'',0,47100,,'',0,40700,,'',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 518e6b8d..20c159e1 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,16 +1,8 @@
-'2920',300,80300,0,'School Spcl',0
-'2922',300,80300,0,'School Spcl',0
-'2926',300,80300,0,'School Spcl',0
-'2928',300,80300,0,'School Spcl',0
-'2920',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,80300,0,'School Spcl',0
+'1803',300,80300,0,'School Spcl',0
+'1798',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
+'1803',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1501,193000,0,'Downtown',0,12400,0,'Downtown',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 96ebb437..a3278383 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,16 +1,8 @@
-'2920',300,80600,0,'School Spcl',0
-'2922',300,80600,0,'School Spcl',0
-'2926',300,80600,0,'School Spcl',0
-'2928',300,80600,0,'School Spcl',0
-'2920',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2920',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,80600,0,'School Spcl',0
+'1803',300,80600,0,'School Spcl',0
+'1798',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
+'1803',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 e9d534a5..1c80cb1b 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,8 +1,4 @@
-'2920',300,80700,0,'School Spcl',0
-'2922',300,80700,0,'School Spcl',0
-'2926',300,80700,0,'School Spcl',0
-'2928',300,80700,0,'School Spcl',0
-'2920',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,80700,0,'School Spcl',0
+'1803',300,80700,0,'School Spcl',0
+'1798',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
+'1803',400,82400,,'',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_146209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
index fd573830..39d9fcc9 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,8 +1,4 @@
-'2920',300,81000,0,'School Spcl',0
-'2922',300,81000,0,'School Spcl',0
-'2926',300,81000,0,'School Spcl',0
-'2928',300,81000,0,'School Spcl',0
-'2920',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,81000,0,'School Spcl',0
+'1803',300,81000,0,'School Spcl',0
+'1798',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
+'1803',400,82700,,'',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 e9d534a5..1c80cb1b 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,8 +1,4 @@
-'2920',300,80700,0,'School Spcl',0
-'2922',300,80700,0,'School Spcl',0
-'2926',300,80700,0,'School Spcl',0
-'2928',300,80700,0,'School Spcl',0
-'2920',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,80700,0,'School Spcl',0
+'1803',300,80700,0,'School Spcl',0
+'1798',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
+'1803',400,82400,,'',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 d8db6a33..8a135848 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,10 +1,5 @@
-'2920',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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
+'1803',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 1053a481..224d0a73 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,8 +1,4 @@
-'2920',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,200800,,'',0,12400,,'',0
-'2922',1500,200800,,'',0,12400,,'',0
-'2926',1500,200800,,'',0,12400,,'',0
-'2928',1500,200800,,'',0,12400,,'',0
+'1798',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
+'1803',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1500,200800,,'',0,12400,,'',0
+'1803',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 90e00927..3b8a5b55 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,8 +1,4 @@
-'2920',1000,83000,,'',0,47200,,'',0,40700,,'',0
-'2922',1000,71000,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2923',1000,170900,,'',0
-'2924',1000,170900,,'',0
-'2925',1000,170900,,'',0
-'2926',1000,71000,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'2927',1000,170900,,'',0
-'2928',1000,83000,,'',0,47200,,'',0,40700,,'',0
+'1579',1000,170900,,'',0
+'1798',1000,71000,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
+'1799',1000,170900,,'',0
+'1803',1000,83000,,'',0,47200,,'',0,40700,,'',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 e76916d5..c8aa8b08 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,8 +1,4 @@
-'2920',1001,84600,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,72200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172400,,'',0
-'2924',1001,172400,,'',0
-'2925',1001,172400,,'',0
-'2926',1001,72200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172400,,'',0
-'2928',1001,84600,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172400,,'',0
+'1798',1001,72200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172400,,'',0
+'1803',1001,84600,,'',0,47100,,'',0,40700,,'',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 d382127c..e2ef0dbd 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,10 +1,6 @@
-'2920',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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
+'1798',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
+'1798',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
+'1803',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',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
 '2919',1600,94900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
 '2919',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,10000,4,'',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 5e468f47..efd54e91 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,21 +1,11 @@
-'2920',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1101,124200,,'',0
-'2923',1101,181500,,'',0
-'2924',1101,181500,,'',0
-'2925',1101,181500,,'',0
-'2926',1101,124200,,'',0
-'2927',1101,181500,,'',0
-'2920',1501,194100,,'',0,16400,,'',0
-'2922',1501,194100,,'',0,16400,,'',0
-'2926',1501,194100,,'',0,16400,,'',0
-'2928',1501,194100,,'',0,16400,,'',0
+'1798',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
+'1803',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1101,181500,,'',0
+'1798',1101,124200,,'',0
+'1799',1101,181500,,'',0
+'1798',1501,194100,,'',0,16400,,'',0
+'1803',1501,194100,,'',0,16400,,'',0
 '2919',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 8508dd88..6222be14 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,12 +1,6 @@
-'2920',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1100,95700,,'',0,34700,,'',0
-'2926',1100,95700,,'',0,34700,,'',0
-'2920',1500,201200,,'',0,12400,,'',0
-'2922',1500,201200,,'',0,12400,,'',0
-'2926',1500,201200,,'',0,12400,,'',0
-'2928',1500,201200,,'',0,12400,,'',0
-'2922',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1798',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
+'1803',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1100,95700,,'',0,34700,,'',0
+'1798',1500,201200,,'',0,12400,,'',0
+'1803',1500,201200,,'',0,12400,,'',0
+'1798',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 70672d24..a3495083 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,8 +1,4 @@
-'2920',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194500,,'',0,16400,,'',0
-'2922',1501,194500,,'',0,16400,,'',0
-'2926',1501,194500,,'',0,16400,,'',0
-'2928',1501,194500,,'',0,16400,,'',0
+'1798',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
+'1803',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194500,,'',0,16400,,'',0
+'1803',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 b60c6195..4581fdd8 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,22 +1,12 @@
-'2920',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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
+'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',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
+'1803',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
 '2919',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1001,91700,,'',0,43100,,'',0,40500,,'',0
-'2922',1001,75100,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2923',1001,175300,,'',0
-'2924',1001,175300,,'',0
-'2925',1001,175300,,'',0
-'2926',1001,75100,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'2927',1001,175300,,'',0
-'2928',1001,91700,,'',0,43100,,'',0,40500,,'',0
+'1579',1001,175300,,'',0
+'1798',1001,75100,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
+'1799',1001,175300,,'',0
+'1803',1001,91700,,'',0,43100,,'',0,40500,,'',0
 '2919',1601,93200,,'',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_146220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
index 150a91a2..92ba74ca 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,11 +1,6 @@
-'2920',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 e4fbd181..e7fa95d9 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,11 +1,6 @@
-'2920',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'2922',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'2926',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'2928',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'2922',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'1803',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'1798',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',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 bb96661c..0a18aab5 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,4 +1,2 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',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
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 6b707bca..d7b78fcc 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,4 +1,2 @@
-'2920',401,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84400,,'',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_146224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
index 39fa87d6..325a19bb 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,4 +1,2 @@
-'2920',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84300,,'',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_146225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
index 0d27a91a..b2596d74 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,4 +1,2 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',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
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 39fa87d6..325a19bb 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,4 +1,2 @@
-'2920',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84300,,'',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_146227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
index 8688f736..7209c9d2 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,4 +1,2 @@
-'2920',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2922',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
-'2926',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
-'2928',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'1798',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
+'1803',301,91900,,'',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 6ec07dc8..2097d076 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,9 +1,5 @@
-'2920',300,82100,4,'',0
-'2920',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
-'2922',300,82100,4,'',0
-'2922',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
-'2926',300,82100,4,'',0
-'2926',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
-'2928',300,82100,4,'',0
-'2928',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
+'1798',300,82100,4,'',0
+'1798',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
+'1803',300,82100,4,'',0
+'1803',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
 '2919',1601,92500,,'',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_146229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
index a253772a..aff5a2c2 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,14 +1,7 @@
-'2920',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'2920',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'2928',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,55100,,'',0
-'2926',7000,55100,,'',0
+'1798',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
+'1798',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
+'1803',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'1803',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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 e9107569..93db1ed6 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',7000,55800,,'',0
-'2926',7000,55800,,'',0
+'1798',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',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 aba2e2e2..128e4a0d 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,10 +1,5 @@
-'2920',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'2922',7001,182300,,'',0
-'2926',7001,182300,,'',0
+'1798',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
+'1803',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'1798',7001,182300,,'',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 c533793b..79a04754 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,4 +1,2 @@
-'2920',300,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',300,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',300,85100,,'',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_146233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
index c8eea41f..014dd5e6 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,22 +1,12 @@
-'2920',100,82400,,'',0
-'2920',101,82400,4,'',0
-'2922',100,82400,,'',0
-'2922',101,82400,4,'',0
-'2926',100,82400,,'',0
-'2926',101,82400,4,'',0
-'2928',100,82400,,'',0
-'2928',101,82400,4,'',0
-'2920',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',100,82400,,'',0
+'1798',101,82400,4,'',0
+'1803',100,82400,,'',0
+'1803',101,82400,4,'',0
+'1798',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
+'1803',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',500,125200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,95400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'2922',4000,82000,,'',0,51500,,'',0
-'2926',4000,82000,,'',0,51500,,'',0
-'2922',7000,55900,,'',0
-'2926',7000,55900,,'',0
+'1798',4000,82000,,'',0,51500,,'',0
+'1798',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 66e2986f..7477a18c 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,25 +1,13 @@
-'2920',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2920',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
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2928',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
+'1798',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
+'1798',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
+'1803',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1803',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
+'1798',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
+'1803',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
 '2919',501,123500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'2920',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'2922',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'2922',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'2926',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'2926',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'2928',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'2928',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'2922',4001,100600,,'',0,60000,,'',0
-'2926',4001,100600,,'',0,60000,,'',0
-'2922',7001,182200,,'',0
-'2926',7001,182200,,'',0
+'1798',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'1798',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'1803',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'1803',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'1798',4001,100600,,'',0,60000,,'',0
+'1798',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 c047d1f3..e958fb99 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,9 +1,5 @@
-'2920',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,123400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 f68151e5..c19f6ff3 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,16 +1,9 @@
-'2920',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,123200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
+'1798',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
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 d4c81766..d05fd691 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,5 +1,3 @@
+'1798',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
+'1803',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
 '2919',501,122600,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0
-'2920',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
-'2922',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
-'2926',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,2500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,0,'Special',0
-'2928',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,2500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,,'',0,4500,,'',0,5500,0,'Special',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 a6d67a2a..6e6889a2 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,16 +1,8 @@
-'2920',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
-'2920',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',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
-'2928',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'2920',1000,81000,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164900,,'',0
-'2924',1000,164900,,'',0
-'2925',1000,164900,,'',0
-'2926',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164900,,'',0
-'2928',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'1798',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
+'1798',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
+'1803',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
+'1803',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'1579',1000,164900,,'',0
+'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164900,,'',0
+'1803',1000,81000,,'',0,43200,,'',0,40700,,'',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 45c60a4b..d93efe97 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,8 +1,4 @@
-'2920',1001,85000,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172800,,'',0
-'2924',1001,172800,,'',0
-'2925',1001,172800,,'',0
-'2926',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172800,,'',0
-'2928',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172800,,'',0
+'1798',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172800,,'',0
+'1803',1001,85000,,'',0,47100,,'',0,40700,,'',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 45c60a4b..d93efe97 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,8 +1,4 @@
-'2920',1001,85000,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172800,,'',0
-'2924',1001,172800,,'',0
-'2925',1001,172800,,'',0
-'2926',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172800,,'',0
-'2928',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172800,,'',0
+'1798',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172800,,'',0
+'1803',1001,85000,,'',0,47100,,'',0,40700,,'',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 28c8626d..df19a015 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,8 +1,4 @@
-'2920',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2920',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2922',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2926',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2928',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'1798',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'1803',3001,81600,,'',0,21500,,'',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 7d4979da..4a206fd8 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,10 +1,5 @@
-'2920',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2920',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2922',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2926',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'2928',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'1798',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'1798',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'1803',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',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 39a2a9c1..c77f4704 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,16 +1,8 @@
-'2920',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
-'2920',101,81100,,'',0
-'2922',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
-'2922',101,81100,,'',0
-'2926',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
-'2926',101,81100,,'',0
-'2928',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
-'2928',101,81100,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2922',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2926',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'2928',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1798',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
+'1798',101,81100,,'',0
+'1803',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
+'1803',101,81100,,'',0
+'1798',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
+'1803',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
+'1798',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'1803',3000,90600,,'',0,21000,,'',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 1175a9f6..cfdf9f6b 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,5 +1,3 @@
-'2920',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91600,,'',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_146246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
index d79b44b5..882da513 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,5 +1,3 @@
-'2920',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91700,,'',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_146247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
index 7908136e..35d0cf15 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,9 +1,5 @@
-'2920',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
-'2920',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',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
-'2928',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1798',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
+'1803',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
+'1803',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91700,,'',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_146248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
index 9f7a3b09..d1e5cb76 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,4 +1,2 @@
-'2920',101,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',101,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',101,84900,,'',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_146251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
index a1353b51..5346ae5d 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,8 +1,4 @@
-'2920',300,80800,0,'School Spcl',0
-'2922',300,80800,0,'School Spcl',0
-'2926',300,80800,0,'School Spcl',0
-'2928',300,80800,0,'School Spcl',0
-'2920',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'2922',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
-'2926',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
-'2928',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'1798',300,80800,0,'School Spcl',0
+'1803',300,80800,0,'School Spcl',0
+'1798',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
+'1803',400,82500,,'',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 6060f321..57cbdc34 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,8 +1,4 @@
-'2920',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,194600,,'',0,16400,,'',0
-'2922',1501,194600,,'',0,16400,,'',0
-'2926',1501,194600,,'',0,16400,,'',0
-'2928',1501,194600,,'',0,16400,,'',0
+'1798',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
+'1803',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,194600,,'',0,16400,,'',0
+'1803',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 7f1fda4d..5d4fc03a 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,13 +1,7 @@
-'2920',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164800,,'',0
-'2924',1000,164800,,'',0
-'2925',1000,164800,,'',0
-'2926',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164800,,'',0
-'2928',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'1798',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1000,164800,,'',0
+'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164800,,'',0
+'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
 '2919',1601,92300,,'',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_146254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
index e17bde06..75abc046 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,8 +1,4 @@
-'2920',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'2922',7001,183000,,'',0
-'2926',7001,183000,,'',0
+'1798',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 56ca3c82..14ad1209 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,14 +1,8 @@
+'1798',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
+'1803',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
 '2919',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55400,,'',0
-'2926',7000,55400,,'',0
+'1798',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
+'1798',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 d9dcd339..b2a0e68c 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,8 +1,4 @@
-'2920',1000,81100,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65100,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,165000,,'',0
-'2924',1000,165000,,'',0
-'2925',1000,165000,,'',0
-'2926',1000,65100,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,165000,,'',0
-'2928',1000,81100,,'',0,43200,,'',0,40700,,'',0
+'1579',1000,165000,,'',0
+'1798',1000,65100,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,165000,,'',0
+'1803',1000,81100,,'',0,43200,,'',0,40700,,'',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 8cd93631..69200420 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'1798',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
 '2919',1600,90100,,'',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_146258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
index 1370e7a8..63c63a97 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,10 +1,6 @@
+'1798',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
+'1803',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
 '2919',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2928',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,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Special',0
-'2920',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,93500,,'',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_146259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
index 217935e2..3f578204 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,8 +1,4 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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
+'1803',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
+'1798',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91200,,'',0,21000,,'',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 f1b6c108..ac7dd358 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,8 +1,4 @@
-'2920',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,85000,,'',0,25000,,'',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 910e19ac..30b4bcd1 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,8 +1,4 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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
+'1803',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
+'1798',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91300,,'',0,21000,,'',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 2dda832b..dc0b582c 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,8 +1,4 @@
-'2920',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84900,,'',0,21000,,'',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 14997a30..c7275815 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,8 +1,4 @@
-'2920',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84900,,'',0,21000,,'',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 910e19ac..30b4bcd1 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,8 +1,4 @@
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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
+'1803',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
+'1798',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91300,,'',0,21000,,'',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 d3aa1570..b44d0506 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,24 +1,12 @@
-'2920',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',1101,124200,,'',0
-'2923',1101,181500,,'',0
-'2924',1100,183800,,'',0
-'2924',1101,181500,,'',0
-'2925',1101,181500,,'',0
-'2926',1101,124200,,'',0
-'2927',1100,183800,,'',0
-'2927',1101,181500,,'',0
-'2920',1501,194200,,'',0,16400,,'',0
-'2922',1501,194200,,'',0,16400,,'',0
-'2926',1501,194200,,'',0,16400,,'',0
-'2928',1501,194200,,'',0,16400,,'',0
-'2920',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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
+'1803',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1579',1100,183800,,'',0
+'1579',1101,181500,,'',0
+'1798',1101,124200,,'',0
+'1799',1101,181500,,'',0
+'1798',1501,194200,,'',0,16400,,'',0
+'1803',1501,194200,,'',0,16400,,'',0
+'1798',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84700,,'',0,21000,,'',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 1d8de3a8..408478ad 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,15 +1,8 @@
-'2920',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',1600,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 fbce6297..19008db1 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,11 +1,6 @@
-'2920',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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 2693e6d7..2178cc43 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,12 +1,6 @@
-'2920',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2922',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
-'2926',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
-'2928',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'2920',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2922',7001,183400,4,'',0
-'2926',7001,183400,4,'',0
+'1798',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
+'1803',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'1798',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 6a86f442..5902fa0b 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,8 @@
-'2920',300,81200,0,'School Spcl',0
-'2922',300,81200,0,'School Spcl',0
-'2926',300,81200,0,'School Spcl',0
-'2928',300,81200,0,'School Spcl',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2920',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'1798',300,81200,0,'School Spcl',0
+'1803',300,81200,0,'School Spcl',0
+'1798',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
+'1803',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
+'1798',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',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 beb044bf..5042ca94 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,14 +1,8 @@
+'1798',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
+'1803',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
 '2919',501,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55500,,'',0
-'2926',7000,55500,,'',0
+'1798',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
+'1798',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 dbcf4a27..599fa85a 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,8 +1,4 @@
-'2920',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2922',7001,182800,,'',0
-'2926',7001,182800,,'',0
+'1798',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 a2b28bf5..a8bc69d0 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,14 +1,8 @@
+'1798',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
+'1803',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
 '2919',501,123700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55300,,'',0
-'2926',7000,55300,,'',0
+'1798',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
+'1798',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 a843ff40..3e9cbe53 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,8 +1,4 @@
-'2920',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2922',7001,183100,,'',0
-'2926',7001,183100,,'',0
+'1798',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 b410a14e..f51ebf7f 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,4 +1,2 @@
-'2920',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85200,,'',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 b410a14e..f51ebf7f 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,4 +1,2 @@
-'2920',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85200,,'',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 49b81f02..b12e4dcd 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,4 +1,2 @@
-'2920',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75500,,'',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_146278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
index 49b81f02..b12e4dcd 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,4 +1,2 @@
-'2920',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',201,75500,,'',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_146279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
index 20c6b16c..ed1db4b4 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,4 +1,2 @@
-'2920',200,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',200,85300,,'',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 8256f7be..79d080c4 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,8 +1,4 @@
-'2920',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
-'2920',201,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2922',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
-'2926',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
-'2926',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
-'2928',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
-'2928',201,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1798',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
+'1803',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
+'1803',201,75400,,'',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_146281 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
index f58bc931..d18d96ed 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,16 +1,8 @@
-'2920',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
-'2920',1500,201100,,'',0,12400,,'',0
-'2922',1500,201100,,'',0,12400,,'',0
-'2926',1500,201100,,'',0,12400,,'',0
-'2928',1500,201100,,'',0,12400,,'',0
-'2920',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2922',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2926',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'2928',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1798',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
+'1803',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',1500,201100,,'',0,12400,,'',0
+'1803',1500,201100,,'',0,12400,,'',0
+'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'1803',3000,91500,,'',0,21000,,'',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 9e425269..aec69a7b 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,8 +1,4 @@
-'2920',1001,84900,,'',0,47100,,'',0,40700,,'',0
-'2922',1001,72500,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2923',1001,172700,,'',0
-'2924',1001,172700,,'',0
-'2925',1001,172700,,'',0
-'2926',1001,72500,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'2927',1001,172700,,'',0
-'2928',1001,84900,,'',0,47100,,'',0,40700,,'',0
+'1579',1001,172700,,'',0
+'1798',1001,72500,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
+'1799',1001,172700,,'',0
+'1803',1001,84900,,'',0,47100,,'',0,40700,,'',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 8df61bfe..838aa4fa 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,8 +1,4 @@
-'2920',1000,81300,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,65300,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,165200,,'',0
-'2924',1000,165200,,'',0
-'2925',1000,165200,,'',0
-'2926',1000,65300,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,165200,,'',0
-'2928',1000,81300,,'',0,43200,,'',0,40700,,'',0
+'1579',1000,165200,,'',0
+'1798',1000,65300,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,165200,,'',0
+'1803',1000,81300,,'',0,43200,,'',0,40700,,'',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 9948c2fc..bb6cd975 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,4 +1,2 @@
-'2920',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',3001,82000,,'',0,21500,,'',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 880074fd..06eb5984 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,8 +1,4 @@
-'2920',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2920',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2922',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2926',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2928',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'1798',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'1803',3001,82400,,'',0,21500,,'',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 12a05bdb..2cdee29a 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,6 +1,3 @@
-'2920',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
+'1798',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',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 4263cb27..7481fec2 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,8 +1,4 @@
-'2920',3000,113800,,'',0,61000,,'',0
-'2920',3001,83300,,'',0,69000,,'',0
-'2922',3000,113800,,'',0,61000,,'',0
-'2922',3001,73300,,'',0,79000,,'',0
-'2926',3000,113800,,'',0,61000,,'',0
-'2926',3001,73300,,'',0,79000,,'',0
-'2928',3000,113800,,'',0,61000,,'',0
-'2928',3001,83300,,'',0,69000,,'',0
+'1798',3000,113800,,'',0,61000,,'',0
+'1798',3001,73300,,'',0,79000,,'',0
+'1803',3000,113800,,'',0,61000,,'',0
+'1803',3001,83300,,'',0,69000,,'',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 703ea132..0053d843 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,8 +1,4 @@
-'2920',3000,113900,,'',0,61000,,'',0
-'2920',3001,83400,,'',0,69000,,'',0
-'2922',3000,113900,,'',0,61000,,'',0
-'2922',3001,73400,,'',0,79000,,'',0
-'2926',3000,113900,,'',0,61000,,'',0
-'2926',3001,73400,,'',0,79000,,'',0
-'2928',3000,113900,,'',0,61000,,'',0
-'2928',3001,83400,,'',0,69000,,'',0
+'1798',3000,113900,,'',0,61000,,'',0
+'1798',3001,73400,,'',0,79000,,'',0
+'1803',3000,113900,,'',0,61000,,'',0
+'1803',3001,83400,,'',0,69000,,'',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 654cabe0..b6b068d7 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,6 +1,3 @@
-'2920',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2922',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2926',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2928',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'2922',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
-'2926',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'1798',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'1803',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'1798',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 b2487f9e..f026b997 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,8 +1,4 @@
-'2920',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
-'2920',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2922',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
-'2922',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2926',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
-'2926',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'2928',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
-'2928',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1798',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
+'1798',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'1803',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
+'1803',3001,81500,,'',0,21500,,'',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 bc72a758..91676be0 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 @@
-'2922',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
-'2926',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
+'1798',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 c59c103a..ea035cde 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,2 @@
-'2922',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'2926',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'2922',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
-'2926',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
+'1798',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'1798',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 7639912d..ccabb8a4 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,2 @@
-'2922',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
-'2926',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
-'2922',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
-'2926',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
+'1798',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'1798',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 9bdfa408..bcc7e114 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 @@
-'2922',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'2926',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'1798',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 4ea2310f..4b737a9f 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 @@
-'2922',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'2926',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'1798',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 adb147b2..545d9b18 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 @@
-'2922',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
-'2926',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'1798',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 7dd6fb55..5539dbef 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 @@
-'2922',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'2926',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'1798',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 b030d387..c3bf41f9 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 @@
-'2922',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
-'2926',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
+'1798',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 af3ed896..e4ede5c1 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 @@
-'2922',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'2926',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'1798',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 72a329ce..ecfc9f78 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 @@
-'2922',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
-'2926',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
+'1798',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 16674131..da563ade 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 @@
-'2922',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
-'2926',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
+'1798',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 4fb9984f..f3d4c0be 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 @@
-'2922',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 16674131..da563ade 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 @@
-'2922',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
-'2926',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
+'1798',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 86b9c824..0a65f497 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 @@
-'2922',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 90794d7c..b596bf78 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 @@
-'2922',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
-'2926',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
+'1798',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 86b9c824..0a65f497 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 @@
-'2922',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 20493bc6..ce13cd3b 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 @@
-'2922',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 d6c9282d..d4818156 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 @@
-'2922',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
-'2926',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
+'1798',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 18941e75..6b4574cf 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 @@
-'2922',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'1798',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 6e630b2b..696bb1a1 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 @@
-'2922',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
-'2926',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
+'1798',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 8b1f55ad..3e2db8ab 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,2 @@
-'2922',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2922',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'2926',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2926',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'1798',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'1798',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 e557ede0..59e186f1 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,2 @@
-'2922',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2922',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'2926',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2926',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'1798',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'1798',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 6af7c466..a54fe5f7 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,2 @@
-'2922',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2922',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'2926',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2926',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'1798',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'1798',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 e2003cdf..fa328221 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,2 @@
-'2922',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2922',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'2926',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2926',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'1798',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'1798',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 7d27608d..87dae96e 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,2 @@
-'2922',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2922',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'2926',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'2926',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'1798',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'1798',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 08f88145..09e48c90 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,3 @@
-'2922',4000,71500,,'',0,51500,,'',0
-'2922',4001,111500,4,'',0,60000,4,'',0
-'2926',4000,71500,,'',0,51500,,'',0
-'2926',4001,111500,4,'',0,60000,4,'',0
-'2922',4100,71500,4,'',0,51500,4,'',0
-'2926',4100,71500,4,'',0,51500,4,'',0
+'1798',4000,71500,,'',0,51500,,'',0
+'1798',4001,111500,4,'',0,60000,4,'',0
+'1798',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 f5aab19c..91a2a825 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,25 +1,13 @@
-'2920',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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
-'2928',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
+'1798',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
+'1803',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
+'1798',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
+'1803',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
 '2919',500,130300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1000,80400,,'',0,43000,,'',0,40700,,'',0
-'2922',1000,64400,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2923',1000,164100,,'',0
-'2924',1000,164100,,'',0
-'2925',1000,164100,,'',0
-'2926',1000,64400,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'2927',1000,164100,,'',0
-'2928',1000,80400,,'',0,43000,,'',0,40700,,'',0
-'2920',1500,200500,,'',0,12400,,'',0
-'2922',1500,200500,,'',0,12400,,'',0
-'2926',1500,200500,,'',0,12400,,'',0
-'2928',1500,200500,,'',0,12400,,'',0
+'1579',1000,164100,,'',0
+'1798',1000,64400,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
+'1799',1000,164100,,'',0
+'1803',1000,80400,,'',0,43000,,'',0,40700,,'',0
+'1798',1500,200500,,'',0,12400,,'',0
+'1803',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 25334098..694323ef 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,2 @@
-'2922',4000,81000,,'',0,51500,,'',0
-'2922',4001,101600,,'',0,60000,,'',0
-'2926',4000,81000,,'',0,51500,,'',0
-'2926',4001,101600,,'',0,60000,,'',0
+'1798',4000,81000,,'',0,51500,,'',0
+'1798',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 56ca3c82..14ad1209 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,14 +1,8 @@
+'1798',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
+'1803',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
 '2919',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55400,,'',0
-'2926',7000,55400,,'',0
+'1798',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
+'1798',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 3ca45c2c..3167f554 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,4 +1,2 @@
-'2920',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,91400,,'',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 919b6610..a3e0e083 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,4 +1,2 @@
-'2920',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84500,,'',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_146326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
index 9c3f827d..216d5789 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 @@
-'2922',4100,71000,,'',0,51500,,'',0
-'2926',4100,71000,,'',0,51500,,'',0
+'1798',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 660135e0..25e1cefa 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 @@
-'2922',4100,64900,,'',0,55500,,'',0
-'2926',4100,64900,,'',0,55500,,'',0
+'1798',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 f33f966a..c042b441 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 @@
-'2922',4100,64500,,'',0,55500,,'',0
-'2926',4100,64500,,'',0,55500,,'',0
+'1798',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 6fbe7601..877ee607 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 @@
-'2922',4100,70700,,'',0,51500,,'',0
-'2926',4100,70700,,'',0,51500,,'',0
+'1798',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 831ad23b..142c9946 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 @@
-'2922',4100,70500,,'',0,51500,,'',0
-'2926',4100,70500,,'',0,51500,,'',0
+'1798',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 bc438848..977ed718 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 @@
-'2922',4100,70100,,'',0,51500,,'',0
-'2926',4100,70100,,'',0,51500,,'',0
+'1798',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 889cef37..db0586a2 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 @@
-'2922',4100,70000,,'',0,51500,,'',0
-'2926',4100,70000,,'',0,51500,,'',0
+'1798',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 ebafbc2c..66b64770 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 @@
-'2922',1100,95800,,'',0,34700,,'',0
-'2926',1100,95800,,'',0,34700,,'',0
+'1798',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 6df80077..7557a6d4 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,6 +1,3 @@
-'2922',1101,93900,,'',0,30700,,'',0
-'2923',1101,181900,,'',0
-'2924',1101,181900,,'',0
-'2925',1101,181900,,'',0
-'2926',1101,93900,,'',0,30700,,'',0
-'2927',1101,181900,,'',0
+'1579',1101,181900,,'',0
+'1798',1101,93900,,'',0,30700,,'',0
+'1799',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 fa9f584a..85c3c49f 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,6 +1,3 @@
-'2922',1101,94000,,'',0,30700,,'',0
-'2923',1101,182000,,'',0
-'2924',1101,182000,,'',0
-'2925',1101,182000,,'',0
-'2926',1101,94000,,'',0,30700,,'',0
-'2927',1101,182000,,'',0
+'1579',1101,182000,,'',0
+'1798',1101,94000,,'',0,30700,,'',0
+'1799',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 a7fe2c16..a13b20aa 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,12 +1,6 @@
-'2922',1100,94200,,'',0,30700,,'',0
-'2922',1101,94200,4,'',0,30700,4,'',0
-'2923',1100,182200,,'',0
-'2923',1101,182200,4,'',0
-'2924',1100,182200,,'',0
-'2924',1101,182200,4,'',0
-'2925',1100,182200,,'',0
-'2925',1101,182200,4,'',0
-'2926',1100,94200,,'',0,30700,,'',0
-'2926',1101,94200,4,'',0,30700,4,'',0
-'2927',1100,182200,,'',0
-'2927',1101,182200,4,'',0
+'1579',1100,182200,,'',0
+'1579',1101,182200,4,'',0
+'1798',1100,94200,,'',0,30700,,'',0
+'1798',1101,94200,4,'',0,30700,4,'',0
+'1799',1100,182200,,'',0
+'1799',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 512d6ed1..4b0ca190 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,6 +1,3 @@
-'2922',1100,94600,,'',0,30700,,'',0
-'2923',1100,182600,,'',0
-'2924',1100,182600,,'',0
-'2925',1100,182600,,'',0
-'2926',1100,94600,,'',0,30700,,'',0
-'2927',1100,182600,,'',0
+'1579',1100,182600,,'',0
+'1798',1100,94600,,'',0,30700,,'',0
+'1799',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 cb852d53..1e581fc1 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,6 +1,3 @@
-'2922',1100,94800,,'',0,30700,,'',0
-'2923',1100,182800,,'',0
-'2924',1100,182800,,'',0
-'2925',1100,182800,,'',0
-'2926',1100,94800,,'',0,30700,,'',0
-'2927',1100,182800,,'',0
+'1579',1100,182800,,'',0
+'1798',1100,94800,,'',0,30700,,'',0
+'1799',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 b9418fa1..8563cd6d 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,6 +1,3 @@
-'2922',1100,94900,,'',0,30700,,'',0
-'2923',1100,182900,,'',0
-'2924',1100,182900,,'',0
-'2925',1100,182900,,'',0
-'2926',1100,94900,,'',0,30700,,'',0
-'2927',1100,182900,,'',0
+'1579',1100,182900,,'',0
+'1798',1100,94900,,'',0,30700,,'',0
+'1799',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 b9418fa1..8563cd6d 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,6 +1,3 @@
-'2922',1100,94900,,'',0,30700,,'',0
-'2923',1100,182900,,'',0
-'2924',1100,182900,,'',0
-'2925',1100,182900,,'',0
-'2926',1100,94900,,'',0,30700,,'',0
-'2927',1100,182900,,'',0
+'1579',1100,182900,,'',0
+'1798',1100,94900,,'',0,30700,,'',0
+'1799',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 1b09fc8d..7c0eadf2 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,6 +1,3 @@
-'2922',1100,95100,,'',0,30700,,'',0
-'2923',1100,183100,,'',0
-'2924',1100,183100,,'',0
-'2925',1100,183100,,'',0
-'2926',1100,95100,,'',0,30700,,'',0
-'2927',1100,183100,,'',0
+'1579',1100,183100,,'',0
+'1798',1100,95100,,'',0,30700,,'',0
+'1799',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 5145910e..1fa00944 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,13 +1,7 @@
-'2920',101,81900,,'',0
-'2922',101,81900,,'',0
-'2926',101,81900,,'',0
-'2928',101,81900,,'',0
-'2920',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2922',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2926',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'2928',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1798',101,81900,,'',0
+'1803',101,81900,,'',0
+'1798',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'1803',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
 '2919',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2922',7000,55200,,'',0
-'2926',7000,55200,,'',0
+'1798',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
+'1798',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 fcd0574c..3b4024b1 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,3 @@
-'2922',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'2926',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'2922',4000,80000,,'',0,51500,,'',0
-'2922',4001,102600,,'',0,60000,,'',0
-'2926',4000,80000,,'',0,51500,,'',0
-'2926',4001,102600,,'',0,60000,,'',0
+'1798',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'1798',4000,80000,,'',0,51500,,'',0
+'1798',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 2d2a40f0..4f99e504 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 @@
-'2922',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
-'2926',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
+'1798',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 ada4ae19..05eabb89 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 @@
-'2922',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'2926',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'1798',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 56e48861..4831ae96 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 @@
-'2922',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
-'2926',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'1798',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 23ae516c..00b5ef96 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 @@
-'2922',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'2926',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'1798',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 775de8fb..6c8eaf61 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 @@
-'2922',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
-'2926',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
+'1798',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 a136a2c8..47e233a1 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 @@
-'2922',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'2926',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'1798',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 a63ba0bc..fa9b797a 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 @@
-'2922',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'2926',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'1798',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 3c535d9e..39e6a705 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 @@
-'2922',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'2926',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'1798',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 b42875d4..c254cc3a 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 @@
-'2922',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
-'2926',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'1798',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 9e8ef764..76791a3e 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 @@
-'2922',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
-'2926',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
+'1798',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 f3d78a21..288e03f8 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 @@
-'2922',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
-'2926',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
+'1798',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 f70d78e1..f2328350 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,125600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',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 1ef454c9..0d59253e 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,9 +1,5 @@
-'2920',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',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
+'1803',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
 '2919',501,123300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 206dd96e..3032e163 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,11 +1,6 @@
+'1798',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
+'1803',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
 '2919',500,125700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2926',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2928',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'2922',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'2926',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'1798',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'1803',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'1798',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',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 7e5294da..380de22e 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,5 +1,3 @@
+'1798',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
+'1803',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
 '2919',500,125400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',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
-'2922',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
-'2926',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',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,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146364 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146364
deleted file mode 100644
index bbded0a4..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146364
+++ /dev/null
@@ -1,2 +0,0 @@
-'2926',500,194100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',500,194100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',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 e96f7d23..81cc0f92 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,8 +1,4 @@
-'2920',1000,80900,,'',0,43200,,'',0,40700,,'',0
-'2922',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2923',1000,164800,,'',0
-'2924',1000,164800,,'',0
-'2925',1000,164800,,'',0
-'2926',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'2927',1000,164800,,'',0
-'2928',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'1579',1000,164800,,'',0
+'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
+'1799',1000,164800,,'',0
+'1803',1000,80900,,'',0,43200,,'',0,40700,,'',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 4f7e3945..5072ae5d 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,15 +1,8 @@
-'2920',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',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
-'2926',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
-'2928',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2926',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2928',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2920',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'2922',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'2926',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
-'2928',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'1798',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
+'1803',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'1803',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
 '2919',1600,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2922',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
-'2926',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
+'1798',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 3b73d1ca..ae29adef 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,8 +1,4 @@
-'2924',1100,183600,,'',0
-'2927',1100,183600,,'',0
-'2920',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1579',1100,183600,,'',0
+'1798',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 6d5c3bee..b5456707 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,8 +1,4 @@
-'2924',1100,183700,,'',0
-'2927',1100,183700,,'',0
-'2920',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2926',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2928',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'2922',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
-'2926',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
+'1579',1100,183700,,'',0
+'1798',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1803',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'1798',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 a5ce3f78..ba3b81c8 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,4 +1,2 @@
-'2920',300,81700,0,'School Spcl',0
-'2922',300,81700,0,'School Spcl',0
-'2926',300,81700,0,'School Spcl',0
-'2928',300,81700,0,'School Spcl',0
+'1798',300,81700,0,'School Spcl',0
+'1803',300,81700,0,'School Spcl',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 96c3bdc8..15caa2b1 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 @@
-'2922',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
-'2926',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
+'1798',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 2ff6fc02..101fa4c4 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 @@
-'2922',4000,73300,,'',0,51500,,'',0
-'2926',4000,73300,,'',0,51500,,'',0
+'1798',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 9b74342c..1b6d12c8 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 @@
-'2922',4001,105000,,'',0,60000,,'',0
-'2926',4001,105000,,'',0,60000,,'',0
+'1798',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 b095bc3c..6ce67b37 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,2 @@
-'2922',4000,73800,,'',0,51500,,'',0
-'2922',4001,104600,,'',0,60000,,'',0
-'2926',4000,73800,,'',0,51500,,'',0
-'2926',4001,104600,,'',0,60000,,'',0
+'1798',4000,73800,,'',0,51500,,'',0
+'1798',4001,104600,,'',0,60000,,'',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 e06af737..b3d2320e 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
@@ -6,6 +6,6 @@
     <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_max_lng">-119.44801</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1722182400</integer><!-- 2024/07/28 09:00:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1723392000</integer><!-- 2024/08/11 09:00:00 PDT -->
     <integer name="current_gtfs_rts_last_departure_in_sec">1725328800</integer><!-- 2024/09/02 19:00:00 PDT -->
 </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 3fdce4db..16ae04a5 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">20240730</integer>
+    <integer name="gtfs_rts_db_version">20240813</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>