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 d22ec7c1..3935c7e5 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 August 31, 2024 to November 30, 2024.
+Schedule from October 15, 2024 to January 5, 2025.
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 6769256a..f706653a 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,362 +1,252 @@
-'2375',20240831,1
-'3132',20240903,1
-'3201',20240903,1
-'3202',20240903,1
-'3203',20240903,1
-'3204',20240903,1
-'3205',20240903,1
-'3206',20240903,1
-'3207',20240903,1
-'3132',20240904,1
-'3201',20240904,1
-'3202',20240904,1
-'3203',20240904,1
-'3208',20240904,1
-'3209',20240904,1
-'3132',20240905,1
-'3201',20240905,1
-'3202',20240905,1
-'3204',20240905,1
-'3205',20240905,1
-'3210',20240905,1
-'3132',20240906,1
-'3204',20240906,1
-'3206',20240906,1
-'3211',20240906,1
-'2375',20240907,1
-'3132',20240909,1
-'3201',20240909,1
-'3208',20240909,1
-'3212',20240909,1
-'3132',20240910,1
-'3201',20240910,1
-'3202',20240910,1
-'3203',20240910,1
-'3204',20240910,1
-'3205',20240910,1
-'3206',20240910,1
-'3207',20240910,1
-'3132',20240911,1
-'3201',20240911,1
-'3202',20240911,1
-'3203',20240911,1
-'3208',20240911,1
-'3209',20240911,1
-'3132',20240912,1
-'3201',20240912,1
-'3202',20240912,1
-'3204',20240912,1
-'3205',20240912,1
-'3210',20240912,1
-'3132',20240913,1
-'3204',20240913,1
-'3206',20240913,1
-'3211',20240913,1
-'2375',20240914,1
-'3132',20240916,1
-'3201',20240916,1
-'3208',20240916,1
-'3212',20240916,1
-'3132',20240917,1
-'3201',20240917,1
-'3202',20240917,1
-'3203',20240917,1
-'3204',20240917,1
-'3205',20240917,1
-'3206',20240917,1
-'3207',20240917,1
-'3132',20240918,1
-'3201',20240918,1
-'3202',20240918,1
-'3203',20240918,1
-'3208',20240918,1
-'3209',20240918,1
-'3132',20240919,1
-'3201',20240919,1
-'3202',20240919,1
-'3204',20240919,1
-'3205',20240919,1
-'3210',20240919,1
-'3132',20240920,1
-'3204',20240920,1
-'3206',20240920,1
-'3211',20240920,1
-'2375',20240921,1
-'3132',20240923,1
-'3201',20240923,1
-'3208',20240923,1
-'3212',20240923,1
-'3132',20240924,1
-'3201',20240924,1
-'3202',20240924,1
-'3203',20240924,1
-'3204',20240924,1
-'3205',20240924,1
-'3206',20240924,1
-'3207',20240924,1
-'3132',20240925,1
-'3201',20240925,1
-'3202',20240925,1
-'3203',20240925,1
-'3208',20240925,1
-'3209',20240925,1
-'3132',20240926,1
-'3201',20240926,1
-'3202',20240926,1
-'3204',20240926,1
-'3205',20240926,1
-'3210',20240926,1
-'3132',20240927,1
-'3204',20240927,1
-'3206',20240927,1
-'3211',20240927,1
-'2375',20240928,1
-'3132',20241001,1
-'3201',20241001,1
-'3202',20241001,1
-'3203',20241001,1
-'3204',20241001,1
-'3205',20241001,1
-'3206',20241001,1
-'3207',20241001,1
-'3132',20241002,1
-'3201',20241002,1
-'3202',20241002,1
-'3203',20241002,1
-'3208',20241002,1
-'3209',20241002,1
-'3132',20241003,1
-'3201',20241003,1
-'3202',20241003,1
-'3204',20241003,1
-'3205',20241003,1
-'3210',20241003,1
-'3132',20241004,1
-'3204',20241004,1
-'3206',20241004,1
-'3211',20241004,1
-'2375',20241005,1
-'3132',20241007,1
-'3201',20241007,1
-'3208',20241007,1
-'3212',20241007,1
-'3132',20241008,1
-'3201',20241008,1
-'3202',20241008,1
-'3203',20241008,1
-'3204',20241008,1
-'3205',20241008,1
-'3206',20241008,1
-'3207',20241008,1
-'3132',20241009,1
-'3201',20241009,1
-'3202',20241009,1
-'3203',20241009,1
-'3208',20241009,1
-'3209',20241009,1
-'3132',20241010,1
-'3201',20241010,1
-'3202',20241010,1
-'3204',20241010,1
-'3205',20241010,1
-'3210',20241010,1
-'3132',20241011,1
-'3204',20241011,1
-'3206',20241011,1
-'3211',20241011,1
-'2375',20241012,1
-'3132',20241015,1
-'3201',20241015,1
-'3202',20241015,1
-'3203',20241015,1
-'3204',20241015,1
-'3205',20241015,1
-'3206',20241015,1
-'3207',20241015,1
-'3132',20241016,1
-'3201',20241016,1
-'3202',20241016,1
-'3203',20241016,1
-'3208',20241016,1
-'3209',20241016,1
-'3132',20241017,1
-'3201',20241017,1
-'3202',20241017,1
-'3204',20241017,1
-'3205',20241017,1
-'3210',20241017,1
-'3132',20241018,1
-'3204',20241018,1
-'3206',20241018,1
-'3211',20241018,1
-'2375',20241019,1
-'3132',20241021,1
-'3201',20241021,1
-'3208',20241021,1
-'3212',20241021,1
-'3132',20241022,1
-'3201',20241022,1
-'3202',20241022,1
-'3203',20241022,1
-'3204',20241022,1
-'3205',20241022,1
-'3206',20241022,1
-'3207',20241022,1
-'3132',20241023,1
-'3201',20241023,1
-'3202',20241023,1
-'3203',20241023,1
-'3208',20241023,1
-'3209',20241023,1
-'3132',20241024,1
-'3201',20241024,1
-'3202',20241024,1
-'3204',20241024,1
-'3205',20241024,1
-'3210',20241024,1
-'3132',20241025,1
-'3204',20241025,1
-'3206',20241025,1
-'3211',20241025,1
-'2375',20241026,1
-'3132',20241028,1
-'3201',20241028,1
-'3208',20241028,1
-'3212',20241028,1
-'3132',20241029,1
-'3201',20241029,1
-'3202',20241029,1
-'3203',20241029,1
-'3204',20241029,1
-'3205',20241029,1
-'3206',20241029,1
-'3207',20241029,1
-'3132',20241030,1
-'3201',20241030,1
-'3202',20241030,1
-'3203',20241030,1
-'3208',20241030,1
-'3209',20241030,1
-'3132',20241031,1
-'3201',20241031,1
-'3202',20241031,1
-'3204',20241031,1
-'3205',20241031,1
-'3210',20241031,1
-'3132',20241101,1
-'3204',20241101,1
-'3206',20241101,1
-'3211',20241101,1
-'2375',20241102,1
-'3132',20241104,1
-'3201',20241104,1
-'3208',20241104,1
-'3212',20241104,1
-'3132',20241105,1
-'3201',20241105,1
-'3202',20241105,1
-'3203',20241105,1
-'3204',20241105,1
-'3205',20241105,1
-'3206',20241105,1
-'3207',20241105,1
-'3132',20241106,1
-'3201',20241106,1
-'3202',20241106,1
-'3203',20241106,1
-'3208',20241106,1
-'3209',20241106,1
-'3132',20241107,1
-'3201',20241107,1
-'3202',20241107,1
-'3204',20241107,1
-'3205',20241107,1
-'3210',20241107,1
-'3132',20241108,1
-'3204',20241108,1
-'3206',20241108,1
-'3211',20241108,1
-'2375',20241109,1
-'3132',20241112,1
-'3201',20241112,1
-'3202',20241112,1
-'3203',20241112,1
-'3204',20241112,1
-'3205',20241112,1
-'3206',20241112,1
-'3207',20241112,1
-'3132',20241113,1
-'3201',20241113,1
-'3202',20241113,1
-'3203',20241113,1
-'3208',20241113,1
-'3209',20241113,1
-'3132',20241114,1
-'3201',20241114,1
-'3202',20241114,1
-'3204',20241114,1
-'3205',20241114,1
-'3210',20241114,1
-'3132',20241115,1
-'3204',20241115,1
-'3206',20241115,1
-'3211',20241115,1
-'2375',20241116,1
-'3132',20241118,1
-'3201',20241118,1
-'3208',20241118,1
-'3212',20241118,1
-'3132',20241119,1
-'3201',20241119,1
-'3202',20241119,1
-'3203',20241119,1
-'3204',20241119,1
-'3205',20241119,1
-'3206',20241119,1
-'3207',20241119,1
-'3132',20241120,1
-'3201',20241120,1
-'3202',20241120,1
-'3203',20241120,1
-'3208',20241120,1
-'3209',20241120,1
-'3132',20241121,1
-'3201',20241121,1
-'3202',20241121,1
-'3204',20241121,1
-'3205',20241121,1
-'3210',20241121,1
-'3132',20241122,1
-'3204',20241122,1
-'3206',20241122,1
-'3211',20241122,1
-'2375',20241123,1
-'3132',20241125,1
-'3201',20241125,1
-'3208',20241125,1
-'3212',20241125,1
-'3132',20241126,1
-'3201',20241126,1
-'3202',20241126,1
-'3203',20241126,1
-'3204',20241126,1
-'3205',20241126,1
-'3206',20241126,1
-'3207',20241126,1
-'3132',20241127,1
-'3201',20241127,1
-'3202',20241127,1
-'3203',20241127,1
-'3208',20241127,1
-'3209',20241127,1
-'3132',20241128,1
-'3201',20241128,1
-'3202',20241128,1
-'3204',20241128,1
-'3205',20241128,1
-'3210',20241128,1
-'3132',20241129,1
-'3204',20241129,1
-'3206',20241129,1
-'3211',20241129,1
-'2375',20241130,1
+'3563',20241015,1
+'3564',20241015,1
+'3565',20241015,1
+'3566',20241015,1
+'3567',20241015,1
+'3568',20241015,1
+'3569',20241015,1
+'3570',20241015,1
+'3563',20241016,1
+'3564',20241016,1
+'3565',20241016,1
+'3566',20241016,1
+'3571',20241016,1
+'3572',20241016,1
+'3563',20241017,1
+'3564',20241017,1
+'3565',20241017,1
+'3567',20241017,1
+'3568',20241017,1
+'3573',20241017,1
+'3563',20241018,1
+'3567',20241018,1
+'3569',20241018,1
+'3574',20241018,1
+'3343',20241019,1
+'3563',20241021,1
+'3564',20241021,1
+'3571',20241021,1
+'3575',20241021,1
+'3563',20241022,1
+'3564',20241022,1
+'3565',20241022,1
+'3566',20241022,1
+'3567',20241022,1
+'3568',20241022,1
+'3569',20241022,1
+'3570',20241022,1
+'3563',20241023,1
+'3564',20241023,1
+'3565',20241023,1
+'3566',20241023,1
+'3571',20241023,1
+'3572',20241023,1
+'3563',20241024,1
+'3564',20241024,1
+'3565',20241024,1
+'3567',20241024,1
+'3568',20241024,1
+'3573',20241024,1
+'3563',20241025,1
+'3567',20241025,1
+'3569',20241025,1
+'3574',20241025,1
+'3343',20241026,1
+'3563',20241028,1
+'3564',20241028,1
+'3571',20241028,1
+'3575',20241028,1
+'3563',20241029,1
+'3564',20241029,1
+'3565',20241029,1
+'3566',20241029,1
+'3567',20241029,1
+'3568',20241029,1
+'3569',20241029,1
+'3570',20241029,1
+'3563',20241030,1
+'3564',20241030,1
+'3565',20241030,1
+'3566',20241030,1
+'3571',20241030,1
+'3572',20241030,1
+'3563',20241031,1
+'3564',20241031,1
+'3565',20241031,1
+'3567',20241031,1
+'3568',20241031,1
+'3573',20241031,1
+'3563',20241101,1
+'3567',20241101,1
+'3569',20241101,1
+'3574',20241101,1
+'3343',20241102,1
+'3563',20241104,1
+'3564',20241104,1
+'3571',20241104,1
+'3575',20241104,1
+'3563',20241105,1
+'3564',20241105,1
+'3565',20241105,1
+'3566',20241105,1
+'3567',20241105,1
+'3568',20241105,1
+'3569',20241105,1
+'3570',20241105,1
+'3563',20241106,1
+'3564',20241106,1
+'3565',20241106,1
+'3566',20241106,1
+'3571',20241106,1
+'3572',20241106,1
+'3563',20241107,1
+'3564',20241107,1
+'3565',20241107,1
+'3567',20241107,1
+'3568',20241107,1
+'3573',20241107,1
+'3563',20241108,1
+'3567',20241108,1
+'3569',20241108,1
+'3574',20241108,1
+'3343',20241109,1
+'3563',20241112,1
+'3564',20241112,1
+'3565',20241112,1
+'3566',20241112,1
+'3567',20241112,1
+'3568',20241112,1
+'3569',20241112,1
+'3570',20241112,1
+'3563',20241113,1
+'3564',20241113,1
+'3565',20241113,1
+'3566',20241113,1
+'3571',20241113,1
+'3572',20241113,1
+'3563',20241114,1
+'3564',20241114,1
+'3565',20241114,1
+'3567',20241114,1
+'3568',20241114,1
+'3573',20241114,1
+'3563',20241115,1
+'3567',20241115,1
+'3569',20241115,1
+'3574',20241115,1
+'3343',20241116,1
+'3563',20241118,1
+'3564',20241118,1
+'3571',20241118,1
+'3575',20241118,1
+'3563',20241119,1
+'3564',20241119,1
+'3565',20241119,1
+'3566',20241119,1
+'3567',20241119,1
+'3568',20241119,1
+'3569',20241119,1
+'3570',20241119,1
+'3563',20241120,1
+'3564',20241120,1
+'3565',20241120,1
+'3566',20241120,1
+'3571',20241120,1
+'3572',20241120,1
+'3563',20241121,1
+'3564',20241121,1
+'3565',20241121,1
+'3567',20241121,1
+'3568',20241121,1
+'3573',20241121,1
+'3563',20241122,1
+'3567',20241122,1
+'3569',20241122,1
+'3574',20241122,1
+'3343',20241123,1
+'3563',20241125,1
+'3564',20241125,1
+'3571',20241125,1
+'3575',20241125,1
+'3563',20241126,1
+'3564',20241126,1
+'3565',20241126,1
+'3566',20241126,1
+'3567',20241126,1
+'3568',20241126,1
+'3569',20241126,1
+'3570',20241126,1
+'3563',20241127,1
+'3564',20241127,1
+'3565',20241127,1
+'3566',20241127,1
+'3571',20241127,1
+'3572',20241127,1
+'3563',20241128,1
+'3564',20241128,1
+'3565',20241128,1
+'3567',20241128,1
+'3568',20241128,1
+'3573',20241128,1
+'3563',20241129,1
+'3567',20241129,1
+'3569',20241129,1
+'3574',20241129,1
+'3343',20241130,1
+'3563',20241202,1
+'3564',20241202,1
+'3571',20241202,1
+'3575',20241202,1
+'3563',20241203,1
+'3564',20241203,1
+'3565',20241203,1
+'3566',20241203,1
+'3567',20241203,1
+'3568',20241203,1
+'3569',20241203,1
+'3570',20241203,1
+'3563',20241204,1
+'3564',20241204,1
+'3565',20241204,1
+'3566',20241204,1
+'3571',20241204,1
+'3572',20241204,1
+'3563',20241205,1
+'3564',20241205,1
+'3565',20241205,1
+'3567',20241205,1
+'3568',20241205,1
+'3573',20241205,1
+'3563',20241206,1
+'3567',20241206,1
+'3569',20241206,1
+'3574',20241206,1
+'3343',20241207,1
+'3563',20241209,1
+'3564',20241209,1
+'3571',20241209,1
+'3575',20241209,1
+'3563',20241210,1
+'3564',20241210,1
+'3565',20241210,1
+'3566',20241210,1
+'3567',20241210,1
+'3568',20241210,1
+'3569',20241210,1
+'3570',20241210,1
+'3563',20241211,1
+'3564',20241211,1
+'3565',20241211,1
+'3566',20241211,1
+'3571',20241211,1
+'3572',20241211,1
+'3563',20241212,1
+'3564',20241212,1
+'3565',20241212,1
+'3567',20241212,1
+'3568',20241212,1
+'3573',20241212,1
+'3563',20241213,1
+'3567',20241213,1
+'3569',20241213,1
+'3574',20241213,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160000
index 39ede6cc..3f89a02d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160000
@@ -1,3 +1,3 @@
-'2375',9800,90600,,'',0,34400,,'',0,47800,,'',0
-'3132',9800,61900,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,184600,,'',0
+'3343',9800,90600,,'',0,34400,,'',0,47800,,'',0
+'3563',9800,61900,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,184600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160001
index f81cf787..0d193389 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160001
@@ -1,3 +1,3 @@
-'2375',9801,95600,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,71100,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,193400,,'',0
+'3343',9801,95600,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,71100,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,193400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160002
index 2eff87d6..1266d7f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160002
@@ -1,8 +1,8 @@
-'2375',3300,112200,,'',0,32500,,'',0,15900,,'',0
-'3132',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
-'3132',3301,73500,4,'',0,80300,4,'',0
-'3132',3601,74500,,'',0,79300,0,'Selkirk Coll',0,6900,4,'',0
-'2375',9900,93600,,'',0,38400,,'',0,43900,,'',0
-'2375',9901,92700,4,'',0,38400,4,'',0,43600,4,'',0
-'3132',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
-'3132',9901,63900,4,'',0,9200,4,'',0,11400,4,'',0,17900,4,'',0,22200,4,'',0,30800,4,'',0,14600,4,'',0,4600,4,'',0
+'3343',3300,112200,,'',0,32500,,'',0,15900,,'',0
+'3563',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3563',3301,73500,4,'',0,80300,4,'',0
+'3563',3601,74500,,'',0,79300,0,'Selkirk Coll',0,6900,4,'',0
+'3343',9900,93600,,'',0,38400,,'',0,43900,,'',0
+'3343',9901,92700,4,'',0,38400,4,'',0,43600,4,'',0
+'3563',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
+'3563',9901,63900,4,'',0,9200,4,'',0,11400,4,'',0,17900,4,'',0,22200,4,'',0,30800,4,'',0,14600,4,'',0,4600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160003
index 19052d97..1a43566d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160003
@@ -1,3 +1,3 @@
-'2375',9800,90700,,'',0,34400,,'',0,47800,,'',0
-'3132',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,184700,,'',0
+'3343',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3563',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,184700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160004
index ac8ff58d..2f57c3bb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160004
@@ -1,3 +1,3 @@
-'2375',9801,95500,,'',0,38500,,'',0,47700,,'',0
-'3132',9801,71000,,'',0,9100,,'',0,25000,,'',0,26600,,'',0,31800,,'',0,18200,,'',0
-'3211',9801,193300,,'',0
+'3343',9801,95500,,'',0,38500,,'',0,47700,,'',0
+'3563',9801,71000,,'',0,9100,,'',0,25000,,'',0,26600,,'',0,31800,,'',0,18200,,'',0
+'3574',9801,193300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160005
index 19052d97..1a43566d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160005
@@ -1,3 +1,3 @@
-'2375',9800,90700,,'',0,34400,,'',0,47800,,'',0
-'3132',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,184700,,'',0
+'3343',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3563',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,184700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160006
index 8d2ef4b1..d9511a73 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160006
@@ -1,3 +1,3 @@
-'2375',9801,95500,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,193300,,'',0
+'3343',9801,95500,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,193300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160007
index 19052d97..1a43566d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160007
@@ -1,3 +1,3 @@
-'2375',9800,90700,,'',0,34400,,'',0,47800,,'',0
-'3132',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,184700,,'',0
+'3343',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3563',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,184700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160008
index 8d2ef4b1..d9511a73 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160008
@@ -1,3 +1,3 @@
-'2375',9801,95500,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,193300,,'',0
+'3343',9801,95500,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,193300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160009
index d7546e06..fc0e4472 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160009
@@ -1,3 +1,3 @@
-'2375',9800,91800,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185800,,'',0
+'3343',9800,91800,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160010
index dcd449d5..0f07f19f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160010
@@ -1,5 +1,5 @@
-'2375',3400,91900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,65800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
-'2375',9801,94400,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192200,,'',0
+'3343',3400,91900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,65800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',9801,94400,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160011
index d7546e06..fc0e4472 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160011
@@ -1,3 +1,3 @@
-'2375',9800,91800,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185800,,'',0
+'3343',9800,91800,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160012
index 6792cdd8..23917486 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160012
@@ -1 +1 @@
-'3132',4500,60900,,'',0,3000,,'',0,200,,'',0,88300,,'',0
+'3563',4500,60900,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160013
index 33519ce9..8f05cd54 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160013
@@ -1,2 +1,2 @@
-'2375',200,105000,,'',0,27500,,'',0,31400,,'',0
-'3132',200,104500,,'',0,17000,,'',0,20100,,'',0,20600,,'',0
+'3343',200,105000,,'',0,27500,,'',0,31400,,'',0
+'3563',200,104500,,'',0,17000,,'',0,20100,,'',0,20600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160014
index 937e9dbf..75ee6ef0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160014
@@ -1 +1 @@
-'3132',200,82800,0,'Fairview -',0
+'3563',200,82800,0,'Fairview -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160015
index cfbe221a..b3ad2940 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160015
@@ -1,4 +1,4 @@
-'2375',3101,95200,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,82300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3201,73000,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'3206',3800,100200,,'',0,41000,,'',0
+'3343',3101,95200,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,82300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3201,73000,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3569',3800,100200,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160016
index 45613d13..4aeb5c94 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160016
@@ -1,3 +1,3 @@
-'2375',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3200,81100,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3343',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3200,81100,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160017
index 6b78a89b..461b65a6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160017
@@ -1,3 +1,3 @@
-'2375',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3343',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160018
index 31a2901d..c70d6ae9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160018
@@ -1,3 +1,3 @@
-'2375',9800,91700,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,63000,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185700,,'',0
+'3343',9800,91700,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,63000,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160019
index 68c916bc..9f9c287f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160019
@@ -1,3 +1,3 @@
-'2375',9801,94500,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,70000,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192300,,'',0
+'3343',9801,94500,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,70000,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160020
index 75c4fd93..3129e58a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160020
@@ -1,2 +1,2 @@
-'2375',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
+'3343',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160021
index 98eb7e0f..0449b372 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160021
@@ -1,3 +1,3 @@
-'2375',4600,82400,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,80300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205500,,'',0
+'3343',4600,82400,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,80300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160023
index a20979ac..1046f935 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160023
@@ -1,3 +1,3 @@
-'2375',4301,82200,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,18400,0,'Trail',0,12600,0,'Trail',0,11800,4,'',0
-'3132',4301,62400,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,220600,4,'',0
+'3343',4301,82200,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,18400,0,'Trail',0,12600,0,'Trail',0,11800,4,'',0
+'3563',4301,62400,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,220600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160024
index 3ec01159..ea0ce82a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160024
@@ -1,2 +1,2 @@
-'2375',4101,85700,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4101,85700,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160025
index 13e7f58e..a9e37fcf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160025
@@ -1,9 +1,9 @@
-'2375',4101,90200,,'',0,34700,,'',0,30600,,'',0
-'3132',4101,80000,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
-'3132',4500,62300,,'',0,3000,,'',0,200,,'',0,87600,,'',0
-'2375',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,4,'',0
-'3132',4600,82000,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
-'3211',4600,211100,,'',0
-'2375',9801,101100,,'',0,34500,,'',0,47700,,'',0
-'3132',9801,72600,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
-'3211',9801,194900,,'',0
+'3343',4101,90200,,'',0,34700,,'',0,30600,,'',0
+'3563',4101,80000,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3563',4500,62300,,'',0,3000,,'',0,200,,'',0,87600,,'',0
+'3343',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,4,'',0
+'3563',4600,82000,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3574',4600,211100,,'',0
+'3343',9801,101100,,'',0,34500,,'',0,47700,,'',0
+'3563',9801,72600,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3574',9801,194900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160026
index 2f002a86..19560ad7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160026
@@ -1,2 +1,2 @@
-'3204',101,73400,0,'LVR Express -',0
-'3208',101,73400,0,'LVR Express -',0
+'3567',101,73400,0,'LVR Express -',0
+'3571',101,73400,0,'LVR Express -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160027
index a1d2dea3..0ba35f25 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160027
@@ -1,2 +1,2 @@
-'2375',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160028
index d4af1585..a24b5b2f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160028
@@ -1,2 +1,2 @@
-'2375',3400,93000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
+'3343',3400,93000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160029 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160029
index af7072fa..385225eb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160029
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160029
@@ -1,2 +1,2 @@
-'2375',4300,75700,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,60100,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75700,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,60100,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160030
index 945c2446..f641d404 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160030
@@ -1 +1 @@
-'3132',4500,61800,,'',0,3000,,'',0,200,,'',0,86600,,'',0
+'3563',4500,61800,,'',0,3000,,'',0,200,,'',0,86600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160031
index e810c37a..b7aa5532 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160031
@@ -1,5 +1,5 @@
-'2375',4300,80400,4,'',0,14100,4,'',0,20100,4,'',0,31000,4,'',0,18400,4,'',0,16600,4,'',0,12700,4,'',0
-'2375',4301,80600,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
-'3132',4300,60800,4,'',0,9400,4,'',0,4400,4,'',0,15900,4,'',0,14900,4,'',0,25200,4,'',0,12800,4,'',0,16800,4,'',0,2700,4,'',0,17300,4,'',0,12800,4,'',0
-'3132',4301,60800,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,215500,0,'Waneta Only',0
+'3343',4300,80400,4,'',0,14100,4,'',0,20100,4,'',0,31000,4,'',0,18400,4,'',0,16600,4,'',0,12700,4,'',0
+'3343',4301,80600,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3563',4300,60800,4,'',0,9400,4,'',0,4400,4,'',0,15900,4,'',0,14900,4,'',0,25200,4,'',0,12800,4,'',0,16800,4,'',0,2700,4,'',0,17300,4,'',0,12800,4,'',0
+'3563',4301,60800,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,215500,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160032
index 9dccaa3e..99bba898 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160032
@@ -1,5 +1,5 @@
-'2375',4300,91900,,'',0,20100,,'',0,20300,4,'',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'2375',4301,81900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4300,72000,0,'Fruitvale',0,8200,4,'',0,3700,0,'Fruitvale',0,7900,4,'',0,11000,,'',0,11200,4,'',0,10000,,'',0,16800,,'',0,1800,4,'',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3132',4301,62100,0,'Trail',0,9400,0,'Trail',0,400,,'',0,4000,0,'Trail',0,4300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4300,214200,,'',0
+'3343',4300,91900,,'',0,20100,,'',0,20300,4,'',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3343',4301,81900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4300,72000,0,'Fruitvale',0,8200,4,'',0,3700,0,'Fruitvale',0,7900,4,'',0,11000,,'',0,11200,4,'',0,10000,,'',0,16800,,'',0,1800,4,'',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3563',4301,62100,0,'Trail',0,9400,0,'Trail',0,400,,'',0,4000,0,'Trail',0,4300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4300,214200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160033
index 8b0a22db..c8e58053 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160033
@@ -1 +1 @@
-'3132',4301,92700,,'',0,22200,,'',0,28600,,'',0,2300,,'',0,36800,,'',0
+'3563',4301,92700,,'',0,22200,,'',0,28600,,'',0,2300,,'',0,36800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160034
index 1cd8039c..74b57f13 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160034
@@ -1 +1 @@
-'3132',4300,90700,0,'Waneta / Walmart -',0,22200,0,'Waneta / Walmart -',0,22800,,'',0,19500,,'',0,17400,,'',0
+'3563',4300,90700,0,'Waneta / Walmart -',0,22200,0,'Waneta / Walmart -',0,22800,,'',0,19500,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160035
index 4702d73f..e9a063a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160035
@@ -1,2 +1,2 @@
-'2375',4101,90000,,'',0,34700,,'',0,30600,,'',0
-'3132',4101,75800,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4101,90000,,'',0,34700,,'',0,30600,,'',0
+'3563',4101,75800,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160036
index 76512bdd..c4678d25 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160036
@@ -1,3 +1,3 @@
-'2375',4300,91000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,12700,,'',0
-'3132',4300,75300,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
-'3211',4300,213300,,'',0
+'3343',4300,91000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,12700,,'',0
+'3563',4300,75300,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3574',4300,213300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160037
index 3ec01159..ea0ce82a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160037
@@ -1,2 +1,2 @@
-'2375',4101,85700,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4101,85700,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160039
index 709337fc..4e69bcb1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160039
@@ -1,5 +1,5 @@
-'2375',3301,111800,,'',0,32500,,'',0,15900,,'',0
-'3132',3301,73100,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
-'2375',9800,92500,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,63800,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,190500,,'',0
+'3343',3301,111800,,'',0,32500,,'',0,15900,,'',0
+'3563',3301,73100,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
+'3343',9800,92500,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,63800,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,190500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160040
index 8cbef8a3..567ca094 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160040
@@ -1,3 +1,3 @@
-'2375',4600,82600,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27000,,'',0
-'3132',4600,62300,,'',0,18200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205700,,'',0
+'3343',4600,82600,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27000,,'',0
+'3563',4600,62300,,'',0,18200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160041
index 6b609685..45434857 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160041
@@ -1,7 +1,7 @@
-'3132',4300,150800,,'',0
-'3132',4301,81000,0,'Trail',0,1600,,'',0
-'2375',4401,82600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
-'3132',4401,70400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,8000,0,'Sunningdale -',0,1100,,'',0,100,0,'Sunningdale -',0,12600,,'',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1400,,'',0,21600,0,'Sunningdale -',0,5300,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,13500,,'',0,5700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
-'3211',4401,195500,,'',0
-'3132',4600,82900,4,'',0
-'3132',9800,151700,,'',0
+'3563',4300,150800,,'',0
+'3563',4301,81000,0,'Trail',0,1600,,'',0
+'3343',4401,82600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
+'3563',4401,70400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,8000,0,'Sunningdale -',0,1100,,'',0,100,0,'Sunningdale -',0,12600,,'',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1400,,'',0,21600,0,'Sunningdale -',0,5300,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,13500,,'',0,5700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
+'3574',4401,195500,,'',0
+'3563',4600,82900,4,'',0
+'3563',9800,151700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160042
index f5c9ac28..889dea0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160042
@@ -1,4 +1,4 @@
-'2375',4401,82800,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
-'3132',4401,70600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,4,'',0,7900,0,'Sunningdale -',0,1200,4,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,25600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
-'3211',4401,195700,,'',0
-'3132',9800,152000,,'',0
+'3343',4401,82800,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
+'3563',4401,70600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,4,'',0,7900,0,'Sunningdale -',0,1200,4,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,25600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
+'3574',4401,195700,,'',0
+'3563',9800,152000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160043
index 1e614682..7689c75e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160043
@@ -1 +1 @@
-'3132',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160044
index e69cca25..fe93616c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160044
@@ -1,3 +1,3 @@
-'2375',4601,80000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4601,61200,,'',0,13700,,'',0,10500,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,17600,,'',0
-'3211',4601,203200,,'',0
+'3343',4601,80000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4601,61200,,'',0,13700,,'',0,10500,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,17600,,'',0
+'3574',4601,203200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160045
index a6b1a0df..6ce71f35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160045
@@ -1,4 +1,4 @@
-'3132',4500,62100,,'',0,3000,,'',0,200,,'',0
-'2375',4600,83600,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0,26800,,'',0
-'3132',4600,63000,,'',0,18500,,'',0,11600,,'',0,11300,0,'Trail -',0,15700,,'',0,12300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,210700,,'',0
+'3563',4500,62100,,'',0,3000,,'',0,200,,'',0
+'3343',4600,83600,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0,26800,,'',0
+'3563',4600,63000,,'',0,18500,,'',0,11600,,'',0,11300,0,'Trail -',0,15700,,'',0,12300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,210700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160046
index 79faf269..f3d5c4d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160046
@@ -1,3 +1,3 @@
-'2375',4601,75100,,'',0,30500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,23800,,'',0
-'3132',4601,60500,,'',0,13400,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11800,0,'Rossland -',0,12000,,'',0,7500,,'',0,11500,0,'Rossland -',0,17000,,'',0,13600,,'',0
-'3211',4601,202000,,'',0
+'3343',4601,75100,,'',0,30500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,23800,,'',0
+'3563',4601,60500,,'',0,13400,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11800,0,'Rossland -',0,12000,,'',0,7500,,'',0,11500,0,'Rossland -',0,17000,,'',0,13600,,'',0
+'3574',4601,202000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160047
index 6bd951df..bd9ae063 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160047
@@ -1 +1 @@
-'3132',3601,80600,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80600,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160048
index 37883ae1..38ffc4dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160048
@@ -1,6 +1,6 @@
-'3132',4300,150900,,'',0
-'3132',4301,81100,0,'Trail',0,1600,,'',0
-'2375',4401,82700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
-'3132',4401,70500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,21600,0,'Sunningdale -',0,5200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
-'3211',4401,195600,,'',0
-'3132',9800,151900,,'',0
+'3563',4300,150900,,'',0
+'3563',4301,81100,0,'Trail',0,1600,,'',0
+'3343',4401,82700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
+'3563',4401,70500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,21600,0,'Sunningdale -',0,5200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
+'3574',4401,195600,,'',0
+'3563',9800,151900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160049
index bca251c3..1dd17efa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160049
@@ -1 +1 @@
-'3132',3601,80700,,'',0,44900,,'',0,34400,0,'Selkirk Coll',0
+'3563',3601,80700,,'',0,44900,,'',0,34400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160050
index 0a9ccb9c..40839641 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160050
@@ -1,3 +1,3 @@
-'2375',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'3132',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3211',4600,204300,,'',0
+'3343',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3563',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3574',4600,204300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160051
index ebbdcf3c..8a382239 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160051
@@ -1,3 +1,3 @@
-'2375',4601,81000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,75300,,'',0,15100,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,204200,,'',0
+'3343',4601,81000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,75300,,'',0,15100,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,204200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160052
index 6b0787c5..c1149f1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160052
@@ -1,3 +1,3 @@
-'2375',4600,81300,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'3132',4600,75600,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3211',4600,204500,,'',0
+'3343',4600,81300,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3563',4600,75600,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3574',4600,204500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160053
index c65dbc68..d066d8fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160053
@@ -1,3 +1,3 @@
-'2375',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'3132',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3211',4600,204400,,'',0
+'3343',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3563',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3574',4600,204400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160054
index c65dbc68..d066d8fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160054
@@ -1,3 +1,3 @@
-'2375',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'3132',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3211',4600,204400,,'',0
+'3343',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3563',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3574',4600,204400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160055
index c3879633..be825773 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160055
@@ -1,3 +1,3 @@
-'2375',4601,80900,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,75300,,'',0,15000,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,204100,,'',0
+'3343',4601,80900,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,75300,,'',0,15000,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,204100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160056
index a9af01d3..4b31d5e3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160056
@@ -1,4 +1,4 @@
-'2375',4600,81400,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'3132',4600,75700,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3132',4601,75200,,'',0
-'3211',4600,204600,,'',0
+'3343',4600,81400,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3563',4600,75700,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3563',4601,75200,,'',0
+'3574',4600,204600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160057
index 05c7e47b..66000c02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160057
@@ -1,4 +1,4 @@
-'2375',4601,80800,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4600,62000,,'',0
-'3132',4601,62000,4,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,204000,,'',0
+'3343',4601,80800,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4600,62000,,'',0
+'3563',4601,62000,4,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,204000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160058
index 6775a462..8a2d5fbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160058
@@ -1,3 +1,3 @@
-'2375',4600,81900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27300,,'',0
-'3132',4600,75800,,'',0,15600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205000,,'',0
+'3343',4600,81900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27300,,'',0
+'3563',4600,75800,,'',0,15600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160059
index 9444d137..2a900897 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160059
@@ -1,3 +1,3 @@
-'2375',4601,80700,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61900,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203900,,'',0
+'3343',4601,80700,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61900,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160060
index e4551527..50e99f10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160060
@@ -1,3 +1,3 @@
-'2375',4601,80600,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61800,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203800,,'',0
+'3343',4601,80600,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61800,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160061
index 64a9fbde..cf507ea7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160061
@@ -1,3 +1,3 @@
-'2375',4600,82100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,80000,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205200,,'',0
+'3343',4600,82100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,80000,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160062
index 38a69662..85cde26c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160062
@@ -1,3 +1,3 @@
-'2375',4601,80200,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61400,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203400,,'',0
+'3343',4601,80200,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61400,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160063
index 6203762f..0ac33751 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160063
@@ -1,3 +1,3 @@
-'2375',4601,80300,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61500,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203500,,'',0
+'3343',4601,80300,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61500,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160064
index 106d3e4a..b3888e56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160064
@@ -1,3 +1,3 @@
-'2375',4600,82300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,80200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205400,,'',0
+'3343',4600,82300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,80200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160065
index a42fe03c..24ea83d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160065
@@ -1,3 +1,3 @@
-'2375',4601,80400,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61600,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203600,,'',0
+'3343',4601,80400,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61600,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160066
index 52771ee0..5b17a247 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160066
@@ -1,3 +1,3 @@
-'2375',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205300,,'',0
+'3343',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160067
index 52771ee0..5b17a247 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160067
@@ -1,3 +1,3 @@
-'2375',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,205300,,'',0
+'3343',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,205300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160068
index ea9ea008..3d95f276 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160068
@@ -1,3 +1,3 @@
-'2375',4601,80500,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
-'3132',4601,61700,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
-'3211',4601,203700,,'',0
+'3343',4601,80500,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3563',4601,61700,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3574',4601,203700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160070
index d0e430f1..09dfa169 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160070
@@ -1,3 +1,3 @@
-'2375',4600,83300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
-'3132',4600,62800,,'',0,18400,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,210400,,'',0
+'3343',4600,83300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3563',4600,62800,,'',0,18400,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,210400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160071
index ab988e5d..04063223 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160071
@@ -1,3 +1,3 @@
-'2375',4601,75600,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4601,60800,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
-'3211',4601,202500,,'',0
+'3343',4601,75600,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4601,60800,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3574',4601,202500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160072
index da80f6b6..e08bbb9f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160072
@@ -1,3 +1,3 @@
-'2375',4600,83100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
-'3132',4600,62700,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,210200,,'',0
+'3343',4600,83100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3563',4600,62700,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,210200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160073
index 7994435c..df25349e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160073
@@ -1,3 +1,3 @@
-'2375',4600,83200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
-'3132',4600,62800,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3211',4600,210300,,'',0
+'3343',4600,83200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3563',4600,62800,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3574',4600,210300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160074
index 98b0f4a7..03739a16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160074
@@ -1,3 +1,3 @@
-'2375',4601,75500,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4601,60700,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
-'3211',4601,202400,,'',0
+'3343',4601,75500,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4601,60700,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3574',4601,202400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160075
index ea3436d2..a0926120 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160075
@@ -1,3 +1,3 @@
-'2375',4601,75400,,'',0,30500,0,'Rossland -',0,35800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4601,60700,,'',0,13500,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
-'3211',4601,202300,,'',0
+'3343',4601,75400,,'',0,30500,0,'Rossland -',0,35800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4601,60700,,'',0,13500,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3574',4601,202300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160076
index 9307bcba..4f305650 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160076
@@ -1,4 +1,4 @@
-'2375',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
-'2375',4601,105400,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0
-'3132',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
-'3132',4601,95400,0,'Rossland -',0,27800,0,'Rossland -',0,31000,0,'Rossland -',0
+'3343',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3343',4601,105400,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0
+'3563',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3563',4601,95400,0,'Rossland -',0,27800,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160077
index aef3c694..dfa8acb2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160077
@@ -1,4 +1,4 @@
-'2375',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
-'2375',4601,105300,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
-'3132',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
-'3132',4601,95300,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
+'3343',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3343',4601,105300,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3563',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3563',4601,95300,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160078
index 58141185..5217ad4e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160078
@@ -1,4 +1,4 @@
-'2375',4600,83900,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
-'2375',4601,105500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
-'3132',4600,104700,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
-'3132',4601,95500,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
+'3343',4600,83900,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3343',4601,105500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3563',4600,104700,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3563',4601,95500,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160079
index b1c73474..4080ecea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160079
@@ -1,4 +1,4 @@
-'2375',4600,84000,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
-'2375',4601,105600,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
-'3132',4600,104800,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
-'3132',4601,95600,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
+'3343',4600,84000,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3343',4601,105600,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3563',4600,104800,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3563',4601,95600,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160080
index 93347f2c..77f70085 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160080
@@ -1,2 +1,2 @@
-'2375',4101,85400,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3343',4101,85400,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160081
index f3644582..675a2ddd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160081
@@ -1,2 +1,2 @@
-'2375',4101,85500,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
+'3343',4101,85500,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160082
index 6ff559cd..ae3dc876 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160082
@@ -1,2 +1,2 @@
-'2375',4101,85600,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4101,85600,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160083
index 6ff559cd..ae3dc876 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160083
@@ -1,2 +1,2 @@
-'2375',4101,85600,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4101,85600,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160084
index ccb860f2..0e98745e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160084
@@ -1,2 +1,2 @@
-'2375',4200,91400,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
+'3343',4200,91400,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160085
index ccb860f2..0e98745e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160085
@@ -1,2 +1,2 @@
-'2375',4200,91400,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
+'3343',4200,91400,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160086
index 403fb0a6..5a258bc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160086
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160086
@@ -1,16 +1,16 @@
-'2375',4101,85100,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,74900,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
-'2375',4300,85100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2900,0,'Waneta / Walmart -',0,9000,0,'Fruitvale',0,2700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,211600,,'',0
-'2375',4401,82300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,70100,0,'Sunningdale -',0,2800,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15100,0,'Sunningdale -',0,15000,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
-'3211',4401,195200,,'',0
-'3132',4500,60100,,'',0,3200,,'',0
-'2375',4601,74700,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
-'3132',4600,82300,,'',0
-'3132',4601,60100,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
-'3211',4601,201600,,'',0
-'2375',9800,85200,,'',0,38400,,'',0,47800,,'',0
-'3132',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30100,,'',0,19600,,'',0
-'3211',9800,183200,,'',0
+'3343',4101,85100,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,74900,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3343',4300,85100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2900,0,'Waneta / Walmart -',0,9000,0,'Fruitvale',0,2700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,211600,,'',0
+'3343',4401,82300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,70100,0,'Sunningdale -',0,2800,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15100,0,'Sunningdale -',0,15000,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3574',4401,195200,,'',0
+'3563',4500,60100,,'',0,3200,,'',0
+'3343',4601,74700,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
+'3563',4600,82300,,'',0
+'3563',4601,60100,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
+'3574',4601,201600,,'',0
+'3343',9800,85200,,'',0,38400,,'',0,47800,,'',0
+'3563',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30100,,'',0,19600,,'',0
+'3574',9800,183200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160087
index 9cc64464..1b8c8eca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160087
@@ -1,25 +1,25 @@
-'2375',4101,85000,,'',0,5500,4,'',0,33200,,'',0,1500,4,'',0,29100,,'',0,1500,4,'',0
-'3132',4101,74800,,'',0,5500,4,'',0,3200,,'',0,1500,4,'',0,30500,,'',0,5500,4,'',0,22500,,'',0,1500,4,'',0,20400,,'',0,5500,4,'',0,3500,,'',0,1500,4,'',0
-'2375',4200,90700,,'',0,1000,4,'',0,11800,,'',0,1000,4,'',0,50100,,'',0,1000,4,'',0
-'3132',4200,82000,,'',0,1000,4,'',0,27000,,'',0,1000,4,'',0,34000,,'',0,5000,4,'',0,15400,,'',0,5000,4,'',0
-'2375',4300,85000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'2375',4301,84600,4,'',0,18300,4,'',0,20100,4,'',0,12000,4,'',0,19000,4,'',0,17100,4,'',0,12600,4,'',0
-'3132',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2800,0,'Waneta / Walmart -',0,9100,0,'Fruitvale',0,2600,0,'Waneta / Walmart -',0,10900,,'',0,15300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
-'3132',4301,63200,4,'',0,2200,4,'',0,7500,4,'',0,1700,4,'',0,6900,4,'',0,1600,4,'',0,10100,4,'',0,1200,4,'',0,19300,4,'',0,6900,4,'',0,14200,4,'',0,10400,4,'',0,5200,4,'',0,1100,4,'',0,13000,4,'',0,1300,4,'',0,18500,4,'',0,16900,4,'',0
-'3211',4300,211500,,'',0
-'2375',4401,82200,0,'Sunningdale -',0,2500,4,'',0,17100,0,'Sunningdale -',0,2500,4,'',0,11300,0,'Sunningdale -',0,6500,4,'',0,29400,0,'Sunningdale -',0,2500,4,'',0,10500,0,'Sunningdale -',0,6500,4,'',0
-'3132',4401,60000,4,'',0,10000,0,'Sunningdale -',0,2500,4,'',0,300,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,1300,4,'',0,11400,,'',0,1300,4,'',0,15200,0,'Sunningdale -',0,2500,4,'',0,200,,'',0,1300,4,'',0,20300,0,'Sunningdale -',0,6500,4,'',0,8600,0,'Sunningdale -',0,2700,4,'',0,12300,,'',0,5300,4,'',0,400,0,'Sunningdale -',0,2500,4,'',0,6600,0,'Sunningdale -',0,2500,4,'',0
-'3211',4401,195100,,'',0,5300,4,'',0
-'3132',4500,60000,,'',0,2400,4,'',0,800,,'',0,2200,4,'',0,200,4,'',0,87700,4,'',0
-'2375',4600,84700,4,'',0,30800,4,'',0,35700,4,'',0,19600,4,'',0
-'2375',4601,74600,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
-'3132',4600,82200,,'',0,11600,4,'',0,11700,4,'',0,15300,4,'',0,12700,4,'',0,11600,4,'',0,7500,4,'',0,12000,4,'',0,15900,4,'',0,13600,4,'',0
-'3132',4601,60000,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
-'3211',4600,211300,4,'',0
-'3211',4601,201500,,'',0
-'2375',9800,85200,,'',0,38400,,'',0,47800,,'',0
-'2375',9801,101300,4,'',0,34500,4,'',0,47700,4,'',0
-'3132',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30000,,'',0,19700,,'',0
-'3132',9801,72800,4,'',0,9100,4,'',0,29000,4,'',0,22600,4,'',0,31800,4,'',0,18200,4,'',0
-'3211',9800,183200,,'',0
-'3211',9801,195100,4,'',0
+'3343',4101,85000,,'',0,5500,4,'',0,33200,,'',0,1500,4,'',0,29100,,'',0,1500,4,'',0
+'3563',4101,74800,,'',0,5500,4,'',0,3200,,'',0,1500,4,'',0,30500,,'',0,5500,4,'',0,22500,,'',0,1500,4,'',0,20400,,'',0,5500,4,'',0,3500,,'',0,1500,4,'',0
+'3343',4200,90700,,'',0,1000,4,'',0,11800,,'',0,1000,4,'',0,50100,,'',0,1000,4,'',0
+'3563',4200,82000,,'',0,1000,4,'',0,27000,,'',0,1000,4,'',0,34000,,'',0,5000,4,'',0,15400,,'',0,5000,4,'',0
+'3343',4300,85000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3343',4301,84600,4,'',0,18300,4,'',0,20100,4,'',0,12000,4,'',0,19000,4,'',0,17100,4,'',0,12600,4,'',0
+'3563',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2800,0,'Waneta / Walmart -',0,9100,0,'Fruitvale',0,2600,0,'Waneta / Walmart -',0,10900,,'',0,15300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
+'3563',4301,63200,4,'',0,2200,4,'',0,7500,4,'',0,1700,4,'',0,6900,4,'',0,1600,4,'',0,10100,4,'',0,1200,4,'',0,19300,4,'',0,6900,4,'',0,14200,4,'',0,10400,4,'',0,5200,4,'',0,1100,4,'',0,13000,4,'',0,1300,4,'',0,18500,4,'',0,16900,4,'',0
+'3574',4300,211500,,'',0
+'3343',4401,82200,0,'Sunningdale -',0,2500,4,'',0,17100,0,'Sunningdale -',0,2500,4,'',0,11300,0,'Sunningdale -',0,6500,4,'',0,29400,0,'Sunningdale -',0,2500,4,'',0,10500,0,'Sunningdale -',0,6500,4,'',0
+'3563',4401,60000,4,'',0,10000,0,'Sunningdale -',0,2500,4,'',0,300,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,1300,4,'',0,11400,,'',0,1300,4,'',0,15200,0,'Sunningdale -',0,2500,4,'',0,200,,'',0,1300,4,'',0,20300,0,'Sunningdale -',0,6500,4,'',0,8600,0,'Sunningdale -',0,2700,4,'',0,12300,,'',0,5300,4,'',0,400,0,'Sunningdale -',0,2500,4,'',0,6600,0,'Sunningdale -',0,2500,4,'',0
+'3574',4401,195100,,'',0,5300,4,'',0
+'3563',4500,60000,,'',0,2400,4,'',0,800,,'',0,2200,4,'',0,200,4,'',0,87700,4,'',0
+'3343',4600,84700,4,'',0,30800,4,'',0,35700,4,'',0,19600,4,'',0
+'3343',4601,74600,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
+'3563',4600,82200,,'',0,11600,4,'',0,11700,4,'',0,15300,4,'',0,12700,4,'',0,11600,4,'',0,7500,4,'',0,12000,4,'',0,15900,4,'',0,13600,4,'',0
+'3563',4601,60000,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
+'3574',4600,211300,4,'',0
+'3574',4601,201500,,'',0
+'3343',9800,85200,,'',0,38400,,'',0,47800,,'',0
+'3343',9801,101300,4,'',0,34500,4,'',0,47700,4,'',0
+'3563',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30000,,'',0,19700,,'',0
+'3563',9801,72800,4,'',0,9100,4,'',0,29000,4,'',0,22600,4,'',0,31800,4,'',0,18200,4,'',0
+'3574',9800,183200,,'',0
+'3574',9801,195100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160088
index f27eff43..34857a8a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160088
@@ -1,8 +1,8 @@
-'2375',3300,112200,,'',0,32500,,'',0,15900,,'',0
-'3132',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
-'3132',3601,74500,,'',0,79300,0,'Selkirk Coll',0
-'2375',9801,93400,,'',0,38400,,'',0,43800,,'',0
-'3132',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
-'3211',9801,191200,,'',0
-'2375',9900,93600,,'',0,38400,,'',0,43900,,'',0
-'3132',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
+'3343',3300,112200,,'',0,32500,,'',0,15900,,'',0
+'3563',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3563',3601,74500,,'',0,79300,0,'Selkirk Coll',0
+'3343',9801,93400,,'',0,38400,,'',0,43800,,'',0
+'3563',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3574',9801,191200,,'',0
+'3343',9900,93600,,'',0,38400,,'',0,43900,,'',0
+'3563',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160090
index 220754e2..152c6377 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160090
@@ -1,5 +1,5 @@
-'2375',3400,91800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,65700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
-'2375',9801,94400,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192200,,'',0
+'3343',3400,91800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,65700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',9801,94400,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160091
index 922c89db..825515c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160091
@@ -1,2 +1,2 @@
-'2375',3201,101000,,'',0,14800,,'',0,36500,,'',0
-'3132',3201,75500,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,101000,,'',0,14800,,'',0,36500,,'',0
+'3563',3201,75500,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160092
index 85f01608..5d8b4fba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160092
@@ -1,2 +1,2 @@
-'2375',4200,91200,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82500,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
+'3343',4200,91200,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82500,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160093
index 8f818539..ebb9c706 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160093
@@ -1,2 +1,2 @@
-'2375',4200,91300,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82600,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
+'3343',4200,91300,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82600,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160094
index c0a44829..7ad32190 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160094
@@ -1,2 +1,2 @@
-'2375',4200,91000,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
+'3343',4200,91000,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160095
index c0a44829..7ad32190 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160095
@@ -1,2 +1,2 @@
-'2375',4200,91000,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
+'3343',4200,91000,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160096
index 65ee602d..0823360c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160096
@@ -1,2 +1,2 @@
-'2375',4200,90900,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82200,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
+'3343',4200,90900,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82200,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160097 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160097
index dbcecbfa..949e39ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160097
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160097
@@ -1,2 +1,2 @@
-'2375',4200,90800,,'',0,12800,,'',0,51100,,'',0
-'3132',4200,82100,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
+'3343',4200,90800,,'',0,12800,,'',0,51100,,'',0
+'3563',4200,82100,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160098
index da7aa24d..6c7b3e85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160098
@@ -1,14 +1,14 @@
-'2375',4101,90300,,'',0,34700,,'',0,30600,,'',0
-'3132',4101,80100,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
-'2375',4301,84400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,17200,0,'Trail',0,12600,0,'Trail',0
-'3132',4301,63100,0,'Trail',0,2100,,'',0,7600,0,'Trail',0,1600,,'',0,7000,0,'Trail',0,1600,,'',0,10100,0,'Trail',0,1100,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,5200,,'',0,1100,,'',0,13000,,'',0,1400,0,'Trail',0,18400,,'',0,16900,,'',0
-'2375',4401,84500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
-'3132',4401,55900,0,'Trail -',0,16400,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
-'3211',4401,200200,,'',0
-'3132',4500,62300,,'',0,3000,,'',0,200,,'',0,87700,,'',0
-'2375',4600,84500,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
-'3132',4600,82000,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
-'3211',4600,211200,,'',0
-'2375',9801,101200,,'',0,34500,,'',0,47700,,'',0
-'3132',9801,72700,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
-'3211',9801,195000,,'',0
+'3343',4101,90300,,'',0,34700,,'',0,30600,,'',0
+'3563',4101,80100,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3343',4301,84400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,17200,0,'Trail',0,12600,0,'Trail',0
+'3563',4301,63100,0,'Trail',0,2100,,'',0,7600,0,'Trail',0,1600,,'',0,7000,0,'Trail',0,1600,,'',0,10100,0,'Trail',0,1100,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,5200,,'',0,1100,,'',0,13000,,'',0,1400,0,'Trail',0,18400,,'',0,16900,,'',0
+'3343',4401,84500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3563',4401,55900,0,'Trail -',0,16400,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3574',4401,200200,,'',0
+'3563',4500,62300,,'',0,3000,,'',0,200,,'',0,87700,,'',0
+'3343',4600,84500,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3563',4600,82000,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3574',4600,211200,,'',0
+'3343',9801,101200,,'',0,34500,,'',0,47700,,'',0
+'3563',9801,72700,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3574',9801,195000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160102
index 77d560f2..7d63e027 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160102
@@ -1,2 +1,2 @@
-'2375',4301,84000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54900,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,84000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54900,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160103
index 36ef3acd..48385f24 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160103
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160103
@@ -1,3 +1,3 @@
-'2375',4300,85400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,73700,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,211900,,'',0
+'3343',4300,85400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,73700,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,211900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160104
index 8e7e6afc..1a76cb69 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160104
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160104
@@ -1,3 +1,3 @@
-'2375',4300,85300,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,73600,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,211800,,'',0
+'3343',4300,85300,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,73600,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,211800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160105
index 9d753df9..442712ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160105
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160105
@@ -1,2 +1,2 @@
-'2375',4301,84100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54900,,'',0,10000,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,84100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54900,,'',0,10000,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160106 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160106
index f7ed3232..3d140ac3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160106
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160106
@@ -1,7 +1,7 @@
-'3132',4300,150600,,'',0
-'3132',4301,55000,,'',0,27500,,'',0
-'2375',4401,82500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,70300,0,'Sunningdale -',0,2800,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15300,0,'Sunningdale -',0,14800,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
-'3211',4401,195400,,'',0
-'3132',4600,82700,,'',0
-'3132',9800,151600,,'',0
+'3563',4300,150600,,'',0
+'3563',4301,55000,,'',0,27500,,'',0
+'3343',4401,82500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,70300,0,'Sunningdale -',0,2800,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15300,0,'Sunningdale -',0,14800,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3574',4401,195400,,'',0
+'3563',4600,82700,,'',0
+'3563',9800,151600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160107
index 06bef543..2a80fcef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160107
@@ -1,6 +1,6 @@
-'3132',4300,151000,,'',0
-'3132',4301,81200,0,'Trail',0,1600,,'',0
-'2375',4401,84200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
-'3132',4401,55800,0,'Trail -',0,16200,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
-'3211',4401,195900,,'',0
-'3132',9800,152100,,'',0
+'3563',4300,151000,,'',0
+'3563',4301,81200,0,'Trail',0,1600,,'',0
+'3343',4401,84200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3563',4401,55800,0,'Trail -',0,16200,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3574',4401,195900,,'',0
+'3563',9800,152100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160108
index d12d0b78..eae93924 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160108
@@ -1,3 +1,3 @@
-'3132',4301,55000,,'',0
-'2375',4401,82900,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,70700,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3563',4301,55000,,'',0
+'3343',4401,82900,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,70700,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160109
index 9b8dc272..d8372789 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160109
@@ -1,2 +1,2 @@
-'2375',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
-'3132',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3563',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160110
index 9e1e87a1..b2c31134 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160110
@@ -1,3 +1,3 @@
-'3132',4301,55000,,'',0
-'2375',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3563',4301,55000,,'',0
+'3343',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160111
index daaa0004..68455e02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160111
@@ -1,3 +1,3 @@
-'3132',4301,55100,,'',0
-'2375',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3563',4301,55100,,'',0
+'3343',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160112
index 9b8dc272..d8372789 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160112
@@ -1,2 +1,2 @@
-'2375',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
-'3132',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3563',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160117
index c2a0a0d9..4926fec7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160117
@@ -1,6 +1,6 @@
-'3132',4300,150900,,'',0
-'3132',4301,81100,0,'Trail',0,1600,,'',0
-'2375',4401,82900,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
-'3132',4401,70700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,9400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,12700,,'',0,16400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,25500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,10000,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,17600,,'',0,1600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
-'3211',4401,195900,,'',0
-'3132',9800,152100,,'',0
+'3563',4300,150900,,'',0
+'3563',4301,81100,0,'Trail',0,1600,,'',0
+'3343',4401,82900,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
+'3563',4401,70700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,9400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,12700,,'',0,16400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,25500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,10000,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,17600,,'',0,1600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
+'3574',4401,195900,,'',0
+'3563',9800,152100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160118
index 72450533..f88842c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160118
@@ -1,2 +1,2 @@
-'2375',4301,83700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54600,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54600,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160119
index 1cf23f2a..c9bb0dfe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160119
@@ -1,3 +1,3 @@
-'2375',4300,85700,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74000,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212200,,'',0
+'3343',4300,85700,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74000,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160120 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160120
index ac68d9ae..ff881ff0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160120
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160120
@@ -1,2 +1,2 @@
-'2375',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160121
index 8c2a1cac..53c48781 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160121
@@ -1,3 +1,3 @@
-'2375',4300,90200,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
-'3132',4300,74500,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
-'3211',4300,212600,,'',0
+'3343',4300,90200,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
+'3563',4300,74500,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3574',4300,212600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160122
index 7af3c2ed..a4b55a91 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160122
@@ -1,3 +1,3 @@
-'2375',4300,90000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74300,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212500,,'',0
+'3343',4300,90000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74300,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160123
index 95ef690f..1aaf7d6b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160123
@@ -1,2 +1,2 @@
-'2375',4301,83400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54400,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54400,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160124 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160124
index ac68d9ae..ff881ff0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160124
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160124
@@ -1,2 +1,2 @@
-'2375',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160125
index dafabd6c..41a0619c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160125
@@ -1,3 +1,3 @@
-'2375',4300,90100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74400,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212600,,'',0
+'3343',4300,90100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74400,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160126
index 1c92cfd7..e437e49a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160126
@@ -1,3 +1,3 @@
-'2375',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
-'3132',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,220000,0,'Waneta Only',0
+'3343',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
+'3563',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,220000,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160127 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160127
index a52ba511..cac961ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160127
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160127
@@ -1,3 +1,3 @@
-'2375',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,64400,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214900,,'',0
+'3343',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,64400,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160128
index 2966b3a4..259b5a69 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160128
@@ -1,3 +1,3 @@
-'2375',4300,85900,,'',0,24100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74200,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212400,,'',0
+'3343',4300,85900,,'',0,24100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74200,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160129
index 0db6d9ef..d6df97c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160129
@@ -1,2 +1,2 @@
-'2375',4301,83500,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54400,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83500,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54400,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160130
index 7e7ecc1e..62df3ff3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160130
@@ -1,3 +1,3 @@
-'2375',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,74900,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,213000,,'',0
+'3343',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,74900,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,213000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160131 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160131
index 0a0310d5..516ea37e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160131
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160131
@@ -1,2 +1,2 @@
-'2375',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54000,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54000,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160132
index 636735dd..ddf0a51a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160132
@@ -1,3 +1,3 @@
-'2375',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,74900,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
-'3211',4300,213000,,'',0
+'3343',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,74900,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3574',4300,213000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160133
index 80a182c6..c09712b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160133
@@ -1,3 +1,3 @@
-'2375',4300,91700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,71800,0,'Fruitvale',0,8200,0,'Waneta / Walmart -',0,3700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214000,,'',0
+'3343',4300,91700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,71800,0,'Fruitvale',0,8200,0,'Waneta / Walmart -',0,3700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160134
index f2867c02..f8142243 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160134
@@ -1,2 +1,2 @@
-'2375',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
+'3343',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160135
index 8dd05dcb..50ce5fc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160135
@@ -1,3 +1,3 @@
-'2375',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
-'3211',4300,213200,,'',0
+'3343',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3574',4300,213200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160136
index f2867c02..f8142243 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160136
@@ -1,2 +1,2 @@
-'2375',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
+'3343',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160137
index 8dd05dcb..50ce5fc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160137
@@ -1,3 +1,3 @@
-'2375',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
-'3211',4300,213200,,'',0
+'3343',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3574',4300,213200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160138
index f476a6bd..cd9bf917 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160138
@@ -1,3 +1,3 @@
-'2375',4300,90700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,75000,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
-'3211',4300,213100,,'',0
+'3343',4300,90700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,75000,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3574',4300,213100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160139
index dc1b6f95..b003681b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160139
@@ -1,2 +1,2 @@
-'2375',4301,82900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54000,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
+'3343',4301,82900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54000,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160140
index ca95c52f..7f8733c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160140
@@ -1 +1 @@
-'3132',4500,61300,,'',0,3000,,'',0,200,,'',0,88300,,'',0
+'3563',4500,61300,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160147
index 5da622d0..ab169e4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160147
@@ -1,2 +1,2 @@
-'2375',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10800,0,'Sunningdale -',0,30300,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11400,0,'Sunningdale -',0,20400,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10800,0,'Sunningdale -',0,30300,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11400,0,'Sunningdale -',0,20400,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160148
index 4bc702da..23e3b672 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160148
@@ -1,3 +1,3 @@
-'3132',4301,55200,4,'',0
-'2375',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3563',4301,55200,4,'',0
+'3343',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160149
index a951003d..d5e870d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160149
@@ -1,2 +1,2 @@
-'2375',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160150
index d370f5a4..d53cd7ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160150
@@ -1,2 +1,2 @@
-'2375',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160151
index c010b8f0..1e646301 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160151
@@ -1,2 +1,2 @@
-'2375',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55400,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55400,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160152 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160152
index d5c52be1..60867b82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160152
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160152
@@ -1,2 +1,2 @@
-'2375',4401,83300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55300,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55300,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160153
index 6d2b3516..8ff98c92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160153
@@ -1,2 +1,2 @@
-'2375',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55300,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55300,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160154
index d94e71ed..d9f4be0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160154
@@ -1,2 +1,2 @@
-'2375',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
-'3132',4401,55400,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3343',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3563',4401,55400,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160156
index 1bc9770e..92bb0649 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160156
@@ -1,6 +1,6 @@
-'2375',4600,82900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'2375',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4600,80800,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3132',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
-'3211',4600,210000,,'',0
-'3211',4601,202700,,'',0
+'3343',4600,82900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3343',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4600,80800,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3563',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3574',4600,210000,,'',0
+'3574',4601,202700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160157
index df64d750..fd3a4f8d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160157
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160157
@@ -1,2 +1,2 @@
-'2375',4300,80400,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60800,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3343',4300,80400,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60800,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160158 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160158
index 4dcfed91..a5d2d0c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160158
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160158
@@ -1,3 +1,3 @@
-'2375',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,215500,4,'',0
+'3343',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,215500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160159
index f0761f28..b0d4e37e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160159
@@ -1,2 +1,2 @@
-'2375',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160160
index 4b0d9135..85b30e5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160160
@@ -1,3 +1,3 @@
-'2375',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
-'3132',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,220100,0,'Waneta Only',0
+'3343',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3563',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,220100,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160161
index fbcc20c8..2bb5fd30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160161
@@ -1,3 +1,3 @@
-'2375',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,64300,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214900,,'',0
+'3343',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,64300,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160162
index a93edbb2..4e030d62 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160162
@@ -1,2 +1,2 @@
-'2375',4301,194000,0,'Waneta Only',0
-'3211',4301,220200,0,'Waneta Only',0
+'3343',4301,194000,0,'Waneta Only',0
+'3574',4301,220200,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160163
index aeb4e53e..f644add6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160163
@@ -1,3 +1,3 @@
-'2375',4301,82100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,11800,0,'Waneta Only',0
-'3132',4301,62300,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,220500,0,'Waneta Only',0
+'3343',4301,82100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,11800,0,'Waneta Only',0
+'3563',4301,62300,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,220500,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160164
index 48f8fea9..1667716f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160164
@@ -1,3 +1,3 @@
-'2375',4300,91400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,71500,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
-'3211',4300,213700,,'',0
+'3343',4300,91400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,71500,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3574',4300,213700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160165
index e05877c8..c85903c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160165
@@ -1,2 +1,2 @@
-'2375',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3343',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160166
index d9c28b6c..289c609b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160166
@@ -1,3 +1,3 @@
-'2375',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214600,,'',0
+'3343',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160167
index e05877c8..c85903c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160167
@@ -1,2 +1,2 @@
-'2375',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3343',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160168
index d9c28b6c..289c609b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160168
@@ -1,3 +1,3 @@
-'2375',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214600,,'',0
+'3343',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160169
index f753920e..f0c57bef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160169
@@ -1,2 +1,2 @@
-'2375',4301,81400,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4301,61600,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3343',4301,81400,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4301,61600,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160170
index de3e8cef..0a66fd67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160170
@@ -1,3 +1,3 @@
-'2375',4300,92400,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,72500,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214700,,'',0
+'3343',4300,92400,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,72500,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160171
index 35c574f5..ff0ae68c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160171
@@ -1,3 +1,3 @@
-'2375',4300,92900,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,64600,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,215200,,'',0
+'3343',4300,92900,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,64600,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,215200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160172
index 8bef4e3b..623d6744 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160172
@@ -1,3 +1,3 @@
-'2375',4301,81000,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
-'3132',4301,61200,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,215800,0,'Waneta Only',0
+'3343',4301,81000,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
+'3563',4301,61200,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,215800,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160173 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160173
index a5d9f2d2..5e201a87 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160173
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160173
@@ -1,3 +1,3 @@
-'2375',4300,92800,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,64600,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,215100,,'',0
+'3343',4300,92800,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,64600,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,215100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160174 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160174
index c2a6cdbf..5ad3b772 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160174
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160174
@@ -1,3 +1,3 @@
-'2375',4301,80900,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
-'3132',4301,61100,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,215800,0,'Waneta Only',0
+'3343',4301,80900,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3563',4301,61100,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,215800,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160175
index b211c470..ea47b817 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160175
@@ -1,2 +1,2 @@
-'2375',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160176
index b211c470..ea47b817 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160176
@@ -1,2 +1,2 @@
-'2375',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160177
index 11d849a7..7a4e7999 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160177
@@ -1,2 +1,2 @@
-'2375',4300,75400,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55800,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75400,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55800,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160178
index 60f16464..4f21ced6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160178
@@ -1,2 +1,2 @@
-'2375',4300,80000,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60400,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,80000,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60400,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160179
index b212f9ba..f18e50df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160179
@@ -1,2 +1,2 @@
-'2375',4300,80100,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60500,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,80100,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60500,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160180 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160180
index fab8370a..cceaddf5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160180
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160180
@@ -1,2 +1,2 @@
-'2375',4300,75300,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55700,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75300,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55700,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160181 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160181
index bfc22b81..c3540036 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160181
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160181
@@ -1,2 +1,2 @@
-'2375',4300,75900,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60300,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75900,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60300,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160182
index d126b9ae..1bb423d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160182
@@ -1,2 +1,2 @@
-'2375',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160183
index fe3a7369..bdfedbd9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160183
@@ -1,2 +1,2 @@
-'2375',4300,75200,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,55600,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75200,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,55600,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160184
index 273d1dc6..c27e1996 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160184
@@ -1,2 +1,2 @@
-'2375',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,72700,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,20000,,'',0,12800,,'',0
+'3343',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,72700,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,20000,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160185
index a82ad614..1ae5e21c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160185
@@ -1,3 +1,3 @@
-'2375',4301,80700,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
-'3132',4301,60900,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
-'3211',4301,215600,0,'Waneta Only',0
+'3343',4301,80700,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3563',4301,60900,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3574',4301,215600,0,'Waneta Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160186
index e4f908ef..c3cd7d9a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160186
@@ -1,3 +1,3 @@
-'2375',4300,93100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,64800,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,215400,,'',0
+'3343',4300,93100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,64800,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,215400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160187
index 983bcdd5..fa5087c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160187
@@ -1,3 +1,3 @@
-'2375',4300,90500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,74800,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
-'3211',4300,212900,,'',0
+'3343',4300,90500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,74800,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3574',4300,212900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160188
index 6a05741d..3210f2cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160188
@@ -1,2 +1,2 @@
-'2375',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54100,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54100,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160189
index dcc4c40b..f91c8767 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160189
@@ -1,3 +1,3 @@
-'2375',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
-'3132',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
-'3211',4300,212800,,'',0
+'3343',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
+'3563',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3574',4300,212800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160190
index 3272e1ed..b0eaf556 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160190
@@ -1,2 +1,2 @@
-'2375',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54200,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54200,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160191
index 9cf691ab..3e1d945f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160191
@@ -1,2 +1,2 @@
-'2375',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54100,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3343',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54100,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160192
index 04955e9a..91a6ccec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160192
@@ -1,3 +1,3 @@
-'2375',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212900,,'',0
+'3343',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160193 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160193
index eb1e7907..28ae819d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160193
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160193
@@ -1,6 +1,6 @@
-'2375',4600,83000,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
-'2375',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
-'3132',4600,80900,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
-'3132',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
-'3211',4600,210100,,'',0
-'3211',4601,202700,,'',0
+'3343',4600,83000,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3343',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3563',4600,80900,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3563',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3574',4600,210100,,'',0
+'3574',4601,202700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160194
index 93347f2c..77f70085 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160194
@@ -1,2 +1,2 @@
-'2375',4101,85400,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3343',4101,85400,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160195
index 5e569710..b9db6f30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160195
@@ -1,2 +1,2 @@
-'2375',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16900,,'',0,19900,,'',0,12800,,'',0
+'3343',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16900,,'',0,19900,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160196
index 89b1dab1..d0a5eb7f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160196
@@ -1,3 +1,3 @@
-'2375',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,75200,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17400,,'',0,12800,,'',0
-'3211',4300,213300,,'',0
+'3343',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,75200,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17400,,'',0,12800,,'',0
+'3574',4300,213300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160197
index 88c76721..900af134 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160197
@@ -1,3 +1,3 @@
-'2375',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
-'3132',4300,75200,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
-'3211',4300,213300,,'',0
+'3343',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3563',4300,75200,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3574',4300,213300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160198
index 4ef11933..ae73d981 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160198
@@ -1,2 +1,2 @@
-'2375',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
+'3343',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160199
index 06ada914..1f5831c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160199
@@ -1,4 +1,4 @@
-'3132',4500,62300,,'',0,3000,,'',0,200,,'',0
-'2375',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22200,,'',0
-'3132',4600,63200,,'',0,18700,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,15900,,'',0,13600,,'',0
-'3211',4600,211000,,'',0
+'3563',4500,62300,,'',0,3000,,'',0,200,,'',0
+'3343',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22200,,'',0
+'3563',4600,63200,,'',0,18700,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,15900,,'',0,13600,,'',0
+'3574',4600,211000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160200
index 379ea3fe..b397d14c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160200
@@ -1,4 +1,4 @@
-'3132',4500,62200,,'',0,3000,,'',0,200,,'',0
-'2375',4600,84200,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22400,,'',0
-'3132',4600,63200,,'',0,18600,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
-'3211',4600,210900,,'',0
+'3563',4500,62200,,'',0,3000,,'',0,200,,'',0
+'3343',4600,84200,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22400,,'',0
+'3563',4600,63200,,'',0,18600,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3574',4600,210900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160201
index c2c78ea2..e802a1d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160201
@@ -1,4 +1,4 @@
-'3132',4500,62200,,'',0,3000,,'',0,200,,'',0
-'2375',4600,84300,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,,'',0
-'3132',4600,63200,,'',0,18600,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
-'3211',4600,211000,,'',0
+'3563',4500,62200,,'',0,3000,,'',0,200,,'',0
+'3343',4600,84300,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,,'',0
+'3563',4600,63200,,'',0,18600,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3574',4600,211000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160202
index 475dd45c..95ce7245 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160202
@@ -1,5 +1,5 @@
-'2375',4101,85300,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
-'2375',4601,74800,,'',0,30200,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
-'3132',4601,60200,,'',0,13400,,'',0,10300,,'',0,11100,0,'Rossland -',0,16400,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
-'3211',4601,201700,,'',0
+'3343',4101,85300,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3343',4601,74800,,'',0,30200,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
+'3563',4601,60200,,'',0,13400,,'',0,10300,,'',0,11100,0,'Rossland -',0,16400,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
+'3574',4601,201700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160203
index a97cdcea..278f5dbe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160203
@@ -1,5 +1,5 @@
-'2375',4101,85300,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
-'2375',4601,74900,,'',0,30100,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
-'3132',4601,60300,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
-'3211',4601,201800,,'',0
+'3343',4101,85300,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3343',4601,74900,,'',0,30100,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
+'3563',4601,60300,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
+'3574',4601,201800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160204
index 1b4f55ba..6315fc93 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160204
@@ -1,4 +1,4 @@
-'2375',4600,83800,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
-'2375',4601,105400,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
-'3132',4600,104600,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
-'3132',4601,95400,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
+'3343',4600,83800,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3343',4601,105400,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3563',4600,104600,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3563',4601,95400,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160205
index e8f61476..3d92aa8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160205
@@ -1,6 +1,6 @@
-'2375',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
-'2375',4601,81100,4,'',0,30800,4,'',0,31800,4,'',0,19500,4,'',0,27700,4,'',0
-'3132',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
-'3132',4601,75400,4,'',0,15100,4,'',0,11400,4,'',0,12100,4,'',0,11900,4,'',0,15900,4,'',0,3500,4,'',0,15600,4,'',0,12900,4,'',0,17600,4,'',0
-'3211',4600,204300,,'',0
-'3211',4601,204300,4,'',0
+'3343',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3343',4601,81100,4,'',0,30800,4,'',0,31800,4,'',0,19500,4,'',0,27700,4,'',0
+'3563',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3563',4601,75400,4,'',0,15100,4,'',0,11400,4,'',0,12100,4,'',0,11900,4,'',0,15900,4,'',0,3500,4,'',0,15600,4,'',0,12900,4,'',0,17600,4,'',0
+'3574',4600,204300,,'',0
+'3574',4601,204300,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160206
index 746e67d5..28787626 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160206
@@ -1,4 +1,4 @@
-'3212',5100,135500,,'',0,20000,,'',0
-'3209',5200,94500,,'',0,90600,,'',0
-'3211',5300,104000,,'',0,60000,,'',0
-'3205',7400,182000,,'',0
+'3575',5100,135500,,'',0,20000,,'',0
+'3572',5200,94500,,'',0,90600,,'',0
+'3574',5300,104000,,'',0,60000,,'',0
+'3568',7400,182000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160207
index a9cf1644..10ab0d45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160207
@@ -1,7 +1,7 @@
-'3212',5100,131500,,'',0,4000,4,'',0,16000,,'',0,4000,4,'',0
-'3209',5200,94500,4,'',0,90600,4,'',0
-'3209',5201,71000,,'',0,91000,,'',0
-'3211',5300,104000,4,'',0,60000,4,'',0
-'3211',5301,81500,,'',0,53500,,'',0
-'3205',7400,182000,4,'',0
-'3205',7401,80500,,'',0
+'3575',5100,131500,,'',0,4000,4,'',0,16000,,'',0,4000,4,'',0
+'3572',5200,94500,4,'',0,90600,4,'',0
+'3572',5201,71000,,'',0,91000,,'',0
+'3574',5300,104000,4,'',0,60000,4,'',0
+'3574',5301,81500,,'',0,53500,,'',0
+'3568',7400,182000,4,'',0
+'3568',7401,80500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160209
index 70a2bc51..391684c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160209
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160209
@@ -1,2 +1,2 @@
-'2375',2001,63300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,55400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,63300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,55400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160210
index 146190db..b0711984 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160210
@@ -1,2 +1,2 @@
-'2375',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160212 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160212
index 3c50a9cc..cc4710d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160212
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160212
@@ -1,2 +1,2 @@
-'2375',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
+'3343',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160213
index a13d3ee7..f59587d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160213
@@ -1,3 +1,3 @@
-'2375',2000,71200,,'',0,50700,,'',0,43900,0,'Playmor Jct',0,24400,0,'Nelson',0
-'3132',2000,63300,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,93500,,'',0
+'3343',2000,71200,,'',0,50700,,'',0,43900,0,'Playmor Jct',0,24400,0,'Nelson',0
+'3563',2000,63300,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,93500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160214
index f866f51f..48742d9f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160214
@@ -1,2 +1,2 @@
-'2375',9900,94000,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65200,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94000,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65200,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160215
index cce48021..8eb615c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160215
@@ -1,5 +1,5 @@
-'2375',1000,75200,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
-'3132',1000,70100,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
-'3204',1000,130800,,'',0
-'3208',1000,130800,,'',0
-'3207',7601,90700,,'',0
+'3343',1000,75200,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
+'3563',1000,70100,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
+'3567',1000,130800,,'',0
+'3571',1000,130800,,'',0
+'3570',7601,90700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160216
index c096b0c6..44e0fdfe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160216
@@ -1,2 +1,2 @@
-'2375',4300,80200,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60600,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3343',4300,80200,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60600,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160218 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160218
index 9ae3d774..ae358786 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160218
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160218
@@ -1,2 +1,2 @@
-'2375',3201,100800,,'',0,14800,,'',0,36500,,'',0
-'3132',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,100800,,'',0,14800,,'',0,36500,,'',0
+'3563',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160219
index 2f72d4fc..3b872368 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160219
@@ -1,4 +1,4 @@
-'2375',3200,101200,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
-'2375',3201,101200,4,'',0,18800,4,'',0,32500,4,'',0
-'3132',3200,70000,0,'31 N Castlegar',0,5700,,'',0,18700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
-'3132',3201,75700,4,'',0,18700,4,'',0,26400,4,'',0,22100,4,'',0,12500,4,'',0,15900,4,'',0
+'3343',3200,101200,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3343',3201,101200,4,'',0,18800,4,'',0,32500,4,'',0
+'3563',3200,70000,0,'31 N Castlegar',0,5700,,'',0,18700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3563',3201,75700,4,'',0,18700,4,'',0,26400,4,'',0,22100,4,'',0,12500,4,'',0,15900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160220
index 602dcc43..c9209d88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160220
@@ -1,2 +1,2 @@
-'2375',3200,101900,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
-'3132',3200,70700,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0
+'3343',3200,101900,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3563',3200,70700,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160221
index 47c54143..1355c93a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160221
@@ -1,9 +1,9 @@
-'2375',3100,85800,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'2375',3101,100400,4,'',0,14800,4,'',0,36500,4,'',0
-'3132',3100,70800,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,3500,,'',0,15700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3101,93600,4,'',0,26400,4,'',0,50500,4,'',0,11600,4,'',0
-'2375',3200,102000,4,'',0,18800,4,'',0,32500,4,'',0
-'2375',3201,100400,,'',0,14800,,'',0,36500,,'',0
-'3132',3200,70800,4,'',0,9700,,'',0,14700,4,'',0,26400,4,'',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
-'3132',3201,73700,0,'Columbia - Celgar & Robson',0,19900,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,8600,0,'Celgar Only',0,7300,,'',0
-'3206',3800,85000,,'',0,15400,4,'',0,29600,,'',0,11400,4,'',0
+'3343',3100,85800,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3343',3101,100400,4,'',0,14800,4,'',0,36500,4,'',0
+'3563',3100,70800,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,3500,,'',0,15700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3101,93600,4,'',0,26400,4,'',0,50500,4,'',0,11600,4,'',0
+'3343',3200,102000,4,'',0,18800,4,'',0,32500,4,'',0
+'3343',3201,100400,,'',0,14800,,'',0,36500,,'',0
+'3563',3200,70800,4,'',0,9700,,'',0,14700,4,'',0,26400,4,'',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3563',3201,73700,0,'Columbia - Celgar & Robson',0,19900,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,8600,0,'Celgar Only',0,7300,,'',0
+'3569',3800,85000,,'',0,15400,4,'',0,29600,,'',0,11400,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160222
index bcc671a0..fbc4f085 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160222
@@ -1,5 +1,5 @@
-'2375',3100,91100,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
-'3132',3100,72100,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3200,81400,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
-'2375',3400,94100,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,72000,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,7600,,'',0,4900,,'',0
+'3343',3100,91100,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3563',3100,72100,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3200,81400,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3343',3400,94100,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,72000,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,7600,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160223 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160223
index 772cb4b9..e0017d43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160223
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160223
@@ -1,2 +1,2 @@
-'3132',3201,73300,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'3206',3800,100300,,'',0,41000,,'',0
+'3563',3201,73300,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3569',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160224
index 2c7796d8..9d88c20b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160224
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160224
@@ -1,2 +1,2 @@
-'3132',3201,73400,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'3206',3800,100300,,'',0,41000,,'',0
+'3563',3201,73400,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3569',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160225
index 710cdd2d..448f6e9a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160225
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160225
@@ -1,2 +1,2 @@
-'2375',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160226
index ef760d2c..3ff5cdbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160226
@@ -1,2 +1,2 @@
-'2375',3101,100100,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,100100,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160227
index 710cdd2d..448f6e9a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160227
@@ -1,2 +1,2 @@
-'2375',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160228 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160228
index 0e91d079..ae928c1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160228
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160228
@@ -1,2 +1,2 @@
-'2375',3100,90100,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71100,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3343',3100,90100,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71100,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160229
index 583dc25c..d4b93904 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160229
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160229
@@ -1,2 +1,2 @@
-'2375',3101,95900,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83000,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,95900,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83000,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160230
index d3cdd339..bedd8d88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160230
@@ -1,2 +1,2 @@
-'2375',3101,95800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,82900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3343',3101,95800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,82900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160231
index f5149818..9df0b532 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160231
@@ -1,2 +1,2 @@
-'2375',3101,100000,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,100000,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160232
index d69c8b6f..18a280f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160232
@@ -1,2 +1,2 @@
-'2375',3100,90000,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71000,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3343',3100,90000,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71000,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160233
index afa66c58..80b37c8e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160233
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160233
@@ -1,2 +1,2 @@
-'2375',3100,85900,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,70900,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3343',3100,85900,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,70900,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160234
index c4b53691..283eea8e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160234
@@ -1,4 +1,4 @@
-'2375',3100,90300,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'2375',3101,95700,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3100,71300,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3101,82800,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3343',3100,90300,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3343',3101,95700,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3100,71300,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3101,82800,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160236
index 8dc8e2f1..fe0ad920 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160236
@@ -1,2 +1,2 @@
-'2375',3101,95600,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,82700,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3343',3101,95600,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,82700,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160237
index e27a2a1e..7d3b9e93 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160237
@@ -1,6 +1,6 @@
-'2375',3100,91000,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
-'2375',3101,95100,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3100,72000,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3101,82200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3200,81300,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
-'3132',3201,72900,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3343',3100,91000,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3343',3101,95100,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3100,72000,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3101,82200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3200,81300,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3563',3201,72900,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160238
index 6d16f309..b8513af2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160238
@@ -1,6 +1,6 @@
-'2375',3100,90900,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
-'2375',3101,95000,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3100,71900,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3101,82100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3200,81200,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
-'3132',3201,72800,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3343',3100,90900,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3343',3101,95000,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3100,71900,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3101,82100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3200,81200,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3563',3201,72800,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160239
index 11d50be1..f6497a05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160239
@@ -1 +1 @@
-'3132',3601,80400,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80400,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160240
index 9fbf66e5..c7a510d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160240
@@ -1 +1 @@
-'3132',3601,80000,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80000,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160241
index 219a5cdb..4334d78d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160241
@@ -1 +1 @@
-'3132',3601,75900,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75900,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160242
index 01f67255..e611d36d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160242
@@ -1 +1 @@
-'3132',3601,75200,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75200,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160243
index 260bebd7..fe30fdf6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160243
@@ -1 +1 @@
-'3132',3601,75500,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75500,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160244
index ff4383a4..af5322a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160244
@@ -1 +1 @@
-'3132',3601,75300,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75300,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160245
index cc613fc1..920d8e44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160245
@@ -1 +1 @@
-'3132',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160246
index b57cd83e..c1338b5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160246
@@ -1,2 +1,2 @@
-'2375',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160247
index 9befae81..852bb9fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160247
@@ -1,20 +1,20 @@
-'2375',3100,91300,4,'',0,12400,4,'',0,18800,4,'',0,17900,4,'',0,14900,4,'',0
-'2375',3101,94800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3100,72300,4,'',0,12700,4,'',0,15700,4,'',0,3200,4,'',0,7500,4,'',0,11700,4,'',0,10800,4,'',0,16200,4,'',0,3000,4,'',0,9500,4,'',0
-'3132',3101,81900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3200,81600,4,'',0,63200,4,'',0,16500,4,'',0,4600,4,'',0,7300,4,'',0,10000,4,'',0
-'3132',3201,72600,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'2375',3300,113100,4,'',0,32500,4,'',0,15900,4,'',0
-'2375',3301,111200,,'',0,32500,,'',0,11900,,'',0
-'3132',3300,83900,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,19500,4,'',0,2700,4,'',0
-'3132',3301,72500,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
-'2375',3400,91600,0,'Kinnaird -',0,2700,4,'',0,9900,0,'Kinnaird -',0,6700,4,'',0,29800,0,'Kinnaird -',0,2700,4,'',0
-'3132',3400,65500,0,'Kinnaird -',0,6700,4,'',0,2800,0,'Kinnaird -',0,6700,4,'',0,3500,0,'Kinnaird -',0,6700,4,'',0,19500,0,'Kinnaird -',0,2700,4,'',0,20400,,'',0,6000,4,'',0,9600,0,'Kinnaird -',0,2700,4,'',0,500,,'',0,2000,4,'',0,8500,,'',0,2000,4,'',0,4200,0,'Kinnaird -',0,2700,4,'',0,1600,,'',0,6000,4,'',0,2900,,'',0,2000,4,'',0
-'3132',3601,81400,4,'',0,42200,,'',0,6700,4,'',0
-'3206',3800,100200,,'',0,41000,,'',0
-'2375',9800,91900,,'',0,38400,,'',0,43800,,'',0
-'2375',9801,94300,,'',0,38400,,'',0,47800,,'',0
-'3132',9800,63200,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3132',9801,65800,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9800,185900,,'',0
-'3211',9801,192100,,'',0
+'3343',3100,91300,4,'',0,12400,4,'',0,18800,4,'',0,17900,4,'',0,14900,4,'',0
+'3343',3101,94800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3100,72300,4,'',0,12700,4,'',0,15700,4,'',0,3200,4,'',0,7500,4,'',0,11700,4,'',0,10800,4,'',0,16200,4,'',0,3000,4,'',0,9500,4,'',0
+'3563',3101,81900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3200,81600,4,'',0,63200,4,'',0,16500,4,'',0,4600,4,'',0,7300,4,'',0,10000,4,'',0
+'3563',3201,72600,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3343',3300,113100,4,'',0,32500,4,'',0,15900,4,'',0
+'3343',3301,111200,,'',0,32500,,'',0,11900,,'',0
+'3563',3300,83900,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,19500,4,'',0,2700,4,'',0
+'3563',3301,72500,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
+'3343',3400,91600,0,'Kinnaird -',0,2700,4,'',0,9900,0,'Kinnaird -',0,6700,4,'',0,29800,0,'Kinnaird -',0,2700,4,'',0
+'3563',3400,65500,0,'Kinnaird -',0,6700,4,'',0,2800,0,'Kinnaird -',0,6700,4,'',0,3500,0,'Kinnaird -',0,6700,4,'',0,19500,0,'Kinnaird -',0,2700,4,'',0,20400,,'',0,6000,4,'',0,9600,0,'Kinnaird -',0,2700,4,'',0,500,,'',0,2000,4,'',0,8500,,'',0,2000,4,'',0,4200,0,'Kinnaird -',0,2700,4,'',0,1600,,'',0,6000,4,'',0,2900,,'',0,2000,4,'',0
+'3563',3601,81400,4,'',0,42200,,'',0,6700,4,'',0
+'3569',3800,100200,,'',0,41000,,'',0
+'3343',9800,91900,,'',0,38400,,'',0,43800,,'',0
+'3343',9801,94300,,'',0,38400,,'',0,47800,,'',0
+'3563',9800,63200,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3563',9801,65800,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9800,185900,,'',0
+'3574',9801,192100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160248
index 41ec7a22..bc0c918d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160248
@@ -1,2 +1,2 @@
-'2375',3400,92000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,65900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',3400,92000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,65900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160249 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160249
index e85bd557..1af48c74 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160249
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160249
@@ -1,2 +1,2 @@
-'2375',3400,92100,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70000,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',3400,92100,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70000,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160250
index 3adad21f..482832af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160250
@@ -1,2 +1,2 @@
-'2375',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160251
index 3adad21f..482832af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160251
@@ -1,2 +1,2 @@
-'2375',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160252
index eb762480..e791cf47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160252
@@ -1,2 +1,2 @@
-'2375',3400,92400,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70300,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,14200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3343',3400,92400,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70300,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,14200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160253
index c8d5803f..646ab64b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160253
@@ -1,2 +1,2 @@
-'2375',3400,93600,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',3400,93600,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160254
index aaaa4a3a..410b0098 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160254
@@ -1,2 +1,2 @@
-'2375',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160255 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160255
index aaaa4a3a..410b0098 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160255
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160255
@@ -1,2 +1,2 @@
-'2375',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160256
index c7d24a36..a462b8b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160256
@@ -1,2 +1,2 @@
-'2375',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
+'3343',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160257
index 2133e64c..b94fee96 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160257
@@ -1,8 +1,8 @@
-'2375',3300,112500,,'',0,32500,,'',0,15900,,'',0
-'3132',3300,83300,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
-'3132',3601,74800,,'',0,79300,0,'Selkirk Coll',0
-'2375',9801,93700,,'',0,38400,,'',0,43800,,'',0
-'3132',9801,65200,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
-'3211',9801,191500,,'',0
-'2375',9900,93800,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
+'3343',3300,112500,,'',0,32500,,'',0,15900,,'',0
+'3563',3300,83300,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3563',3601,74800,,'',0,79300,0,'Selkirk Coll',0
+'3343',9801,93700,,'',0,38400,,'',0,43800,,'',0
+'3563',9801,65200,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3574',9801,191500,,'',0
+'3343',9900,93800,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160258
index fed4d996..12f559e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160258
@@ -1,3 +1,3 @@
-'2375',9800,91700,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,63000,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185700,,'',0
+'3343',9800,91700,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,63000,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160259
index f541323d..eedf6c86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160259
@@ -1,3 +1,3 @@
-'2375',9801,94600,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192400,,'',0
+'3343',9801,94600,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160260
index e9ae2588..4c68df0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160260
@@ -1,5 +1,5 @@
-'2375',3400,93200,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,71100,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
-'2375',9800,91600,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,62900,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185600,,'',0
+'3343',3400,93200,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,71100,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',9800,91600,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,62900,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160261
index f43e53c9..3d17c767 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160261
@@ -1,3 +1,3 @@
-'2375',9801,94700,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,70200,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192500,,'',0
+'3343',9801,94700,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,70200,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160262
index 6028dd83..f1df4900 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160262
@@ -1,5 +1,5 @@
-'2375',3400,93300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,71200,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
-'2375',9800,91600,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,62900,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,185600,,'',0
+'3343',3400,93300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,71200,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3343',9800,91600,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,62900,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,185600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160263
index f541323d..eedf6c86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160263
@@ -1,3 +1,3 @@
-'2375',9801,94600,,'',0,38400,,'',0,47800,,'',0
-'3132',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,192400,,'',0
+'3343',9801,94600,,'',0,38400,,'',0,47800,,'',0
+'3563',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,192400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160264
index b16655a3..4809e65f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160264
@@ -1,2 +1,2 @@
-'2375',3400,92800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
+'3343',3400,92800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160265
index 30a973e1..6abab8bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160265
@@ -1,2 +1,2 @@
-'2375',3400,92900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
+'3343',3400,92900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160266 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160266
index e630538a..b6352912 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160266
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160266
@@ -1,2 +1,2 @@
-'2375',3400,92600,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
+'3343',3400,92600,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160267 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160267
index 1d9a934d..acc952c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160267
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160267
@@ -1,2 +1,2 @@
-'2375',3400,92700,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
-'3132',3400,70600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
+'3343',3400,92700,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3563',3400,70600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160268
index d67450d3..a8881cc5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160268
@@ -1,2 +1,2 @@
-'2375',3400,93900,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
-'3132',3400,71800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
+'3343',3400,93900,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3563',3400,71800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160269 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160269
index 28eaa994..77942ae2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160269
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160269
@@ -1,6 +1,6 @@
-'2375',9800,91200,,'',0,34400,,'',0,47800,,'',0
-'2375',9801,95100,,'',0,38400,,'',0,47800,,'',0
-'3132',9800,62500,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
-'3132',9801,70600,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9800,185200,,'',0
-'3211',9801,192900,,'',0
+'3343',9800,91200,,'',0,34400,,'',0,47800,,'',0
+'3343',9801,95100,,'',0,38400,,'',0,47800,,'',0
+'3563',9800,62500,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3563',9801,70600,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9800,185200,,'',0
+'3574',9801,192900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160270
index cc613fc1..920d8e44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160270
@@ -1 +1 @@
-'3132',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160271
index 72397331..19a81e9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160271
@@ -1,2 +1,2 @@
-'2375',3201,101100,,'',0,14800,,'',0,36500,,'',0
-'3132',3201,75600,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,101100,,'',0,14800,,'',0,36500,,'',0
+'3563',3201,75600,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160272 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160272
index b6c516fb..ae9b02cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160272
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160272
@@ -1,2 +1,2 @@
-'2375',3100,90200,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71200,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3343',3100,90200,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71200,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160273
index cc2ec9bf..af9c0a7b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160273
@@ -1,6 +1,6 @@
-'2375',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103600,,'',0
-'3208',101,103600,,'',0
-'3211',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103600,,'',0
+'3571',101,103600,,'',0
+'3574',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160274
index cc2ec9bf..af9c0a7b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160274
@@ -1,6 +1,6 @@
-'2375',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103600,,'',0
-'3208',101,103600,,'',0
-'3211',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103600,,'',0
+'3571',101,103600,,'',0
+'3574',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160275
index a658918f..2665e822 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160275
@@ -1,4 +1,4 @@
-'2375',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160276
index 513ad009..d076c260 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160276
@@ -1,4 +1,4 @@
-'2375',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72900,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72900,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160277
index 93a909b9..b82ffb08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160277
@@ -1,4 +1,4 @@
-'2375',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160278
index 93a909b9..b82ffb08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160278
@@ -1,4 +1,4 @@
-'2375',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160279
index 7653170e..02aa117c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160279
@@ -1,4 +1,4 @@
-'2375',301,82100,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72600,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82100,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72600,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160280
index 700acee4..18238733 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160280
@@ -1,3 +1,3 @@
-'3132',300,73700,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
-'3201',300,163000,,'',0,10100,,'',0
-'3211',300,163000,,'',0,10100,,'',0
+'3563',300,73700,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3564',300,163000,,'',0,10100,,'',0
+'3574',300,163000,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160281 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160281
index 433e3354..d13980bf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160281
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160281
@@ -1,6 +1,6 @@
-'2375',101,84000,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64300,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103800,,'',0
-'3208',101,103800,,'',0
-'3211',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,84000,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64300,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103800,,'',0
+'3571',101,103800,,'',0
+'3574',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160282
index 4781595c..aade94c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160282
@@ -1,9 +1,9 @@
-'3132',1400,74600,,'',0,85400,,'',0
-'3204',1400,105000,,'',0,68600,,'',0
-'3208',1400,105000,,'',0,68600,,'',0
-'2375',2001,52400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,44600,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
-'3204',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'2375',9901,84700,,'',0,38400,,'',0,47700,,'',0
-'3132',9901,55900,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3563',1400,74600,,'',0,85400,,'',0
+'3567',1400,105000,,'',0,68600,,'',0
+'3571',1400,105000,,'',0,68600,,'',0
+'3343',2001,52400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,44600,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
+'3567',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3343',9901,84700,,'',0,38400,,'',0,47700,,'',0
+'3563',9901,55900,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160284
index f01f33dd..6a5c0fa3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160284
@@ -1,7 +1,7 @@
-'2375',201,80700,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,62300,,'',0,2400,,'',0,7400,0,'Chahko Mika Mall',0,8100,,'',0,9800,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9100,0,'Fairview - Reverse Route',0,9100,,'',0,10100,,'',0,19700,,'',0
-'3201',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
-'3211',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11200,,'',0
-'3132',300,82000,4,'',0,3700,4,'',0,16800,4,'',0,3400,4,'',0,49400,4,'',0,15200,4,'',0
-'3201',300,163500,4,'',0,10100,4,'',0
-'3211',300,163500,4,'',0,10100,4,'',0
+'3343',201,80700,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,62300,,'',0,2400,,'',0,7400,0,'Chahko Mika Mall',0,8100,,'',0,9800,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9100,0,'Fairview - Reverse Route',0,9100,,'',0,10100,,'',0,19700,,'',0
+'3564',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3574',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11200,,'',0
+'3563',300,82000,4,'',0,3700,4,'',0,16800,4,'',0,3400,4,'',0,49400,4,'',0,15200,4,'',0
+'3564',300,163500,4,'',0,10100,4,'',0
+'3574',300,163500,4,'',0,10100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160285
index 259b101d..13578069 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160285
@@ -1,6 +1,6 @@
-'2375',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103500,,'',0
-'3208',101,103500,,'',0
-'3211',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103500,,'',0
+'3571',101,103500,,'',0
+'3574',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160286
index 259b101d..13578069 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160286
@@ -1,6 +1,6 @@
-'2375',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103500,,'',0
-'3208',101,103500,,'',0
-'3211',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103500,,'',0
+'3571',101,103500,,'',0
+'3574',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160287
index 0d95c56c..ef104318 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160287
@@ -1,6 +1,6 @@
-'2375',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103400,,'',0
-'3208',101,103400,,'',0
-'3211',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103400,,'',0
+'3571',101,103400,,'',0
+'3574',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160288
index 0d95c56c..ef104318 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160288
@@ -1,6 +1,6 @@
-'2375',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103400,,'',0
-'3208',101,103400,,'',0
-'3211',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103400,,'',0
+'3571',101,103400,,'',0
+'3574',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160289
index ca73e05a..26bf8fa6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160289
@@ -1,6 +1,6 @@
-'2375',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103300,,'',0
-'3208',101,103300,,'',0
-'3211',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103300,,'',0
+'3571',101,103300,,'',0
+'3574',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160290
index c6fbd993..e5bb9430 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160290
@@ -1,12 +1,12 @@
-'2375',101,95500,,'',0,75100,,'',0
-'3132',101,74700,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152100,0,'Uphill - No Hosp',0
-'3204',101,72500,0,'LVR Express -',0,30200,,'',0
-'3208',101,72500,0,'LVR Express -',0,30200,,'',0
-'3211',101,152100,0,'Uphill - No Hosp',0
-'2375',301,81800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72300,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
-'3208',1500,84500,,'',0,56200,,'',0,30900,,'',0
-'3204',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
+'3343',101,95500,,'',0,75100,,'',0
+'3563',101,74700,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152100,0,'Uphill - No Hosp',0
+'3567',101,72500,0,'LVR Express -',0,30200,,'',0
+'3571',101,72500,0,'LVR Express -',0,30200,,'',0
+'3574',101,152100,0,'Uphill - No Hosp',0
+'3343',301,81800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72300,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3571',1500,84500,,'',0,56200,,'',0,30900,,'',0
+'3567',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160291
index c029dab8..c3823710 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160291
@@ -1,5 +1,5 @@
-'3132',300,74000,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
-'3201',300,163300,,'',0,10100,,'',0
-'3211',300,163300,,'',0,10100,,'',0
-'3208',1500,85700,,'',0,56200,,'',0,30900,,'',0
-'3204',7200,84400,,'',0,57400,,'',0,42200,0,'Nelson',0
+'3563',300,74000,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3564',300,163300,,'',0,10100,,'',0
+'3574',300,163300,,'',0,10100,,'',0
+'3571',1500,85700,,'',0,56200,,'',0,30900,,'',0
+'3567',7200,84400,,'',0,57400,,'',0,42200,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160292
index 1d119325..254f84e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160292
@@ -1,12 +1,12 @@
-'2375',101,95600,,'',0,75100,,'',0
-'3132',101,74800,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152200,0,'Uphill - No Hosp',0
-'3204',101,72600,0,'LVR Express -',0,30200,,'',0
-'3208',101,72600,0,'LVR Express -',0,30200,,'',0
-'3211',101,152200,0,'Uphill - No Hosp',0
-'2375',301,81900,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72400,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
-'3208',1500,84500,,'',0,56200,,'',0,30900,,'',0
-'3204',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
+'3343',101,95600,,'',0,75100,,'',0
+'3563',101,74800,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152200,0,'Uphill - No Hosp',0
+'3567',101,72600,0,'LVR Express -',0,30200,,'',0
+'3571',101,72600,0,'LVR Express -',0,30200,,'',0
+'3574',101,152200,0,'Uphill - No Hosp',0
+'3343',301,81900,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72400,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3571',1500,84500,,'',0,56200,,'',0,30900,,'',0
+'3567',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160293
index 6bb48ec9..4894e3ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160293
@@ -1,10 +1,10 @@
-'2375',101,95700,,'',0,75100,,'',0
-'3132',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152300,0,'Uphill - No Hosp',0
-'3204',101,102900,,'',0
-'3208',101,102900,,'',0
-'3211',101,152300,0,'Uphill - No Hosp',0
-'2375',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,63400,,'',0,16800,,'',0,45200,,'',0
-'3201',301,193100,,'',0,11700,,'',0,15200,,'',0
-'3211',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,95700,,'',0,75100,,'',0
+'3563',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152300,0,'Uphill - No Hosp',0
+'3567',101,102900,,'',0
+'3571',101,102900,,'',0
+'3574',101,152300,0,'Uphill - No Hosp',0
+'3343',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,63400,,'',0,16800,,'',0,45200,,'',0
+'3564',301,193100,,'',0,11700,,'',0,15200,,'',0
+'3574',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160294
index d880b0cb..a900b5cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160294
@@ -1,10 +1,10 @@
-'2375',101,95700,,'',0,75100,,'',0
-'3132',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152300,0,'Uphill - No Hosp',0
-'3204',101,102900,,'',0
-'3208',101,102900,,'',0
-'3211',101,152300,0,'Uphill - No Hosp',0
-'2375',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,63500,,'',0,16800,,'',0,45200,,'',0
-'3201',301,193200,,'',0,11700,,'',0,15200,,'',0
-'3211',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,95700,,'',0,75100,,'',0
+'3563',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152300,0,'Uphill - No Hosp',0
+'3567',101,102900,,'',0
+'3571',101,102900,,'',0
+'3574',101,152300,0,'Uphill - No Hosp',0
+'3343',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3564',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3574',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160295
index a6b98839..53b2abde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160295
@@ -1,10 +1,10 @@
-'2375',101,95800,,'',0,75100,,'',0
-'3132',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152400,0,'Uphill - No Hosp',0
-'3204',101,103000,,'',0
-'3208',101,103000,,'',0
-'3211',101,152400,0,'Uphill - No Hosp',0
-'2375',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,63500,,'',0,16800,,'',0,45200,,'',0
-'3201',301,193200,,'',0,11700,,'',0,15200,,'',0
-'3211',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,95800,,'',0,75100,,'',0
+'3563',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152400,0,'Uphill - No Hosp',0
+'3567',101,103000,,'',0
+'3571',101,103000,,'',0
+'3574',101,152400,0,'Uphill - No Hosp',0
+'3343',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3564',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3574',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160296
index a6b98839..53b2abde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160296
@@ -1,10 +1,10 @@
-'2375',101,95800,,'',0,75100,,'',0
-'3132',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152400,0,'Uphill - No Hosp',0
-'3204',101,103000,,'',0
-'3208',101,103000,,'',0
-'3211',101,152400,0,'Uphill - No Hosp',0
-'2375',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,63500,,'',0,16800,,'',0,45200,,'',0
-'3201',301,193200,,'',0,11700,,'',0,15200,,'',0
-'3211',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,95800,,'',0,75100,,'',0
+'3563',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152400,0,'Uphill - No Hosp',0
+'3567',101,103000,,'',0
+'3571',101,103000,,'',0
+'3574',101,152400,0,'Uphill - No Hosp',0
+'3343',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3564',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3574',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160297
index a5732844..fb75f34d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160297
@@ -1,10 +1,10 @@
-'2375',101,83300,0,'Uphill - No Hosp',0,7000,,'',0,5600,,'',0,8200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63600,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103100,,'',0
-'3208',101,103100,,'',0
-'3211',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
-'2375',301,83300,4,'',0,7000,4,'',0,13800,4,'',0,9000,4,'',0,12000,4,'',0,15500,4,'',0,11500,4,'',0,3500,4,'',0,34400,4,'',0
-'3132',301,63600,4,'',0,16800,4,'',0,45200,4,'',0
-'3201',301,193300,4,'',0,11700,4,'',0,15200,4,'',0
-'3211',301,193300,4,'',0,11700,4,'',0,15200,4,'',0,10100,4,'',0
+'3343',101,83300,0,'Uphill - No Hosp',0,7000,,'',0,5600,,'',0,8200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63600,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103100,,'',0
+'3571',101,103100,,'',0
+'3574',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',301,83300,4,'',0,7000,4,'',0,13800,4,'',0,9000,4,'',0,12000,4,'',0,15500,4,'',0,11500,4,'',0,3500,4,'',0,34400,4,'',0
+'3563',301,63600,4,'',0,16800,4,'',0,45200,4,'',0
+'3564',301,193300,4,'',0,11700,4,'',0,15200,4,'',0
+'3574',301,193300,4,'',0,11700,4,'',0,15200,4,'',0,10100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160298
index fb82f944..f102ab07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160298
@@ -1,4 +1,4 @@
-'2375',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,63400,,'',0,16800,,'',0,45200,,'',0
-'3201',301,193100,,'',0,11700,,'',0,15200,,'',0
-'3211',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,63400,,'',0,16800,,'',0,45200,,'',0
+'3564',301,193100,,'',0,11700,,'',0,15200,,'',0
+'3574',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160299
index ed4154a1..0aade16e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160299
@@ -1,7 +1,7 @@
-'2375',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81300,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
-'3201',101,194200,,'',0,11700,,'',0,15200,,'',0
-'3204',101,72800,0,'LVR Express -',0,31200,,'',0
-'3208',101,72800,0,'LVR Express -',0,31200,,'',0
-'3211',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
-'3207',7601,94600,,'',0
+'3343',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81300,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3564',101,194200,,'',0,11700,,'',0,15200,,'',0
+'3567',101,72800,0,'LVR Express -',0,31200,,'',0
+'3571',101,72800,0,'LVR Express -',0,31200,,'',0
+'3574',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3570',7601,94600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160300
index 57a48421..39a24c3c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160300
@@ -1,6 +1,6 @@
-'2375',101,91000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81100,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,194000,,'',0,11700,,'',0,15200,,'',0
-'3204',101,72600,0,'LVR Express -',0,31200,,'',0
-'3208',101,72600,0,'LVR Express -',0,31200,,'',0
-'3211',101,194000,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,91000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81100,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,194000,,'',0,11700,,'',0,15200,,'',0
+'3567',101,72600,0,'LVR Express -',0,31200,,'',0
+'3571',101,72600,0,'LVR Express -',0,31200,,'',0
+'3574',101,194000,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160301
index fc0a8d16..0cc0830d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160301
@@ -1,7 +1,7 @@
-'2375',101,91600,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81900,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,9200,,'',0,12300,,'',0,8100,,'',0,5500,,'',0
-'3201',101,194600,,'',0,15700,,'',0,11200,,'',0
-'3204',101,74200,0,'LVR Express -',0,30200,,'',0
-'3208',101,74200,0,'LVR Express -',0,30200,,'',0
-'3211',101,194600,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
-'3132',200,82800,0,'Fairview -',0,100,0,'Fairview -',0
+'3343',101,91600,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81900,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,9200,,'',0,12300,,'',0,8100,,'',0,5500,,'',0
+'3564',101,194600,,'',0,15700,,'',0,11200,,'',0
+'3567',101,74200,0,'LVR Express -',0,30200,,'',0
+'3571',101,74200,0,'LVR Express -',0,30200,,'',0
+'3574',101,194600,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3563',200,82800,0,'Fairview -',0,100,0,'Fairview -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160302
index 4429fd7d..5976217c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160302
@@ -1,5 +1,5 @@
-'3132',300,73800,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
-'3201',300,163100,,'',0,10100,,'',0
-'3211',300,163100,,'',0,10100,,'',0
-'3208',1500,85500,,'',0,56200,,'',0,30900,,'',0
-'3204',7200,84300,,'',0,57400,,'',0,42200,0,'Nelson',0
+'3563',300,73800,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3564',300,163100,,'',0,10100,,'',0
+'3574',300,163100,,'',0,10100,,'',0
+'3571',1500,85500,,'',0,56200,,'',0,30900,,'',0
+'3567',7200,84300,,'',0,57400,,'',0,42200,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160303
index a903e053..69841399 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160303
@@ -1,6 +1,6 @@
-'2375',301,82000,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,72500,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
-'3208',1500,84600,,'',0,56200,,'',0,30900,,'',0
-'3204',7201,72000,0,'Salmo',0,52500,,'',0,47100,,'',0
+'3343',301,82000,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,72500,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3571',1500,84600,,'',0,56200,,'',0,30900,,'',0
+'3567',7201,72000,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160304
index dfb299fa..9b21337c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160304
@@ -1,6 +1,6 @@
-'2375',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103700,,'',0
-'3208',101,103700,,'',0
-'3211',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103700,,'',0
+'3571',101,103700,,'',0
+'3574',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160305
index dfb299fa..9b21337c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160305
@@ -1,6 +1,6 @@
-'2375',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103700,,'',0
-'3208',101,103700,,'',0
-'3211',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103700,,'',0
+'3571',101,103700,,'',0
+'3574',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160306
index ca73e05a..26bf8fa6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160306
@@ -1,6 +1,6 @@
-'2375',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103300,,'',0
-'3208',101,103300,,'',0
-'3211',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103300,,'',0
+'3571',101,103300,,'',0
+'3574',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160307 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160307
index 519fda0b..3d2892dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160307
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160307
@@ -1,6 +1,6 @@
-'2375',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103200,,'',0
-'3208',101,103200,,'',0
-'3211',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103200,,'',0
+'3571',101,103200,,'',0
+'3574',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160308 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160308
index 975cb816..ec96796b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160308
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160308
@@ -1,7 +1,7 @@
-'2375',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',300,73400,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
-'3132',301,63100,,'',0,12800,,'',0,49200,,'',0
-'3201',300,162700,,'',0,10100,,'',0
-'3201',301,192800,,'',0,11700,,'',0,11200,,'',0
-'3211',300,162700,,'',0,10100,,'',0
-'3211',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',300,73400,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3563',301,63100,,'',0,12800,,'',0,49200,,'',0
+'3564',300,162700,,'',0,10100,,'',0
+'3564',301,192800,,'',0,11700,,'',0,11200,,'',0
+'3574',300,162700,,'',0,10100,,'',0
+'3574',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160309 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160309
index d964287b..cfa7e545 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160309
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160309
@@ -1,7 +1,7 @@
-'2375',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',300,73300,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
-'3132',301,63100,,'',0,12800,,'',0,49200,,'',0
-'3201',300,162600,,'',0,10100,,'',0
-'3201',301,192800,,'',0,11700,,'',0,11200,,'',0
-'3211',300,162600,,'',0,10100,,'',0
-'3211',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',300,73300,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3563',301,63100,,'',0,12800,,'',0,49200,,'',0
+'3564',300,162600,,'',0,10100,,'',0
+'3564',301,192800,,'',0,11700,,'',0,11200,,'',0
+'3574',300,162600,,'',0,10100,,'',0
+'3574',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160310 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160310
index f57f0f9e..81bd9c9c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160310
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160310
@@ -1,4 +1,4 @@
-'2375',301,82600,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,62900,,'',0,10200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,1200,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82600,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,62900,,'',0,10200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,1200,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160311 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160311
index 58f4d4c2..44e37f40 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160311
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160311
@@ -1,7 +1,7 @@
-'2375',301,82700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
-'3132',300,73200,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
-'3132',301,63000,,'',0,10200,4,'',0,1400,4,'',0,1200,,'',0,5200,4,'',0,3700,4,'',0,6300,4,'',0,3800,4,'',0,6700,4,'',0,3400,4,'',0,10000,4,'',0,10100,,'',0,9500,4,'',0,10400,4,'',0,9400,4,'',0,11200,4,'',0,16300,4,'',0
-'3201',300,162500,,'',0,10100,,'',0
-'3201',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',300,162500,,'',0,10100,,'',0
-'3211',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3563',300,73200,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3563',301,63000,,'',0,10200,4,'',0,1400,4,'',0,1200,,'',0,5200,4,'',0,3700,4,'',0,6300,4,'',0,3800,4,'',0,6700,4,'',0,3400,4,'',0,10000,4,'',0,10100,,'',0,9500,4,'',0,10400,4,'',0,9400,4,'',0,11200,4,'',0,16300,4,'',0
+'3564',300,162500,,'',0,10100,,'',0
+'3564',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',300,162500,,'',0,10100,,'',0
+'3574',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160312
index 519fda0b..3d2892dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160312
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160312
@@ -1,6 +1,6 @@
-'2375',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
-'3132',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
-'3204',101,103200,,'',0
-'3208',101,103200,,'',0
-'3211',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3563',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3567',101,103200,,'',0
+'3571',101,103200,,'',0
+'3574',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160313
index 5923bacc..13d1c474 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160313
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160313
@@ -1,8 +1,8 @@
-'2375',101,91300,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81500,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
-'3201',101,194300,,'',0,15700,,'',0,11200,,'',0
-'3204',101,72900,0,'LVR Express -',0,31200,,'',0
-'3208',101,72900,0,'LVR Express -',0,31200,,'',0
-'3211',101,194300,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
-'3207',7600,100000,,'',0
-'3207',7601,94800,4,'',0
+'3343',101,91300,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81500,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3564',101,194300,,'',0,15700,,'',0,11200,,'',0
+'3567',101,72900,0,'LVR Express -',0,31200,,'',0
+'3571',101,72900,0,'LVR Express -',0,31200,,'',0
+'3574',101,194300,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3570',7600,100000,,'',0
+'3570',7601,94800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160314 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160314
index a2910ba1..86f57e68 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160314
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160314
@@ -1,7 +1,7 @@
-'2375',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81400,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
-'3201',101,194200,,'',0,11700,,'',0,15200,,'',0
-'3204',101,72800,0,'LVR Express -',0,31200,,'',0
-'3208',101,72800,0,'LVR Express -',0,31200,,'',0
-'3211',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
-'3207',7601,94700,,'',0
+'3343',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81400,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3564',101,194200,,'',0,11700,,'',0,15200,,'',0
+'3567',101,72800,0,'LVR Express -',0,31200,,'',0
+'3571',101,72800,0,'LVR Express -',0,31200,,'',0
+'3574',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3570',7601,94700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160315 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160315
index 96b70c90..adcf2e3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160315
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160315
@@ -1,5 +1,5 @@
-'3132',201,152000,0,'Fairview - Reverse Route',0
-'2375',1001,102900,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,120900,,'',0
-'3208',1001,120900,,'',0
+'3563',201,152000,0,'Fairview - Reverse Route',0
+'3343',1001,102900,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,120900,,'',0
+'3571',1001,120900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160316
index 1df38ffd..05b8e8e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160316
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160316
@@ -1,8 +1,8 @@
-'2375',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64200,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,83000,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134600,,'',0
-'3208',1000,134600,,'',0
+'3343',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64200,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,83000,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134600,,'',0
+'3571',1000,134600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160317 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160317
index e15ca46f..c50a9556 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160317
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160317
@@ -1,4 +1,4 @@
-'2375',400,151300,,'',0
-'3132',400,124800,,'',0,16800,,'',0
-'3201',400,151100,,'',0
-'3211',400,151100,,'',0
+'3343',400,151300,,'',0
+'3563',400,124800,,'',0,16800,,'',0
+'3564',400,151100,,'',0
+'3574',400,151100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160318 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160318
index b550b993..58bc8a1c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160318
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160318
@@ -1,8 +1,8 @@
-'2375',201,81600,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',200,82200,0,'Fairview -',0
-'3132',201,62900,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
-'2375',1001,71200,0,'Balfour Exp',0
-'3132',1001,62300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,99400,0,'Balfour Exp',0
-'3207',7600,101200,,'',0
+'3343',201,81600,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',200,82200,0,'Fairview -',0
+'3563',201,62900,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',1001,71200,0,'Balfour Exp',0
+'3563',1001,62300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,99400,0,'Balfour Exp',0
+'3570',7600,101200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160319 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160319
index 391b87ab..75e96653 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160319
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160319
@@ -1,5 +1,5 @@
-'3132',201,152100,0,'Fairview - Reverse Route',0
-'2375',1001,103000,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,85000,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,121000,,'',0
-'3208',1001,121000,,'',0
+'3563',201,152100,0,'Fairview - Reverse Route',0
+'3343',1001,103000,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,85000,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,121000,,'',0
+'3571',1001,121000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160320 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160320
index afd9c21c..a9b1d36d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160320
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160320
@@ -1,8 +1,8 @@
-'2375',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64200,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,83000,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134600,,'',0
-'3208',1000,134600,,'',0
+'3343',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64200,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,83000,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134600,,'',0
+'3571',1000,134600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160321 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160321
index 9833f73f..b5ea1d30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160321
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160321
@@ -1,5 +1,5 @@
-'3132',201,152100,0,'Fairview - Reverse Route',0
-'2375',1001,103100,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,85100,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,121100,,'',0
-'3208',1001,121100,,'',0
+'3563',201,152100,0,'Fairview - Reverse Route',0
+'3343',1001,103100,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,85100,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,121100,,'',0
+'3571',1001,121100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160322
index 468f808a..ca1a61b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160322
@@ -1,8 +1,8 @@
-'2375',200,82800,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64100,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,82900,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134500,,'',0
-'3208',1000,134500,,'',0
+'3343',200,82800,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64100,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,82900,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134500,,'',0
+'3571',1000,134500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160323 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160323
index cec95712..e866b3b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160323
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160323
@@ -1,4 +1,4 @@
-'2375',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,4,'',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,4,'',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160324
index 65690973..9ed0b4dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160324
@@ -1 +1 @@
-'3132',200,152200,0,'LVR Express',0,1000,0,'LVR Express',0
+'3563',200,152200,0,'LVR Express',0,1000,0,'LVR Express',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160325
index ff640a55..808fc1a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160325
@@ -1,4 +1,4 @@
-'2375',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160326
index d9354923..ca80f43a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160326
@@ -1,5 +1,5 @@
-'2375',201,81700,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',200,82200,0,'Fairview -',0
-'3132',201,63000,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',201,81700,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',200,82200,0,'Fairview -',0
+'3563',201,63000,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160327
index b7446668..76cf4d7e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160327
@@ -1,4 +1,4 @@
-'2375',200,82400,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63700,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82400,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63700,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160328
index ad0d8a76..d00d745f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160328
@@ -1,4 +1,4 @@
-'2375',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160329
index c16b5a9c..c9f421fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160329
@@ -1,5 +1,5 @@
-'3132',201,152300,0,'Fairview - Reverse Route',0
-'2375',1001,103200,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,121200,,'',0
-'3208',1001,121200,,'',0
+'3563',201,152300,0,'Fairview - Reverse Route',0
+'3343',1001,103200,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,121200,,'',0
+'3571',1001,121200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160330
index 510cf706..f5e9311d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160330
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160330
@@ -1,4 +1,4 @@
-'2375',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63900,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63900,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160332
index ed02fa39..afdc9d10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160332
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160332
@@ -1,4 +1,4 @@
-'2375',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63900,,'',0,6400,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63900,,'',0,6400,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160333
index 499dd87e..4f7a13de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160333
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160333
@@ -1,5 +1,5 @@
-'2375',1001,71300,0,'Balfour Exp',0,32000,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,62400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9600,0,'Balfour Exp',0,14300,,'',0,19300,,'',0
-'3204',1001,121300,,'',0
-'3208',1001,121300,,'',0
-'3207',7600,101300,,'',0
+'3343',1001,71300,0,'Balfour Exp',0,32000,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,62400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9600,0,'Balfour Exp',0,14300,,'',0,19300,,'',0
+'3567',1001,121300,,'',0
+'3571',1001,121300,,'',0
+'3570',7600,101300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160334
index ad0d8a76..d00d745f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160334
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160334
@@ -1,4 +1,4 @@
-'2375',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160335
index afc06365..00923f0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160335
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160335
@@ -1,4 +1,4 @@
-'2375',200,82300,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63600,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82300,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63600,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160336
index 1dc7077c..906a40cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160336
@@ -1,4 +1,4 @@
-'2375',201,81900,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,63200,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',201,81900,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,63200,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160337
index fc6d82f7..a2428a3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160337
@@ -1,4 +1,4 @@
-'2375',201,82000,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,63300,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',201,82000,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,63300,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160338
index 569cc877..4cb13177 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160338
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160338
@@ -1,4 +1,4 @@
-'2375',200,82200,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82200,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160339 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160339
index 58d49520..18ca10c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160339
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160339
@@ -1,4 +1,4 @@
-'2375',200,82200,,'',0,11400,,'',0,11500,,'',0,15400,,'',0,12100,,'',0,11300,,'',0,20100,,'',0,10300,,'',0,7800,,'',0,11300,,'',0
-'3132',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10400,,'',0,7100,,'',0,9900,,'',0,9600,,'',0,10500,,'',0,2300,,'',0,9000,0,'LVR Express',0,9300,,'',0,10000,,'',0,19700,,'',0
-'3201',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',200,82200,,'',0,11400,,'',0,11500,,'',0,15400,,'',0,12100,,'',0,11300,,'',0,20100,,'',0,10300,,'',0,7800,,'',0,11300,,'',0
+'3563',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10400,,'',0,7100,,'',0,9900,,'',0,9600,,'',0,10500,,'',0,2300,,'',0,9000,0,'LVR Express',0,9300,,'',0,10000,,'',0,19700,,'',0
+'3564',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160340
index df021d37..5cd0d8df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160340
@@ -1,6 +1,6 @@
-'2375',101,91100,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81200,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
-'3201',101,194100,,'',0,11700,,'',0,15200,,'',0
-'3204',101,72700,0,'LVR Express -',0,31200,,'',0
-'3208',101,72700,0,'LVR Express -',0,31200,,'',0
-'3211',101,194100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3343',101,91100,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81200,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3564',101,194100,,'',0,11700,,'',0,15200,,'',0
+'3567',101,72700,0,'LVR Express -',0,31200,,'',0
+'3571',101,72700,0,'LVR Express -',0,31200,,'',0
+'3574',101,194100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160341 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160341
index 50e603b4..c8e1de7e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160341
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160341
@@ -1,7 +1,7 @@
-'2375',101,91500,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
-'3132',101,81800,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
-'3201',101,194500,,'',0,15700,,'',0,11200,,'',0
-'3204',101,74100,0,'LVR Express -',0,30200,,'',0
-'3208',101,74100,0,'LVR Express -',0,30200,,'',0
-'3211',101,194500,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
-'3132',200,82700,0,'Fairview -',0
+'3343',101,91500,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3563',101,81800,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3564',101,194500,,'',0,15700,,'',0,11200,,'',0
+'3567',101,74100,0,'LVR Express -',0,30200,,'',0
+'3571',101,74100,0,'LVR Express -',0,30200,,'',0
+'3574',101,194500,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3563',200,82700,0,'Fairview -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160342
index 9535de0e..cbaec9b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160342
@@ -1,9 +1,9 @@
-'2375',201,81400,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,62700,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,8700,0,'Fairview - Reverse Route',0,9500,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
-'2375',1001,71100,0,'Balfour Exp',0,31700,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,62200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9900,0,'Balfour Exp',0,14000,,'',0,19300,,'',0
-'3204',1001,120800,,'',0
-'3208',1001,120800,,'',0
-'3207',7600,101100,,'',0
+'3343',201,81400,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,62700,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,8700,0,'Fairview - Reverse Route',0,9500,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3343',1001,71100,0,'Balfour Exp',0,31700,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,62200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9900,0,'Balfour Exp',0,14000,,'',0,19300,,'',0
+'3567',1001,120800,,'',0
+'3571',1001,120800,,'',0
+'3570',7600,101100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160343
index 4f6ae3a0..9cb18a44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160343
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160343
@@ -1 +1 @@
-'3132',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160344
index 6d1fb589..dd66f564 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160344
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160344
@@ -1 +1 @@
-'3132',3601,80300,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80300,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160345 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160345
index 4f6ae3a0..9cb18a44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160345
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160345
@@ -1 +1 @@
-'3132',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160346
index 26894a36..25f55778 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160346
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160346
@@ -1 +1 @@
-'3132',3601,80100,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80100,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160347
index 1a0cb370..4910d1b6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160347
@@ -1,3 +1,3 @@
-'2375',3100,90600,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
-'3132',3100,71600,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
-'3132',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3343',3100,90600,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3563',3100,71600,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3563',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160348
index 3fca6dd6..bcde359b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160348
@@ -1,12 +1,12 @@
-'2375',3100,91200,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
-'3132',3100,72200,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,16200,,'',0,3000,,'',0,9500,,'',0
-'3132',3200,81500,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
-'2375',3300,113000,,'',0,32500,,'',0,15900,,'',0
-'3132',3300,83800,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
-'2375',3400,91700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,10100,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,30000,0,'Kinnaird -',0,2500,0,'Kinnaird -',0
-'3132',3400,65600,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3000,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3700,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,19700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,20600,,'',0,5800,,'',0,9800,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,700,,'',0,1800,,'',0,8700,,'',0,1800,,'',0,4400,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,1800,,'',0,5800,,'',0,3100,,'',0,1800,,'',0
-'3132',3601,81300,,'',0,48900,,'',0
-'3206',3800,100100,,'',0,41000,,'',0
-'2375',9801,94200,,'',0,100,,'',0,38300,,'',0,100,,'',0,47700,,'',0,100,,'',0
-'3132',9801,65700,,'',0,100,,'',0,9000,,'',0,100,,'',0,28900,,'',0,100,,'',0,26400,,'',0,100,,'',0,31700,,'',0,100,,'',0,18200,,'',0,100,,'',0
-'3211',9801,192000,,'',0,100,,'',0
+'3343',3100,91200,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3563',3100,72200,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,16200,,'',0,3000,,'',0,9500,,'',0
+'3563',3200,81500,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3343',3300,113000,,'',0,32500,,'',0,15900,,'',0
+'3563',3300,83800,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3343',3400,91700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,10100,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,30000,0,'Kinnaird -',0,2500,0,'Kinnaird -',0
+'3563',3400,65600,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3000,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3700,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,19700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,20600,,'',0,5800,,'',0,9800,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,700,,'',0,1800,,'',0,8700,,'',0,1800,,'',0,4400,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,1800,,'',0,5800,,'',0,3100,,'',0,1800,,'',0
+'3563',3601,81300,,'',0,48900,,'',0
+'3569',3800,100100,,'',0,41000,,'',0
+'3343',9801,94200,,'',0,100,,'',0,38300,,'',0,100,,'',0,47700,,'',0,100,,'',0
+'3563',9801,65700,,'',0,100,,'',0,9000,,'',0,100,,'',0,28900,,'',0,100,,'',0,26400,,'',0,100,,'',0,31700,,'',0,100,,'',0,18200,,'',0,100,,'',0
+'3574',9801,192000,,'',0,100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160349
index a658918f..2665e822 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160349
@@ -1,4 +1,4 @@
-'2375',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160350 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160350
index 90b416d2..c86fcb36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160350
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160350
@@ -1,11 +1,11 @@
-'2375',201,81000,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,62500,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
-'3211',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
-'2375',1001,102400,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,84400,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
-'3204',1001,120400,,'',0
-'3208',1001,120400,,'',0
-'3204',7200,84700,,'',0,57400,,'',0,42100,0,'Nelson',0
-'3205',7401,101900,,'',0
-'3207',7600,100700,,'',0
+'3343',201,81000,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,62500,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3574',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
+'3343',1001,102400,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,84400,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3567',1001,120400,,'',0
+'3571',1001,120400,,'',0
+'3567',7200,84700,,'',0,57400,,'',0,42100,0,'Nelson',0
+'3568',7401,101900,,'',0
+'3570',7600,100700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160351
index 5bf7be9c..a93b1007 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160351
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160351
@@ -1,14 +1,14 @@
-'2375',200,83700,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64600,,'',0,6800,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,14500,,'',0,3000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10500,,'',0
-'2375',400,151700,,'',0
-'3132',400,125200,,'',0,16800,,'',0
-'3201',400,151500,,'',0
-'3211',400,151500,,'',0
-'2375',1000,83800,,'',0,37600,,'',0,44500,0,'Nelson Exp',0,37400,,'',0
-'3132',1000,74300,,'',0,10100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17400,,'',0,18000,0,'Nelson Exp',0
-'3204',1000,135400,,'',0
-'3208',1000,135400,,'',0
-'3204',7201,71700,0,'Salmo',0,52400,,'',0,47100,,'',0
-'3207',7601,94000,,'',0
+'3343',200,83700,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64600,,'',0,6800,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,14500,,'',0,3000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10500,,'',0
+'3343',400,151700,,'',0
+'3563',400,125200,,'',0,16800,,'',0
+'3564',400,151500,,'',0
+'3574',400,151500,,'',0
+'3343',1000,83800,,'',0,37600,,'',0,44500,0,'Nelson Exp',0,37400,,'',0
+'3563',1000,74300,,'',0,10100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17400,,'',0,18000,0,'Nelson Exp',0
+'3567',1000,135400,,'',0
+'3571',1000,135400,,'',0
+'3567',7201,71700,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3570',7601,94000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160352
index c163c7ee..dc5c89ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160352
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160352
@@ -1,2 +1,2 @@
-'2375',4300,75600,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,60000,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75600,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,60000,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160353
index ee9b7e89..983a27d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160353
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160353
@@ -1,2 +1,2 @@
-'2375',4301,83600,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54600,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83600,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54600,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160354
index 956b717a..ecc8337d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160354
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160354
@@ -1,3 +1,3 @@
-'2375',4300,85800,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,74100,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212300,,'',0
+'3343',4300,85800,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,74100,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160355 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160355
index 7326d308..8edfe21e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160355
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160355
@@ -1,2 +1,2 @@
-'2375',4301,83900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54800,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54800,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160356 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160356
index 96f9ad74..b75f799c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160356
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160356
@@ -1,3 +1,3 @@
-'2375',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212000,,'',0
+'3343',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160357 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160357
index 059b0798..7994d556 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160357
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160357
@@ -1 +1 @@
-'3132',4500,61100,,'',0,3000,,'',0,200,,'',0,88300,,'',0
+'3563',4500,61100,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160358 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160358
index 9877f799..ee6a3f61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160358
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160358
@@ -1,8 +1,8 @@
-'2375',201,80900,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',201,62400,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
-'3201',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
-'3211',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
-'2375',1001,102300,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,84300,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
-'3204',1001,120300,,'',0
-'3208',1001,120300,,'',0
+'3343',201,80900,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',201,62400,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3564',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3574',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
+'3343',1001,102300,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,84300,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3567',1001,120300,,'',0
+'3571',1001,120300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160359 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160359
index 1ffe4b2e..7d8509c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160359
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160359
@@ -1,8 +1,8 @@
-'2375',200,82100,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'2375',201,82100,4,'',0,11400,4,'',0,11400,4,'',0,15500,4,'',0,12000,4,'',0,11400,4,'',0,20000,4,'',0,10400,4,'',0,7800,4,'',0,11300,4,'',0
-'3132',200,63400,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'LVR Express',0,9200,,'',0,10100,,'',0,19700,,'',0
-'3132',201,63400,4,'',0,2400,4,'',0,15500,4,'',0,2600,4,'',0,7500,4,'',0,2700,4,'',0,10300,4,'',0,7200,4,'',0,9800,4,'',0,9700,4,'',0,10400,4,'',0,2400,4,'',0,9000,4,'',0,9200,4,'',0,10100,4,'',0,19700,4,'',0
-'3201',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3201',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0
-'3211',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
-'3211',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0,10900,4,'',0
+'3343',200,82100,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3343',201,82100,4,'',0,11400,4,'',0,11400,4,'',0,15500,4,'',0,12000,4,'',0,11400,4,'',0,20000,4,'',0,10400,4,'',0,7800,4,'',0,11300,4,'',0
+'3563',200,63400,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'LVR Express',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3563',201,63400,4,'',0,2400,4,'',0,15500,4,'',0,2600,4,'',0,7500,4,'',0,2700,4,'',0,10300,4,'',0,7200,4,'',0,9800,4,'',0,9700,4,'',0,10400,4,'',0,2400,4,'',0,9000,4,'',0,9200,4,'',0,10100,4,'',0,19700,4,'',0
+'3564',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3564',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0
+'3574',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3574',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0,10900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160360
index 5af27470..04e3e2c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160360
@@ -1,4 +1,4 @@
-'2375',3101,95400,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,82500,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'3206',3800,100300,,'',0,41000,,'',0
+'3343',3101,95400,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,82500,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3569',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160361
index 11579fdb..189717d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160361
@@ -1,4 +1,4 @@
-'2375',3101,95300,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,82400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
-'3132',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
-'3206',3800,100300,,'',0,41000,,'',0
+'3343',3101,95300,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,82400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3563',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3569',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160362 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160362
index fec6be0e..de3a1598 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160362
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160362
@@ -1 +1 @@
-'3132',3200,80800,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3563',3200,80800,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160363
index 2a0b4d6f..7df95786 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160363
@@ -1 +1 @@
-'3132',3200,80700,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3563',3200,80700,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160364 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160364
index 48a3dbf9..7f023fff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160364
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160364
@@ -1,3 +1,3 @@
-'2375',9800,90200,,'',0,34400,,'',0,47800,,'',0
-'3132',9800,61500,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,184200,,'',0
+'3343',9800,90200,,'',0,34400,,'',0,47800,,'',0
+'3563',9800,61500,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,184200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160365
index 1b75eeca..faf802df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160365
@@ -1,8 +1,8 @@
-'2375',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,82800,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134400,,'',0
-'3208',1000,134400,,'',0
+'3343',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,82800,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134400,,'',0
+'3571',1000,134400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160366 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160366
index e05877c8..c85903c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160366
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160366
@@ -1,2 +1,2 @@
-'2375',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3343',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160367
index d9c28b6c..289c609b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160367
@@ -1,3 +1,3 @@
-'2375',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214600,,'',0
+'3343',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160368
index 2c0e2abe..c43d8fae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160368
@@ -1,4 +1,4 @@
-'2375',301,82500,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',301,62800,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',301,82500,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',301,62800,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160369
index 42a2ebda..830a4e11 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160369
@@ -1,3 +1,3 @@
-'2375',4300,92500,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,72600,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
-'3211',4300,214800,,'',0
+'3343',4300,92500,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,72600,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3574',4300,214800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160370
index 7d1b9bf3..4cf80619 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160370
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160370
@@ -1,2 +1,2 @@
-'2375',4301,81300,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
-'3132',4301,61500,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3343',4301,81300,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3563',4301,61500,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160373 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160373
index d126b9ae..1bb423d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160373
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160373
@@ -1,2 +1,2 @@
-'2375',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
-'3132',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3343',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3563',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160376 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160376
index b8884deb..ebe9cc6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160376
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160376
@@ -1,51 +1,51 @@
-'2375',101,84200,4,'',0,7600,4,'',0,3600,,'',0,6000,4,'',0,4200,4,'',0,9000,4,'',0,16000,4,'',0,11500,4,'',0,11500,4,'',0,7500,4,'',0,9400,,'',0,2000,4,'',0,19000,4,'',0
-'3132',101,64500,4,'',0,10100,0,'Uphill - No Hosp',0,5400,4,'',0,2100,4,'',0,1400,,'',0,1500,0,'Hosp Only',0,500,4,'',0,4500,4,'',0,3000,,'',0,2000,4,'',0,5500,,'',0,2000,4,'',0,10000,0,'Hosp Only',0,1000,4,'',0,200,,'',0,2000,4,'',0,15400,4,'',0,700,0,'Hosp Only',0,1000,4,'',0,1300,,'',0,6000,4,'',0,9900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,800,4,'',0,600,4,'',0,2600,,'',0,6000,4,'',0,10300,,'',0,2000,4,'',0,2100,,'',0,6000,4,'',0,3500,,'',0,6000,4,'',0
-'3201',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0
-'3204',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
-'3208',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
-'3211',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0,10100,4,'',0
-'2375',200,84000,4,'',0,11400,4,'',0,15600,4,'',0,11300,4,'',0,12200,4,'',0,11200,4,'',0,20200,4,'',0,14200,4,'',0,3800,4,'',0,11300,4,'',0
-'3132',200,64800,4,'',0,6900,4,'',0,2600,4,'',0,9000,4,'',0,2500,4,'',0,7500,4,'',0,6700,4,'',0,10500,4,'',0,3000,4,'',0,10000,4,'',0,9500,4,'',0,10600,4,'',0,2200,4,'',0,7400,4,'',0,1000,4,'',0,10000,4,'',0,9900,4,'',0,19700,4,'',0
-'3132',201,82000,0,'LVR Express',0,600,0,'LVR Express',0
-'3201',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0
-'3211',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0,10400,4,'',0
-'2375',301,81700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
-'3132',300,74200,4,'',0,17800,4,'',0,3800,4,'',0,20100,4,'',0,19600,4,'',0,10400,4,'',0,36900,4,'',0
-'3132',301,72200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
-'3201',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
-'3211',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
-'2375',400,152200,4,'',0
-'2375',401,140300,,'',0
-'3132',400,125700,4,'',0,16800,4,'',0
-'3132',401,110500,,'',0,20600,,'',0,12500,,'',0
-'3201',400,152000,4,'',0
-'3211',400,152000,4,'',0
-'2375',1000,84100,4,'',0,37600,4,'',0,48300,4,'',0,33600,4,'',0
-'2375',1001,71000,0,'Balfour Exp',0,31100,,'',0,50100,,'',0,32400,,'',0
-'3132',1000,74500,4,'',0,10200,4,'',0,19000,4,'',0,50000,4,'',0,16300,4,'',0,15800,4,'',0,17300,4,'',0,17900,4,'',0
-'3132',1001,62100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,12600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
-'3204',1000,135700,4,'',0
-'3204',1001,120100,,'',0
-'3208',1000,135700,4,'',0
-'3208',1001,120100,,'',0
-'3132',1400,74500,,'',0,10100,4,'',0,71300,,'',0,9700,4,'',0
-'3204',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
-'3208',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
-'3208',1500,84400,,'',0,1400,4,'',0,54800,,'',0,1400,4,'',0,29500,,'',0,1400,4,'',0
-'2375',2000,80500,4,'',0,50700,4,'',0,64300,4,'',0
-'2375',2001,52300,,'',0,49200,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0
-'3132',2000,72100,4,'',0,22700,4,'',0,37000,4,'',0,53400,4,'',0,15700,4,'',0
-'3132',2001,44500,,'',0,26200,,'',0,32100,,'',0,53100,0,'Slocan Vly -',0,16600,0,'Slocan Vly -',0
-'3204',2000,71700,4,'',0,12200,4,'',0
-'3204',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2000,71700,4,'',0,12200,4,'',0
-'3208',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3204',7200,84500,,'',0,57400,,'',0,42100,0,'Nelson',0
-'3204',7201,71900,0,'Salmo',0,52400,,'',0,47100,,'',0
-'3205',7401,101900,,'',0
-'3207',7600,100500,,'',0
-'3207',7601,94300,,'',0
-'2375',9900,101900,4,'',0,38400,4,'',0,43900,4,'',0
-'2375',9901,84600,,'',0,38400,,'',0,47700,,'',0
-'3132',9900,73100,4,'',0,9100,4,'',0,11400,4,'',0,18100,4,'',0,22200,4,'',0,31300,4,'',0,9800,4,'',0,8900,4,'',0
-'3132',9901,55800,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',101,84200,4,'',0,7600,4,'',0,3600,,'',0,6000,4,'',0,4200,4,'',0,9000,4,'',0,16000,4,'',0,11500,4,'',0,11500,4,'',0,7500,4,'',0,9400,,'',0,2000,4,'',0,19000,4,'',0
+'3563',101,64500,4,'',0,10100,0,'Uphill - No Hosp',0,5400,4,'',0,2100,4,'',0,1400,,'',0,1500,0,'Hosp Only',0,500,4,'',0,4500,4,'',0,3000,,'',0,2000,4,'',0,5500,,'',0,2000,4,'',0,10000,0,'Hosp Only',0,1000,4,'',0,200,,'',0,2000,4,'',0,15400,4,'',0,700,0,'Hosp Only',0,1000,4,'',0,1300,,'',0,6000,4,'',0,9900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,800,4,'',0,600,4,'',0,2600,,'',0,6000,4,'',0,10300,,'',0,2000,4,'',0,2100,,'',0,6000,4,'',0,3500,,'',0,6000,4,'',0
+'3564',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0
+'3567',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
+'3571',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
+'3574',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0,10100,4,'',0
+'3343',200,84000,4,'',0,11400,4,'',0,15600,4,'',0,11300,4,'',0,12200,4,'',0,11200,4,'',0,20200,4,'',0,14200,4,'',0,3800,4,'',0,11300,4,'',0
+'3563',200,64800,4,'',0,6900,4,'',0,2600,4,'',0,9000,4,'',0,2500,4,'',0,7500,4,'',0,6700,4,'',0,10500,4,'',0,3000,4,'',0,10000,4,'',0,9500,4,'',0,10600,4,'',0,2200,4,'',0,7400,4,'',0,1000,4,'',0,10000,4,'',0,9900,4,'',0,19700,4,'',0
+'3563',201,82000,0,'LVR Express',0,600,0,'LVR Express',0
+'3564',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0
+'3574',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0,10400,4,'',0
+'3343',301,81700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3563',300,74200,4,'',0,17800,4,'',0,3800,4,'',0,20100,4,'',0,19600,4,'',0,10400,4,'',0,36900,4,'',0
+'3563',301,72200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3564',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3574',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3343',400,152200,4,'',0
+'3343',401,140300,,'',0
+'3563',400,125700,4,'',0,16800,4,'',0
+'3563',401,110500,,'',0,20600,,'',0,12500,,'',0
+'3564',400,152000,4,'',0
+'3574',400,152000,4,'',0
+'3343',1000,84100,4,'',0,37600,4,'',0,48300,4,'',0,33600,4,'',0
+'3343',1001,71000,0,'Balfour Exp',0,31100,,'',0,50100,,'',0,32400,,'',0
+'3563',1000,74500,4,'',0,10200,4,'',0,19000,4,'',0,50000,4,'',0,16300,4,'',0,15800,4,'',0,17300,4,'',0,17900,4,'',0
+'3563',1001,62100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,12600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3567',1000,135700,4,'',0
+'3567',1001,120100,,'',0
+'3571',1000,135700,4,'',0
+'3571',1001,120100,,'',0
+'3563',1400,74500,,'',0,10100,4,'',0,71300,,'',0,9700,4,'',0
+'3567',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
+'3571',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
+'3571',1500,84400,,'',0,1400,4,'',0,54800,,'',0,1400,4,'',0,29500,,'',0,1400,4,'',0
+'3343',2000,80500,4,'',0,50700,4,'',0,64300,4,'',0
+'3343',2001,52300,,'',0,49200,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0
+'3563',2000,72100,4,'',0,22700,4,'',0,37000,4,'',0,53400,4,'',0,15700,4,'',0
+'3563',2001,44500,,'',0,26200,,'',0,32100,,'',0,53100,0,'Slocan Vly -',0,16600,0,'Slocan Vly -',0
+'3567',2000,71700,4,'',0,12200,4,'',0
+'3567',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2000,71700,4,'',0,12200,4,'',0
+'3571',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3567',7200,84500,,'',0,57400,,'',0,42100,0,'Nelson',0
+'3567',7201,71900,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3568',7401,101900,,'',0
+'3570',7600,100500,,'',0
+'3570',7601,94300,,'',0
+'3343',9900,101900,4,'',0,38400,4,'',0,43900,4,'',0
+'3343',9901,84600,,'',0,38400,,'',0,47700,,'',0
+'3563',9900,73100,4,'',0,9100,4,'',0,11400,4,'',0,18100,4,'',0,22200,4,'',0,31300,4,'',0,9800,4,'',0,8900,4,'',0
+'3563',9901,55800,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160378 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160378
index 573d1a9f..7dde9838 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160378
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160378
@@ -1,22 +1,22 @@
-'2375',200,83400,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'2375',201,81300,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
-'3132',200,71100,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3132',201,72700,4,'',0,17900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
-'3201',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3201',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'3211',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
-'2375',1000,83500,,'',0,37600,,'',0,81900,,'',0
-'2375',1001,102700,,'',0,50100,,'',0,32400,,'',0
-'3132',1000,84100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0
-'3132',1001,84700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
-'3204',1000,135100,,'',0
-'3204',1001,120700,,'',0
-'3208',1000,135100,,'',0
-'3208',1001,120700,,'',0
-'3204',7200,85000,4,'',0,57400,4,'',0,42100,4,'',0
-'3204',7201,71500,0,'Salmo',0,52400,,'',0,47100,,'',0
-'3205',7400,160500,,'',0
-'3205',7401,102000,4,'',0
-'3207',7600,101100,,'',0
-'3207',7601,93500,,'',0
+'3343',200,83400,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3343',201,81300,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3563',200,71100,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3563',201,72700,4,'',0,17900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3564',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3564',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3574',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3343',1000,83500,,'',0,37600,,'',0,81900,,'',0
+'3343',1001,102700,,'',0,50100,,'',0,32400,,'',0
+'3563',1000,84100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0
+'3563',1001,84700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3567',1000,135100,,'',0
+'3567',1001,120700,,'',0
+'3571',1000,135100,,'',0
+'3571',1001,120700,,'',0
+'3567',7200,85000,4,'',0,57400,4,'',0,42100,4,'',0
+'3567',7201,71500,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3568',7400,160500,,'',0
+'3568',7401,102000,4,'',0
+'3570',7600,101100,,'',0
+'3570',7601,93500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160379
index 7b4039a9..3e63c795 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160379
@@ -1,2 +1,2 @@
-'2375',401,141200,4,'',0
-'3132',401,111400,4,'',0,20600,4,'',0,12500,4,'',0
+'3343',401,141200,4,'',0
+'3563',401,111400,4,'',0,20600,4,'',0,12500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160381 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160381
index f3644582..675a2ddd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160381
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160381
@@ -1,2 +1,2 @@
-'2375',4101,85500,,'',0,38700,,'',0,30600,,'',0
-'3132',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
+'3343',4101,85500,,'',0,38700,,'',0,30600,,'',0
+'3563',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160382 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160382
index 21d3f7b7..b555c2e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160382
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160382
@@ -1,3 +1,3 @@
-'2375',4300,91500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
-'3132',4300,71600,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,16800,,'',0
-'3211',4300,213800,,'',0
+'3343',4300,91500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3563',4300,71600,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,16800,,'',0
+'3574',4300,213800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160383 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160383
index f5b36629..5a51e635 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160383
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160383
@@ -1,6 +1,6 @@
-'2375',9800,85800,,'',0,38400,,'',0,47800,,'',0
-'2375',9801,100400,,'',0,34500,,'',0,47700,,'',0
-'3132',9800,61100,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
-'3132',9801,71900,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
-'3211',9800,183800,,'',0
-'3211',9801,194200,,'',0
+'3343',9800,85800,,'',0,38400,,'',0,47800,,'',0
+'3343',9801,100400,,'',0,34500,,'',0,47700,,'',0
+'3563',9800,61100,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3563',9801,71900,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3574',9800,183800,,'',0
+'3574',9801,194200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160384 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160384
index 372532bd..a4c7a9b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160384
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160384
@@ -1,3 +1,3 @@
-'3206',3800,95900,,'',0,45000,,'',0
-'2375',9901,92400,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,63600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95900,,'',0,45000,,'',0
+'3343',9901,92400,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,63600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160385 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160385
index 77a1fcde..971fd47b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160385
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160385
@@ -1 +1 @@
-'3206',3800,85400,,'',0,45000,,'',0
+'3569',3800,85400,,'',0,45000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160386 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160386
index 9ae3d774..ae358786 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160386
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160386
@@ -1,2 +1,2 @@
-'2375',3201,100800,,'',0,14800,,'',0,36500,,'',0
-'3132',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,100800,,'',0,14800,,'',0,36500,,'',0
+'3563',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160387 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160387
index adcd4bb4..36028c05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160387
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160387
@@ -1,2 +1,2 @@
-'2375',3200,101700,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
-'3132',3200,70500,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3200,101700,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3563',3200,70500,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160388 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160388
index 59a70f47..a704db1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160388
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160388
@@ -1,2 +1,2 @@
-'3132',3200,164000,,'',0
-'3132',3201,74500,0,'Columbia - Celgar & Robson',0,89500,4,'',0
+'3563',3200,164000,,'',0
+'3563',3201,74500,0,'Columbia - Celgar & Robson',0,89500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160390 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160390
index 1e614682..7689c75e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160390
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160390
@@ -1 +1 @@
-'3132',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
+'3563',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160391 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160391
index 96b70c90..adcf2e3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160391
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160391
@@ -1,5 +1,5 @@
-'3132',201,152000,0,'Fairview - Reverse Route',0
-'2375',1001,102900,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,120900,,'',0
-'3208',1001,120900,,'',0
+'3563',201,152000,0,'Fairview - Reverse Route',0
+'3343',1001,102900,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,120900,,'',0
+'3571',1001,120900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160392 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160392
index 4aec278e..06fabdbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160392
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160392
@@ -1,8 +1,8 @@
-'2375',200,83000,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64300,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,83100,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,74000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134700,,'',0
-'3208',1000,134700,,'',0
+'3343',200,83000,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64300,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,83100,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,74000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134700,,'',0
+'3571',1000,134700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160393 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160393
index e836774a..84561573 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160393
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160393
@@ -1,2 +1,2 @@
-'2375',3200,101500,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
-'3132',3200,70300,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3200,101500,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3563',3200,70300,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160394 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160394
index 14b96fdb..8aab8e5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160394
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160394
@@ -1,3 +1,3 @@
-'2375',9801,100100,,'',0,34400,,'',0,47800,,'',0
-'3132',9801,71600,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
-'3211',9801,193900,,'',0
+'3343',9801,100100,,'',0,34400,,'',0,47800,,'',0
+'3563',9801,71600,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3574',9801,193900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160395 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160395
index 1b75eeca..faf802df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160395
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160395
@@ -1,8 +1,8 @@
-'2375',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
-'2375',1000,82800,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134400,,'',0
-'3208',1000,134400,,'',0
+'3343',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3343',1000,82800,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134400,,'',0
+'3571',1000,134400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160396 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160396
index bb21cec4..208e1030 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160396
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160396
@@ -1,5 +1,5 @@
-'3132',201,152200,0,'Fairview - Reverse Route',0
-'2375',1001,103200,,'',0,50100,,'',0,32400,,'',0
-'3132',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
-'3204',1001,121200,,'',0
-'3208',1001,121200,,'',0
+'3563',201,152200,0,'Fairview - Reverse Route',0
+'3343',1001,103200,,'',0,50100,,'',0,32400,,'',0
+'3563',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3567',1001,121200,,'',0
+'3571',1001,121200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160397 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160397
index cef59758..e538b1d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160397
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160397
@@ -1,4 +1,4 @@
-'2375',1000,82700,,'',0,37600,,'',0,81900,,'',0
-'3132',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
-'3204',1000,134300,,'',0
-'3208',1000,134300,,'',0
+'3343',1000,82700,,'',0,37600,,'',0,81900,,'',0
+'3563',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3567',1000,134300,,'',0
+'3571',1000,134300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160398 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160398
index d93885d9..4e0927a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160398
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160398
@@ -1,4 +1,4 @@
-'2375',1001,104800,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,19300,,'',0
-'3204',1001,122800,,'',0
-'3208',1001,122800,,'',0
+'3343',1001,104800,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,19300,,'',0
+'3567',1001,122800,,'',0
+'3571',1001,122800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160399 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160399
index af2c5f52..36569999 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160399
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160399
@@ -1,5 +1,5 @@
-'2375',1001,72400,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123000,,'',0
-'3208',1001,123000,,'',0
-'3207',7600,102500,,'',0
+'3343',1001,72400,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123000,,'',0
+'3571',1001,123000,,'',0
+'3570',7600,102500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160400 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160400
index 42ae0a43..bd5140f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160400
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160400
@@ -1,5 +1,5 @@
-'2375',1001,72700,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123300,,'',0
-'3208',1001,123300,,'',0
-'3207',7600,102800,,'',0
+'3343',1001,72700,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123300,,'',0
+'3571',1001,123300,,'',0
+'3570',7600,102800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160401 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160401
index 20c8e691..70a1c05f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160401
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160401
@@ -1,4 +1,4 @@
-'2375',1000,80600,,'',0,33600,,'',0,86000,,'',0
-'3132',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
-'3204',1000,132200,,'',0
-'3208',1000,132200,,'',0
+'3343',1000,80600,,'',0,33600,,'',0,86000,,'',0
+'3563',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
+'3567',1000,132200,,'',0
+'3571',1000,132200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160402 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160402
index e26bce82..d3fc797f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160402
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160402
@@ -1,5 +1,5 @@
-'2375',1001,73300,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,64400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123800,,'',0
-'3208',1001,123800,,'',0
-'3207',7600,103400,,'',0
+'3343',1001,73300,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,64400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123800,,'',0
+'3571',1001,123800,,'',0
+'3570',7600,103400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160403 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160403
index d8c77571..2e69638d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160403
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160403
@@ -1,5 +1,5 @@
-'2375',1001,73400,0,'Balfour Exp',0,32500,,'',0,54100,,'',0,32300,,'',0
-'3132',1001,64500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123900,,'',0
-'3208',1001,123900,,'',0
-'3207',7600,103400,,'',0
+'3343',1001,73400,0,'Balfour Exp',0,32500,,'',0,54100,,'',0,32300,,'',0
+'3563',1001,64500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123900,,'',0
+'3571',1001,123900,,'',0
+'3570',7600,103400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160404 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160404
index c762fa9e..75f942d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160404
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160404
@@ -1,5 +1,5 @@
-'2375',1001,73500,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,64600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124100,,'',0
-'3208',1001,124100,,'',0
-'3207',7600,103600,,'',0
+'3343',1001,73500,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,64600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124100,,'',0
+'3571',1001,124100,,'',0
+'3570',7600,103600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160405 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160405
index 64790c33..556988ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160405
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160405
@@ -1,5 +1,5 @@
-'2375',1001,73600,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124200,,'',0
-'3208',1001,124200,,'',0
-'3207',7600,103700,,'',0
+'3343',1001,73600,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124200,,'',0
+'3571',1001,124200,,'',0
+'3570',7600,103700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160406 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160406
index 6b798483..992f7f85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160406
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160406
@@ -1,5 +1,5 @@
-'2375',1001,73700,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,64800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124300,,'',0
-'3208',1001,124300,,'',0
-'3207',7600,103800,,'',0
+'3343',1001,73700,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,64800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124300,,'',0
+'3571',1001,124300,,'',0
+'3570',7600,103800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160407 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160407
index 6ed0dcf6..552af779 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160407
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160407
@@ -1,8 +1,8 @@
-'2375',1000,75900,,'',0,37600,,'',0,82000,,'',0
-'2375',1001,110400,,'',0,50100,,'',0,32300,,'',0
-'3132',1000,70800,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0
-'3132',1001,92400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1000,131500,,'',0
-'3204',1001,124400,,'',0
-'3208',1000,131500,,'',0
-'3208',1001,124400,,'',0
+'3343',1000,75900,,'',0,37600,,'',0,82000,,'',0
+'3343',1001,110400,,'',0,50100,,'',0,32300,,'',0
+'3563',1000,70800,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0
+'3563',1001,92400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1000,131500,,'',0
+'3567',1001,124400,,'',0
+'3571',1000,131500,,'',0
+'3571',1001,124400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160408 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160408
index 8563fe2e..3ed210bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160408
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160408
@@ -1,5 +1,5 @@
-'2375',1001,73900,0,'Balfour Exp',0,36800,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18300,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124700,,'',0
-'3208',1001,124700,,'',0
-'3207',7600,104000,,'',0
+'3343',1001,73900,0,'Balfour Exp',0,36800,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18300,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124700,,'',0
+'3571',1001,124700,,'',0
+'3570',7600,104000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160409 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160409
index 07f86843..6fffd19f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160409
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160409
@@ -1,5 +1,5 @@
-'2375',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,125100,,'',0
-'3208',1001,125100,,'',0
-'3207',7600,104300,,'',0
+'3343',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,125100,,'',0
+'3571',1001,125100,,'',0
+'3570',7600,104300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160410 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160410
index 07f86843..6fffd19f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160410
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160410
@@ -1,5 +1,5 @@
-'2375',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,125100,,'',0
-'3208',1001,125100,,'',0
-'3207',7600,104300,,'',0
+'3343',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,125100,,'',0
+'3571',1001,125100,,'',0
+'3570',7600,104300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160411 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160411
index b70d8a4e..8dbe5b46 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160411
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160411
@@ -1,5 +1,5 @@
-'2375',1001,74300,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,125200,,'',0
-'3208',1001,125200,,'',0
-'3207',7600,104400,,'',0
+'3343',1001,74300,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,125200,,'',0
+'3571',1001,125200,,'',0
+'3570',7600,104400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160412 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160412
index b415d5cc..57651421 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160412
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160412
@@ -1,5 +1,5 @@
-'2375',1001,74500,0,'Balfour Exp',0,37000,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18500,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,125500,,'',0
-'3208',1001,125500,,'',0
-'3207',7600,104600,,'',0
+'3343',1001,74500,0,'Balfour Exp',0,37000,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18500,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,125500,,'',0
+'3571',1001,125500,,'',0
+'3570',7600,104600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160413 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160413
index 6291fb77..4bcb32f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160413
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160413
@@ -1,18 +1,18 @@
-'2375',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
-'2375',1001,74500,4,'',0,37100,4,'',0,50100,4,'',0,32300,4,'',0
-'3132',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
-'3132',1001,65600,4,'',0,9400,4,'',0,18600,4,'',0,50100,4,'',0,32000,4,'',0,18000,4,'',0,19300,4,'',0
-'3204',1000,130500,,'',0
-'3204',1001,125600,4,'',0
-'3208',1000,130500,,'',0
-'3208',1001,125600,4,'',0
-'3202',7600,130500,,'',0
-'3202',7601,125500,4,'',0
-'3203',7600,180000,,'',0
-'3203',7601,175500,4,'',0
-'3207',7600,104600,,'',0
-'3207',7601,90500,,'',0
-'3209',7600,75500,,'',0
-'3209',7601,74500,4,'',0
-'3210',7600,94000,,'',0,86000,,'',0
-'3210',7601,93500,4,'',0,82000,4,'',0
+'3343',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3343',1001,74500,4,'',0,37100,4,'',0,50100,4,'',0,32300,4,'',0
+'3563',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3563',1001,65600,4,'',0,9400,4,'',0,18600,4,'',0,50100,4,'',0,32000,4,'',0,18000,4,'',0,19300,4,'',0
+'3567',1000,130500,,'',0
+'3567',1001,125600,4,'',0
+'3571',1000,130500,,'',0
+'3571',1001,125600,4,'',0
+'3565',7600,130500,,'',0
+'3565',7601,125500,4,'',0
+'3566',7600,180000,,'',0
+'3566',7601,175500,4,'',0
+'3570',7600,104600,,'',0
+'3570',7601,90500,,'',0
+'3572',7600,75500,,'',0
+'3572',7601,74500,4,'',0
+'3573',7600,94000,,'',0,86000,,'',0
+'3573',7601,93500,4,'',0,82000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160414 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160414
index 9f72475c..27e308bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160414
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160414
@@ -1,5 +1,5 @@
-'2375',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
-'3132',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
-'3204',1000,130500,,'',0
-'3208',1000,130500,,'',0
-'3207',7601,90500,,'',0
+'3343',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3563',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3567',1000,130500,,'',0
+'3571',1000,130500,,'',0
+'3570',7601,90500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160415 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160415
index c8f954d9..0542e558 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160415
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160415
@@ -1,5 +1,5 @@
-'2375',1000,75000,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
-'3132',1000,65900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
-'3204',1000,130600,,'',0
-'3208',1000,130600,,'',0
-'3207',7601,90600,,'',0
+'3343',1000,75000,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3563',1000,65900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3567',1000,130600,,'',0
+'3571',1000,130600,,'',0
+'3570',7601,90600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160416 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160416
index d23211b0..78066791 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160416
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160416
@@ -1,5 +1,5 @@
-'2375',1000,75300,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
-'3132',1000,70200,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
-'3204',1000,130900,,'',0
-'3208',1000,130900,,'',0
-'3207',7601,90800,,'',0
+'3343',1000,75300,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
+'3563',1000,70200,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
+'3567',1000,130900,,'',0
+'3571',1000,130900,,'',0
+'3570',7601,90800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160417 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160417
index e1c22983..2f071ec8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160417
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160417
@@ -1,5 +1,5 @@
-'2375',1000,75500,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
-'3132',1000,70400,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
-'3204',1000,131100,,'',0
-'3208',1000,131100,,'',0
-'3207',7601,90900,,'',0
+'3343',1000,75500,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3563',1000,70400,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3567',1000,131100,,'',0
+'3571',1000,131100,,'',0
+'3570',7601,90900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160418 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160418
index e2773c00..827da9de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160418
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160418
@@ -1,5 +1,5 @@
-'2375',1000,75700,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
-'3132',1000,70600,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
-'3204',1000,131300,,'',0
-'3208',1000,131300,,'',0
-'3207',7601,91000,,'',0
+'3343',1000,75700,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3563',1000,70600,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3567',1000,131300,,'',0
+'3571',1000,131300,,'',0
+'3570',7601,91000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160419 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160419
index c77920cc..41a366ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160419
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160419
@@ -1,5 +1,5 @@
-'2375',1000,75800,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
-'3132',1000,70700,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
-'3204',1000,131400,,'',0
-'3208',1000,131400,,'',0
-'3207',7601,91100,,'',0
+'3343',1000,75800,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3563',1000,70700,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3567',1000,131400,,'',0
+'3571',1000,131400,,'',0
+'3570',7601,91100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160420 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160420
index 485c6010..52419d8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160420
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160420
@@ -1,5 +1,5 @@
-'2375',1000,80500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,71400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,132100,,'',0
-'3208',1000,132100,,'',0
-'3207',7601,91600,,'',0
+'3343',1000,80500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,71400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,132100,,'',0
+'3571',1000,132100,,'',0
+'3570',7601,91600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160421 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160421
index 221df5db..46b8b592 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160421
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160421
@@ -1,5 +1,5 @@
-'2375',1000,80900,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,71800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,132500,,'',0
-'3208',1000,132500,,'',0
-'3207',7601,92000,,'',0
+'3343',1000,80900,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,71800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,132500,,'',0
+'3571',1000,132500,,'',0
+'3570',7601,92000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160422 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160422
index 06342832..fe8fe0d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160422
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160422
@@ -1,5 +1,5 @@
-'2375',1000,81100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,132700,,'',0
-'3208',1000,132700,,'',0
-'3207',7601,92200,,'',0
+'3343',1000,81100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,132700,,'',0
+'3571',1000,132700,,'',0
+'3570',7601,92200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160423 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160423
index d0c3826f..01a59f70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160423
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160423
@@ -1,4 +1,4 @@
-'2375',1000,81300,,'',0,33600,,'',0,86000,,'',0
-'3132',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
-'3204',1000,132900,,'',0
-'3208',1000,132900,,'',0
+'3343',1000,81300,,'',0,33600,,'',0,86000,,'',0
+'3563',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3567',1000,132900,,'',0
+'3571',1000,132900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160424 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160424
index 7149f983..c0165b18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160424
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160424
@@ -1,4 +1,4 @@
-'2375',1000,81400,,'',0,33600,,'',0,86000,,'',0
-'3132',1000,72300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
-'3204',1000,133000,,'',0
-'3208',1000,133000,,'',0
+'3343',1000,81400,,'',0,33600,,'',0,86000,,'',0
+'3563',1000,72300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3567',1000,133000,,'',0
+'3571',1000,133000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160425 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160425
index c749bb6f..26abceed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160425
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160425
@@ -1,5 +1,5 @@
-'2375',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,133100,,'',0
-'3208',1000,133100,,'',0
-'3207',7601,92500,,'',0
+'3343',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,133100,,'',0
+'3571',1000,133100,,'',0
+'3570',7601,92500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160426 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160426
index c749bb6f..26abceed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160426
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160426
@@ -1,5 +1,5 @@
-'2375',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,133100,,'',0
-'3208',1000,133100,,'',0
-'3207',7601,92500,,'',0
+'3343',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,133100,,'',0
+'3571',1000,133100,,'',0
+'3570',7601,92500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160427 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160427
index 7c67a0a6..1eb7368e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160427
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160427
@@ -1,5 +1,5 @@
-'2375',1000,81600,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,133200,,'',0
-'3208',1000,133200,,'',0
-'3207',7601,92600,,'',0
+'3343',1000,81600,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,133200,,'',0
+'3571',1000,133200,,'',0
+'3570',7601,92600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160428 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160428
index 144172bb..5bcdd376 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160428
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160428
@@ -1,5 +1,5 @@
-'2375',1000,81800,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,133400,,'',0
-'3208',1000,133400,,'',0
-'3207',7601,92700,,'',0
+'3343',1000,81800,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,133400,,'',0
+'3571',1000,133400,,'',0
+'3570',7601,92700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160429 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160429
index d35620b6..835b695a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160429
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160429
@@ -1,5 +1,5 @@
-'2375',1000,81900,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36400,,'',0
-'3132',1000,72800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,18600,0,'Nelson Exp',0
-'3204',1000,133500,,'',0
-'3208',1000,133500,,'',0
-'3207',7601,92800,,'',0
+'3343',1000,81900,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36400,,'',0
+'3563',1000,72800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,18600,0,'Nelson Exp',0
+'3567',1000,133500,,'',0
+'3571',1000,133500,,'',0
+'3570',7601,92800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160430 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160430
index 1f75bd9e..1acd58b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160430
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160430
@@ -1,5 +1,5 @@
-'2375',1000,82000,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,133600,,'',0
-'3208',1000,133600,,'',0
-'3207',7601,92800,,'',0
+'3343',1000,82000,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,133600,,'',0
+'3571',1000,133600,,'',0
+'3570',7601,92800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160431 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160431
index 32c8d290..35ceb2cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160431
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160431
@@ -1,5 +1,5 @@
-'2375',1000,82100,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,73000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,133700,,'',0
-'3208',1000,133700,,'',0
-'3207',7601,92900,,'',0
+'3343',1000,82100,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,73000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,133700,,'',0
+'3571',1000,133700,,'',0
+'3570',7601,92900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160432 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160432
index 348c9dd4..f1643c0c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160432
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160432
@@ -1,5 +1,5 @@
-'2375',1000,82400,,'',0,37600,,'',0,45500,0,'Nelson Exp',0,36400,,'',0
-'3132',1000,73300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18600,0,'Nelson Exp',0
-'3204',1000,134000,,'',0
-'3208',1000,134000,,'',0
-'3207',7601,93100,,'',0
+'3343',1000,82400,,'',0,37600,,'',0,45500,0,'Nelson Exp',0,36400,,'',0
+'3563',1000,73300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18600,0,'Nelson Exp',0
+'3567',1000,134000,,'',0
+'3571',1000,134000,,'',0
+'3570',7601,93100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160433 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160433
index c2dc48c6..2678a179 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160433
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160433
@@ -1,5 +1,5 @@
-'2375',1000,82500,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
-'3132',1000,73400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
-'3204',1000,134100,,'',0
-'3208',1000,134100,,'',0
-'3207',7601,93100,,'',0
+'3343',1000,82500,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3563',1000,73400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3567',1000,134100,,'',0
+'3571',1000,134100,,'',0
+'3570',7601,93100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160434 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160434
index fa115990..03a2a93c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160434
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160434
@@ -1,5 +1,5 @@
-'2375',1000,82600,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
-'3132',1000,73500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
-'3204',1000,134200,,'',0
-'3208',1000,134200,,'',0
-'3207',7601,93200,,'',0
+'3343',1000,82600,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3563',1000,73500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3567',1000,134200,,'',0
+'3571',1000,134200,,'',0
+'3570',7601,93200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160435 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160435
index 4b1d7a0b..5fbf8bda 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160435
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160435
@@ -1,5 +1,5 @@
-'2375',1001,71400,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,62500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
-'3204',1001,121500,,'',0
-'3208',1001,121500,,'',0
-'3207',7600,101400,,'',0
+'3343',1001,71400,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,62500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3567',1001,121500,,'',0
+'3571',1001,121500,,'',0
+'3570',7600,101400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160436 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160436
index 99a1fc7b..8770da02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160436
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160436
@@ -1,5 +1,5 @@
-'2375',1001,71500,0,'Balfour Exp',0,32200,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
-'3204',1001,121700,,'',0
-'3208',1001,121700,,'',0
-'3207',7600,101500,,'',0
+'3343',1001,71500,0,'Balfour Exp',0,32200,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3567',1001,121700,,'',0
+'3571',1001,121700,,'',0
+'3570',7600,101500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160437 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160437
index b294f3f5..c3cf18f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160437
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160437
@@ -1,5 +1,5 @@
-'2375',1001,71800,0,'Balfour Exp',0,32300,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,62900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18200,,'',0,15300,,'',0
-'3204',1001,122100,,'',0
-'3208',1001,122100,,'',0
-'3207',7600,101800,,'',0
+'3343',1001,71800,0,'Balfour Exp',0,32300,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,62900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18200,,'',0,15300,,'',0
+'3567',1001,122100,,'',0
+'3571',1001,122100,,'',0
+'3570',7600,101800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160438 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160438
index b469dab3..25c7cd52 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160438
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160438
@@ -1,4 +1,4 @@
-'2375',1001,104800,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,122800,,'',0
-'3208',1001,122800,,'',0
+'3343',1001,104800,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,122800,,'',0
+'3571',1001,122800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160439 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160439
index 0b863a6f..ea34f5a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160439
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160439
@@ -1,4 +1,4 @@
-'2375',1001,104900,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,90900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,122900,,'',0
-'3208',1001,122900,,'',0
+'3343',1001,104900,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,90900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,122900,,'',0
+'3571',1001,122900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160440 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160440
index f8e22948..832344e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160440
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160440
@@ -1,4 +1,4 @@
-'2375',1001,104900,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,90900,,'',0,50100,,'',0,22200,4,'',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,122900,,'',0
-'3208',1001,122900,,'',0
+'3343',1001,104900,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,90900,,'',0,50100,,'',0,22200,4,'',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,122900,,'',0
+'3571',1001,122900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160441 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160441
index 0d9dc1f7..3e391710 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160441
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160441
@@ -1,5 +1,5 @@
-'2375',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123100,,'',0
-'3208',1001,123100,,'',0
-'3207',7600,102500,,'',0
+'3343',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123100,,'',0
+'3571',1001,123100,,'',0
+'3570',7600,102500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160442 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160442
index 6b0805ce..d1db3fec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160442
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160442
@@ -1,5 +1,5 @@
-'2375',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123100,,'',0
-'3208',1001,123100,,'',0
-'3207',7600,102600,,'',0
+'3343',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123100,,'',0
+'3571',1001,123100,,'',0
+'3570',7600,102600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160443 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160443
index 1b68acc8..c42f653f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160443
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160443
@@ -1,5 +1,5 @@
-'2375',1001,72800,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123300,,'',0
-'3208',1001,123300,,'',0
-'3207',7600,102900,,'',0
+'3343',1001,72800,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123300,,'',0
+'3571',1001,123300,,'',0
+'3570',7600,102900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160444 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160444
index 1e3b3a03..eddd10f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160444
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160444
@@ -1,5 +1,5 @@
-'2375',1001,72900,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123400,,'',0
-'3208',1001,123400,,'',0
-'3207',7600,102900,,'',0
+'3343',1001,72900,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123400,,'',0
+'3571',1001,123400,,'',0
+'3570',7600,102900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160445 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160445
index 20122888..610c8f1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160445
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160445
@@ -1,5 +1,5 @@
-'2375',1001,72900,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123500,,'',0
-'3208',1001,123500,,'',0
-'3207',7600,103000,,'',0
+'3343',1001,72900,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123500,,'',0
+'3571',1001,123500,,'',0
+'3570',7600,103000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160446 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160446
index 42c72d16..59722400 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160446
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160446
@@ -1,5 +1,5 @@
-'2375',1001,73200,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,64300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123700,,'',0
-'3208',1001,123700,,'',0
-'3207',7600,103300,,'',0
+'3343',1001,73200,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,64300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123700,,'',0
+'3571',1001,123700,,'',0
+'3570',7600,103300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160447 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160447
index 30d2f4fc..387f6dca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160447
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160447
@@ -1,5 +1,5 @@
-'2375',1001,73600,0,'Balfour Exp',0,36500,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124100,,'',0
-'3208',1001,124100,,'',0
-'3207',7600,103600,,'',0
+'3343',1001,73600,0,'Balfour Exp',0,36500,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124100,,'',0
+'3571',1001,124100,,'',0
+'3570',7600,103600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160448 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160448
index 9fe2efc3..64d7a77a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160448
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160448
@@ -1,5 +1,5 @@
-'2375',1001,73800,0,'Balfour Exp',0,36700,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,64900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18200,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124500,,'',0
-'3208',1001,124500,,'',0
-'3207',7600,103900,,'',0
+'3343',1001,73800,0,'Balfour Exp',0,36700,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,64900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18200,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124500,,'',0
+'3571',1001,124500,,'',0
+'3570',7600,103900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160449 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160449
index 96db710c..19c91546 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160449
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160449
@@ -1,5 +1,5 @@
-'2375',1001,74000,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
-'3132',1001,65100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,124900,,'',0
-'3208',1001,124900,,'',0
-'3207',7600,104100,,'',0
+'3343',1001,74000,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3563',1001,65100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,124900,,'',0
+'3571',1001,124900,,'',0
+'3570',7600,104100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160450 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160450
index 4776dd13..3078e88c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160450
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160450
@@ -1,5 +1,5 @@
-'2375',1000,75100,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
-'3132',1000,70000,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
-'3204',1000,130700,,'',0
-'3208',1000,130700,,'',0
-'3207',7601,90600,,'',0
+'3343',1000,75100,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3563',1000,70000,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3567',1000,130700,,'',0
+'3571',1000,130700,,'',0
+'3570',7601,90600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160455 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160455
index e486fa35..b745af2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160455
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160455
@@ -1,5 +1,5 @@
-'2375',1000,80000,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
-'3132',1000,70900,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,131600,,'',0
-'3208',1000,131600,,'',0
-'3207',7601,91200,,'',0
+'3343',1000,80000,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3563',1000,70900,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,131600,,'',0
+'3571',1000,131600,,'',0
+'3570',7601,91200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160456 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160456
index d6763588..9b6b317a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160456
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160456
@@ -1,5 +1,5 @@
-'2375',1000,80100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
-'3132',1000,71000,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,131700,,'',0
-'3208',1000,131700,,'',0
-'3207',7601,91300,,'',0
+'3343',1000,80100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3563',1000,71000,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,131700,,'',0
+'3571',1000,131700,,'',0
+'3570',7601,91300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160457 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160457
index 371f597e..9f8a9585 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160457
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160457
@@ -1,5 +1,5 @@
-'2375',1000,80300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
-'3132',1000,71200,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
-'3204',1000,131900,,'',0
-'3208',1000,131900,,'',0
-'3207',7601,91500,,'',0
+'3343',1000,80300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3563',1000,71200,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3567',1000,131900,,'',0
+'3571',1000,131900,,'',0
+'3570',7601,91500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160458 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160458
index 20c8e691..70a1c05f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160458
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160458
@@ -1,4 +1,4 @@
-'2375',1000,80600,,'',0,33600,,'',0,86000,,'',0
-'3132',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
-'3204',1000,132200,,'',0
-'3208',1000,132200,,'',0
+'3343',1000,80600,,'',0,33600,,'',0,86000,,'',0
+'3563',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
+'3567',1000,132200,,'',0
+'3571',1000,132200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160459 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160459
index 289c971a..2df8acc3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160459
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160459
@@ -1,5 +1,5 @@
-'2375',1000,80800,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,71700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,132400,,'',0
-'3208',1000,132400,,'',0
-'3207',7601,91900,,'',0
+'3343',1000,80800,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,71700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,132400,,'',0
+'3571',1000,132400,,'',0
+'3570',7601,91900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160460 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160460
index a1056a92..8cd58d88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160460
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160460
@@ -1,5 +1,5 @@
-'2375',1000,81300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
-'3132',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
-'3204',1000,132900,,'',0
-'3208',1000,132900,,'',0
-'3207',7601,92400,,'',0
+'3343',1000,81300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3563',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3567',1000,132900,,'',0
+'3571',1000,132900,,'',0
+'3570',7601,92400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160461 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160461
index d0c3826f..01a59f70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160461
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160461
@@ -1,4 +1,4 @@
-'2375',1000,81300,,'',0,33600,,'',0,86000,,'',0
-'3132',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
-'3204',1000,132900,,'',0
-'3208',1000,132900,,'',0
+'3343',1000,81300,,'',0,33600,,'',0,86000,,'',0
+'3563',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3567',1000,132900,,'',0
+'3571',1000,132900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160462 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160462
index 64de4fc8..90a33553 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160462
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160462
@@ -1,8 +1,8 @@
-'3132',1400,75100,,'',0
-'2375',2001,52800,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,45000,,'',0,26200,,'',0,32100,,'',0,57200,0,'Slocan Vly -',0,12400,0,'Slocan Vly -',0
-'3204',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,161000,,'',0
-'2375',9901,85100,,'',0,38400,,'',0,47700,,'',0
-'3132',9901,60300,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3563',1400,75100,,'',0
+'3343',2001,52800,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,45000,,'',0,26200,,'',0,32100,,'',0,57200,0,'Slocan Vly -',0,12400,0,'Slocan Vly -',0
+'3567',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,161000,,'',0
+'3343',9901,85100,,'',0,38400,,'',0,47700,,'',0
+'3563',9901,60300,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160463 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160463
index 6a2f41d3..5ec39004 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160463
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160463
@@ -1,7 +1,7 @@
-'2375',2001,53000,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,45200,,'',0,26200,,'',0,32100,,'',0,69500,0,'Slocan Vly -',0
-'3204',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,161200,,'',0
-'2375',9901,85300,,'',0,38400,,'',0,47700,,'',0
-'3132',9901,60500,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,53000,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,45200,,'',0,26200,,'',0,32100,,'',0,69500,0,'Slocan Vly -',0
+'3567',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,161200,,'',0
+'3343',9901,85300,,'',0,38400,,'',0,47700,,'',0
+'3563',9901,60500,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160464 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160464
index eaf8c629..05033243 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160464
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160464
@@ -1,7 +1,7 @@
-'2375',2001,53100,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,45300,,'',0,26200,,'',0,32100,,'',0,57600,0,'Slocan Vly -',0,11900,0,'Slocan Vly -',0
-'3204',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,161300,,'',0
-'2375',9901,85400,,'',0,38400,,'',0,47600,,'',0
-'3132',9901,60600,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,53100,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,45300,,'',0,26200,,'',0,32100,,'',0,57600,0,'Slocan Vly -',0,11900,0,'Slocan Vly -',0
+'3567',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,161300,,'',0
+'3343',9901,85400,,'',0,38400,,'',0,47600,,'',0
+'3563',9901,60600,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160465 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160465
index f8dac478..9b039cfb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160465
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160465
@@ -1,7 +1,7 @@
-'2375',2001,53400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,45600,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,161600,,'',0
-'2375',9901,85700,,'',0,38400,,'',0,47600,,'',0
-'3132',9901,60900,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,53400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,45600,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,161600,,'',0
+'3343',9901,85700,,'',0,38400,,'',0,47600,,'',0
+'3563',9901,60900,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160466 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160466
index aa32024f..bb6f1610 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160466
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160466
@@ -1,7 +1,7 @@
-'2375',2001,54100,,'',0,49900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,50300,,'',0,22200,,'',0,32800,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
-'3208',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
-'3205',7400,162600,,'',0
-'2375',9901,90400,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,61600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,54100,,'',0,49900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,50300,,'',0,22200,,'',0,32800,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3571',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3568',7400,162600,,'',0
+'3343',9901,90400,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,61600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160467 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160467
index b4f6099e..7d17ead6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160467
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160467
@@ -1,7 +1,7 @@
-'2375',2001,54400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,50500,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
-'3208',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
-'3205',7400,162900,,'',0
-'2375',9901,90600,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,61800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,54400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,50500,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3571',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3568',7400,162900,,'',0
+'3343',9901,90600,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,61800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160468 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160468
index df81dc49..c4e94652 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160468
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160468
@@ -1,15 +1,15 @@
-'2375',2000,73800,,'',0,50700,,'',0,47900,4,'',0,20400,0,'Nelson',0
-'2375',2001,54500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2000,65900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3132',2001,50600,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
-'3204',2001,64600,4,'',0,16200,4,'',0
-'3208',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2001,64600,4,'',0,16200,4,'',0
-'3206',3800,94500,,'',0,41000,,'',0
-'3205',7400,163000,,'',0
-'3205',7401,95500,,'',0
-'2375',9900,95700,,'',0,38400,,'',0,47900,,'',0
-'2375',9901,90700,,'',0,34400,,'',0,47600,,'',0
-'3132',9900,70900,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
-'3132',9901,61900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2000,73800,,'',0,50700,,'',0,47900,4,'',0,20400,0,'Nelson',0
+'3343',2001,54500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2000,65900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3563',2001,50600,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
+'3567',2001,64600,4,'',0,16200,4,'',0
+'3571',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2001,64600,4,'',0,16200,4,'',0
+'3569',3800,94500,,'',0,41000,,'',0
+'3568',7400,163000,,'',0
+'3568',7401,95500,,'',0
+'3343',9900,95700,,'',0,38400,,'',0,47900,,'',0
+'3343',9901,90700,,'',0,34400,,'',0,47600,,'',0
+'3563',9900,70900,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3563',9901,61900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160469 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160469
index d9446900..6295c132 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160469
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160469
@@ -1,3 +1,3 @@
-'3206',3800,94600,,'',0,41000,,'',0
-'2375',9901,90800,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,94600,,'',0,41000,,'',0
+'3343',9901,90800,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160470 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160470
index e6a3ed4c..83a0076f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160470
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160470
@@ -1,3 +1,3 @@
-'3206',3800,94700,,'',0,41000,,'',0
-'2375',9901,90900,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,94700,,'',0,41000,,'',0
+'3343',9901,90900,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160471 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160471
index 5255ea65..20d88b1d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160471
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160471
@@ -1,3 +1,3 @@
-'3206',3800,94800,,'',0,41000,,'',0
-'2375',9901,91000,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62200,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,94800,,'',0,41000,,'',0
+'3343',9901,91000,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62200,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160472 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160472
index dc8b2d74..ea195dc3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160472
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160472
@@ -1,3 +1,3 @@
-'3206',3800,94900,,'',0,41000,,'',0
-'2375',9901,91100,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62300,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,94900,,'',0,41000,,'',0
+'3343',9901,91100,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62300,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160473 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160473
index b19a65f6..fcffc9fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160473
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160473
@@ -1,3 +1,3 @@
-'3206',3800,95000,,'',0,45000,,'',0
-'2375',9901,91200,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62400,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95000,,'',0,45000,,'',0
+'3343',9901,91200,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62400,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160474 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160474
index bb63ecdb..fd633b98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160474
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160474
@@ -1,3 +1,3 @@
-'3206',3800,95100,,'',0,45000,,'',0
-'2375',9901,91300,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62500,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95100,,'',0,45000,,'',0
+'3343',9901,91300,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62500,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160475 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160475
index c0b75509..fdccf805 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160475
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160475
@@ -1,3 +1,3 @@
-'3206',3800,95200,,'',0,45000,,'',0
-'2375',9901,91400,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95200,,'',0,45000,,'',0
+'3343',9901,91400,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160476 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160476
index c0b75509..fdccf805 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160476
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160476
@@ -1,3 +1,3 @@
-'3206',3800,95200,,'',0,45000,,'',0
-'2375',9901,91400,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95200,,'',0,45000,,'',0
+'3343',9901,91400,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160477 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160477
index 9700b306..66f2e26b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160477
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160477
@@ -1,3 +1,3 @@
-'3206',3800,95300,,'',0,45000,,'',0
-'2375',9901,91500,,'',0,34400,,'',0,47600,,'',0
-'3132',9901,62700,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95300,,'',0,45000,,'',0
+'3343',9901,91500,,'',0,34400,,'',0,47600,,'',0
+'3563',9901,62700,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160478 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160478
index 6c4deada..07e5743a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160478
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160478
@@ -1,3 +1,3 @@
-'3206',3800,95400,,'',0,45000,,'',0
-'2375',9901,91600,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95400,,'',0,45000,,'',0
+'3343',9901,91600,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160479 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160479
index 6c4deada..07e5743a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160479
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160479
@@ -1,3 +1,3 @@
-'3206',3800,95400,,'',0,45000,,'',0
-'2375',9901,91600,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95400,,'',0,45000,,'',0
+'3343',9901,91600,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160480 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160480
index a94b08a0..c013eb01 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160480
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160480
@@ -1,3 +1,3 @@
-'3206',3800,95500,,'',0,45000,,'',0
-'2375',9901,91700,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,62900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95500,,'',0,45000,,'',0
+'3343',9901,91700,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,62900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160481 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160481
index 7873e4ca..22bb3056 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160481
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160481
@@ -1,3 +1,3 @@
-'3206',3800,95500,,'',0,45000,,'',0
-'2375',9901,91800,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95500,,'',0,45000,,'',0
+'3343',9901,91800,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160482 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160482
index 7873e4ca..22bb3056 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160482
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160482
@@ -1,3 +1,3 @@
-'3206',3800,95500,,'',0,45000,,'',0
-'2375',9901,91800,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95500,,'',0,45000,,'',0
+'3343',9901,91800,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160483 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160483
index 28f58893..13853a56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160483
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160483
@@ -1,3 +1,3 @@
-'3206',3800,95600,,'',0,45000,,'',0
-'2375',9901,91900,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95600,,'',0,45000,,'',0
+'3343',9901,91900,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160484 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160484
index 28f58893..13853a56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160484
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160484
@@ -1,3 +1,3 @@
-'3206',3800,95600,,'',0,45000,,'',0
-'2375',9901,91900,,'',0,38400,,'',0,43600,,'',0
-'3132',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3569',3800,95600,,'',0,45000,,'',0
+'3343',9901,91900,,'',0,38400,,'',0,43600,,'',0
+'3563',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160485 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160485
index 326fd681..5402d6fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160485
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160485
@@ -1,2 +1,2 @@
-'2375',9900,94400,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65600,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94400,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65600,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160486 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160486
index 7753bba2..6abd5260 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160486
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160486
@@ -1,2 +1,2 @@
-'2375',9900,94500,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65700,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94500,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65700,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160487 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160487
index d743b2aa..36799e5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160487
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160487
@@ -1,2 +1,2 @@
-'2375',9900,94600,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94600,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160488 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160488
index d743b2aa..36799e5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160488
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160488
@@ -1,2 +1,2 @@
-'2375',9900,94600,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94600,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160489 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160489
index 33ce4154..735c6d88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160489
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160489
@@ -1,2 +1,2 @@
-'2375',9900,94700,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,65900,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94700,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,65900,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160490 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160490
index 9dc4ef93..5a9cbf34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160490
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160490
@@ -1,2 +1,2 @@
-'2375',9900,94900,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,70100,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,94900,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,70100,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160491 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160491
index acea2e7b..a1d943b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160491
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160491
@@ -1,2 +1,2 @@
-'2375',9900,95000,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,95000,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160492 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160492
index acea2e7b..a1d943b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160492
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160492
@@ -1,2 +1,2 @@
-'2375',9900,95000,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,95000,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160493 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160493
index 2203b6da..bf607cbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160493
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160493
@@ -1,2 +1,2 @@
-'2375',9900,95100,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,70300,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,95100,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,70300,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160494 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160494
index 1e500350..40162d25 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160494
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160494
@@ -1,2 +1,2 @@
-'2375',9900,95600,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,70800,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',9900,95600,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,70800,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160495 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160495
index a6c9724a..4d2a4a1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160495
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160495
@@ -1,7 +1,7 @@
-'2375',2000,73900,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,70000,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
-'3205',7401,95600,,'',0
-'2375',9900,95800,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,71000,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,73900,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,70000,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
+'3568',7401,95600,,'',0
+'3343',9900,95800,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,71000,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160497 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160497
index 82041235..e2df0cec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160497
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160497
@@ -1,7 +1,7 @@
-'2375',2000,74000,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,70100,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
-'3205',7401,95800,,'',0
-'2375',9900,95900,,'',0,38400,,'',0,47900,,'',0
-'3132',9900,71100,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,74000,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,70100,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
+'3568',7401,95800,,'',0
+'3343',9900,95900,,'',0,38400,,'',0,47900,,'',0
+'3563',9900,71100,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160498 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160498
index dafc6c61..3e573a2d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160498
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160498
@@ -1,7 +1,7 @@
-'2375',2000,74100,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,70300,,'',0,22100,,'',0,33000,,'',0,58000,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
-'3205',7401,100000,,'',0
-'2375',9900,100100,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,71300,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,74100,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,70300,,'',0,22100,,'',0,33000,,'',0,58000,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
+'3568',7401,100000,,'',0
+'3343',9900,100100,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,71300,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160500 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160500
index 67838b47..958796f9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160500
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160500
@@ -1,7 +1,7 @@
-'2375',2000,74500,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,70500,,'',0,22300,,'',0,33000,,'',0,57800,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
-'3205',7401,100200,,'',0
-'2375',9900,100300,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,74500,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,70500,,'',0,22300,,'',0,33000,,'',0,57800,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
+'3568',7401,100200,,'',0
+'3343',9900,100300,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160501 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160501
index bb465722..d2d205ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160501
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160501
@@ -1,7 +1,7 @@
-'2375',2000,74600,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,70500,,'',0,22400,,'',0,33000,,'',0,57700,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
-'3205',7401,100300,,'',0
-'2375',9900,100300,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,74600,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,70500,,'',0,22400,,'',0,33000,,'',0,57700,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
+'3568',7401,100300,,'',0
+'3343',9900,100300,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160502 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160502
index e8d8aaf0..a24dbfb2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160502
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160502
@@ -1,4 +1,4 @@
-'3132',2000,70700,,'',0,113100,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,100500,,'',0
-'2375',9900,100500,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,71700,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3563',2000,70700,,'',0,113100,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,100500,,'',0
+'3343',9900,100500,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,71700,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160503 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160503
index e5c3db3a..8594ff29 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160503
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160503
@@ -1,7 +1,7 @@
-'2375',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
-'3132',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
-'3205',7401,100900,,'',0
-'2375',9900,100800,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3563',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3568',7401,100900,,'',0
+'3343',9900,100800,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160504 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160504
index e5c3db3a..8594ff29 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160504
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160504
@@ -1,7 +1,7 @@
-'2375',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
-'3132',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
-'3204',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
-'3205',7401,100900,,'',0
-'2375',9900,100800,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3343',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3563',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
+'3567',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3568',7401,100900,,'',0
+'3343',9900,100800,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160505 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160505
index 1d58c84b..ba42788d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160505
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160505
@@ -1,7 +1,7 @@
-'2375',2000,75900,,'',0,54700,,'',0,64300,0,'Nelson',0
-'3132',2000,71500,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
-'3204',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
-'3205',7401,101500,,'',0
-'2375',9900,101300,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,72500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
+'3343',2000,75900,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3563',2000,71500,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3567',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
+'3568',7401,101500,,'',0
+'3343',9900,101300,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,72500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160506 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160506
index f5b5faa0..a885d88d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160506
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160506
@@ -1,7 +1,7 @@
-'2375',2000,80000,,'',0,50700,,'',0,64300,0,'Nelson',0
-'3132',2000,71600,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
-'3204',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
-'3205',7401,101700,,'',0
-'2375',9900,101400,,'',0,34400,,'',0,47900,,'',0
-'3132',9900,72600,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
+'3343',2000,80000,,'',0,50700,,'',0,64300,0,'Nelson',0
+'3563',2000,71600,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3567',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
+'3568',7401,101700,,'',0
+'3343',9900,101400,,'',0,34400,,'',0,47900,,'',0
+'3563',9900,72600,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160507 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160507
index 101dbee7..a168573a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160507
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160507
@@ -1,2 +1,2 @@
-'3204',7200,80500,,'',0,53400,,'',0,47100,0,'Nelson',0
-'3204',7201,75000,4,'',0,57400,4,'',0,43100,4,'',0
+'3567',7200,80500,,'',0,53400,,'',0,47100,0,'Nelson',0
+'3567',7201,75000,4,'',0,57400,4,'',0,43100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160508 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160508
index 4098ff52..daeda601 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160508
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160508
@@ -1,2 +1,2 @@
-'2375',2000,64500,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60600,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
+'3343',2000,64500,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60600,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160509 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160509
index 3c50a9cc..cc4710d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160509
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160509
@@ -1,2 +1,2 @@
-'2375',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
+'3343',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160510 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160510
index 6beb1bd8..80024b31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160510
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160510
@@ -1,4 +1,4 @@
-'2375',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'2375',2001,63400,4,'',0,50700,4,'',0,48400,4,'',0,20300,4,'',0
-'3132',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
-'3132',2001,55500,4,'',0,26200,4,'',0,33000,4,'',0,58400,4,'',0,11700,4,'',0
+'3343',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3343',2001,63400,4,'',0,50700,4,'',0,48400,4,'',0,20300,4,'',0
+'3563',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
+'3563',2001,55500,4,'',0,26200,4,'',0,33000,4,'',0,58400,4,'',0,11700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160511 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160511
index 6dffcd1d..bb9d6b49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160511
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160511
@@ -1,8 +1,8 @@
-'3132',1400,74900,,'',0
-'2375',2001,52700,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,44900,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
-'3204',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,160800,,'',0
-'2375',9901,85000,,'',0,38400,,'',0,47700,,'',0
-'3132',9901,60200,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3563',1400,74900,,'',0
+'3343',2001,52700,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,44900,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
+'3567',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,160800,,'',0
+'3343',9901,85000,,'',0,38400,,'',0,47700,,'',0
+'3563',9901,60200,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160514 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160514
index 8f6cae42..02e9729a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160514
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160514
@@ -1,2 +1,2 @@
-'2375',2000,71100,,'',0,50700,,'',0
-'3132',2000,63200,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,71100,,'',0,50700,,'',0
+'3563',2000,63200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160515 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160515
index d9e29769..007a62a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160515
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160515
@@ -1,8 +1,8 @@
-'2375',200,83100,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
-'3132',200,70800,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
-'3201',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'3211',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
-'2375',1000,83200,,'',0,37600,,'',0,45100,0,'Nelson Exp',0,36800,,'',0
-'3132',1000,74100,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18200,0,'Nelson Exp',0
-'3204',1000,134800,,'',0
-'3208',1000,134800,,'',0
+'3343',200,83100,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3563',200,70800,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3564',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3574',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3343',1000,83200,,'',0,37600,,'',0,45100,0,'Nelson Exp',0,36800,,'',0
+'3563',1000,74100,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18200,0,'Nelson Exp',0
+'3567',1000,134800,,'',0
+'3571',1000,134800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160516 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160516
index 336622a4..fcb1f828 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160516
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160516
@@ -1,5 +1,5 @@
-'2375',1000,82700,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
-'3132',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
-'3204',1000,134300,,'',0
-'3208',1000,134300,,'',0
-'3207',7601,93300,,'',0
+'3343',1000,82700,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3563',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3567',1000,134300,,'',0
+'3571',1000,134300,,'',0
+'3570',7601,93300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160518 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160518
index bb910234..048c656a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160518
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160518
@@ -1,3 +1,3 @@
-'2375',2001,54700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,50800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,163100,,'',0
+'3343',2001,54700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,50800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,163100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160519 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160519
index ce6d1faf..a1b81588 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160519
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160519
@@ -1,3 +1,3 @@
-'2375',2001,55200,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,51300,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,163400,,'',0
+'3343',2001,55200,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,51300,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,163400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160520 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160520
index 0b5365bf..fd6f9c8f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160520
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160520
@@ -1,3 +1,3 @@
-'2375',2001,55400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,51500,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,163500,,'',0
+'3343',2001,55400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,51500,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,163500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160521 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160521
index 8782f218..014f3153 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160521
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160521
@@ -1,3 +1,3 @@
-'2375',2001,55500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,51600,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,163600,,'',0
+'3343',2001,55500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,51600,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,163600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160522 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160522
index 3f9cef0a..ff22b9cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160522
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160522
@@ -1,3 +1,3 @@
-'2375',2001,55600,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,51700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,163700,,'',0
+'3343',2001,55600,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,51700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,163700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160523 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160523
index 7c179b9a..91d3fbba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160523
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160523
@@ -1,3 +1,3 @@
-'2375',2001,55700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,51800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,163800,,'',0
+'3343',2001,55700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,51800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,163800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160524 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160524
index 65ffe8cf..aeff9735 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160524
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160524
@@ -1,3 +1,3 @@
-'2375',2001,55900,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,52000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,164000,,'',0
+'3343',2001,55900,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,52000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,164000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160525 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160525
index b8ba50ed..d6565fda 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160525
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160525
@@ -1,3 +1,3 @@
-'2375',2001,60600,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,52700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,164700,,'',0
+'3343',2001,60600,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,52700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,164700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160526 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160526
index 24515cf8..875166db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160526
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160526
@@ -1,3 +1,3 @@
-'2375',2001,60900,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,53000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
-'3205',7400,165000,,'',0
+'3343',2001,60900,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,53000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3568',7400,165000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160527 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160527
index f2df7974..5aa4469b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160527
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160527
@@ -1,3 +1,3 @@
-'2375',2001,60900,,'',0
-'3132',2001,53000,,'',0,22200,,'',0,37000,,'',0
-'3205',7400,165000,,'',0
+'3343',2001,60900,,'',0
+'3563',2001,53000,,'',0,22200,,'',0,37000,,'',0
+'3568',7400,165000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160528 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160528
index 4fd3d28a..88677f04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160528
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160528
@@ -1,3 +1,3 @@
-'2375',2001,61000,,'',0
-'3132',2001,53100,,'',0,22200,,'',0,37000,,'',0
-'3205',7400,165100,,'',0
+'3343',2001,61000,,'',0
+'3563',2001,53100,,'',0,22200,,'',0,37000,,'',0
+'3568',7400,165100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160529 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160529
index 04c87d50..7b573926 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160529
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160529
@@ -1,3 +1,3 @@
-'2375',2001,61100,,'',0
-'3132',2001,53200,,'',0,22200,,'',0,37000,,'',0
-'3205',7400,165200,,'',0
+'3343',2001,61100,,'',0
+'3563',2001,53200,,'',0,22200,,'',0,37000,,'',0
+'3568',7400,165200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160530 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160530
index 01be6285..53764952 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160530
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160530
@@ -1,3 +1,3 @@
-'2375',2001,61600,,'',0
-'3132',2001,53700,,'',0,22200,,'',0,37000,,'',0
-'3205',7400,165800,,'',0
+'3343',2001,61600,,'',0
+'3563',2001,53700,,'',0,22200,,'',0,37000,,'',0
+'3568',7400,165800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160531 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160531
index de6b057e..1db9b759 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160531
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160531
@@ -1,3 +1,3 @@
-'2375',2001,61700,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,53800,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,165800,,'',0
+'3343',2001,61700,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,53800,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,165800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160532 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160532
index c9cf3f02..4b89f358 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160532
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160532
@@ -1,3 +1,3 @@
-'2375',2001,61800,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,53900,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170000,,'',0
+'3343',2001,61800,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,53900,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160533 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160533
index b4e11df9..63834faa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160533
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160533
@@ -1,3 +1,3 @@
-'2375',2001,62100,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,54200,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170200,,'',0
+'3343',2001,62100,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,54200,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160534 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160534
index 6d9f62bf..2019dca7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160534
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160534
@@ -1,3 +1,3 @@
-'2375',2001,62300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,54400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170400,,'',0
+'3343',2001,62300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,54400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160535 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160535
index daff1b89..1625b4da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160535
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160535
@@ -1,3 +1,3 @@
-'2375',2001,62400,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,54500,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170500,,'',0
+'3343',2001,62400,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,54500,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160536 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160536
index a66e7bfa..61800bf1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160536
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160536
@@ -1,3 +1,3 @@
-'2375',2001,62600,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,54700,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170600,,'',0
+'3343',2001,62600,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,54700,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160537 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160537
index ca540426..5f1a8031 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160537
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160537
@@ -1,3 +1,3 @@
-'2375',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170800,,'',0
+'3343',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160538 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160538
index afd0bf9e..d82f2d68 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160538
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160538
@@ -1,3 +1,3 @@
-'2375',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,170900,,'',0
+'3343',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,170900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160539 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160539
index 0f3be562..35a99562 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160539
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160539
@@ -1,3 +1,3 @@
-'2375',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3205',7400,171000,,'',0
+'3343',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3568',7400,171000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160540 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160540
index c5361ae3..df018ddf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160540
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160540
@@ -1,3 +1,3 @@
-'2375',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,91600,,'',0
+'3343',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,91600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160541 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160541
index c5361ae3..df018ddf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160541
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160541
@@ -1,3 +1,3 @@
-'2375',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,91600,,'',0
+'3343',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,91600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160542 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160542
index 2581465a..e1c699a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160542
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160542
@@ -1,3 +1,3 @@
-'2375',2000,64800,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,60900,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,91700,,'',0
+'3343',2000,64800,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,60900,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,91700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160543 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160543
index 1b0e39fa..3918b3cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160543
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160543
@@ -1,3 +1,3 @@
-'2375',2000,65000,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61100,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,91900,,'',0
+'3343',2000,65000,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61100,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,91900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160544 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160544
index d44f169e..965fc6bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160544
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160544
@@ -1,3 +1,3 @@
-'2375',2000,65200,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61300,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92100,,'',0
+'3343',2000,65200,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61300,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160545 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160545
index 07b9adc2..1e2bef3e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160545
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160545
@@ -1,3 +1,3 @@
-'2375',2000,65400,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61500,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92300,,'',0
+'3343',2000,65400,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61500,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160546 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160546
index 060a20af..44e25f15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160546
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160546
@@ -1,3 +1,3 @@
-'2375',2000,164700,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,175300,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92400,,'',0
+'3343',2000,164700,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,175300,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160547 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160547
index bfb2296c..d188dc83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160547
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160547
@@ -1,3 +1,3 @@
-'2375',2000,65600,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61700,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92500,,'',0
+'3343',2000,65600,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61700,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160548 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160548
index 11701f0d..50bc003c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160548
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160548
@@ -1,3 +1,3 @@
-'2375',2000,65700,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92600,,'',0
+'3343',2000,65700,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160549 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160549
index 73bd818b..0caffd1b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160549
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160549
@@ -1,3 +1,3 @@
-'2375',2000,65800,,'',0,54700,,'',0,44500,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,61900,,'',0,22200,,'',0,37000,,'',0,54500,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92700,,'',0
+'3343',2000,65800,,'',0,54700,,'',0,44500,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,61900,,'',0,22200,,'',0,37000,,'',0,54500,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160550 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160550
index 3b2c8ebc..ce672bae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160550
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160550
@@ -1,3 +1,3 @@
-'2375',2000,65900,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,62000,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
-'3205',7401,92700,,'',0
+'3343',2000,65900,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,62000,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3568',7401,92700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160551 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160551
index 3de97792..8a7c3eea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160551
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160551
@@ -1,3 +1,3 @@
-'2375',2000,71500,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,63600,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,93800,,'',0
+'3343',2000,71500,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,63600,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,93800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160552 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160552
index 990b59f8..8e0f2320 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160552
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160552
@@ -1,3 +1,3 @@
-'2375',2000,71600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,63700,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,93800,,'',0
+'3343',2000,71600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,63700,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,93800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160553 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160553
index 055d2113..8f09616d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160553
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160553
@@ -1,3 +1,3 @@
-'2375',2000,71700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,63800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,93900,,'',0
+'3343',2000,71700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,63800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,93900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160554 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160554
index 0d0035ef..065c6b5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160554
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160554
@@ -1,3 +1,3 @@
-'2375',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94500,,'',0
+'3343',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160555 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160555
index 0d0035ef..065c6b5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160555
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160555
@@ -1,3 +1,3 @@
-'2375',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94500,,'',0
+'3343',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160556 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160556
index 55cf43f0..ed86fa07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160556
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160556
@@ -1,3 +1,3 @@
-'2375',2000,72600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94700,,'',0
+'3343',2000,72600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160557 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160557
index 7d11b7c9..44563b09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160557
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160557
@@ -1,3 +1,3 @@
-'2375',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94800,,'',0
+'3343',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160558 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160558
index 7d11b7c9..44563b09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160558
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160558
@@ -1,3 +1,3 @@
-'2375',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94800,,'',0
+'3343',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160559 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160559
index 5224a4d1..29072d5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160559
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160559
@@ -1,3 +1,3 @@
-'2375',2000,72900,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,65000,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,95000,,'',0
+'3343',2000,72900,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,65000,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,95000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160560 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160560
index 2117ce9b..f6df61a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160560
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160560
@@ -1,3 +1,3 @@
-'2375',2000,73100,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,65200,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,95100,,'',0
+'3343',2000,73100,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,65200,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,95100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160561 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160561
index f6f140ff..c6e0abff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160561
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160561
@@ -1,4 +1,4 @@
-'2375',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3206',3800,93400,,'',0,41000,,'',0
-'3205',7401,95400,,'',0
+'3343',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3569',3800,93400,,'',0,41000,,'',0
+'3568',7401,95400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160562 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160562
index 9ee545af..d5551b28 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160562
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160562
@@ -1,4 +1,4 @@
-'2375',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3206',3800,93500,,'',0,41000,,'',0
-'3205',7401,95400,,'',0
+'3343',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3569',3800,93500,,'',0,41000,,'',0
+'3568',7401,95400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160563 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160563
index 473a952c..f05e5d7c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160563
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160563
@@ -1,2 +1,2 @@
-'2375',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160564 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160564
index 473a952c..f05e5d7c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160564
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160564
@@ -1,2 +1,2 @@
-'2375',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160565 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160565
index 02b1d4fa..13288940 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160565
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160565
@@ -1,2 +1,2 @@
-'2375',2001,111100,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170100,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111100,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170100,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160566 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160566
index 21214017..af7e24ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160566
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160566
@@ -1,2 +1,2 @@
-'2375',2001,111300,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
-'3132',2001,170300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111300,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
+'3563',2001,170300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160567 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160567
index 7a5e5778..870d22c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160567
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160567
@@ -1,2 +1,2 @@
-'2375',2001,111400,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
-'3132',2001,170400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111400,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
+'3563',2001,170400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160568 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160568
index 52060bfb..6a183735 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160568
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160568
@@ -1,2 +1,2 @@
-'2375',2001,111600,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170600,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111600,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170600,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160569 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160569
index 0bec161d..c08a7500 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160569
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160569
@@ -1,2 +1,2 @@
-'2375',2001,111800,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170800,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111800,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170800,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160570 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160570
index 4accb416..1fc30c4e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160570
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160570
@@ -1,2 +1,2 @@
-'2375',2001,111900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,170900,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,111900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,170900,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160571 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160571
index 8f6cae42..02e9729a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160571
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160571
@@ -1,2 +1,2 @@
-'2375',2000,71100,,'',0,50700,,'',0
-'3132',2000,63200,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,71100,,'',0,50700,,'',0
+'3563',2000,63200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160572 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160572
index 7ee8b700..f72108a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160572
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160572
@@ -1,2 +1,2 @@
-'2375',2000,65900,,'',0,54700,,'',0
-'3132',2000,62000,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,65900,,'',0,54700,,'',0
+'3563',2000,62000,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160573 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160573
index 92faee9b..88126c75 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160573
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160573
@@ -1,2 +1,2 @@
-'2375',2000,70000,,'',0,50700,,'',0
-'3132',2000,62100,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70000,,'',0,50700,,'',0
+'3563',2000,62100,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160574 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160574
index 89abd784..ad2e2230 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160574
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160574
@@ -1,2 +1,2 @@
-'2375',2000,70100,,'',0,50700,,'',0
-'3132',2000,62200,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70100,,'',0,50700,,'',0
+'3563',2000,62200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160575 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160575
index 89abd784..ad2e2230 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160575
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160575
@@ -1,2 +1,2 @@
-'2375',2000,70100,,'',0,50700,,'',0
-'3132',2000,62200,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70100,,'',0,50700,,'',0
+'3563',2000,62200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160576 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160576
index 4b6caa2a..bea765ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160576
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160576
@@ -1,2 +1,2 @@
-'2375',2000,70700,,'',0,50700,,'',0
-'3132',2000,62800,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70700,,'',0,50700,,'',0
+'3563',2000,62800,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160577 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160577
index c8524429..43fa7517 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160577
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160577
@@ -1,2 +1,2 @@
-'2375',2000,70800,,'',0,50700,,'',0
-'3132',2000,62900,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70800,,'',0,50700,,'',0
+'3563',2000,62900,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160580 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160580
index c959811a..04a14577 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160580
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160580
@@ -1,2 +1,2 @@
-'2375',3101,100300,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
-'3132',3101,83400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
+'3343',3101,100300,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3563',3101,83400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160581 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160581
index b654d0c2..5a2e0f47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160581
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160581
@@ -1,2 +1,2 @@
-'2375',3200,101600,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
-'3132',3200,70400,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3200,101600,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3563',3200,70400,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160582 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160582
index 781fa7d5..f3e728b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160582
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160582
@@ -1,2 +1,2 @@
-'2375',3201,100900,,'',0,14800,,'',0,36500,,'',0
-'3132',3201,75400,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,100900,,'',0,14800,,'',0,36500,,'',0
+'3563',3201,75400,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160583 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160583
index df98b418..9c836534 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160583
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160583
@@ -1,2 +1,2 @@
-'2375',3201,101200,,'',0,18800,,'',0,32500,,'',0
-'3132',3201,75700,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3343',3201,101200,,'',0,18800,,'',0,32500,,'',0
+'3563',3201,75700,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160584 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160584
index 5e1ec2a4..557097f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160584
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160584
@@ -1 +1 @@
-'3211',5301,85700,,'',0,57600,,'',0
+'3574',5301,85700,,'',0,57600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160585 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160585
index 77624bee..97e4625b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160585
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160585
@@ -1 +1 @@
-'3211',5300,95800,,'',0,60000,,'',0
+'3574',5300,95800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160586 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160586
index 2ca0df33..d04e29e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160586
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160586
@@ -1,2 +1,2 @@
-'2375',4301,170800,0,'Trail',0,12600,0,'Trail',0
-'3132',4301,63000,0,'Trail',0,9600,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
+'3343',4301,170800,0,'Trail',0,12600,0,'Trail',0
+'3563',4301,63000,0,'Trail',0,9600,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160587 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160587
index 0c7e2a7f..427c17a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160587
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160587
@@ -1,4 +1,4 @@
-'3132',4500,60200,,'',0,3200,,'',0
-'2375',9800,85300,,'',0,38400,,'',0,47800,,'',0
-'3132',9800,60600,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
-'3211',9800,183300,,'',0
+'3563',4500,60200,,'',0,3200,,'',0
+'3343',9800,85300,,'',0,38400,,'',0,47800,,'',0
+'3563',9800,60600,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3574',9800,183300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160588 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160588
index 9f8df97a..d6938c55 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160588
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160588
@@ -1 +1 @@
-'3132',4300,63300,0,'Fruitvale',0,7700,0,'Fruitvale',0,11900,0,'Fruitvale',0
+'3563',4300,63300,0,'Fruitvale',0,7700,0,'Fruitvale',0,11900,0,'Fruitvale',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160589 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160589
index 17f9ca69..c8ffe389 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160589
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160589
@@ -1,2 +1,2 @@
-'2375',4301,170400,0,'Trail',0,12600,0,'Trail',0
-'3132',4301,62700,0,'Trail',0,9500,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
+'3343',4301,170400,0,'Trail',0,12600,0,'Trail',0
+'3563',4301,62700,0,'Trail',0,9500,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160590 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160590
index 6bc8300b..11ca613b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160590
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160590
@@ -1,2 +1,2 @@
-'2375',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54700,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54700,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160591 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160591
index 389a36c2..a1ef0957 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160591
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160591
@@ -1,3 +1,3 @@
-'2375',4300,85600,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,73900,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212100,,'',0
+'3343',4300,85600,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,73900,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160592 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160592
index e8df6e45..fbc3bdce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160592
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160592
@@ -1,2 +1,2 @@
-'2375',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
-'3132',4301,54800,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
+'3343',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3563',4301,54800,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160593 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160593
index 96f9ad74..b75f799c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160593
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160593
@@ -1,3 +1,3 @@
-'2375',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
-'3132',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
-'3211',4300,212000,,'',0
+'3343',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3563',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3574',4300,212000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160594 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160594
index 4c5368b8..eb121a77 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160594
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160594
@@ -1,8 +1,8 @@
-'2375',3301,112200,4,'',0,32500,4,'',0,15900,4,'',0
-'3132',3301,83000,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,22200,4,'',0
-'2375',9800,92900,4,'',0,38400,4,'',0,43800,4,'',0
-'2375',9801,93400,,'',0,38400,,'',0,43800,,'',0
-'3132',9800,64200,4,'',0,9300,4,'',0,28900,4,'',0,22500,4,'',0,30900,4,'',0,18800,4,'',0
-'3132',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
-'3211',9800,190900,4,'',0
-'3211',9801,191200,,'',0
+'3343',3301,112200,4,'',0,32500,4,'',0,15900,4,'',0
+'3563',3301,83000,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,22200,4,'',0
+'3343',9800,92900,4,'',0,38400,4,'',0,43800,4,'',0
+'3343',9801,93400,,'',0,38400,,'',0,43800,,'',0
+'3563',9800,64200,4,'',0,9300,4,'',0,28900,4,'',0,22500,4,'',0,30900,4,'',0,18800,4,'',0
+'3563',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3574',9800,190900,4,'',0
+'3574',9801,191200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160611 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160611
index c2c16f8f..dc773457 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160611
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160611
@@ -1,10 +1,10 @@
-'3132',1400,84500,,'',0,81000,,'',0
-'3204',1400,114500,,'',0,68600,,'',0
-'3208',1400,114500,,'',0,68600,,'',0
-'2375',2000,80400,,'',0,50700,,'',0,64300,0,'Nelson',0
-'3132',2000,72000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
-'3204',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
-'3205',7401,101800,,'',0
-'2375',9900,101800,,'',0,38400,,'',0,43900,,'',0
-'3132',9900,73000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31300,,'',0,9800,,'',0,8900,,'',0
+'3563',1400,84500,,'',0,81000,,'',0
+'3567',1400,114500,,'',0,68600,,'',0
+'3571',1400,114500,,'',0,68600,,'',0
+'3343',2000,80400,,'',0,50700,,'',0,64300,0,'Nelson',0
+'3563',2000,72000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3567',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
+'3568',7401,101800,,'',0
+'3343',9900,101800,,'',0,38400,,'',0,43900,,'',0
+'3563',9900,73000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31300,,'',0,9800,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160613 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160613
index 69cce3fc..f066c350 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160613
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160613
@@ -1,2 +1,2 @@
-'3209',5201,75500,,'',0,95000,,'',0
-'3205',7401,85000,,'',0
+'3572',5201,75500,,'',0,95000,,'',0
+'3568',7401,85000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160614 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160614
index c80f1b38..11188317 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160614
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160614
@@ -1,5 +1,5 @@
-'2375',1001,103500,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,85500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
-'3204',1001,121500,,'',0
-'3208',1001,121500,,'',0
-'3207',7600,101400,,'',0
+'3343',1001,103500,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,85500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3567',1001,121500,,'',0
+'3571',1001,121500,,'',0
+'3570',7600,101400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160615 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160615
index 877e8a9c..17c7def5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160615
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160615
@@ -1,5 +1,5 @@
-'2375',1001,71500,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
-'3204',1001,121600,,'',0
-'3208',1001,121600,,'',0
-'3207',7600,101500,,'',0
+'3343',1001,71500,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3567',1001,121600,,'',0
+'3571',1001,121600,,'',0
+'3570',7600,101500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160616 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160616
index 57c83583..cd22500c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160616
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160616
@@ -1,5 +1,5 @@
-'2375',1001,71700,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,62800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
-'3204',1001,122100,,'',0
-'3208',1001,122100,,'',0
-'3207',7600,101800,,'',0
+'3343',1001,71700,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,62800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
+'3567',1001,122100,,'',0
+'3571',1001,122100,,'',0
+'3570',7600,101800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160617 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160617
index 5d7be7d9..1031e657 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160617
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160617
@@ -1,5 +1,5 @@
-'2375',1001,71900,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36400,,'',0
-'3132',1001,63000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
-'3204',1001,122300,,'',0
-'3208',1001,122300,,'',0
-'3207',7600,102000,,'',0
+'3343',1001,71900,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36400,,'',0
+'3563',1001,63000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
+'3567',1001,122300,,'',0
+'3571',1001,122300,,'',0
+'3570',7600,102000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160618 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160618
index db6113a9..f1e20958 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160618
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_160618
@@ -1,5 +1,5 @@
-'2375',1001,72100,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,63200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,15300,,'',0
-'3204',1001,122500,,'',0
-'3208',1001,122500,,'',0
-'3207',7600,102100,,'',0
+'3343',1001,72100,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,63200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,15300,,'',0
+'3567',1001,122500,,'',0
+'3571',1001,122500,,'',0
+'3570',7600,102100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560000
index ee1a6380..a879b711 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560000
@@ -1,2 +1,2 @@
-'2375',3101,134900,4,'',0
-'3132',3101,83500,4,'',0,18900,4,'',0,3500,4,'',0,26500,4,'',0,12200,4,'',0,7000,4,'',0,9500,4,'',0
+'3343',3101,134900,4,'',0
+'3563',3101,83500,4,'',0,18900,4,'',0,3500,4,'',0,26500,4,'',0,12200,4,'',0,7000,4,'',0,9500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560003
index 319cb897..5615cc16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560003
@@ -1 +1 @@
-'3206',3800,92000,,'',0,41000,,'',0
+'3569',3800,92000,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560005
index 227d4673..b3f5b568 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560005
@@ -1,4 +1,4 @@
-'2375',400,151400,,'',0
-'3132',400,124900,,'',0,16800,,'',0
-'3201',400,151200,,'',0
-'3211',400,151200,,'',0
+'3343',400,151400,,'',0
+'3563',400,124900,,'',0,16800,,'',0
+'3564',400,151200,,'',0
+'3574',400,151200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560007
index f708a759..23a8bddf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560007
@@ -1,5 +1,5 @@
-'2375',1001,105600,,'',0,50100,,'',0,36300,,'',0
-'3132',1001,91600,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
-'3204',1001,123600,,'',0
-'3208',1001,123600,,'',0
-'3207',7600,103200,,'',0
+'3343',1001,105600,,'',0,50100,,'',0,36300,,'',0
+'3563',1001,91600,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3567',1001,123600,,'',0
+'3571',1001,123600,,'',0
+'3570',7600,103200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560008
index 49db73f6..c13b0746 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560008
@@ -1,3 +1,3 @@
-'3132',1400,161100,,'',0
-'3204',1400,110100,,'',0,64600,,'',0
-'3208',1400,110100,,'',0,64600,,'',0
+'3563',1400,161100,,'',0
+'3567',1400,110100,,'',0,64600,,'',0
+'3571',1400,110100,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560009
index 875fcd9b..a6e93063 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560009
@@ -1,3 +1,3 @@
-'3132',1400,80700,,'',0,81000,,'',0
-'3204',1400,110700,,'',0,64600,,'',0
-'3208',1400,110700,,'',0,64600,,'',0
+'3563',1400,80700,,'',0,81000,,'',0
+'3567',1400,110700,,'',0,64600,,'',0
+'3571',1400,110700,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560010
index 0e80b091..19c8e103 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560010
@@ -1,3 +1,3 @@
-'3132',1400,81200,,'',0,81000,,'',0
-'3204',1400,111200,,'',0,64600,,'',0
-'3208',1400,111200,,'',0,64600,,'',0
+'3563',1400,81200,,'',0,81000,,'',0
+'3567',1400,111200,,'',0,64600,,'',0
+'3571',1400,111200,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560011
index b2ea4c35..86a6e003 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560011
@@ -1,3 +1,3 @@
-'3132',1400,81500,,'',0,81000,,'',0
-'3204',1400,111500,,'',0,68600,,'',0
-'3208',1400,111500,,'',0,68600,,'',0
+'3563',1400,81500,,'',0,81000,,'',0
+'3567',1400,111500,,'',0,68600,,'',0
+'3571',1400,111500,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560012
index 27035476..656f58a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560012
@@ -1,3 +1,3 @@
-'3132',1400,81800,,'',0,81000,,'',0
-'3204',1400,111800,,'',0,68600,,'',0
-'3208',1400,111800,,'',0,68600,,'',0
+'3563',1400,81800,,'',0,81000,,'',0
+'3567',1400,111800,,'',0,68600,,'',0
+'3571',1400,111800,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560013
index 3fc1254a..31a51630 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560013
@@ -1,3 +1,3 @@
-'3132',1400,82400,,'',0,81000,,'',0
-'3204',1400,112400,,'',0,68600,,'',0
-'3208',1400,112400,,'',0,68600,,'',0
+'3563',1400,82400,,'',0,81000,,'',0
+'3567',1400,112400,,'',0,68600,,'',0
+'3571',1400,112400,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560014
index 4c0037f5..0cae5273 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560014
@@ -1,3 +1,3 @@
-'3132',1400,83200,,'',0,81000,,'',0
-'3204',1400,113200,,'',0,68600,,'',0
-'3208',1400,113200,,'',0,68600,,'',0
+'3563',1400,83200,,'',0,81000,,'',0
+'3567',1400,113200,,'',0,68600,,'',0
+'3571',1400,113200,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560015
index ab0eff8d..6912d798 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560015
@@ -1,3 +1,3 @@
-'3208',1500,85000,,'',0,56200,,'',0,30900,,'',0
-'3204',7200,83800,,'',0,57400,,'',0
-'3204',7201,125000,,'',0,47100,,'',0
+'3571',1500,85000,,'',0,56200,,'',0,30900,,'',0
+'3567',7200,83800,,'',0,57400,,'',0
+'3567',7201,125000,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560017
index 4078481a..2ad41c0d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560017
@@ -1,3 +1,3 @@
-'2375',2000,72800,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
-'3132',2000,64900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
-'3205',7401,94900,,'',0
+'3343',2000,72800,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3563',2000,64900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3568',7401,94900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560021
index f86c2dd9..a6d363fa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560021
@@ -1,12 +1,12 @@
-'3211',5700,90000,,'',0,5500,4,'',0,19000,,'',0
-'3210',5801,63500,,'',0,21000,4,'',0,100500,,'',0,20500,4,'',0
-'3202',7600,134000,4,'',0
-'3202',7601,122000,0,'Balfour Only',0
-'3203',7600,183500,4,'',0
-'3203',7601,172000,0,'Balfour Only',0
-'3207',7600,112100,4,'',0
-'3207',7601,83000,,'',0
-'3209',7600,83000,4,'',0
-'3209',7601,71000,0,'Balfour Only',0
-'3210',7600,101500,4,'',0,82000,4,'',0
-'3210',7601,90000,0,'Balfour Only',0,82000,0,'Balfour Only',0
+'3574',5700,90000,,'',0,5500,4,'',0,19000,,'',0
+'3573',5801,63500,,'',0,21000,4,'',0,100500,,'',0,20500,4,'',0
+'3565',7600,134000,4,'',0
+'3565',7601,122000,0,'Balfour Only',0
+'3566',7600,183500,4,'',0
+'3566',7601,172000,0,'Balfour Only',0
+'3570',7600,112100,4,'',0
+'3570',7601,83000,,'',0
+'3572',7600,83000,4,'',0
+'3572',7601,71000,0,'Balfour Only',0
+'3573',7600,101500,4,'',0,82000,4,'',0
+'3573',7601,90000,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560022
index a9c75a04..f345224a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560022
@@ -1,2 +1,2 @@
-'3211',5700,91000,,'',0,24500,4,'',0
-'3210',5801,64500,,'',0,125500,,'',0
+'3574',5700,91000,,'',0,24500,4,'',0
+'3573',5801,64500,,'',0,125500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560023
index 4c03dcf7..4463975c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560023
@@ -1 +1 @@
-'3211',5700,92500,,'',0
+'3574',5700,92500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560024
index 45024c3c..fea9bff5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560024
@@ -1 +1 @@
-'3211',5700,94500,,'',0
+'3574',5700,94500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560025
index 45096132..10d77c56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560025
@@ -1 +1 @@
-'3211',5700,95000,,'',0
+'3574',5700,95000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560026
index 31bbed7f..dadd4074 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560026
@@ -1 +1 @@
-'3211',5700,92000,,'',0
+'3574',5700,92000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560027
index 9d9232c3..fdb77da0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560027
@@ -1 +1 @@
-'3205',7400,160600,,'',0
+'3568',7400,160600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560034
index 7e6bd625..756be8b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560034
@@ -1,2 +1,2 @@
-'2375',2000,70400,,'',0,50700,,'',0
-'3132',2000,62500,,'',0,22200,,'',0,37000,,'',0
+'3343',2000,70400,,'',0,50700,,'',0
+'3563',2000,62500,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560035
index 4592d7dc..101deb72 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560035
@@ -1,2 +1,2 @@
-'2375',2001,112300,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
-'3132',2001,171300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,112300,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3563',2001,171300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560036
index 993ab084..7b13bf21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560036
@@ -1,5 +1,5 @@
-'3202',7601,123500,0,'Balfour Only',0
-'3203',7601,173500,0,'Balfour Only',0
-'3207',7601,84500,,'',0
-'3209',7601,72500,0,'Balfour Only',0
-'3210',7601,91500,0,'Balfour Only',0,82000,0,'Balfour Only',0
+'3565',7601,123500,0,'Balfour Only',0
+'3566',7601,173500,0,'Balfour Only',0
+'3570',7601,84500,,'',0
+'3572',7601,72500,0,'Balfour Only',0
+'3573',7601,91500,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560037
index a7e02d48..d9ce042d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560037
@@ -1,5 +1,5 @@
-'3202',7600,132500,,'',0
-'3203',7600,182000,,'',0
-'3207',7600,110600,,'',0
-'3209',7600,81500,,'',0
-'3210',7600,100000,,'',0,82000,,'',0
+'3565',7600,132500,,'',0
+'3566',7600,182000,,'',0
+'3570',7600,110600,,'',0
+'3572',7600,81500,,'',0
+'3573',7600,100000,,'',0,82000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560038
index e4446b9b..e05b453d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560038
@@ -1,2 +1,2 @@
-'3211',5300,92500,,'',0,60000,,'',0
-'3211',5301,92000,4,'',0,60000,4,'',0
+'3574',5300,92500,,'',0,60000,,'',0
+'3574',5301,92000,4,'',0,60000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560039
index ac0d7579..85eee9f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560039
@@ -1,7 +1,7 @@
-'2375',2001,53300,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,45500,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3208',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
-'3205',7400,161500,,'',0
-'2375',9901,85600,,'',0,38400,,'',0,47600,,'',0
-'3132',9901,60800,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
+'3343',2001,53300,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,45500,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3571',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3568',7400,161500,,'',0
+'3343',9901,85600,,'',0,38400,,'',0,47600,,'',0
+'3563',9901,60800,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560041
index e24f3e4a..dea7b360 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560041
@@ -1,2 +1,2 @@
-'2375',2001,103000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2001,104300,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3343',2001,103000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2001,104300,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560042
index e0b933be..336cf0c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560042
@@ -1,4 +1,4 @@
-'2375',2000,74900,,'',0,50700,,'',0,68300,0,'Nelson',0
-'3132',2000,93200,,'',0,37000,,'',0
-'3204',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
-'3208',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
+'3343',2000,74900,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3563',2000,93200,,'',0,37000,,'',0
+'3567',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
+'3571',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560043
index cc32c620..303b3afc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560043
@@ -1,6 +1,6 @@
-'2375',2000,74200,,'',0,50700,,'',0,68300,0,'Nelson',0
-'2375',2001,103500,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
-'3132',2000,92500,,'',0,33000,,'',0
-'3132',2001,104900,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
-'3204',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
-'3208',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
+'3343',2000,74200,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3343',2001,103500,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3563',2000,92500,,'',0,33000,,'',0
+'3563',2001,104900,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3567',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
+'3571',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560046
index 3baaea9c..cb590561 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560046
@@ -1 +1 @@
-'3204',7201,131200,,'',0,43100,,'',0
+'3567',7201,131200,,'',0,43100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560047
index ffe8922b..399d085d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560047
@@ -1 +1 @@
-'3204',7200,81500,,'',0,53400,,'',0
+'3567',7200,81500,,'',0,53400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560048
index c65505c1..3601a398 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560048
@@ -1 +1 @@
-'3210',5801,72000,,'',0,128500,,'',0
+'3573',5801,72000,,'',0,128500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560050
index d9e6c399..139de704 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560050
@@ -1 +1 @@
-'3212',5100,133500,,'',0,20000,,'',0
+'3575',5100,133500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560051
index 37c903f5..8ff666ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560051
@@ -1,2 +1,2 @@
-'3209',5200,93500,,'',0,90600,,'',0
-'3205',7400,181000,,'',0
+'3572',5200,93500,,'',0,90600,,'',0
+'3568',7400,181000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560052
index 24baac43..8c88cd9b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560052
@@ -1,2 +1,2 @@
-'3209',5201,72000,,'',0,91000,,'',0
-'3205',7401,81500,,'',0
+'3572',5201,72000,,'',0,91000,,'',0
+'3568',7401,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560053
index 221aa105..80d5c6a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560053
@@ -1,2 +1,2 @@
-'3209',5200,92500,,'',0,90600,,'',0
-'3205',7400,180000,,'',0
+'3572',5200,92500,,'',0,90600,,'',0
+'3568',7400,180000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560054
index 914c7ad8..4787ae16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560054
@@ -1,2 +1,2 @@
-'3209',5201,73000,,'',0,91000,,'',0
-'3205',7401,82500,,'',0
+'3572',5201,73000,,'',0,91000,,'',0
+'3568',7401,82500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560055
index 35d5f0b8..22e7b189 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560055
@@ -1,2 +1,2 @@
-'3209',5200,90500,,'',0,90600,,'',0
-'3205',7400,174000,,'',0
+'3572',5200,90500,,'',0,90600,,'',0
+'3568',7400,174000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560056
index f6ad47ae..0d40bcf5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560056
@@ -1,2 +1,2 @@
-'3209',5201,75000,,'',0,95000,,'',0
-'3205',7401,84500,,'',0
+'3572',5201,75000,,'',0,95000,,'',0
+'3568',7401,84500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560058
index 1e59e368..fbd0f066 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560058
@@ -1,2 +1,2 @@
-'3209',5200,90000,,'',0,90600,,'',0
-'3205',7400,173500,,'',0
+'3572',5200,90000,,'',0,90600,,'',0
+'3568',7400,173500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560059
index c1fe18af..055c53d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560059
@@ -1 +1 @@
-'3211',5301,83000,,'',0,57500,,'',0
+'3574',5301,83000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560060
index cb90e86d..d61ead2b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560060
@@ -1 +1 @@
-'3211',5300,102500,,'',0,60000,,'',0
+'3574',5300,102500,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560061
index bfbf27c7..c69420f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560061
@@ -1 +1 @@
-'3211',5301,84000,,'',0,57500,,'',0
+'3574',5301,84000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560062
index d4b52ce9..42b6f3bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560062
@@ -1 +1 @@
-'3211',5300,101500,,'',0,60000,,'',0
+'3574',5300,101500,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560065
index fc94eb13..5eeeb3cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560065
@@ -1 +1 @@
-'3211',5301,85500,,'',0,57500,,'',0
+'3574',5301,85500,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560066
index 174990e9..94b6b45b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560066
@@ -1 +1 @@
-'3211',5300,100000,,'',0,60000,,'',0
+'3574',5300,100000,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560067
index 14b81317..6e5423e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560067
@@ -1 +1 @@
-'3210',5801,72500,,'',0,128500,,'',0
+'3573',5801,72500,,'',0,128500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560068
index c7a16ae3..03738d11 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560068
@@ -1 +1 @@
-'3210',5801,71400,,'',0,124000,,'',0
+'3573',5801,71400,,'',0,124000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560069
index 33e2ffc1..a9611fe8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560069
@@ -1 +1 @@
-'3210',5801,75000,,'',0,119000,,'',0
+'3573',5801,75000,,'',0,119000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560070
index 70a5c68d..2299f78d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560070
@@ -1,5 +1,5 @@
-'3202',7601,122500,0,'Balfour Only',0
-'3203',7601,172500,0,'Balfour Only',0
-'3207',7601,83500,,'',0
-'3209',7601,71500,0,'Balfour Only',0
-'3210',7601,90500,0,'Balfour Only',0,82000,0,'Balfour Only',0
+'3565',7601,122500,0,'Balfour Only',0
+'3566',7601,172500,0,'Balfour Only',0
+'3570',7601,83500,,'',0
+'3572',7601,71500,0,'Balfour Only',0
+'3573',7601,90500,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560071
index abb0fd0e..907907b6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560071
@@ -1,5 +1,5 @@
-'3202',7600,133500,,'',0
-'3203',7600,183000,,'',0
-'3207',7600,111600,,'',0
-'3209',7600,82500,,'',0
-'3210',7600,101000,,'',0,82000,,'',0
+'3565',7600,133500,,'',0
+'3566',7600,183000,,'',0
+'3570',7600,111600,,'',0
+'3572',7600,82500,,'',0
+'3573',7600,101000,,'',0,82000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560072
index 90714f00..52078ba3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560072
@@ -1,5 +1,5 @@
-'3202',7601,124000,0,'Balfour Only',0
-'3203',7601,174000,0,'Balfour Only',0
-'3207',7601,85000,,'',0
-'3209',7601,73000,0,'Balfour Only',0
-'3210',7601,92000,0,'Balfour Only',0,82000,0,'Balfour Only',0
+'3565',7601,124000,0,'Balfour Only',0
+'3566',7601,174000,0,'Balfour Only',0
+'3570',7601,85000,,'',0
+'3572',7601,73000,0,'Balfour Only',0
+'3573',7601,92000,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560073
index d6e4b3e3..ef54b849 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560073
@@ -1,5 +1,5 @@
-'3202',7600,132000,,'',0
-'3203',7600,181500,,'',0
-'3207',7600,110100,,'',0
-'3209',7600,81000,,'',0
-'3210',7600,95500,,'',0,86000,,'',0
+'3565',7600,132000,,'',0
+'3566',7600,181500,,'',0
+'3570',7600,110100,,'',0
+'3572',7600,81000,,'',0
+'3573',7600,95500,,'',0,86000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560082
index 6fa9b084..03dece59 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560082
@@ -1,2 +1,2 @@
-'2375',401,141100,,'',0
-'3132',401,111300,,'',0,20600,,'',0,12500,,'',0
+'3343',401,141100,,'',0
+'3563',401,111300,,'',0,20600,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560088
index ca6e7a20..7fec0512 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560088
@@ -1 +1 @@
-'3210',5801,83000,,'',0,121000,,'',0
+'3573',5801,83000,,'',0,121000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560093
index 252cf302..02514d44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560093
@@ -1,4 +1,4 @@
-'3132',1400,75500,,'',0
-'3132',2000,71300,,'',0
-'3132',2001,161000,0,'Slocan Vly -',0
-'3132',9900,110900,,'',0,53300,,'',0
+'3563',1400,75500,,'',0
+'3563',2000,71300,,'',0
+'3563',2001,161000,0,'Slocan Vly -',0
+'3563',9900,110900,,'',0,53300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560140
index a07d5eed..ab01ed76 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560140
@@ -1,2 +1,2 @@
-'3132',4500,60500,,'',0,3000,,'',0,200,,'',0,88300,,'',0
-'3132',4600,63500,4,'',0
+'3563',4500,60500,,'',0,3000,,'',0,200,,'',0,88300,,'',0
+'3563',4600,63500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560142
index 0249ea74..43718146 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560142
@@ -1,2 +1,2 @@
-'3209',5200,83500,,'',0,90600,,'',0
-'3205',7400,171000,,'',0
+'3572',5200,83500,,'',0,90600,,'',0
+'3568',7400,171000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560143
index c1c2c8b2..6a8add3a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_560143
@@ -1,2 +1,2 @@
-'3209',5201,82000,4,'',0,91000,4,'',0
-'3205',7401,91500,,'',0
+'3572',5201,82000,4,'',0,91000,4,'',0
+'3568',7401,91500,,'',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 523ffb06..af63022f 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">50.2967</string>
     <string name="current_gtfs_rts_area_min_lng">-118.14054</string>
     <string name="current_gtfs_rts_area_max_lng">-116.89681</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1725106980</integer><!-- 2024/08/31 05:23:00 PDT -->
-    <integer name="current_gtfs_rts_last_departure_in_sec">1733027760</integer><!-- 2024/11/30 20:36:00 PST -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1728992700</integer><!-- 2024/10/15 04:45:00 PDT -->
+    <integer name="current_gtfs_rts_last_departure_in_sec">1734160680</integer><!-- 2024/12/13 23:18:00 PST -->
 </resources>
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_routes b/app-android/src/main/res-next/raw/next_gtfs_rts_routes
new file mode 100644
index 00000000..99026552
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_routes
@@ -0,0 +1,31 @@
+1,'1','Uphill','004B8D',49,3
+2,'2','Fairview','8CC63F',50,3
+3,'3','Rosemont','F37421',51,3
+4,'4','Nelson Airport','00AEEF',52,3
+10,'10','North Shore','FCAF17',1567,3
+14,'14','Blewett','00AA47',1571,3
+15,'15','Perrier','ED1D8F',1572,3
+20,'20','Slocan Valley','8177B7',1598,3
+31,'31','North Castlegar','49176B',1630,3
+32,'32','Columbia','B2BB1E',1631,3
+33,'33','Selkirk','4F6F19',1632,3
+34,'34','Kinnaird/Southridge','77AF99',1633,3
+36,'36','Ootischenia','E270AB',1635,3
+38,'38','Playmor Via Pass Creek','5D87A1',1637,3
+41,'41','Binns','0073AE',1661,3
+42,'42','Columbia Heights','F49A5D',1662,3
+43,'43','Glenmerry/Fruitvale','B3AA7E',1663,3
+44,'44','Sunningdale','BF83B9',1664,3
+45,'45','Teck','A54499',1665,3
+46,'46','Rossland','00B5AD',1666,3
+48,'48','Red Mountain Ski Bus','8E0C3A',1668,3
+51,'51','Nakusp-Hot Springs','E31937',1692,3
+52,'52','Nakusp-Playmor Via Silverton','AC5C3B',1693,3
+53,'53','Nakusp-Edgewood','875D9F',1694,3
+57,'57','Kaslo Local','7C3F25',1698,3
+58,'58','Kaslo-Argenta','91278F',1699,3
+72,'72','Salmo-Nelson Via Ymir','FFC20E',1755,3
+74,'74','Nakusp-Nelson','004B8D',1757,3
+76,'76','Kaslo-Nelson','8CC63F',1759,3
+98,'98','Columbia Connector','F37421',1823,3
+99,'99','Kootenay Connector','00AEEF',1824,3
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_stops b/app-android/src/main/res-next/raw/next_gtfs_rts_stops
new file mode 100644
index 00000000..c585f23a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_stops
@@ -0,0 +1,623 @@
+160000,'160000','12 Av & Hwy 22',49.20775,-117.70425,0,1454176165
+160001,'160001','12 Av & Hwy 22',49.20782,-117.70427,0,1454176166
+160002,'160002','Selkirk College',49.31101,-117.65237,0,1454176167
+160003,'160003','12 Av & 15 Av',49.20886,-117.69712,0,1454176168
+160004,'160004','12 Av & 15 Av',49.20893,-117.69716,0,1454176169
+160005,'160005','12 Av & 5 St',49.21290,-117.69169,0,1454176170
+160006,'160006','12 Av & 5 St',49.21295,-117.69178,0,1454176171
+160007,'160007','12 Av & 6 St',49.21491,-117.68914,0,1454176172
+160008,'160008','12 Av & 6 St',49.21495,-117.68921,0,1454176173
+160009,'160009','Columbia & 22 St',49.29130,-117.65062,0,1454176174
+160010,'160010','Columbia & 23 St',49.28828,-117.65087,0,1454176196
+160011,'160011','Columbia & 23 St',49.28832,-117.65066,0,1454176197
+160012,'160012','Teck D Pkng Lot',49.09839,-117.71554,0,1454176198
+160013,'160013','Mtn Lk',49.50831,-117.26588,0,1454176199
+160014,'160014','Hoover & Hall',49.48826,-117.28744,0,1454176200
+160015,'160015','1555 Columbia Av',49.30480,-117.65828,0,1454176201
+160016,'160016','1530 Columbia Av',49.30472,-117.65868,0,1454176202
+160017,'160017','Columbia & Hunters',49.30607,-117.65879,0,1454176203
+160018,'160018','2529 Columbia Av',49.28276,-117.65067,0,1454176204
+160019,'160019','2528 Columbia Av',49.28253,-117.65096,0,1454176205
+160020,'160020','14 Av & Hwy 3',49.28773,-117.66090,0,1454176227
+160021,'160021','Thompson & Schofield',49.07157,-117.79144,0,1454176228
+160022,'160022','Victoria & Tamarac',49.09620,-117.71325,0,1454176229
+160023,'160023','Waneta Plz',49.09056,-117.63378,0,1454176230
+160024,'160024','Nelson & Lookout',49.09361,-117.71343,0,1454176231
+160025,'160025','Victoria & Tamarac',49.09626,-117.71223,0,1454176232
+160026,'160026','LV Rogers Secondary',49.50119,-117.27354,0,1454176233
+160027,'160027','10 Av & 26 St',49.28199,-117.65414,0,1454176234
+160028,'160028','14 Av & 37 St',49.26614,-117.66012,0,1454176235
+160029,'160029','Tamarac & Columbia Grdns',49.10586,-117.54908,0,1454176236
+160030,'160030','Warfield Plant',49.10443,-117.73742,0,1454176258
+160031,'160031','Kootenay & Main',49.11528,-117.54500,0,1454176259
+160032,'160032','Trail Walmart',49.08504,-117.62057,0,1454176260
+160033,'160033','3543 Hwy Dr',49.09756,-117.66448,0,1454176261
+160034,'160034','3550 Hwy Dr',49.09744,-117.66422,0,1454176262
+160035,'160035','920 Glover Rd',49.09633,-117.71753,0,1454176263
+160036,'160036','Carnation & Woodland Dr E',49.09713,-117.65589,0,1454176264
+160037,'160037','Nelson & B St',49.09434,-117.71617,0,1454176265
+160038,'160038','Red Mtn Resort',49.10252,-117.81908,0,1454176266
+160039,'160039','Castlegar Airport',49.30088,-117.63686,0,1454176267
+160040,'160040','Schofield Hwy & Redstone',49.07787,-117.77496,0,1454176289
+160041,'160041','Hosp Bench & 4 Av',49.10189,-117.70202,0,1454176290
+160042,'160042','KBR Hosp',49.10333,-117.70067,0,1454176291
+160043,'160043','Ootischenia & Columbia',49.30329,-117.63205,0,1454176292
+160044,'160044','Schofield Hwy & Cemetery',49.07629,-117.77973,0,1454176293
+160045,'160045','Schofield Hwy & Wellington',49.09817,-117.73243,0,1454176294
+160046,'160046','Schofield Hwy & Wellington',49.09846,-117.73324,0,1454176295
+160047,'160047','454 Ootischenia Rd',49.29963,-117.63096,0,1454176296
+160048,'160048','Hosp Bench & JL Crowe Sch',49.10317,-117.69951,0,1454176297
+160049,'160049','350 Ootischenia Rd',49.29337,-117.62901,0,1454176298
+160050,'160050','St Paul & 5 Av',49.08194,-117.79647,0,1454176320
+160051,'160051','Jubilee & Washington',49.08082,-117.79933,0,1454176321
+160052,'160052','Butte & Columbia',49.07674,-117.79388,0,1454176322
+160053,'160053','2 St & St Paul',49.07912,-117.79602,0,1454176323
+160054,'160054','St Paul & 3 Av',49.08014,-117.79656,0,1454176324
+160055,'160055','Washington & 3 Av',49.07986,-117.79971,0,1454176325
+160056,'160056','Columbia & Queen',49.07689,-117.79824,0,1454176326
+160057,'160057','Columbia & Spokane',49.07695,-117.80165,0,1454176327
+160058,'160058','Columbia & Spokane',49.07705,-117.80165,0,1454176328
+160059,'160059','Columbia & Hwy 3B/22',49.07721,-117.80790,0,1454176329
+160060,'160060','Nevada & Kootenay',49.07547,-117.81019,0,1454176351
+160061,'160061','Nevada & Kootenay',49.07549,-117.81043,0,1454176352
+160062,'160062','Thompson & Irwin',49.07212,-117.79185,0,1454176353
+160063,'160063','Thompson & St Paul',49.07373,-117.79715,0,1454176354
+160064,'160064','Thompson & St Paul',49.07352,-117.79678,0,1454176355
+160065,'160065','Thompson & Spokane',49.07396,-117.80182,0,1454176356
+160066,'160066','Thompson & Spokane',49.07385,-117.80183,0,1454176357
+160067,'160067','Thompson & Davis',49.07399,-117.80551,0,1454176358
+160068,'160068','Thompson & Davis',49.07409,-117.80569,0,1454176359
+160069,'160069','Hwy 3B & Hwy 22',49.07751,-117.81421,0,1454176360
+160070,'160070','Murray & Schofield Hwy',49.09510,-117.74495,0,1454176382
+160071,'160071','Warfield Store',49.09120,-117.75229,0,1454176383
+160072,'160072','Warfield Store',49.09115,-117.75216,0,1454176384
+160073,'160073','Forrest & Willow',49.09289,-117.74856,0,1454176385
+160074,'160074','Forrest & Willow',49.09297,-117.74872,0,1454176386
+160075,'160075','Forrest & Murray',49.09488,-117.74511,0,1454176387
+160076,'160076','Haig & French',49.09604,-117.73375,0,1454176388
+160077,'160077','Wellington & Turner',49.09711,-117.73528,0,1454176389
+160078,'160078','Wellington & Turner',49.09706,-117.73507,0,1454176390
+160079,'160079','Wellington & Schofield',49.09784,-117.73219,0,1454176391
+160080,'160080','Binns & Esling',49.09830,-117.72546,0,1454176413
+160081,'160081','Binns & Buckna',49.09705,-117.72126,0,1454176414
+160082,'160082','Dockerill & Hendry',49.09497,-117.71766,0,1454176415
+160083,'160083','Binns & McAnally',49.09625,-117.71932,0,1454176416
+160084,'160084','Daniel & Maple',49.09257,-117.70691,0,1454176417
+160085,'160085','Daniel & Munter',49.09234,-117.70452,0,1454176418
+160086,'160086','Cedar & Farwell',49.09666,-117.71003,0,1454176419
+160087,'160087','Trail Exch',49.09478,-117.70785,0,1454176420
+160088,'160088','Student Residence',49.30999,-117.65263,0,1454176421
+160090,'160090','Columbia & 22 St',49.29129,-117.65089,0,1454176444
+160091,'160091','Broadwater & Horcoff',49.33283,-117.68297,0,1454176445
+160092,'160092','Daniel & End',49.09172,-117.69718,0,1454176446
+160093,'160093','Daniel & Wilmes',49.09182,-117.70073,0,1454176447
+160094,'160094','Topping & Elm',49.09219,-117.70140,0,1454176448
+160095,'160095','Topping & Bay',49.09250,-117.70360,0,1454176449
+160096,'160096','Pine & Maple',49.09319,-117.70768,0,1454176450
+160097,'160097','Eldorado & Pine',49.09539,-117.70977,0,1454176451
+160098,'160098','Bay & Farwell',49.09666,-117.70876,0,1454176452
+160102,'160102','2 Av & McQuarrie',49.09709,-117.70080,0,1454177128
+160103,'160103','2 Av & McQuarrie',49.09671,-117.70066,0,1454177129
+160104,'160104','2 Av & Robertson',49.09847,-117.70230,0,1454177130
+160105,'160105','2 Av & Robertson',49.09891,-117.70257,0,1454177131
+160106,'160106','2 Av & Bailey',49.10050,-117.70381,0,1454177132
+160107,'160107','2 Av & Goepel',49.10109,-117.70434,0,1454177133
+160108,'160108','2 Av & Goepel',49.10160,-117.70452,0,1454177134
+160109,'160109','2 Av & Taylor',49.10274,-117.70542,0,1454177135
+160110,'160110','2 Av & Taylor',49.10321,-117.70557,0,1454177157
+160111,'160111','Charles Lks & Gyro Pk',49.10560,-117.70752,0,1454177158
+160112,'160112','Charles Lks & Gyro Pk',49.10555,-117.70766,0,1454177159
+160117,'160117','Goepel & 4 Av',49.10191,-117.70253,0,1454177164
+160118,'160118','5 Av & Bowser',49.09831,-117.69054,0,1454177165
+160119,'160119','5 Av & Bowser',49.09818,-117.69059,0,1454177166
+160120,'160120','McBride & 7 Av',49.09920,-117.68736,0,1454177188
+160121,'160121','McBride & 7 Av',49.09911,-117.68715,0,1454177189
+160122,'160122','Oliver & 7 Av',49.10046,-117.69326,0,1454177190
+160123,'160123','Oliver & 6 Av',49.10019,-117.69374,0,1454177191
+160124,'160124','7 Av & Bowser',49.09988,-117.69008,0,1454177192
+160125,'160125','7 Av & Bowser',49.09980,-117.69016,0,1454177193
+160126,'160126','Hwy 3B & Beaver',49.08701,-117.57652,0,1454177194
+160127,'160127','Hwy 3B & Beaver',49.08694,-117.57632,0,1454177195
+160128,'160128','6 Av & Brewster',49.09949,-117.69170,0,1454177196
+160129,'160129','6 Av & Brewster',49.09942,-117.69175,0,1454177197
+160130,'160130','Hwy & Laurel',49.09780,-117.67202,0,1454177219
+160131,'160131','Hwy & Lily',49.09796,-117.66990,0,1454177220
+160132,'160132','Hwy & Lily',49.09782,-117.66974,0,1454177221
+160133,'160133','Hwy 22A & Hwy 3B',49.08653,-117.62520,0,1454177222
+160134,'160134','Carnation & Marigold',49.09972,-117.66379,0,1454177223
+160135,'160135','Carnation & Daisy',49.09987,-117.66548,0,1454177224
+160136,'160136','Carnation & Cottonwood',49.09872,-117.66094,0,1454177225
+160137,'160137','Carnation & Woodland Dr W',49.09909,-117.66229,0,1454177226
+160138,'160138','Lily & Carnation',49.09965,-117.66972,0,1454177227
+160139,'160139','Lily & Carnation',49.09965,-117.66992,0,1454177228
+160140,'160140','Teck Main Gt',49.10713,-117.72719,0,1454177250
+160147,'160147','Hazlewood & Diana',49.11365,-117.71698,0,1454177257
+160148,'160148','Hillside & Viola',49.11378,-117.71472,0,1454177258
+160149,'160149','Hazlewood & Portia',49.11481,-117.71952,0,1454177259
+160150,'160150','Hillside & Sylvia',49.11535,-117.71539,0,1454177281
+160151,'160151','Hazlewood & Hermia',49.11566,-117.72155,0,1454177282
+160152,'160152','Marianna & Celia Cres E',49.11794,-117.71696,0,1454177283
+160153,'160153','Marianna & Nerissa',49.11971,-117.72034,0,1454177284
+160154,'160154','Marianna & Celia Cres W',49.11818,-117.72359,0,1454177285
+160156,'160156','Wordsworth & Shelley',49.09434,-117.75476,0,1454177287
+160157,'160157','Main & Columbia Grdns',49.11591,-117.54277,0,1454177288
+160158,'160158','Main & Kootenay',49.11457,-117.54526,0,1454177289
+160159,'160159','Laurier & Main',49.11371,-117.54642,0,1454177290
+160160,'160160','1057 Hwy 3B',49.08389,-117.58043,0,1454177312
+160161,'160161','1050 Hwy 3B',49.08352,-117.58061,0,1454177313
+160162,'160162','Montrose: 10 Av & 5 St',49.07921,-117.59195,0,1454177314
+160163,'160163','Hwy 3B & Goodwin',49.08819,-117.62725,0,1454177315
+160164,'160164','Old Waneta & Devito',49.08862,-117.63476,0,1454177316
+160165,'160165','9 Av & 2 St',49.07449,-117.59816,0,1454177317
+160166,'160166','9 Av & 2 St',49.07437,-117.59809,0,1454177318
+160167,'160167','9 Av & 3 St',49.07584,-117.59602,0,1454177319
+160168,'160168','9 Av & 3 St',49.07579,-117.59564,0,1454177320
+160169,'160169','9 Av & 4 St',49.07815,-117.59312,0,1454177321
+160170,'160170','9 Av & 4 St',49.07798,-117.59316,0,1454177343
+160171,'160171','Hwy 3B & Bluebird',49.10112,-117.56108,0,1454177344
+160172,'160172','Hwy 3B & Robinson',49.09690,-117.56531,0,1454177345
+160173,'160173','Hwy 3B & Robinson',49.09688,-117.56514,0,1454177346
+160174,'160174','Hwy 3B & Bluebird',49.10096,-117.56138,0,1454177347
+160175,'160175','Grn & Redwood',49.10897,-117.54090,0,1454177348
+160176,'160176','Grn & Beaver Vly Arena',49.10655,-117.54317,0,1454177349
+160177,'160177','Grn & Mill',49.11053,-117.53930,0,1454177350
+160178,'160178','1992 Old Salmo Rd',49.11509,-117.53725,0,1454177351
+160179,'160179','Old Salmo & Mollar',49.11744,-117.53236,0,1454177352
+160180,'160180','Mill & Columbia Grdns',49.11267,-117.54175,0,1454177374
+160181,'160181','Columbia Grdns & Cedar',49.11179,-117.54388,0,1454177375
+160182,'160182','Columbia Grdns & Juniper',49.10745,-117.54800,0,1454177376
+160183,'160183','Beaver & Columbia Grdn',49.11484,-117.54244,0,1454177377
+160184,'160184','Carnation & Woodland',49.09728,-117.65674,0,1454177378
+160185,'160185','Hwy 3B & Nelson',49.11347,-117.54929,0,1454177379
+160186,'160186','Hwy 3B & Nelson',49.11333,-117.54910,0,1454177380
+160187,'160187','Hwy & Lilac',49.09783,-117.67504,0,1454177381
+160188,'160188','Hwy & Dahlia',49.09794,-117.67402,0,1454177382
+160189,'160189','2950 Hwy Dr',49.09785,-117.68011,0,1454177383
+160190,'160190','2905 Hwy Dr',49.09792,-117.68091,0,1454177405
+160191,'160191','Hwy & Lilac',49.09794,-117.67720,0,1454177406
+160192,'160192','Hwy & Iris',49.09787,-117.67692,0,1454177407
+160193,'160193','Tennyson & Shakespeare',49.09226,-117.75511,0,1454177408
+160194,'160194','Old Rossland & White',49.09970,-117.72595,0,1454177409
+160195,'160195','Rosewood & Carnation',49.09737,-117.66047,0,1454177410
+160196,'160196','Rosewood & Carnation',49.09722,-117.66049,0,1454177411
+160197,'160197','Cottonwood & Rosewood',49.09780,-117.66175,0,1454177412
+160198,'160198','Cottonwood & Carnation',49.09808,-117.66117,0,1454177413
+160199,'160199','Rossland & 2 St',49.09673,-117.71647,0,1454177414
+160200,'160200','Rossland & Railway',49.09848,-117.72205,0,1454178087
+160201,'160201','Rossland & Byers',49.09772,-117.71964,0,1454178088
+160202,'160202','Rossland & Byers',49.09790,-117.71970,0,1454178089
+160203,'160203','Rossland & Railway',49.09896,-117.72278,0,1454178090
+160204,'160204','Haig & Coleman',49.09666,-117.73107,0,1454178091
+160205,'160205','Jubilee & St Paul',49.08312,-117.79652,0,1454178092
+160206,'160206','Nakusp: 6 Av NW & 2 St SE',50.24169,-117.80489,0,1454178093
+160207,'160207','Nakusp: B''way W @ 6 Av SW',50.23919,-117.80516,0,1454178094
+160209,'160209','Harold & Delany',49.76794,-117.46965,0,1454178096
+160210,'160210','Slocan & Giffin',49.76330,-117.46571,0,1454178118
+160212,'160212','Harold & Delany',49.76794,-117.46950,0,1454178120
+160213,'160213','Hwy 6 & Winlaw Bridge',49.61066,-117.56353,0,1454178121
+160214,'160214','Hwy 3A & Ootischenia',49.31403,-117.63209,0,1454178122
+160215,'160215','Hwy 3A & Upper Balfour',49.62233,-116.98835,0,1454178123
+160216,'160216','Grieve & Mollar',49.12002,-117.53492,0,1454178124
+160218,'160218','Broadwater & Relkoff',49.33560,-117.66876,0,1454178126
+160219,'160219','Blake & Waldie',49.33442,-117.69658,0,1454178127
+160220,'160220','Columbia & 1 St',49.32832,-117.66758,0,1454178149
+160221,'160221','Columbia & 4 St',49.32544,-117.66608,0,1454178150
+160222,'160222','Columbia & 20 St',49.29671,-117.65495,0,1454178151
+160223,'160223','Columbia & 10 St',49.31520,-117.66351,0,1454178152
+160224,'160224','Columbia & 8 St',49.31805,-117.66449,0,1454178153
+160225,'160225','3 St & 7 Av',49.32648,-117.65976,0,1454178154
+160226,'160226','5 Av & 5 St',49.32457,-117.65703,0,1454178155
+160227,'160227','5 Av & 3 St',49.32621,-117.65699,0,1454178156
+160228,'160228','7 Av & 7 St',49.32056,-117.65975,0,1454178157
+160229,'160229','7 Av & 7 St',49.32088,-117.65945,0,1454178158
+160230,'160230','7 Av & Larch',49.31731,-117.65966,0,1454178180
+160231,'160231','6 St & 6 Av',49.32232,-117.65795,0,1454178181
+160232,'160232','6 St & 9 Av',49.32237,-117.66221,0,1454178182
+160233,'160233','6 St & 11 Av',49.32245,-117.66502,0,1454178183
+160234,'160234','Castlegar Hosp',49.31468,-117.66066,0,1454178184
+160236,'160236','11 St & 7 Av',49.31251,-117.66046,0,1454178186
+160237,'160237','17 St & Columbia',49.30187,-117.65736,0,1454178187
+160238,'160238','18 St & Columbia',49.30000,-117.65627,0,1454178188
+160239,'160239','Columbia & McPhee',49.29965,-117.62714,0,1454178189
+160240,'160240','Columbia & Hipwell',49.28461,-117.62571,0,1454178211
+160241,'160241','Columbia & Waterloo',49.28143,-117.62791,0,1454178212
+160242,'160242','Waterloo & Columbia',49.28210,-117.62971,0,1454178213
+160243,'160243','Bridgeview & Lawrence',49.28798,-117.64096,0,1454178214
+160244,'160244','Bridgeview & Waterloo',49.28086,-117.63820,0,1454178215
+160245,'160245','Bridgeview & Edgewater',49.28399,-117.63875,0,1454178216
+160246,'160246','14 Av & Meadowbrook',49.28525,-117.66104,0,1454178217
+160247,'160247','Castlegar Comm Ctr',49.29448,-117.65092,0,1454178218
+160248,'160248','24 St & 6 Av',49.28567,-117.64850,0,1454178219
+160249,'160249','5 Av & 26 St',49.28252,-117.64712,0,1454178220
+160250,'160250','5 Av & 29 St',49.27616,-117.64703,0,1454178242
+160251,'160251','5 Av & 30 St',49.27400,-117.64734,0,1454178243
+160252,'160252','5 Av & 32 St',49.27127,-117.64758,0,1454178244
+160253,'160253','24 St & 10 Av',49.28705,-117.65473,0,1454178245
+160254,'160254','9 Av & 27 St',49.27870,-117.65145,0,1454178246
+160255,'160255','28 St & 9 Av',49.27759,-117.65014,0,1454178247
+160256,'160256','10 Av & 25 St',49.28481,-117.65392,0,1454178248
+160257,'160257','F Beinder & Heritage',49.30095,-117.63866,0,1454178249
+160258,'160258','Columbia & 27 St',49.27931,-117.64952,0,1454178250
+160259,'160259','Columbia & 27 St',49.27930,-117.64973,0,1454178251
+160260,'160260','Columbia & 32 St',49.27154,-117.64883,0,1454178273
+160261,'160261','Columbia & 32 St',49.27185,-117.64904,0,1454178274
+160262,'160262','Columbia & 28 St',49.27614,-117.64835,0,1454178275
+160263,'160263','Columbia & 28 St',49.27605,-117.64867,0,1454178276
+160264,'160264','3379 Southridge Dr',49.26920,-117.65462,0,1454178277
+160265,'160265','Southridge & 14 Av',49.27000,-117.65729,0,1454178278
+160266,'160266','9 Av & 35 St',49.26741,-117.65172,0,1454178279
+160267,'160267','9 Av & 37 St',49.26546,-117.65270,0,1454178280
+160268,'160268','Hwy 3 & Crestview',49.29311,-117.65602,0,1454178281
+160269,'160269','100 St & Blueberry',49.24711,-117.66347,0,1454178282
+160270,'160270','Bridgeview & Wild Orchid',49.28802,-117.63878,0,1454178304
+160271,'160271','Broadwater & Columbia Hgts',49.33243,-117.68840,0,1454178305
+160272,'160272','7 Av & 8 St',49.31769,-117.65987,0,1454178306
+160273,'160273','Cedar & Robson',49.48779,-117.28291,0,1454178307
+160274,'160274','Cedar & Gore',49.48697,-117.28216,0,1454178308
+160275,'160275','W Innes & Crease',49.48216,-117.30247,0,1454178309
+160276,'160276','W Innes & Kary',49.48213,-117.30116,0,1454178310
+160277,'160277','W Innes & McQuarrie',49.48215,-117.29890,0,1454178311
+160278,'160278','W Innes & Robertson',49.48216,-117.29667,0,1454178312
+160279,'160279','Vancouver & Observatory',49.48513,-117.29504,0,1454178313
+160280,'160280','Vancouver & Observatory',49.48505,-117.29517,0,1454178335
+160281,'160281','Josephine & Hoover',49.48777,-117.28838,0,1454178336
+160282,'160282','Baker & Falls',49.49054,-117.29796,0,1454178337
+160284,'160284','Nelson: Baker & Ward',49.49214,-117.29347,0,1454178339
+160285,'160285','Houston & Hall',49.48479,-117.28332,0,1454178340
+160286,'160286','Houston & Cedar',49.48551,-117.28115,0,1454178341
+160287,'160287','Houston & Josephine',49.48420,-117.28480,0,1454178342
+160288,'160288','Houston & Ward',49.48344,-117.28675,0,1454178343
+160289,'160289','Houston & Kootenay',49.48242,-117.28955,0,1454178344
+160290,'160290','Stanley & Silica',49.48965,-117.29387,0,1454178366
+160291,'160291','Stanley & Carbonate',49.48883,-117.29294,0,1454178367
+160292,'160292','Stanley & Mill',49.48818,-117.29257,0,1454178368
+160293,'160293','Stanley & Robson',49.48508,-117.28981,0,1454178369
+160294,'160294','Stanley & Innes',49.48395,-117.28881,0,1454178370
+160295,'160295','Stanley & Richards',49.48214,-117.28715,0,1454178371
+160296,'160296','Stanley & Beasley',49.48103,-117.28622,0,1454178372
+160297,'160297','Stanley & Hart',49.47943,-117.28482,0,1454178373
+160298,'160298','Kootenay & Observatory',49.48530,-117.29178,0,1454178374
+160299,'160299','Carbonate & Cedar',49.49166,-117.28664,0,1454178375
+160300,'160300','Latimer & Josephine',49.48880,-117.28878,0,1454179048
+160301,'160301','Latimer & Josephine',49.48882,-117.28902,0,1454179049
+160302,'160302','Hall Mines & Hoover',49.48593,-117.29305,0,1454179050
+160303,'160303','Hall Mines & Observatory',49.48549,-117.29332,0,1454179051
+160304,'160304','Robson & Hendryx',49.48734,-117.28489,0,1454179052
+160305,'160305','Robson & Josephine',49.48651,-117.28702,0,1454179053
+160306,'160306','Falls & Richards',49.48111,-117.28970,0,1454179054
+160307,'160307','Falls & Beasley',49.47960,-117.28837,0,1454179055
+160308,'160308','Vancouver & Houston',49.48058,-117.29526,0,1454179056
+160309,'160309','Silver King & W Beasley',49.47906,-117.29609,0,1454179057
+160310,'160310','Silver King & W Beasley',49.47886,-117.29620,0,1454179079
+160311,'160311','Silver King Campus',49.47667,-117.29573,0,1454179080
+160312,'160312','Hart & Falls',49.47840,-117.28707,0,1454179081
+160313,'160313','Kootenay Lk Hosp',49.49467,-117.28513,0,1454179082
+160314,'160314','Vw & Pk',49.49288,-117.28512,0,1454179083
+160315,'160315','Behnsen & 2 St',49.50102,-117.28141,0,1454179084
+160316,'160316','Behnsen & 1 St',49.50115,-117.28173,0,1454179085
+160317,'160317','Lakeside & Airport',49.49161,-117.30281,0,1454179086
+160318,'160318','Nelson & Behnsen',49.50055,-117.27932,0,1454179087
+160319,'160319','2 St & Davie',49.50329,-117.28078,0,1454179088
+160320,'160320','2 St & Davie',49.50327,-117.28092,0,1454179110
+160321,'160321','2 St & Kokanee',49.50563,-117.28080,0,1454179111
+160322,'160322','2 St & Kokanee',49.50571,-117.28086,0,1454179112
+160323,'160323','Cottonwood & 7 St',49.50220,-117.27316,0,1454179113
+160324,'160324','Cottonwood & 7 St',49.50227,-117.27315,0,1454179114
+160325,'160325','Cottonwood & 5 St',49.50222,-117.27475,0,1454179115
+160326,'160326','Cottonwood & 3 St',49.50221,-117.27745,0,1454179116
+160327,'160327','5 St & Davies',49.50354,-117.27526,0,1454179117
+160328,'160328','5 St & Kokanee',49.50597,-117.27524,0,1454179118
+160329,'160329','Gordon & 3 St',49.50806,-117.27775,0,1454179119
+160330,'160330','Gordon & 4 St',49.50815,-117.27596,0,1454179141
+160332,'160332','Gordon & 6 St',49.50814,-117.27427,0,1454179143
+160333,'160333','Nelson & Kokanee',49.50681,-117.27904,0,1454179144
+160334,'160334','Fell & 6 St',49.50690,-117.27441,0,1454179145
+160335,'160335','8 St & Davies',49.50367,-117.27161,0,1454179146
+160336,'160336','8 St & Davies',49.50356,-117.27140,0,1454179147
+160337,'160337','8 St & Kokanee',49.50545,-117.27133,0,1454179148
+160338,'160338','8 St & Kokanee',49.50563,-117.27147,0,1454179149
+160339,'160339','Fell & 9 St',49.50699,-117.26995,0,1454179150
+160340,'160340','Hendryx & Mill',49.49036,-117.28702,0,1454179172
+160341,'160341','Hendryx & Mill',49.49021,-117.28708,0,1454179173
+160342,'160342','Front & Poplar',49.49945,-117.28551,0,1454179174
+160343,'160343','1333 McPhee Rd',49.29401,-117.61759,0,1454179175
+160344,'160344','McPhee & Columbia',49.29790,-117.62113,0,1454179176
+160345,'160345','McPhee & Lark',49.29120,-117.61835,0,1454179177
+160346,'160346','McPhee & Columbia',49.28601,-117.62334,0,1454179178
+160347,'160347','Columbia & Selkirk',49.30844,-117.65992,0,1454179179
+160348,'160348','Columbia & 21 St',49.29420,-117.65278,0,1454179180
+160349,'160349','Crease & W Houston',49.48145,-117.30314,0,1454179181
+160350,'160350','Hall & Front',49.49509,-117.29290,0,1454179203
+160351,'160351','Hall & Front',49.49509,-117.29324,0,1454179204
+160352,'160352','Grn & Tamarac',49.10464,-117.54505,0,1454179205
+160353,'160353','McBride & 6 Av',49.09859,-117.68831,0,1454179206
+160354,'160354','McBride & 6 Av',49.09850,-117.68818,0,1454179207
+160355,'160355','2 Av & Main',49.09618,-117.69671,0,1454179208
+160356,'160356','2 Av & Main',49.09608,-117.69680,0,1454179209
+160357,'160357','Local 480',49.10088,-117.72218,0,1454179210
+160358,'160358','Vernon & Hendryx',49.49430,-117.29116,0,1454179211
+160359,'160359','10 St & Kokanee',49.50590,-117.26883,0,1454179212
+160360,'160360','Columbia & Selkirk',49.30891,-117.65976,0,1454179234
+160361,'160361','Columbia & 15 St',49.30688,-117.65857,0,1454179235
+160362,'160362','Columbia & 10 St',49.31504,-117.66406,0,1454179236
+160363,'160363','Columbia & 8 St',49.31865,-117.66514,0,1454179237
+160364,'160364','Hwy 22 & Birchbank Golf',49.16207,-117.73178,0,1454179238
+160365,'160365','3 St & Gordon',49.50816,-117.27775,0,1454179239
+160366,'160366','1 St & 9 Av',49.07394,-117.60106,0,1454179240
+160367,'160367','1 St & 10 Av',49.07393,-117.60122,0,1454179241
+160368,'160368','455 Richards St W',49.48007,-117.29882,0,1454179242
+160369,'160369','7 St & 10 Av',49.07978,-117.58761,0,1454179243
+160370,'160370','7 St & 9 Av',49.07947,-117.58765,0,1454179265
+160373,'160373','Columbia Grdns & Aspen',49.10903,-117.54650,0,1454179268
+160376,'160376','Nelson: Ward & Baker',49.49182,-117.29382,0,1454179271
+160378,'160378','Chahko Mika Mall',49.50018,-117.28718,0,1454179273
+160379,'160379','Lakeside & Airport',49.49159,-117.30310,0,1454179274
+160381,'160381','Austad & Buckna',49.09770,-117.72351,0,1454179297
+160382,'160382','Waneta Plz',49.09056,-117.63357,0,1454179298
+160383,'160383','Rivervale: Hwy 22 & 1 Av',49.12565,-117.74129,0,1454179299
+160384,'160384','Hwy 3A & Rosedale',49.31310,-117.63323,0,1454179300
+160385,'160385','Robson & Raspberry',49.33397,-117.65460,0,1454179301
+160386,'160386','Broadwater & Bayview',49.33521,-117.66312,0,1454179302
+160387,'160387','Broadwater & Bayview',49.33513,-117.66325,0,1454179303
+160388,'160388','Celgar',49.33504,-117.72348,0,1454179304
+160390,'160390','Columbia & Aaron',49.30355,-117.63036,0,1454179327
+160391,'160391','1 St & Anderson',49.50024,-117.28209,0,1454179328
+160392,'160392','1 St & Anderson',49.50012,-117.28229,0,1454179329
+160393,'160393','2600 Broadwater Rd',49.33307,-117.67589,0,1454179330
+160394,'160394','Hwy 22 & Birchbank Golf',49.16220,-117.73191,0,1454179331
+160395,'160395','Gordon & Lakeside',49.50771,-117.27946,0,1454179332
+160396,'160396','Gordon & Lakeside',49.50764,-117.27940,0,1454179333
+160397,'160397','Kokanee & 4 St',49.50574,-117.27682,0,1454179334
+160398,'160398','Lower 6 Mile & Hwy 3A',49.57185,-117.22824,0,1454179335
+160399,'160399','Hwy 3A & Bainbridge',49.58367,-117.21072,0,1454179336
+160400,'160400','Hwy 3A & MacGregor',49.59841,-117.17594,0,1454180009
+160401,'160401','Cr & Hwy 3A',49.60562,-117.13592,0,1454180010
+160402,'160402','Hwy 3A & Kokanee Lndg',49.61198,-117.11204,0,1454180011
+160403,'160403','Hwy 3A & McKnown',49.61210,-117.10572,0,1454180012
+160404,'160404','Hwy 3A & Longbeach',49.61264,-117.08526,0,1454180013
+160405,'160405','5810 Hwy 3A',49.61368,-117.07291,0,1454180014
+160406,'160406','Hwy 3A & Martin',49.61367,-117.05657,0,1454180015
+160407,'160407','Harrop Ferry',49.61237,-117.05406,0,1454180016
+160408,'160408','Hwy 3A & Sunshine',49.61599,-117.03294,0,1454180017
+160409,'160409','Hwy 3A & Lee',49.61890,-117.00123,0,1454180018
+160410,'160410','Hwy 3A & Beggs',49.61997,-116.99624,0,1454180040
+160411,'160411','Hwy 3A & Heuston',49.62229,-116.98793,0,1454180041
+160412,'160412','Balfour Store',49.62494,-116.96270,0,1454180042
+160413,'160413','Balfour Ferry Term',49.62508,-116.95953,0,1454180043
+160414,'160414','Balfour Store',49.62517,-116.96244,0,1454180044
+160415,'160415','Hwy 3A & Balfour Wharf',49.62356,-116.96969,0,1454180045
+160416,'160416','Hwy 3A & Beggs',49.62031,-116.99584,0,1454180046
+160417,'160417','Hwy 3A & Grandview',49.61810,-117.01629,0,1454180047
+160418,'160418','Hwy 3A & Wightwick',49.61600,-117.03502,0,1454180048
+160419,'160419','Hwy 3A & Sykes',49.61450,-117.04909,0,1454180049
+160420,'160420','Kokanee Crk Prov Prk',49.60650,-117.12136,0,1454180071
+160421,'160421','Hwy 3A & Kane',49.60010,-117.17405,0,1454180072
+160422,'160422','Hwy 3A & Keiran',49.59068,-117.19741,0,1454180073
+160423,'160423','2914 Lower 6 Mile Rd',49.57726,-117.22047,0,1454180074
+160424,'160424','2756 Lower 6 Mile Rd',49.57234,-117.22618,0,1454180075
+160425,'160425','Hwy 3A & Greenwood',49.57136,-117.23254,0,1454180076
+160426,'160426','Hwy 3A & 6 Mile Rd',49.57051,-117.23628,0,1454180077
+160427,'160427','2473 Hwy 3A',49.56756,-117.23923,0,1454180078
+160428,'160428','Hwy 3A & Annable',49.55739,-117.25001,0,1454180079
+160429,'160429','Hwy 3A & Ridgewood',49.55053,-117.25711,0,1454180080
+160430,'160430','1679 Hwy 3A',49.54492,-117.25906,0,1454180102
+160431,'160431','Hwy 3A & Nasookin',49.54011,-117.26187,0,1454180103
+160432,'160432','1050 Hwy 3A',49.52469,-117.27373,0,1454180104
+160433,'160433','901 Hwy 3A',49.52093,-117.28034,0,1454180105
+160434,'160434','Hwy 3A & Johnstone',49.51512,-117.28457,0,1454180106
+160435,'160435','758 Hwy 3A',49.51686,-117.28246,0,1454180107
+160436,'160436','1050 Hwy 3A',49.52458,-117.27330,0,1454180108
+160437,'160437','1679 Hwy 3A',49.54540,-117.25898,0,1454180109
+160438,'160438','2756 Lower 6 Mile Rd',49.57242,-117.22546,0,1454180110
+160439,'160439','Lower 6 Mile & Barnes',49.57527,-117.22140,0,1454180111
+160440,'160440','2914 Lower 6 Mile Rd',49.57729,-117.22023,0,1454180133
+160441,'160441','Hwy 3A & Hamilton',49.58584,-117.20379,0,1454180134
+160442,'160442','3465 Hwy 3A',49.58961,-117.19819,0,1454180135
+160443,'160443','Hwy 3A & Dvorjetz',49.60237,-117.17042,0,1454180136
+160444,'160444','Hwy 3A & Cr Bay',49.60497,-117.16260,0,1454180137
+160445,'160445','4336 Hwy 3A',49.60803,-117.15321,0,1454180138
+160446,'160446','Kokanee Crk Prov Prk',49.60653,-117.12069,0,1454180139
+160447,'160447','5720 Hwy 3A',49.61336,-117.07820,0,1454180140
+160448,'160448','Hwy 3A & Bryan',49.61445,-117.04879,0,1454180141
+160449,'160449','Hwy 3A & Grandview',49.61794,-117.01638,0,1454180142
+160450,'160450','7519 Hwy 3A',49.62265,-116.97887,0,1454180164
+160455,'160455','Hwy 3A & Longbeach',49.61367,-117.06058,0,1454180169
+160456,'160456','5720 Hwy 3A',49.61359,-117.07642,0,1454180170
+160457,'160457','Hwy 3A & McKnown',49.61224,-117.10896,0,1454180171
+160458,'160458','Hwy 3A & Robertson',49.60471,-117.13205,0,1454180172
+160459,'160459','Hwy 3A & Sundance',49.60715,-117.15877,0,1454180173
+160460,'160460','Hwy 3A & Lower 6 Mile',49.57991,-117.21806,0,1454180195
+160461,'160461','Lower 6 Mile & Barnes',49.57509,-117.22185,0,1454180196
+160462,'160462','1680 Hwy 3A/6',49.48821,-117.32878,0,1454180197
+160463,'160463','Hwy 3A/6 & Insight',49.49758,-117.35775,0,1454180198
+160464,'160464','Hwy 3A/6 & Granite',49.49494,-117.37599,0,1454180199
+160465,'160465','Hwy 3A/6 & Boylen',49.49030,-117.41473,0,1454180200
+160466,'160466','Hwy 3A/6 & S Slocan Vlg',49.46321,-117.49750,0,1454180201
+160467,'160467','Hwy 3A/6 & Sentinel',49.44673,-117.53480,0,1454180202
+160468,'160468','Playmor Junction',49.44165,-117.53899,0,1454180203
+160469,'160469','Hwy 3A & Fir',49.43749,-117.53571,0,1454180204
+160470,'160470','Hwy 3A & Kelly',49.42555,-117.53003,0,1454180226
+160471,'160471','Hwy 3A & Alexis',49.42146,-117.53073,0,1454180227
+160472,'160472','Hwy 3A & Lazeroff',49.41017,-117.53999,0,1454180228
+160473,'160473','Hwy 3A & Jenisa',49.40330,-117.54456,0,1454180229
+160474,'160474','Tarrys Fire Hall',49.39305,-117.55101,0,1454180230
+160475,'160475','2067 Hwy 3A',49.38990,-117.55245,0,1454180231
+160476,'160476','Hwy 3A & Tarry''s',49.38663,-117.55396,0,1454180232
+160477,'160477','1973 Hwy 3A',49.38312,-117.55554,0,1454180233
+160478,'160478','Hwy 3A & Irving',49.37541,-117.56046,0,1454180234
+160479,'160479','1807 Hwy 3A',49.37268,-117.56347,0,1454180235
+160480,'160480','Hwy 3A & Thrums E Rd',49.36680,-117.56904,0,1454180257
+160481,'160481','Hwy 3A & Moran',49.36110,-117.57266,0,1454180258
+160482,'160482','1599 Hwy 3A',49.35670,-117.57578,0,1454180259
+160483,'160483','Hwy 3A & Chalmers',49.35194,-117.58107,0,1454180260
+160484,'160484','Hwy 3A & Lookout',49.34646,-117.58774,0,1454180261
+160485,'160485','Hwy 3A & Thrums W',49.34685,-117.58692,0,1454180262
+160486,'160486','Hwy 3A & Thrums Stub',49.35434,-117.57750,0,1454180263
+160487,'160487','Hwy 3A & Moran',49.36115,-117.57237,0,1454180264
+160488,'160488','Hwy 3A & Thrums E',49.36631,-117.56903,0,1454180265
+160489,'160489','1814 Hwy 3A',49.37350,-117.56217,0,1454180266
+160490,'160490','Hwy 3A & Tarrys',49.38655,-117.55374,0,1454180288
+160491,'160491','Tarry Fire Hall',49.39233,-117.55110,0,1454180289
+160492,'160492','Hwy 3A & Loff',49.39767,-117.54820,0,1454180290
+160493,'160493','2214 Hwy 3A',49.40140,-117.54561,0,1454180291
+160494,'160494','Hwy 3A & Fir',49.43765,-117.53553,0,1454180292
+160495,'160495','2915 Hwy 3A/6',49.44858,-117.53366,0,1454180293
+160497,'160497','Hwy 3A/6 & Blewett',49.45986,-117.51723,0,1454180295
+160498,'160498','3750 Hwy 3A/6',49.46329,-117.49538,0,1454180296
+160500,'160500','4426 Hwy 3A/6',49.46895,-117.47211,0,1454180970
+160501,'160501','Hwy 3A/6 & Corra Linn',49.47326,-117.46897,0,1454180971
+160502,'160502','5010 Hwy 3A/6',49.48639,-117.45308,0,1454180972
+160503,'160503','Taghum Gas Stn',49.49129,-117.40556,0,1454180973
+160504,'160504','Hwy 3A/6 & Taghum Hall',49.49096,-117.39754,0,1454180974
+160505,'160505','1680 Hwy 3A/6',49.48799,-117.32862,0,1454180975
+160506,'160506','Hwy 3A/6 & Granite',49.48564,-117.30880,0,1454180976
+160507,'160507','Salmo: Main & Hwy 6',49.19372,-117.28018,0,1454180977
+160508,'160508','Slocan & Giffin',49.76331,-117.46584,0,1454180978
+160509,'160509','Harold St @ Ward',49.76694,-117.46951,0,1454180979
+160510,'160510','Harold St @ Fitz',49.76423,-117.46957,0,1454181001
+160511,'160511','Hwy 3A/6 & Granite',49.48557,-117.31163,0,1454181002
+160514,'160514','Slocan River & Winlaw Br',49.61624,-117.56670,0,1454181005
+160515,'160515','Front & Poplar',49.49978,-117.28516,0,1454181006
+160516,'160516','Nelson & Kokanee',49.50659,-117.27920,0,1454181007
+160518,'160518','Cres Vly Comm Hall',49.45054,-117.55913,0,1454181009
+160519,'160519','2173 Hwy 6',49.48425,-117.58001,0,1454181010
+160520,'160520','Hwy 6 & Cunningham',49.49616,-117.59306,0,1454181032
+160521,'160521','Hwy 6 & Storbo',49.50525,-117.60023,0,1454181033
+160522,'160522','Slocan Pk Comm Hall',49.51545,-117.62079,0,1454181034
+160523,'160523','Hwy 6 & Slocan Pk',49.51708,-117.62522,0,1454181035
+160524,'160524','Passmore Upper Rd',49.54129,-117.65036,0,1454181036
+160525,'160525','Hwy 6 & Pedro Crk',49.59142,-117.58971,0,1454181037
+160526,'160526','Hwy 6 & Paradise Vly',49.61056,-117.56347,0,1454181038
+160527,'160527','Hwy 6 & Cedar Crk',49.61327,-117.55981,0,1454181039
+160528,'160528','Hwy 6 & Katasonoff',49.61907,-117.55137,0,1454181040
+160529,'160529','Hwy 6 & Lancaster',49.62393,-117.54670,0,1454181041
+160530,'160530','Hwy 6 & Graham',49.66361,-117.50770,0,1454181063
+160531,'160531','Hwy 6 & Gustafson',49.66785,-117.50430,0,1454181064
+160532,'160532','Hwy 6 & St Thomas',49.67865,-117.49553,0,1454181065
+160533,'160533','Hwy 6 & Lemon Crk',49.70006,-117.48061,0,1454181066
+160534,'160534','8074 Hwy 6',49.71264,-117.46929,0,1454181067
+160535,'160535','8150 Hwy 6',49.71800,-117.46605,0,1454181068
+160536,'160536','8330 Hwy 6',49.72923,-117.46338,0,1454181069
+160537,'160537','Hwy 6 & Martens',49.75073,-117.46611,0,1454181070
+160538,'160538','Slocan S & Gravel Pit',49.75443,-117.46784,0,1454181071
+160539,'160539','Slocan S & Arlington',49.76119,-117.46725,0,1454181072
+160540,'160540','Slocan S & Gravel Pit',49.75443,-117.46809,0,1454181094
+160541,'160541','Hwy 6 & Martens',49.75103,-117.46663,0,1454181095
+160542,'160542','Hwy 6 & Copeland',49.74468,-117.46524,0,1454181096
+160543,'160543','8363 Hwy 6',49.72906,-117.46383,0,1454181097
+160544,'160544','8065 Hwy 6',49.71325,-117.46915,0,1454181098
+160545,'160545','Hwy 6 & Kennedy',49.69991,-117.48105,0,1454181099
+160546,'160546','Hwy 6 & Rooster',49.68914,-117.49164,0,1454181100
+160547,'160547','Hwy 6 & Popou',49.68536,-117.49304,0,1454181101
+160548,'160548','Hwy 6 & St Thomas',49.67854,-117.49581,0,1454181102
+160549,'160549','Hwy 6 & Harasomov',49.66795,-117.50454,0,1454181103
+160550,'160550','Hwy 6 & Perrys Back',49.66487,-117.50705,0,1454181125
+160551,'160551','Hwy 6 & Oma',49.59300,-117.58164,0,1454181126
+160552,'160552','Hwy 6 & Pedro Crk',49.59144,-117.59008,0,1454181127
+160553,'160553','Hwy 6 & Lebhado',49.58459,-117.60317,0,1454181128
+160554,'160554','Passmore Upper Rd',49.54138,-117.65078,0,1454181129
+160555,'160555','Passmore Comm Hall',49.53878,-117.64914,0,1454181130
+160556,'160556','Hwy 6 & Slocan Pk W',49.51876,-117.62849,0,1454181131
+160557,'160557','Slocan Pk Gas Sta',49.51530,-117.62063,0,1454181132
+160558,'160558','Hwy 6 & Slocan Vly E',49.51344,-117.61536,0,1454181133
+160559,'160559','Hwy 6 & Cunningham',49.49569,-117.59260,0,1454181134
+160560,'160560','2185 Hwy 6',49.48421,-117.58064,0,1454181156
+160561,'160561','Hwy 6 & Pass Crk',49.45005,-117.55914,0,1454181157
+160562,'160562','Cres Vly Gas Sta',49.44600,-117.55773,0,1454181158
+160563,'160563','Winlaw Elementary',49.61378,-117.56673,0,1454181159
+160564,'160564','Winlaw Br & Cedar Crk',49.61496,-117.56592,0,1454181160
+160565,'160565','Slocan River & Winlaw Br',49.61620,-117.56635,0,1454181161
+160566,'160566','Slocan River & McKean',49.62632,-117.55707,0,1454181162
+160567,'160567','Slocan River & Youngs S',49.62854,-117.55623,0,1454181163
+160568,'160568','Slocan River & Youngs N',49.63968,-117.54919,0,1454181164
+160569,'160569','Slocan River & Appledale W',49.64597,-117.54432,0,1454181165
+160570,'160570','Perrys Back & Appledale Lower',49.65383,-117.53725,0,1454181187
+160571,'160571','Winlaw Elementary',49.61379,-117.56701,0,1454181188
+160572,'160572','Perrys Back & Hwy 6',49.66471,-117.50791,0,1454181189
+160573,'160573','Perrys Back & Avis',49.66658,-117.51574,0,1454181190
+160574,'160574','Perrys Back & Powell',49.66344,-117.52013,0,1454181191
+160575,'160575','Perrys Back & Hecker',49.66183,-117.52604,0,1454181192
+160576,'160576','Slocan River & McKean N',49.63265,-117.55479,0,1454181193
+160577,'160577','Slocan River & McKean S',49.62645,-117.55716,0,1454181194
+160580,'160580','3rd St & 11th Ave',49.32650,-117.66394,0,1454181218
+160581,'160581','Broadwater & Relkoff',49.33579,-117.66789,0,1454181219
+160582,'160582','Broadwater 2700 Blk',49.33326,-117.67584,0,1454181220
+160583,'160583','Charleston & Donald',49.33535,-117.69487,0,1454181221
+160584,'160584','Hwy 6 @ Needles',49.87405,-118.09815,0,1454181222
+160585,'160585','Needles - Fauquier Ferry',49.87397,-118.09801,0,1454181223
+160586,'160586','Hwy 3B @ J L Crowe Sch',49.10155,-117.69245,0,1454181224
+160587,'160587','Hwy 22 & Hwy 3B',49.09761,-117.71653,0,1454181225
+160588,'160588','Hwy 3B 380 Blk',49.09933,-117.67683,0,1454181226
+160589,'160589','Hwy 3B & Laburnum',49.10011,-117.66196,0,1454181227
+160590,'160590','McLean & 5th',49.09819,-117.69520,0,1454181249
+160591,'160591','McLean & 5th',49.09828,-117.69509,0,1454181250
+160592,'160592','McLean & 2nd Ave',49.09632,-117.69469,0,1454181251
+160593,'160593','McLean & 2nd Ave',49.09644,-117.69460,0,1454181252
+160594,'160594','Selkirk College',49.31103,-117.65225,0,1454181253
+160611,'160611','Victoria & Kootenay',49.49031,-117.29559,0,1454181963
+160613,'160613','Silverton',49.95261,-117.35687,0,1454181965
+160614,'160614','824 Hwy 3A',49.51766,-117.28136,0,1454181966
+160615,'160615','966 Hwy 3A',49.52212,-117.27792,0,1454181967
+160616,'160616','1578 Hwy 3A',49.54129,-117.25862,0,1454181968
+160617,'160617','2051 Hwy 3A',49.55507,-117.25117,0,1454181969
+160618,'160618','Hwy 3A & Gilroy',49.56370,-117.24192,0,1454181970
+560000,'560000','Columbia & 4 St',49.32547,-117.66607,0,1568692769
+560003,'560003','Pass Crk & Krestova',49.43506,-117.60250,0,1568692772
+560005,'560005','Lakeside @ Wholesale Club',49.49488,-117.29734,0,1568692774
+560007,'560007','Cr @ Hey 3A Flag Stop',49.60580,-117.13579,0,1568692776
+560008,'560008','Granite & Blewett',49.49277,-117.36939,0,1568692777
+560009,'560009','Blewett & Bedford',49.47740,-117.40012,0,1568692778
+560010,'560010','Blewett & Turner',49.46797,-117.44138,0,1568692800
+560011,'560011','Blewett & Marrello',49.46527,-117.45670,0,1568692801
+560012,'560012','Blewett & Turner',49.46783,-117.44137,0,1568692802
+560013,'560013','Blewett & Bedford',49.47740,-117.39967,0,1568692803
+560014,'560014','Granite & Blewett',49.49262,-117.36928,0,1568692804
+560015,'560015','Perryer Rd',49.47298,-117.28974,0,1568692805
+560017,'560017','Hwy 6 @ Storbo Flag Stop',49.50360,-117.59988,0,1568692807
+560021,'560021','Kaslo: A Av & 4 St',49.91128,-116.90462,0,1568692832
+560022,'560022','Shutty Crk',49.96076,-116.90591,0,1568692833
+560023,'560023','Kaslo Hosp',49.91371,-116.91329,0,1568692834
+560024,'560024','8 St & C Av',49.91329,-116.91760,0,1568692835
+560025,'560025','Kaslo: Front St',49.91208,-116.90494,0,1568692836
+560026,'560026','Kaslo Campground',49.90962,-116.89850,0,1568692837
+560027,'560027','Vernon & Stanley',49.49249,-117.29580,0,1568692838
+560034,'560034','Perrys Back Rd @ Appledale W Rd',49.64643,-117.54407,0,1568692866
+560035,'560035','Perrys Back Rd @ Hwy 6',49.66458,-117.50837,0,1568692867
+560036,'560036','Woodbury Vlg',49.78668,-116.89735,0,1568692868
+560037,'560037','Woodbury Vlg',49.78666,-116.89681,0,1568692869
+560038,'560038','Edgewood',49.77817,-118.14054,0,1568692870
+560039,'560039','Hwy 3A @ Taghum Frontage Rd Flag Stop',49.49146,-117.40563,0,1568692871
+560041,'560041','Beasley Rd',49.48505,-117.45855,0,1568692894
+560042,'560042','Beasley Rd',49.48494,-117.45841,0,1568692895
+560043,'560043','Bonnington Rd',49.46513,-117.48351,0,1568692896
+560046,'560046','Ymir',49.28303,-117.21458,0,1568692899
+560047,'560047','Ymir',49.28310,-117.21426,0,1568692900
+560048,'560048','Mdw Crk',50.24501,-116.96487,0,1568692901
+560050,'560050','Nakusp Hot Spgs',50.29670,-117.68485,0,1568692924
+560051,'560051','Summit Lk',50.15474,-117.65434,0,1568692925
+560052,'560052','Summit Lk',50.15464,-117.65434,0,1568692926
+560053,'560053','Bonanza Rd',50.09739,-117.47162,0,1568692927
+560054,'560054','Bonanza Rd',50.09723,-117.47120,0,1568692928
+560055,'560055','New Denver',49.99294,-117.37206,0,1568692929
+560056,'560056','New Denver',49.99293,-117.37215,0,1568692930
+560058,'560058','Silverton',49.95315,-117.35675,0,1568692932
+560059,'560059','Arrow Pk',50.10143,-117.90054,0,1568692933
+560060,'560060','Arrow Pk',50.10065,-117.90039,0,1568692955
+560061,'560061','Burton',49.99121,-117.87980,0,1568692956
+560062,'560062','Burton',49.99098,-117.87896,0,1568692957
+560065,'560065','Needles - Fauquier Ferry',49.87193,-118.07985,0,1568692960
+560066,'560066','Needles - Fauquier Ferry',49.87178,-118.07979,0,1568692961
+560067,'560067','Cooper Crk Rd',50.20182,-116.96366,0,1568692962
+560068,'560068','Cooper Crk Rd',50.20191,-116.96349,0,1568692963
+560069,'560069','Argenta',50.15612,-116.92021,0,1568692964
+560070,'560070','Arcola Rd',49.87755,-116.90171,0,1568692986
+560071,'560071','Arcola Rd',49.87753,-116.90110,0,1568692987
+560072,'560072','Ainsworth Hot Spgs',49.73523,-116.91052,0,1568692988
+560073,'560073','Ainsworth Hot Spgs',49.73524,-116.91042,0,1568692989
+560082,'560082','Lakeside @ Wholesale Club',49.49482,-117.29773,0,1568693019
+560088,'560088','Shutty Beach',49.96071,-116.90625,0,1568693025
+560093,'560093','Hwy 3A @ Pacific Insight Flag Stop',49.49709,-117.35873,0,1568693051
+560140,'560140','Teck Main Gt',49.10675,-117.72717,0,1568693854
+560142,'560142','Slocan',49.76302,-117.46567,0,1568693856
+560143,'560143','Slocan',49.76299,-117.46582,0,1568693857
+560162,'560162','Montrose: 10 Av & 5 St',49.07910,-117.59191,0,1568693918
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops b/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
new file mode 100644
index 00000000..716c0095
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
@@ -0,0 +1,1106 @@
+101,160376,1,0
+101,160290,2,0
+101,160292,3,0
+101,160293,4,0
+101,160294,5,0
+101,160295,6,0
+101,160296,7,0
+101,160297,8,0
+101,160312,9,0
+101,160307,10,0
+101,160306,11,0
+101,160289,12,0
+101,160288,13,0
+101,160287,14,0
+101,160285,15,0
+101,160286,16,0
+101,160274,17,0
+101,160273,18,0
+101,160304,19,0
+101,160305,20,0
+101,160281,21,0
+101,160300,22,0
+101,160340,23,0
+101,160299,24,0
+101,160314,25,0
+101,160313,26,0
+101,160026,27,0
+101,160341,28,0
+101,160301,29,0
+200,160359,1,0
+200,160013,2,0
+200,160339,3,0
+200,160338,4,0
+200,160335,5,0
+200,160324,6,0
+200,160327,7,0
+200,160328,8,0
+200,160334,9,0
+200,160332,10,0
+200,160330,11,0
+200,160365,12,0
+200,160395,13,0
+200,160322,14,0
+200,160320,15,0
+200,160316,16,0
+200,160392,17,0
+200,160515,18,0
+200,160378,19,0
+200,160351,20,0
+200,160318,21,0
+200,160326,22,0
+200,160341,23,0
+200,160301,24,0
+200,160014,25,0
+200,160376,26,1
+201,160376,1,0
+201,160284,2,0
+201,160358,3,0
+201,160350,4,0
+201,160378,5,0
+201,160342,6,0
+201,160391,7,0
+201,160315,8,0
+201,160319,9,0
+201,160321,10,0
+201,160396,11,0
+201,160329,12,0
+201,160318,13,0
+201,160326,14,0
+201,160325,15,0
+201,160323,16,0
+201,160336,17,0
+201,160337,18,0
+201,160359,19,1
+300,160311,1,0
+300,160309,2,0
+300,160308,3,0
+300,160280,4,0
+300,160302,5,0
+300,160291,6,0
+300,160376,7,1
+300,160284,8,1
+301,160376,1,0
+301,160290,2,0
+301,160292,3,0
+301,160303,4,0
+301,160279,5,0
+301,160278,6,0
+301,160277,7,0
+301,160276,8,0
+301,160275,9,0
+301,160349,10,0
+301,160368,11,0
+301,160310,12,0
+301,160311,13,0
+301,160309,14,0
+301,160308,15,0
+301,160298,16,0
+301,160293,17,0
+301,160294,18,0
+301,160295,19,0
+301,160296,20,0
+301,160297,21,1
+400,160317,1,0
+400,560005,2,0
+400,160351,3,0
+400,160376,4,1
+401,160376,1,0
+401,560082,2,0
+401,160379,3,1
+1000,160413,1,0
+1000,160414,2,0
+1000,160415,3,0
+1000,160450,4,0
+1000,160215,5,0
+1000,160416,6,0
+1000,160417,7,0
+1000,160418,8,0
+1000,160419,9,0
+1000,160407,10,0
+1000,160455,11,0
+1000,160456,12,0
+1000,160457,13,0
+1000,160420,14,0
+1000,160458,15,0
+1000,160401,16,0
+1000,160459,17,0
+1000,160421,18,0
+1000,160422,19,0
+1000,160460,20,0
+1000,160423,21,0
+1000,160461,22,0
+1000,160424,23,0
+1000,160425,24,0
+1000,160426,25,0
+1000,160427,26,0
+1000,160428,27,0
+1000,160429,28,0
+1000,160430,29,0
+1000,160431,30,0
+1000,160432,31,0
+1000,160433,32,0
+1000,160434,33,0
+1000,160516,34,0
+1000,160397,35,0
+1000,160365,36,0
+1000,160395,37,0
+1000,160322,38,0
+1000,160320,39,0
+1000,160316,40,0
+1000,160392,41,0
+1000,160515,42,0
+1000,160378,43,0
+1000,160351,44,0
+1000,160376,45,1
+1001,160376,1,0
+1001,160358,2,0
+1001,160350,3,0
+1001,160378,4,0
+1001,160342,5,0
+1001,160391,6,0
+1001,160315,7,0
+1001,160319,8,0
+1001,160321,9,0
+1001,160396,10,0
+1001,160329,11,0
+1001,160318,12,0
+1001,160333,13,0
+1001,160435,14,0
+1001,160614,15,0
+1001,160615,16,0
+1001,160436,17,0
+1001,160616,18,0
+1001,160437,19,0
+1001,160617,20,0
+1001,160618,21,0
+1001,160398,22,0
+1001,160438,23,0
+1001,160439,24,0
+1001,160440,25,0
+1001,160399,26,0
+1001,160441,27,0
+1001,160442,28,0
+1001,160400,29,0
+1001,160443,30,0
+1001,160444,31,0
+1001,160445,32,0
+1001,560007,33,0
+1001,160446,34,0
+1001,160402,35,0
+1001,160403,36,0
+1001,160404,37,0
+1001,160447,38,0
+1001,160405,39,0
+1001,160406,40,0
+1001,160407,41,0
+1001,160448,42,0
+1001,160408,43,0
+1001,160449,44,0
+1001,160409,45,0
+1001,160410,46,0
+1001,160411,47,0
+1001,160412,48,0
+1001,160413,49,1
+1400,160376,1,0
+1400,160282,2,0
+1400,160511,3,0
+1400,160462,4,0
+1400,560093,5,0
+1400,560008,6,0
+1400,560009,7,0
+1400,560010,8,0
+1400,560011,9,0
+1400,560012,10,0
+1400,560013,11,0
+1400,560014,12,0
+1400,160611,13,0
+1500,160376,1,0
+1500,160290,2,0
+1500,160292,3,0
+1500,160303,4,0
+1500,560015,5,0
+1500,160302,6,0
+1500,160291,7,0
+2000,160510,1,0
+2000,160509,2,0
+2000,160212,3,0
+2000,160508,4,0
+2000,160540,5,0
+2000,160541,6,0
+2000,160542,7,0
+2000,160543,8,0
+2000,160544,9,0
+2000,160545,10,0
+2000,160546,11,0
+2000,160547,12,0
+2000,160548,13,0
+2000,160549,14,0
+2000,160550,15,0
+2000,160572,16,0
+2000,160573,17,0
+2000,160574,18,0
+2000,160575,19,0
+2000,560034,20,0
+2000,160576,21,0
+2000,160577,22,0
+2000,160514,23,0
+2000,160571,24,0
+2000,160213,25,0
+2000,160551,26,0
+2000,160552,27,0
+2000,160553,28,0
+2000,160554,29,0
+2000,160555,30,0
+2000,160556,31,0
+2000,160557,32,0
+2000,160558,33,0
+2000,560017,34,0
+2000,160559,35,0
+2000,160560,36,0
+2000,160561,37,0
+2000,160562,38,0
+2000,160468,39,0
+2000,160495,40,0
+2000,160497,41,0
+2000,160498,42,0
+2000,560043,43,0
+2000,160500,44,0
+2000,160501,45,0
+2000,560042,46,0
+2000,160502,47,0
+2000,160503,48,0
+2000,160504,49,0
+2000,560093,50,0
+2000,160505,51,0
+2000,160506,52,0
+2000,160611,53,0
+2000,160376,54,1
+2001,160376,1,0
+2001,160282,2,0
+2001,160511,3,0
+2001,160462,4,0
+2001,160463,5,0
+2001,560093,6,0
+2001,160464,7,0
+2001,560039,8,0
+2001,160465,9,0
+2001,560041,10,0
+2001,560043,11,0
+2001,160466,12,0
+2001,160467,13,0
+2001,160468,14,0
+2001,160518,15,0
+2001,160519,16,0
+2001,160520,17,0
+2001,160521,18,0
+2001,160522,19,0
+2001,160523,20,0
+2001,160524,21,0
+2001,160525,22,0
+2001,160526,23,0
+2001,160527,24,0
+2001,160528,25,0
+2001,160529,26,0
+2001,160530,27,0
+2001,160563,28,0
+2001,160564,29,0
+2001,160565,30,0
+2001,160566,31,0
+2001,160567,32,0
+2001,160568,33,0
+2001,160569,34,0
+2001,160570,35,0
+2001,560035,36,0
+2001,160531,37,0
+2001,160532,38,0
+2001,160533,39,0
+2001,160534,40,0
+2001,160535,41,0
+2001,160536,42,0
+2001,160537,43,0
+2001,160538,44,0
+2001,160539,45,0
+2001,160210,46,0
+2001,160209,47,0
+2001,160510,48,1
+3100,160221,1,0
+3100,160233,2,0
+3100,160232,3,0
+3100,160228,4,0
+3100,160272,5,0
+3100,160234,6,0
+3100,160347,7,0
+3100,160017,8,0
+3100,160016,9,0
+3100,160238,10,0
+3100,160237,11,0
+3100,160222,12,0
+3100,160348,13,0
+3100,160247,14,1
+3101,160247,1,0
+3101,160238,2,0
+3101,160237,3,0
+3101,160015,4,0
+3101,160361,5,0
+3101,160360,6,0
+3101,160236,7,0
+3101,160234,8,0
+3101,160230,9,0
+3101,160229,10,0
+3101,160231,11,0
+3101,160226,12,0
+3101,160227,13,0
+3101,160225,14,0
+3101,160580,15,0
+3101,560000,16,1
+3101,160221,17,1
+3200,160388,1,0
+3200,160219,2,0
+3200,160393,3,0
+3200,160581,4,0
+3200,160387,5,0
+3200,160220,6,0
+3200,160221,7,0
+3200,160363,8,0
+3200,160362,9,0
+3200,160347,10,0
+3200,160017,11,0
+3200,160016,12,0
+3200,160238,13,0
+3200,160237,14,0
+3200,160222,15,0
+3200,160348,16,0
+3200,160247,17,1
+3201,160247,1,0
+3201,160238,2,0
+3201,160237,3,0
+3201,160015,4,0
+3201,160361,5,0
+3201,160360,6,0
+3201,160223,7,0
+3201,160224,8,0
+3201,160221,9,0
+3201,160388,10,0
+3201,160386,11,0
+3201,160218,12,0
+3201,160582,13,0
+3201,160091,14,0
+3201,160271,15,0
+3201,160583,16,0
+3201,160219,17,1
+3300,160002,1,0
+3300,160088,2,0
+3300,160257,3,0
+3300,160348,4,0
+3300,160247,5,1
+3301,160247,1,0
+3301,160039,2,0
+3301,160594,3,1
+3301,160002,4,1
+3400,160247,1,0
+3400,160348,2,0
+3400,160090,3,0
+3400,160010,4,0
+3400,160248,5,0
+3400,160249,6,0
+3400,160250,7,0
+3400,160251,8,0
+3400,160252,9,0
+3400,160266,10,0
+3400,160267,11,0
+3400,160264,12,0
+3400,160265,13,0
+3400,160028,14,0
+3400,160260,15,0
+3400,160262,16,0
+3400,160255,17,0
+3400,160254,18,0
+3400,160027,19,0
+3400,160256,20,0
+3400,160253,21,0
+3400,160246,22,0
+3400,160020,23,0
+3400,160268,24,0
+3400,160222,25,0
+3601,160002,1,0
+3601,160088,2,0
+3601,160257,3,0
+3601,160242,4,0
+3601,160244,5,0
+3601,160245,6,0
+3601,160270,7,0
+3601,160243,8,0
+3601,160247,9,0
+3601,160241,10,0
+3601,160240,11,0
+3601,160346,12,0
+3601,160345,13,0
+3601,160343,14,0
+3601,160344,15,0
+3601,160239,16,0
+3601,160390,17,0
+3601,160043,18,0
+3601,160047,19,0
+3601,160049,20,0
+3601,160348,21,0
+3800,160221,1,0
+3800,160385,2,0
+3800,560003,3,0
+3800,160561,4,0
+3800,160562,5,0
+3800,160468,6,0
+3800,160469,7,0
+3800,160470,8,0
+3800,160471,9,0
+3800,160472,10,0
+3800,160473,11,0
+3800,160474,12,0
+3800,160475,13,0
+3800,160476,14,0
+3800,160477,15,0
+3800,160478,16,0
+3800,160479,17,0
+3800,160480,18,0
+3800,160481,19,0
+3800,160482,20,0
+3800,160483,21,0
+3800,160484,22,0
+3800,160384,23,0
+3800,160348,24,0
+3800,160247,25,0
+3800,160015,26,0
+3800,160361,27,0
+3800,160360,28,0
+3800,160223,29,0
+3800,160224,30,0
+4101,160087,1,0
+4101,160086,2,0
+4101,160202,3,0
+4101,160203,4,0
+4101,160194,5,0
+4101,160080,6,0
+4101,160381,7,0
+4101,160081,8,0
+4101,160083,9,0
+4101,160082,10,0
+4101,160037,11,0
+4101,160024,12,0
+4101,160035,13,0
+4101,160025,14,0
+4101,160098,15,0
+4200,160087,1,0
+4200,160097,2,0
+4200,160096,3,0
+4200,160095,4,0
+4200,160094,5,0
+4200,160092,6,0
+4200,160093,7,0
+4200,160085,8,0
+4200,160084,9,0
+4300,160087,1,0
+4300,160086,2,0
+4300,160106,3,0
+4300,160041,4,0
+4300,160048,5,0
+4300,160117,6,0
+4300,160107,7,0
+4300,160104,8,0
+4300,160103,9,0
+4300,160356,10,0
+4300,160593,11,0
+4300,160591,12,0
+4300,160119,13,0
+4300,160354,14,0
+4300,160128,15,0
+4300,160122,16,0
+4300,160125,17,0
+4300,160121,18,0
+4300,160189,19,0
+4300,160192,20,0
+4300,160187,21,0
+4300,160130,22,0
+4300,160132,23,0
+4300,160138,24,0
+4300,160135,25,0
+4300,160137,26,0
+4300,160197,27,0
+4300,160034,28,0
+4300,160196,29,0
+4300,160036,30,0
+4300,160588,31,0
+4300,160164,32,0
+4300,160382,33,0
+4300,160133,34,0
+4300,160032,35,0
+4300,160367,36,0
+4300,160166,37,0
+4300,160168,38,0
+4300,160170,39,0
+4300,160369,40,0
+4300,160161,41,0
+4300,160127,42,0
+4300,160173,43,0
+4300,160171,44,0
+4300,160186,45,0
+4300,160158,46,0
+4300,160159,47,0
+4300,160183,48,0
+4300,160180,49,0
+4300,160177,50,0
+4300,160175,51,0
+4300,160176,52,0
+4300,160352,53,0
+4300,160029,54,0
+4300,160182,55,0
+4300,160373,56,0
+4300,160181,57,0
+4300,160178,58,0
+4300,160179,59,0
+4300,160216,60,0
+4300,160157,61,0
+4300,160031,62,1
+4301,160031,1,0
+4301,160185,2,0
+4301,160174,3,0
+4301,160172,4,0
+4301,160126,5,0
+4301,160160,6,0
+4301,160370,7,0
+4301,160169,8,0
+4301,160167,9,0
+4301,160165,10,0
+4301,160366,11,0
+4301,160032,12,0
+4301,160162,13,0
+4301,160163,14,0
+4301,160023,15,0
+4301,160184,16,0
+4301,160195,17,0
+4301,160198,18,0
+4301,160136,19,0
+4301,160134,20,0
+4301,160139,21,0
+4301,160033,22,0
+4301,160131,23,0
+4301,160188,24,0
+4301,160191,25,0
+4301,160190,26,0
+4301,160120,27,0
+4301,160124,28,0
+4301,160123,29,0
+4301,160129,30,0
+4301,160353,31,0
+4301,160118,32,0
+4301,160590,33,0
+4301,160592,34,0
+4301,160355,35,0
+4301,160102,36,0
+4301,160105,37,0
+4301,160106,38,0
+4301,160108,39,0
+4301,160110,40,0
+4301,160111,41,0
+4301,160148,42,1
+4301,160589,43,0
+4301,160586,44,0
+4301,160041,45,0
+4301,160048,46,0
+4301,160117,47,0
+4301,160107,48,0
+4301,160098,49,0
+4301,160087,50,1
+4401,160087,1,0
+4401,160086,2,0
+4401,160106,3,0
+4401,160041,4,0
+4401,160048,5,0
+4401,160042,6,0
+4401,160117,7,0
+4401,160108,8,0
+4401,160110,9,0
+4401,160111,10,0
+4401,160148,11,0
+4401,160150,12,0
+4401,160152,13,0
+4401,160153,14,0
+4401,160154,15,0
+4401,160151,16,0
+4401,160149,17,0
+4401,160147,18,0
+4401,160112,19,0
+4401,160109,20,0
+4401,160107,21,0
+4401,160098,22,0
+4500,160030,1,0
+4500,560140,2,0
+4500,160012,3,0
+4500,160357,4,0
+4500,160140,5,0
+4500,160045,6,0
+4500,160200,7,0
+4500,160201,8,0
+4500,160199,9,0
+4500,160025,10,0
+4500,160098,11,0
+4500,160087,12,0
+4500,160086,13,0
+4500,160587,14,0
+4600,160057,1,0
+4600,160205,2,0
+4600,160050,3,0
+4600,160054,4,0
+4600,160053,5,0
+4600,160052,6,0
+4600,160056,7,0
+4600,160058,8,0
+4600,160061,9,0
+4600,160067,10,0
+4600,160066,11,0
+4600,160064,12,0
+4600,160021,13,0
+4600,160040,14,0
+4600,160156,15,0
+4600,160193,16,0
+4600,160072,17,0
+4600,160073,18,0
+4600,160070,19,0
+4600,160045,20,0
+4600,160077,21,0
+4600,160076,22,0
+4600,160204,23,0
+4600,160078,24,0
+4600,160079,25,0
+4600,160200,26,0
+4600,160201,27,0
+4600,160199,28,0
+4600,160025,29,0
+4600,160098,30,0
+4600,160087,31,0
+4600,160086,32,0
+4600,160106,33,0
+4600,160041,34,1
+4600,560140,35,1
+4601,160087,1,0
+4601,160086,2,0
+4601,160202,3,0
+4601,160203,4,0
+4601,160077,5,0
+4601,160076,6,0
+4601,160204,7,0
+4601,160078,8,0
+4601,160079,9,0
+4601,160046,10,0
+4601,160075,11,0
+4601,160074,12,0
+4601,160071,13,0
+4601,160156,14,0
+4601,160193,15,0
+4601,160044,16,0
+4601,160062,17,0
+4601,160063,18,0
+4601,160065,19,0
+4601,160068,20,0
+4601,160060,21,0
+4601,160059,22,0
+4601,160057,23,0
+4601,160056,24,0
+4601,160055,25,0
+4601,160051,26,0
+4601,160205,27,1
+4800,160038,1,0
+4800,160069,2,0
+4800,160057,3,0
+4800,160040,4,0
+4800,160072,5,0
+4800,160073,6,0
+4800,160070,7,0
+4800,160045,8,0
+4800,160200,9,0
+4800,160201,10,0
+4800,160199,11,0
+4800,160025,12,0
+4800,160098,13,0
+4800,160087,14,0
+4800,160086,15,0
+4800,160189,16,0
+4800,160192,17,0
+4800,160187,18,0
+4800,160130,19,0
+4800,160132,20,0
+4800,160034,21,0
+4800,160196,22,0
+4800,160036,23,0
+4800,160164,24,0
+4800,160382,25,0
+4800,160133,26,0
+4800,160032,27,0
+4800,560162,28,0
+4800,160161,29,0
+4800,160127,30,0
+4800,160173,31,0
+4800,160171,32,0
+4800,160186,33,0
+4800,160158,34,1
+4801,160158,1,0
+4801,160031,2,0
+4801,160185,3,0
+4801,160174,4,0
+4801,160172,5,0
+4801,160126,6,0
+4801,160160,7,0
+4801,160162,8,0
+4801,160032,9,0
+4801,160163,10,0
+4801,160023,11,0
+4801,160184,12,0
+4801,160195,13,0
+4801,160033,14,0
+4801,160131,15,0
+4801,160188,16,0
+4801,160191,17,0
+4801,160190,18,0
+4801,160586,19,0
+4801,160098,20,0
+4801,160087,21,0
+4801,160086,22,0
+4801,160022,23,0
+4801,160202,24,0
+4801,160203,25,0
+4801,160046,26,0
+4801,160075,27,0
+4801,160074,28,0
+4801,160071,29,0
+4801,160044,30,0
+4801,160056,31,0
+4801,160058,32,0
+4801,160069,33,0
+4801,160038,34,1
+5100,160207,1,0
+5100,560050,2,0
+5100,160206,3,0
+5200,560142,1,0
+5200,560058,2,0
+5200,560055,3,0
+5200,560053,4,0
+5200,560051,5,0
+5200,160206,6,0
+5200,160207,7,1
+5201,160207,1,0
+5201,560052,2,0
+5201,560054,3,0
+5201,560056,4,0
+5201,160613,5,0
+5201,560143,6,1
+5300,560038,1,0
+5300,160585,2,0
+5300,560066,3,0
+5300,560062,4,0
+5300,560060,5,0
+5300,160206,6,0
+5300,160207,7,1
+5301,160207,1,0
+5301,560059,2,0
+5301,560061,3,0
+5301,560065,4,0
+5301,160584,5,0
+5301,560038,6,1
+5700,560021,1,0
+5700,560022,2,0
+5700,560026,3,0
+5700,560023,4,0
+5700,560024,5,0
+5700,560025,6,0
+5801,560021,1,0
+5801,560022,2,0
+5801,560069,3,0
+5801,560068,4,0
+5801,560048,5,0
+5801,560067,6,0
+5801,560088,7,0
+7200,160507,1,0
+7200,560047,2,0
+7200,560015,3,0
+7200,160302,4,0
+7200,160291,5,0
+7200,160376,6,0
+7200,160350,7,0
+7200,160378,8,1
+7201,160378,1,0
+7201,160351,2,0
+7201,160376,3,0
+7201,160290,4,0
+7201,160292,5,0
+7201,160303,6,0
+7201,560015,7,0
+7201,560046,8,0
+7201,160507,9,1
+7400,160378,1,0
+7400,560027,2,0
+7400,160511,3,0
+7400,160462,4,0
+7400,160463,5,0
+7400,160464,6,0
+7400,560039,7,0
+7400,160465,8,0
+7400,160466,9,0
+7400,160467,10,0
+7400,160468,11,0
+7400,160518,12,0
+7400,160519,13,0
+7400,160520,14,0
+7400,160521,15,0
+7400,160522,16,0
+7400,160523,17,0
+7400,160524,18,0
+7400,160525,19,0
+7400,160526,20,0
+7400,160527,21,0
+7400,160528,22,0
+7400,160529,23,0
+7400,160530,24,0
+7400,160531,25,0
+7400,160532,26,0
+7400,160533,27,0
+7400,160534,28,0
+7400,160535,29,0
+7400,160536,30,0
+7400,160537,31,0
+7400,160538,32,0
+7400,160539,33,0
+7400,560142,34,0
+7400,560058,35,0
+7400,560055,36,0
+7400,560053,37,0
+7400,560051,38,0
+7400,160206,39,0
+7400,160207,40,1
+7401,160207,1,0
+7401,560052,2,0
+7401,560054,3,0
+7401,560056,4,0
+7401,160613,5,0
+7401,560143,6,0
+7401,160540,7,0
+7401,160541,8,0
+7401,160542,9,0
+7401,160543,10,0
+7401,160544,11,0
+7401,160545,12,0
+7401,160546,13,0
+7401,160547,14,0
+7401,160548,15,0
+7401,160549,16,0
+7401,160550,17,0
+7401,160213,18,0
+7401,160551,19,0
+7401,160552,20,0
+7401,160553,21,0
+7401,160554,22,0
+7401,160555,23,0
+7401,160556,24,0
+7401,160557,25,0
+7401,160558,26,0
+7401,560017,27,0
+7401,160559,28,0
+7401,160560,29,0
+7401,160561,30,0
+7401,160562,31,0
+7401,160468,32,0
+7401,160495,33,0
+7401,160497,34,0
+7401,160498,35,0
+7401,160500,36,0
+7401,160501,37,0
+7401,160502,38,0
+7401,160503,39,0
+7401,160504,40,0
+7401,160505,41,0
+7401,160506,42,0
+7401,160611,43,0
+7401,160376,44,0
+7401,160350,45,0
+7401,160378,46,1
+7600,160313,1,0
+7600,160376,2,0
+7600,160350,3,0
+7600,160378,4,0
+7600,160342,5,0
+7600,160318,6,0
+7600,160333,7,0
+7600,160435,8,0
+7600,160614,9,0
+7600,160615,10,0
+7600,160436,11,0
+7600,160616,12,0
+7600,160437,13,0
+7600,160617,14,0
+7600,160618,15,0
+7600,160399,16,0
+7600,160441,17,0
+7600,160442,18,0
+7600,160400,19,0
+7600,160443,20,0
+7600,160444,21,0
+7600,160445,22,0
+7600,560007,23,0
+7600,160446,24,0
+7600,160402,25,0
+7600,160403,26,0
+7600,160404,27,0
+7600,160447,28,0
+7600,160405,29,0
+7600,160406,30,0
+7600,160448,31,0
+7600,160408,32,0
+7600,160449,33,0
+7600,160409,34,0
+7600,160410,35,0
+7600,160411,36,0
+7600,160412,37,0
+7600,160413,38,0
+7600,560073,39,0
+7600,560037,40,0
+7600,560071,41,0
+7600,560021,42,1
+7601,560021,1,0
+7601,560070,2,0
+7601,560036,3,0
+7601,560072,4,0
+7601,160413,5,0
+7601,160414,6,0
+7601,160415,7,0
+7601,160450,8,0
+7601,160215,9,0
+7601,160416,10,0
+7601,160417,11,0
+7601,160418,12,0
+7601,160419,13,0
+7601,160455,14,0
+7601,160456,15,0
+7601,160457,16,0
+7601,160420,17,0
+7601,160459,18,0
+7601,160421,19,0
+7601,160422,20,0
+7601,160460,21,0
+7601,160425,22,0
+7601,160426,23,0
+7601,160427,24,0
+7601,160428,25,0
+7601,160429,26,0
+7601,160430,27,0
+7601,160431,28,0
+7601,160432,29,0
+7601,160433,30,0
+7601,160434,31,0
+7601,160516,32,0
+7601,160378,33,0
+7601,160351,34,0
+7601,160376,35,0
+7601,160299,36,0
+7601,160314,37,0
+7601,160313,38,1
+9800,160087,1,0
+9800,160086,2,0
+9800,160106,3,0
+9800,160041,4,0
+9800,160048,5,0
+9800,160042,6,0
+9800,160117,7,0
+9800,160107,8,0
+9800,160587,9,0
+9800,160383,10,0
+9800,160364,11,0
+9800,160000,12,0
+9800,160003,13,0
+9800,160005,14,0
+9800,160007,15,0
+9800,160269,16,0
+9800,160260,17,0
+9800,160262,18,0
+9800,160258,19,0
+9800,160018,20,0
+9800,160011,21,0
+9800,160009,22,0
+9800,160247,23,0
+9800,160039,24,0
+9800,160594,25,1
+9801,160594,1,0
+9801,160088,2,0
+9801,160257,3,0
+9801,160348,4,0
+9801,160247,5,0
+9801,160090,6,0
+9801,160010,7,0
+9801,160019,8,0
+9801,160259,9,0
+9801,160263,10,0
+9801,160261,11,0
+9801,160269,12,0
+9801,160008,13,0
+9801,160006,14,0
+9801,160004,15,0
+9801,160001,16,0
+9801,160394,17,0
+9801,160383,18,0
+9801,160025,19,0
+9801,160098,20,0
+9801,160087,21,1
+9900,160002,1,0
+9900,160088,2,0
+9900,160257,3,0
+9900,160214,4,0
+9900,160485,5,0
+9900,160486,6,0
+9900,160487,7,0
+9900,160488,8,0
+9900,160489,9,0
+9900,160490,10,0
+9900,160491,11,0
+9900,160492,12,0
+9900,160493,13,0
+9900,160494,14,0
+9900,160468,15,0
+9900,160495,16,0
+9900,160497,17,0
+9900,160498,18,0
+9900,160500,19,0
+9900,160501,20,0
+9900,160502,21,0
+9900,160503,22,0
+9900,160504,23,0
+9900,560093,24,0
+9900,160505,25,0
+9900,160506,26,0
+9900,160611,27,0
+9900,160376,28,1
+9901,160376,1,0
+9901,160282,2,0
+9901,160511,3,0
+9901,160462,4,0
+9901,160463,5,0
+9901,160464,6,0
+9901,560039,7,0
+9901,160465,8,0
+9901,160466,9,0
+9901,160467,10,0
+9901,160468,11,0
+9901,160469,12,0
+9901,160470,13,0
+9901,160471,14,0
+9901,160472,15,0
+9901,160473,16,0
+9901,160474,17,0
+9901,160475,18,0
+9901,160476,19,0
+9901,160477,20,0
+9901,160478,21,0
+9901,160479,22,0
+9901,160480,23,0
+9901,160481,24,0
+9901,160482,25,0
+9901,160483,26,0
+9901,160484,27,0
+9901,160384,28,0
+9901,160002,29,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_trips b/app-android/src/main/res-next/raw/next_gtfs_rts_trips
new file mode 100644
index 00000000..6a9734a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_trips
@@ -0,0 +1,49 @@
+101,0,'Uphill',1
+200,0,'Downtown',2
+201,0,'Fairview',2
+301,0,'1 Uphill',3
+300,0,'Downtown',3
+400,0,'Downtown',4
+401,0,'Lakeside Dr West',4
+1001,0,'Balfour',10
+1000,0,'Nelson',10
+1400,0,'Blewett',14
+1500,0,'Perrier',15
+2000,0,'Nelson -',20
+2001,0,'Slocan Vly',20
+3101,0,'32 Columbia / Downtown',31
+3100,0,'North Castlegar - Comm Complex',31
+3200,0,'Comm Complex',32
+3201,0,'Robson',32
+3300,0,'Comm Complex',33
+3301,0,'Selkirk Coll',33
+3400,0,'Kinnaird',34
+3601,0,'Comm Complex',36
+3800,0,'Playmor -',38
+4101,0,'Binns',41
+4200,0,'Columbia Hgts',42
+4300,0,'Fruitvale -',43
+4301,0,'Trail -',43
+4401,0,'KBR Hosp Only',44
+4500,0,'Teck',45
+4601,0,'Rossland',46
+4600,0,'Trail',46
+4801,0,'AM',48
+4800,0,'PM',48
+5100,0,'Nakusp Hot Spgs',51
+5200,0,'Nakusp -',52
+5201,0,'Slocan -',52
+5301,0,'Edgewood',53
+5300,0,'Nakusp',53
+5700,0,'Kaslo Local',57
+5801,0,'Argenta',58
+7200,0,'Nelson -',72
+7201,0,'Salmo -',72
+7400,0,'Nakusp',74
+7401,0,'Nelson',74
+7600,0,'Kaslo',76
+7601,0,'Nelson',76
+9800,0,'Castlegar - Selkirk College',98
+9801,0,'Trail',98
+9901,0,'Castlegar - Selkirk College',99
+9900,0,'Nelson',99
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
new file mode 100644
index 00000000..8f372995
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
@@ -0,0 +1,76 @@
+'3518',20241214,1
+'3576',20241215,1
+'3577',20241216,1
+'3578',20241216,1
+'3579',20241216,1
+'3580',20241216,1
+'3577',20241217,1
+'3578',20241217,1
+'3581',20241217,1
+'3582',20241217,1
+'3583',20241217,1
+'3584',20241217,1
+'3585',20241217,1
+'3586',20241217,1
+'3577',20241218,1
+'3578',20241218,1
+'3579',20241218,1
+'3581',20241218,1
+'3582',20241218,1
+'3587',20241218,1
+'3577',20241219,1
+'3578',20241219,1
+'3581',20241219,1
+'3583',20241219,1
+'3584',20241219,1
+'3588',20241219,1
+'3577',20241220,1
+'3583',20241220,1
+'3585',20241220,1
+'3589',20241220,1
+'3518',20241221,1
+'3576',20241222,1
+'3577',20241223,1
+'3578',20241223,1
+'3579',20241223,1
+'3580',20241223,1
+'3577',20241224,1
+'3578',20241224,1
+'3581',20241224,1
+'3582',20241224,1
+'3583',20241224,1
+'3584',20241224,1
+'3585',20241224,1
+'3586',20241224,1
+'3576',20241226,1
+'3577',20241227,1
+'3583',20241227,1
+'3585',20241227,1
+'3589',20241227,1
+'3518',20241228,1
+'3576',20241229,1
+'3577',20241230,1
+'3578',20241230,1
+'3579',20241230,1
+'3580',20241230,1
+'3577',20241231,1
+'3578',20241231,1
+'3581',20241231,1
+'3582',20241231,1
+'3583',20241231,1
+'3584',20241231,1
+'3585',20241231,1
+'3586',20241231,1
+'3576',20250101,1
+'3577',20250102,1
+'3578',20250102,1
+'3581',20250102,1
+'3583',20250102,1
+'3584',20250102,1
+'3588',20250102,1
+'3577',20250103,1
+'3583',20250103,1
+'3585',20250103,1
+'3589',20250103,1
+'3518',20250104,1
+'3576',20250105,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160000
new file mode 100644
index 00000000..57b9fd74
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160000
@@ -0,0 +1,3 @@
+'3518',9800,90600,,'',0,34400,,'',0,47800,,'',0
+'3577',9800,61900,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,184600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160001 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160001
new file mode 100644
index 00000000..b2681b8c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160001
@@ -0,0 +1,3 @@
+'3518',9801,95600,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,71100,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,193400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160002
new file mode 100644
index 00000000..f8299ffa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160002
@@ -0,0 +1,8 @@
+'3518',3300,112200,,'',0,32500,,'',0,15900,,'',0
+'3577',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3577',3301,73500,4,'',0,80300,4,'',0
+'3577',3601,74500,,'',0,79300,0,'Selkirk Coll',0,6900,4,'',0
+'3518',9900,93600,,'',0,38400,,'',0,43900,,'',0
+'3518',9901,92700,4,'',0,38400,4,'',0,43600,4,'',0
+'3577',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
+'3577',9901,63900,4,'',0,9200,4,'',0,11400,4,'',0,17900,4,'',0,22200,4,'',0,30800,4,'',0,14600,4,'',0,4600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160003 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160003
new file mode 100644
index 00000000..8957edbc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160003
@@ -0,0 +1,3 @@
+'3518',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3577',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,184700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160004 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160004
new file mode 100644
index 00000000..937af8b0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160004
@@ -0,0 +1,3 @@
+'3518',9801,95500,,'',0,38500,,'',0,47700,,'',0
+'3577',9801,71000,,'',0,9100,,'',0,25000,,'',0,26600,,'',0,31800,,'',0,18200,,'',0
+'3589',9801,193300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160005
new file mode 100644
index 00000000..8957edbc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160005
@@ -0,0 +1,3 @@
+'3518',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3577',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,184700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160006
new file mode 100644
index 00000000..baba3473
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160006
@@ -0,0 +1,3 @@
+'3518',9801,95500,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,193300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160007
new file mode 100644
index 00000000..8957edbc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160007
@@ -0,0 +1,3 @@
+'3518',9800,90700,,'',0,34400,,'',0,47800,,'',0
+'3577',9800,62000,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,184700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160008
new file mode 100644
index 00000000..baba3473
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160008
@@ -0,0 +1,3 @@
+'3518',9801,95500,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,71000,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,193300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160009
new file mode 100644
index 00000000..5b4e9596
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160009
@@ -0,0 +1,3 @@
+'3518',9800,91800,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160010
new file mode 100644
index 00000000..620944a7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160010
@@ -0,0 +1,5 @@
+'3518',3400,91900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,65800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3518',9801,94400,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160011
new file mode 100644
index 00000000..5b4e9596
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160011
@@ -0,0 +1,3 @@
+'3518',9800,91800,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,63100,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160012
new file mode 100644
index 00000000..8f1009a7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160012
@@ -0,0 +1 @@
+'3577',4500,60900,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160013
new file mode 100644
index 00000000..24144dc8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160013
@@ -0,0 +1,2 @@
+'3518',200,105000,,'',0,27500,,'',0,31400,,'',0
+'3577',200,104500,,'',0,17000,,'',0,20100,,'',0,20600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160014
new file mode 100644
index 00000000..1ae460d4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160014
@@ -0,0 +1 @@
+'3577',200,82800,0,'Fairview -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160015
new file mode 100644
index 00000000..df5a73bb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160015
@@ -0,0 +1,4 @@
+'3518',3101,95200,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,82300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3201,73000,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3585',3800,100200,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160016
new file mode 100644
index 00000000..15648e63
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160016
@@ -0,0 +1,3 @@
+'3518',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3200,81100,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160017
new file mode 100644
index 00000000..b76984e4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160017
@@ -0,0 +1,3 @@
+'3518',3100,90700,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71700,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160018
new file mode 100644
index 00000000..fda411d3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160018
@@ -0,0 +1,3 @@
+'3518',9800,91700,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,63000,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160019 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160019
new file mode 100644
index 00000000..7a701513
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160019
@@ -0,0 +1,3 @@
+'3518',9801,94500,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,70000,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160020 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160020
new file mode 100644
index 00000000..443fe702
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160020
@@ -0,0 +1,2 @@
+'3518',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160021
new file mode 100644
index 00000000..9e40a53d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160021
@@ -0,0 +1,3 @@
+'3518',4600,82400,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,80300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160022
new file mode 100644
index 00000000..447888e8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160022
@@ -0,0 +1,3 @@
+'3518',4801,82200,0,'Red Mtn - Ski Bus',0
+'3576',4801,82200,0,'Red Mtn - Ski Bus',0
+'3577',4801,82200,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160023
new file mode 100644
index 00000000..4fb96ec5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160023
@@ -0,0 +1,6 @@
+'3518',4301,82200,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,18400,0,'Trail',0,12600,0,'Trail',0,11800,4,'',0
+'3577',4301,62400,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,220600,4,'',0
+'3518',4801,80600,0,'Red Mtn - Ski Bus',0
+'3576',4801,80600,0,'Red Mtn - Ski Bus',0
+'3577',4801,80600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160024
new file mode 100644
index 00000000..f6dd403b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160024
@@ -0,0 +1,2 @@
+'3518',4101,85700,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160025
new file mode 100644
index 00000000..64e1e9cd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160025
@@ -0,0 +1,12 @@
+'3518',4101,90200,,'',0,34700,,'',0,30600,,'',0
+'3577',4101,80000,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3577',4500,62300,,'',0,3000,,'',0,200,,'',0,87600,,'',0
+'3518',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,4,'',0
+'3577',4600,82000,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3589',4600,211100,,'',0
+'3518',4800,160500,0,'Red Mtn - Ski Bus',0
+'3576',4800,160500,0,'Red Mtn - Ski Bus',0
+'3577',4800,160500,0,'Red Mtn - Ski Bus',0
+'3518',9801,101100,,'',0,34500,,'',0,47700,,'',0
+'3577',9801,72600,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3589',9801,194900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160026
new file mode 100644
index 00000000..84db6011
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160026
@@ -0,0 +1,2 @@
+'3579',101,73400,0,'LVR Express -',0
+'3583',101,73400,0,'LVR Express -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160027
new file mode 100644
index 00000000..b3eb5135
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160027
@@ -0,0 +1,2 @@
+'3518',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160028 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160028
new file mode 100644
index 00000000..a68d9aa8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160028
@@ -0,0 +1,2 @@
+'3518',3400,93000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160029 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160029
new file mode 100644
index 00000000..df65b0b5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160029
@@ -0,0 +1,2 @@
+'3518',4300,75700,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,60100,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160030 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160030
new file mode 100644
index 00000000..a01c8f74
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160030
@@ -0,0 +1 @@
+'3577',4500,61800,,'',0,3000,,'',0,200,,'',0,86600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160031
new file mode 100644
index 00000000..d30551ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160031
@@ -0,0 +1,8 @@
+'3518',4300,80400,4,'',0,14100,4,'',0,20100,4,'',0,31000,4,'',0,18400,4,'',0,16600,4,'',0,12700,4,'',0
+'3518',4301,80600,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3577',4300,60800,4,'',0,9400,4,'',0,4400,4,'',0,15900,4,'',0,14900,4,'',0,25200,4,'',0,12800,4,'',0,16800,4,'',0,2700,4,'',0,17300,4,'',0,12800,4,'',0
+'3577',4301,60800,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,215500,0,'Waneta Only',0
+'3518',4801,75400,0,'Red Mtn - Ski Bus',0
+'3576',4801,75400,0,'Red Mtn - Ski Bus',0
+'3577',4801,75400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160032 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160032
new file mode 100644
index 00000000..15ba87d2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160032
@@ -0,0 +1,11 @@
+'3518',4300,91900,,'',0,20100,,'',0,20300,4,'',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3518',4301,81900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4300,72000,0,'Fruitvale',0,8200,4,'',0,3700,0,'Fruitvale',0,7900,4,'',0,11000,,'',0,11200,4,'',0,10000,,'',0,16800,,'',0,1800,4,'',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3577',4301,62100,0,'Trail',0,9400,0,'Trail',0,400,,'',0,4000,0,'Trail',0,4300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4300,214200,,'',0
+'3518',4800,162500,0,'Red Mtn - Ski Bus',0
+'3518',4801,80300,0,'Red Mtn - Ski Bus',0
+'3576',4800,162500,0,'Red Mtn - Ski Bus',0
+'3576',4801,80300,0,'Red Mtn - Ski Bus',0
+'3577',4800,162500,0,'Red Mtn - Ski Bus',0
+'3577',4801,80300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160033
new file mode 100644
index 00000000..cca21692
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160033
@@ -0,0 +1,4 @@
+'3577',4301,92700,,'',0,22200,,'',0,28600,,'',0,2300,,'',0,36800,,'',0
+'3518',4801,81100,0,'Red Mtn - Ski Bus',0
+'3576',4801,81100,0,'Red Mtn - Ski Bus',0
+'3577',4801,81100,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160034
new file mode 100644
index 00000000..0b75bb9f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160034
@@ -0,0 +1,4 @@
+'3577',4300,90700,0,'Waneta / Walmart -',0,22200,0,'Waneta / Walmart -',0,22800,,'',0,19500,,'',0,17400,,'',0
+'3518',4800,161500,0,'Red Mtn - Ski Bus',0
+'3576',4800,161500,0,'Red Mtn - Ski Bus',0
+'3577',4800,161500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160035
new file mode 100644
index 00000000..8321ff76
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160035
@@ -0,0 +1,2 @@
+'3518',4101,90000,,'',0,34700,,'',0,30600,,'',0
+'3577',4101,75800,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160036
new file mode 100644
index 00000000..4f240ed1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160036
@@ -0,0 +1,6 @@
+'3518',4300,91000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,12700,,'',0
+'3577',4300,75300,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3589',4300,213300,,'',0
+'3518',4800,161700,0,'Red Mtn - Ski Bus',0
+'3576',4800,161700,0,'Red Mtn - Ski Bus',0
+'3577',4800,161700,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160037
new file mode 100644
index 00000000..f6dd403b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160037
@@ -0,0 +1,2 @@
+'3518',4101,85700,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75500,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160038
new file mode 100644
index 00000000..0d663e01
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160038
@@ -0,0 +1,6 @@
+'3518',4800,154500,0,'Red Mtn - Ski Bus',0
+'3518',4801,84400,4,'',0
+'3576',4800,154500,0,'Red Mtn - Ski Bus',0
+'3576',4801,84400,4,'',0
+'3577',4800,154500,0,'Red Mtn - Ski Bus',0
+'3577',4801,84400,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160039
new file mode 100644
index 00000000..c29d34de
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160039
@@ -0,0 +1,5 @@
+'3518',3301,111800,,'',0,32500,,'',0,15900,,'',0
+'3577',3301,73100,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
+'3518',9800,92500,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,63800,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,190500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160040
new file mode 100644
index 00000000..3a81816a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160040
@@ -0,0 +1,6 @@
+'3518',4600,82600,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27000,,'',0
+'3577',4600,62300,,'',0,18200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205700,,'',0
+'3518',4800,155600,0,'Red Mtn - Ski Bus',0
+'3576',4800,155600,0,'Red Mtn - Ski Bus',0
+'3577',4800,155600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160041
new file mode 100644
index 00000000..3fee7ccd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160041
@@ -0,0 +1,7 @@
+'3577',4300,150800,,'',0
+'3577',4301,81000,0,'Trail',0,1600,,'',0
+'3518',4401,82600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
+'3577',4401,70400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,8000,0,'Sunningdale -',0,1100,,'',0,100,0,'Sunningdale -',0,12600,,'',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1400,,'',0,21600,0,'Sunningdale -',0,5300,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,13500,,'',0,5700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
+'3589',4401,195500,,'',0
+'3577',4600,82900,4,'',0
+'3577',9800,151700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160042
new file mode 100644
index 00000000..a7178dc4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160042
@@ -0,0 +1,4 @@
+'3518',4401,82800,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
+'3577',4401,70600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,4,'',0,7900,0,'Sunningdale -',0,1200,4,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,25600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
+'3589',4401,195700,,'',0
+'3577',9800,152000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160043
new file mode 100644
index 00000000..708791e6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160043
@@ -0,0 +1 @@
+'3577',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160044
new file mode 100644
index 00000000..920dc963
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160044
@@ -0,0 +1,6 @@
+'3518',4601,80000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4601,61200,,'',0,13700,,'',0,10500,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,17600,,'',0
+'3589',4601,203200,,'',0
+'3518',4801,83300,0,'Red Mtn - Ski Bus',0
+'3576',4801,83300,0,'Red Mtn - Ski Bus',0
+'3577',4801,83300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160045
new file mode 100644
index 00000000..9a516151
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160045
@@ -0,0 +1,7 @@
+'3577',4500,62100,,'',0,3000,,'',0,200,,'',0
+'3518',4600,83600,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0,26800,,'',0
+'3577',4600,63000,,'',0,18500,,'',0,11600,,'',0,11300,0,'Trail -',0,15700,,'',0,12300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,210700,,'',0
+'3518',4800,160300,0,'Red Mtn - Ski Bus',0
+'3576',4800,160300,0,'Red Mtn - Ski Bus',0
+'3577',4800,160300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160046
new file mode 100644
index 00000000..7493128f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160046
@@ -0,0 +1,6 @@
+'3518',4601,75100,,'',0,30500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,23800,,'',0
+'3577',4601,60500,,'',0,13400,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11800,0,'Rossland -',0,12000,,'',0,7500,,'',0,11500,0,'Rossland -',0,17000,,'',0,13600,,'',0
+'3589',4601,202000,,'',0
+'3518',4801,82500,0,'Red Mtn - Ski Bus',0
+'3576',4801,82500,0,'Red Mtn - Ski Bus',0
+'3577',4801,82500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160047
new file mode 100644
index 00000000..f0e5d65d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160047
@@ -0,0 +1 @@
+'3577',3601,80600,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160048
new file mode 100644
index 00000000..2130b292
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160048
@@ -0,0 +1,6 @@
+'3577',4300,150900,,'',0
+'3577',4301,81100,0,'Trail',0,1600,,'',0
+'3518',4401,82700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,18400,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,16600,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,30700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,11800,0,'Sunningdale -',0,5200,0,'Sunningdale -',0
+'3577',4401,70500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1600,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,1500,,'',0,21600,0,'Sunningdale -',0,5200,0,'Sunningdale -',0,10100,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,17600,,'',0,1700,0,'Sunningdale -',0,1200,0,'Sunningdale -',0,7900,0,'Sunningdale -',0,1200,0,'Sunningdale -',0
+'3589',4401,195600,,'',0
+'3577',9800,151900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160049
new file mode 100644
index 00000000..0d435b58
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160049
@@ -0,0 +1 @@
+'3577',3601,80700,,'',0,44900,,'',0,34400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160050
new file mode 100644
index 00000000..a6401874
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160050
@@ -0,0 +1,3 @@
+'3518',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3577',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3589',4600,204300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160051
new file mode 100644
index 00000000..bed6c827
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160051
@@ -0,0 +1,3 @@
+'3518',4601,81000,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,75300,,'',0,15100,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,204200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160052 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160052
new file mode 100644
index 00000000..dedd4a19
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160052
@@ -0,0 +1,3 @@
+'3518',4600,81300,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3577',4600,75600,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3589',4600,204500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160053
new file mode 100644
index 00000000..873a5033
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160053
@@ -0,0 +1,3 @@
+'3518',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3577',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3589',4600,204400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160054
new file mode 100644
index 00000000..873a5033
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160054
@@ -0,0 +1,3 @@
+'3518',4600,81200,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3577',4600,75500,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3589',4600,204400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160055
new file mode 100644
index 00000000..b8a485ac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160055
@@ -0,0 +1,3 @@
+'3518',4601,80900,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,75300,,'',0,15000,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,204100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160056
new file mode 100644
index 00000000..3f72e641
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160056
@@ -0,0 +1,7 @@
+'3518',4600,81400,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3577',4600,75700,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,15900,0,'Trail -',0,11900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3577',4601,75200,,'',0
+'3589',4600,204600,,'',0
+'3518',4801,83600,0,'Red Mtn - Ski Bus',0
+'3576',4801,83600,0,'Red Mtn - Ski Bus',0
+'3577',4801,83600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160057
new file mode 100644
index 00000000..62389cbc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160057
@@ -0,0 +1,7 @@
+'3518',4601,80800,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4600,62000,,'',0
+'3577',4601,62000,4,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,204000,,'',0
+'3518',4800,155300,0,'Red Mtn - Ski Bus',0
+'3576',4800,155300,0,'Red Mtn - Ski Bus',0
+'3577',4800,155300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160058
new file mode 100644
index 00000000..a2e3ae78
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160058
@@ -0,0 +1,6 @@
+'3518',4600,81900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,27300,,'',0
+'3577',4600,75800,,'',0,15600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205000,,'',0
+'3518',4801,83600,0,'Red Mtn - Ski Bus',0
+'3576',4801,83600,0,'Red Mtn - Ski Bus',0
+'3577',4801,83600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160059
new file mode 100644
index 00000000..d126f416
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160059
@@ -0,0 +1,3 @@
+'3518',4601,80700,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61900,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160060
new file mode 100644
index 00000000..aac6a60a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160060
@@ -0,0 +1,3 @@
+'3518',4601,80600,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61800,,'',0,28200,,'',0,11400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160061
new file mode 100644
index 00000000..4f57e949
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160061
@@ -0,0 +1,3 @@
+'3518',4600,82100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,80000,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160062
new file mode 100644
index 00000000..8d941650
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160062
@@ -0,0 +1,3 @@
+'3518',4601,80200,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61400,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160063
new file mode 100644
index 00000000..01def6b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160063
@@ -0,0 +1,3 @@
+'3518',4601,80300,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61500,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160064 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160064
new file mode 100644
index 00000000..6ee7502b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160064
@@ -0,0 +1,3 @@
+'3518',4600,82300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,80200,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160065
new file mode 100644
index 00000000..fc27fa9f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160065
@@ -0,0 +1,3 @@
+'3518',4601,80400,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61600,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160066
new file mode 100644
index 00000000..a368aaa0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160066
@@ -0,0 +1,3 @@
+'3518',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160067
new file mode 100644
index 00000000..a368aaa0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160067
@@ -0,0 +1,3 @@
+'3518',4600,82200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,80100,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,205300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160068
new file mode 100644
index 00000000..4a7e13ca
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160068
@@ -0,0 +1,3 @@
+'3518',4601,80500,,'',0,30800,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,27700,,'',0
+'3577',4601,61700,,'',0,24200,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,15600,0,'Rossland -',0,12900,,'',0,17600,,'',0
+'3589',4601,203700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160069
new file mode 100644
index 00000000..a2762f23
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160069
@@ -0,0 +1,6 @@
+'3518',4800,155000,0,'Red Mtn - Ski Bus',0
+'3518',4801,83900,0,'Red Mtn - Ski Bus',0
+'3576',4800,155000,0,'Red Mtn - Ski Bus',0
+'3576',4801,83900,0,'Red Mtn - Ski Bus',0
+'3577',4800,155000,0,'Red Mtn - Ski Bus',0
+'3577',4801,83900,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160070
new file mode 100644
index 00000000..6b3153fd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160070
@@ -0,0 +1,6 @@
+'3518',4600,83300,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3577',4600,62800,,'',0,18400,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,210400,,'',0
+'3518',4800,160100,0,'Red Mtn - Ski Bus',0
+'3576',4800,160100,0,'Red Mtn - Ski Bus',0
+'3577',4800,160100,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160071
new file mode 100644
index 00000000..4bd0280b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160071
@@ -0,0 +1,6 @@
+'3518',4601,75600,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4601,60800,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3589',4601,202500,,'',0
+'3518',4801,82800,0,'Red Mtn - Ski Bus',0
+'3576',4801,82800,0,'Red Mtn - Ski Bus',0
+'3577',4801,82800,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160072
new file mode 100644
index 00000000..d560f5a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160072
@@ -0,0 +1,6 @@
+'3518',4600,83100,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3577',4600,62700,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,210200,,'',0
+'3518',4800,160000,0,'Red Mtn - Ski Bus',0
+'3576',4800,160000,0,'Red Mtn - Ski Bus',0
+'3577',4800,160000,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160073 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160073
new file mode 100644
index 00000000..6a3b9158
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160073
@@ -0,0 +1,6 @@
+'3518',4600,83200,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0,26800,,'',0
+'3577',4600,62800,,'',0,18300,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3589',4600,210300,,'',0
+'3518',4800,160100,0,'Red Mtn - Ski Bus',0
+'3576',4800,160100,0,'Red Mtn - Ski Bus',0
+'3577',4800,160100,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160074 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160074
new file mode 100644
index 00000000..2881db7d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160074
@@ -0,0 +1,6 @@
+'3518',4601,75500,,'',0,34500,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4601,60700,,'',0,13600,,'',0,10300,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3589',4601,202400,,'',0
+'3518',4801,82700,0,'Red Mtn - Ski Bus',0
+'3576',4801,82700,0,'Red Mtn - Ski Bus',0
+'3577',4801,82700,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160075 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160075
new file mode 100644
index 00000000..808cf1c1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160075
@@ -0,0 +1,6 @@
+'3518',4601,75400,,'',0,30500,0,'Rossland -',0,35800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4601,60700,,'',0,13500,,'',0,10300,,'',0,11400,0,'Rossland -',0,16100,,'',0,11900,0,'Rossland -',0,11900,,'',0,7500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3589',4601,202300,,'',0
+'3518',4801,82700,0,'Red Mtn - Ski Bus',0
+'3576',4801,82700,0,'Red Mtn - Ski Bus',0
+'3577',4801,82700,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160076 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160076
new file mode 100644
index 00000000..716044ab
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160076
@@ -0,0 +1,4 @@
+'3518',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3518',4601,105400,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0
+'3577',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3577',4601,95400,0,'Rossland -',0,27800,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160077
new file mode 100644
index 00000000..d1de70b3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160077
@@ -0,0 +1,4 @@
+'3518',4600,83700,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3518',4601,105300,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3577',4600,104500,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3577',4601,95300,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160078
new file mode 100644
index 00000000..a3968121
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160078
@@ -0,0 +1,4 @@
+'3518',4600,83900,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3518',4601,105500,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3577',4600,104700,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3577',4601,95500,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160079
new file mode 100644
index 00000000..a3c58bc3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160079
@@ -0,0 +1,4 @@
+'3518',4600,84000,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3518',4601,105600,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3577',4600,104800,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3577',4601,95600,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160080 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160080
new file mode 100644
index 00000000..74f9f21e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160080
@@ -0,0 +1,2 @@
+'3518',4101,85400,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160081
new file mode 100644
index 00000000..c170da5f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160081
@@ -0,0 +1,2 @@
+'3518',4101,85500,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160082
new file mode 100644
index 00000000..d765ce97
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160082
@@ -0,0 +1,2 @@
+'3518',4101,85600,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160083
new file mode 100644
index 00000000..d765ce97
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160083
@@ -0,0 +1,2 @@
+'3518',4101,85600,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75400,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160084
new file mode 100644
index 00000000..28c0c507
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160084
@@ -0,0 +1,2 @@
+'3518',4200,91400,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160085 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160085
new file mode 100644
index 00000000..28c0c507
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160085
@@ -0,0 +1,2 @@
+'3518',4200,91400,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82700,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160086 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160086
new file mode 100644
index 00000000..d72c4946
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160086
@@ -0,0 +1,22 @@
+'3518',4101,85100,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,74900,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3518',4300,85100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2900,0,'Waneta / Walmart -',0,9000,0,'Fruitvale',0,2700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,211600,,'',0
+'3518',4401,82300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,70100,0,'Sunningdale -',0,2800,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15100,0,'Sunningdale -',0,15000,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3589',4401,195200,,'',0
+'3577',4500,60100,,'',0,3200,,'',0
+'3518',4601,74700,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
+'3577',4600,82300,,'',0
+'3577',4601,60100,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
+'3589',4601,201600,,'',0
+'3518',4800,160800,0,'Red Mtn - Ski Bus',0
+'3518',4801,82100,0,'Red Mtn - Ski Bus',0
+'3576',4800,160800,0,'Red Mtn - Ski Bus',0
+'3576',4801,82100,0,'Red Mtn - Ski Bus',0
+'3577',4800,160800,0,'Red Mtn - Ski Bus',0
+'3577',4801,82100,0,'Red Mtn - Ski Bus',0
+'3518',9800,85200,,'',0,38400,,'',0,47800,,'',0
+'3577',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30100,,'',0,19600,,'',0
+'3589',9800,183200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160087
new file mode 100644
index 00000000..959e71c6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160087
@@ -0,0 +1,31 @@
+'3518',4101,85000,,'',0,5500,4,'',0,33200,,'',0,1500,4,'',0,29100,,'',0,1500,4,'',0
+'3577',4101,74800,,'',0,5500,4,'',0,3200,,'',0,1500,4,'',0,30500,,'',0,5500,4,'',0,22500,,'',0,1500,4,'',0,20400,,'',0,5500,4,'',0,3500,,'',0,1500,4,'',0
+'3518',4200,90700,,'',0,1000,4,'',0,11800,,'',0,1000,4,'',0,50100,,'',0,1000,4,'',0
+'3577',4200,82000,,'',0,1000,4,'',0,27000,,'',0,1000,4,'',0,34000,,'',0,5000,4,'',0,15400,,'',0,5000,4,'',0
+'3518',4300,85000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3518',4301,84600,4,'',0,18300,4,'',0,20100,4,'',0,12000,4,'',0,19000,4,'',0,17100,4,'',0,12600,4,'',0
+'3577',4300,62900,0,'Fruitvale',0,7600,0,'Fruitvale',0,2800,0,'Waneta / Walmart -',0,9100,0,'Fruitvale',0,2600,0,'Waneta / Walmart -',0,10900,,'',0,15300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,1700,0,'Waneta / Walmart -',0,14400,,'',0,3400,,'',0,17500,,'',0,12700,,'',0
+'3577',4301,63200,4,'',0,2200,4,'',0,7500,4,'',0,1700,4,'',0,6900,4,'',0,1600,4,'',0,10100,4,'',0,1200,4,'',0,19300,4,'',0,6900,4,'',0,14200,4,'',0,10400,4,'',0,5200,4,'',0,1100,4,'',0,13000,4,'',0,1300,4,'',0,18500,4,'',0,16900,4,'',0
+'3589',4300,211500,,'',0
+'3518',4401,82200,0,'Sunningdale -',0,2500,4,'',0,17100,0,'Sunningdale -',0,2500,4,'',0,11300,0,'Sunningdale -',0,6500,4,'',0,29400,0,'Sunningdale -',0,2500,4,'',0,10500,0,'Sunningdale -',0,6500,4,'',0
+'3577',4401,60000,4,'',0,10000,0,'Sunningdale -',0,2500,4,'',0,300,,'',0,7700,0,'Sunningdale -',0,1400,,'',0,1300,4,'',0,11400,,'',0,1300,4,'',0,15200,0,'Sunningdale -',0,2500,4,'',0,200,,'',0,1300,4,'',0,20300,0,'Sunningdale -',0,6500,4,'',0,8600,0,'Sunningdale -',0,2700,4,'',0,12300,,'',0,5300,4,'',0,400,0,'Sunningdale -',0,2500,4,'',0,6600,0,'Sunningdale -',0,2500,4,'',0
+'3589',4401,195100,,'',0,5300,4,'',0
+'3577',4500,60000,,'',0,2400,4,'',0,800,,'',0,2200,4,'',0,200,4,'',0,87700,4,'',0
+'3518',4600,84700,4,'',0,30800,4,'',0,35700,4,'',0,19600,4,'',0
+'3518',4601,74600,,'',0,30100,0,'Rossland -',0,35600,0,'Rossland -',0,15500,0,'Rossland -',0,28300,,'',0
+'3577',4600,82200,,'',0,11600,4,'',0,11700,4,'',0,15300,4,'',0,12700,4,'',0,11600,4,'',0,7500,4,'',0,12000,4,'',0,15900,4,'',0,13600,4,'',0
+'3577',4601,60000,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11300,0,'Rossland -',0,12500,,'',0,7500,,'',0,11000,0,'Rossland -',0,17500,,'',0,13600,,'',0
+'3589',4600,211300,4,'',0
+'3589',4601,201500,,'',0
+'3518',4800,160800,0,'Red Mtn - Ski Bus',0
+'3518',4801,82000,0,'Red Mtn - Ski Bus',0
+'3576',4800,160800,0,'Red Mtn - Ski Bus',0
+'3576',4801,82000,0,'Red Mtn - Ski Bus',0
+'3577',4800,160800,0,'Red Mtn - Ski Bus',0
+'3577',4801,82000,0,'Red Mtn - Ski Bus',0
+'3518',9800,85200,,'',0,38400,,'',0,47800,,'',0
+'3518',9801,101300,4,'',0,34500,4,'',0,47700,4,'',0
+'3577',9800,60500,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30000,,'',0,19700,,'',0
+'3577',9801,72800,4,'',0,9100,4,'',0,29000,4,'',0,22600,4,'',0,31800,4,'',0,18200,4,'',0
+'3589',9800,183200,,'',0
+'3589',9801,195100,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160088
new file mode 100644
index 00000000..6d54f266
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160088
@@ -0,0 +1,8 @@
+'3518',3300,112200,,'',0,32500,,'',0,15900,,'',0
+'3577',3300,83000,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3577',3601,74500,,'',0,79300,0,'Selkirk Coll',0
+'3518',9801,93400,,'',0,38400,,'',0,43800,,'',0
+'3577',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3589',9801,191200,,'',0
+'3518',9900,93600,,'',0,38400,,'',0,43900,,'',0
+'3577',9900,64800,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160090
new file mode 100644
index 00000000..5ceee339
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160090
@@ -0,0 +1,5 @@
+'3518',3400,91800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,65700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
+'3518',9801,94400,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,65900,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160091 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160091
new file mode 100644
index 00000000..2ac4bf22
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160091
@@ -0,0 +1,2 @@
+'3518',3201,101000,,'',0,14800,,'',0,36500,,'',0
+'3577',3201,75500,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160092
new file mode 100644
index 00000000..1350cf36
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160092
@@ -0,0 +1,2 @@
+'3518',4200,91200,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82500,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160093
new file mode 100644
index 00000000..617b93af
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160093
@@ -0,0 +1,2 @@
+'3518',4200,91300,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82600,,'',0,28000,,'',0,35000,,'',0,24400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160094 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160094
new file mode 100644
index 00000000..da97e7fe
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160094
@@ -0,0 +1,2 @@
+'3518',4200,91000,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160095 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160095
new file mode 100644
index 00000000..da97e7fe
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160095
@@ -0,0 +1,2 @@
+'3518',4200,91000,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82300,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160096 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160096
new file mode 100644
index 00000000..8874ce32
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160096
@@ -0,0 +1,2 @@
+'3518',4200,90900,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82200,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160097 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160097
new file mode 100644
index 00000000..0b1c3999
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160097
@@ -0,0 +1,2 @@
+'3518',4200,90800,,'',0,12800,,'',0,51100,,'',0
+'3577',4200,82100,,'',0,28000,,'',0,35000,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160098 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160098
new file mode 100644
index 00000000..45ccf97b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160098
@@ -0,0 +1,20 @@
+'3518',4101,90300,,'',0,34700,,'',0,30600,,'',0
+'3577',4101,80100,,'',0,4700,,'',0,36000,,'',0,24000,,'',0,25900,,'',0,5000,,'',0
+'3518',4301,84400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,17200,0,'Trail',0,12600,0,'Trail',0
+'3577',4301,63100,0,'Trail',0,2100,,'',0,7600,0,'Trail',0,1600,,'',0,7000,0,'Trail',0,1600,,'',0,10100,0,'Trail',0,1100,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,5200,,'',0,1100,,'',0,13000,,'',0,1400,0,'Trail',0,18400,,'',0,16900,,'',0
+'3518',4401,84500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3577',4401,55900,0,'Trail -',0,16400,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3589',4401,200200,,'',0
+'3577',4500,62300,,'',0,3000,,'',0,200,,'',0,87700,,'',0
+'3518',4600,84500,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0
+'3577',4600,82000,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3589',4600,211200,,'',0
+'3518',4800,160600,0,'Red Mtn - Ski Bus',0
+'3518',4801,81900,0,'Red Mtn - Ski Bus',0
+'3576',4800,160600,0,'Red Mtn - Ski Bus',0
+'3576',4801,81900,0,'Red Mtn - Ski Bus',0
+'3577',4800,160600,0,'Red Mtn - Ski Bus',0
+'3577',4801,81900,0,'Red Mtn - Ski Bus',0
+'3518',9801,101200,,'',0,34500,,'',0,47700,,'',0
+'3577',9801,72700,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3589',9801,195000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160102 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160102
new file mode 100644
index 00000000..99d1b64d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160102
@@ -0,0 +1,2 @@
+'3518',4301,84000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54900,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160103 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160103
new file mode 100644
index 00000000..77cb85e5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160103
@@ -0,0 +1,3 @@
+'3518',4300,85400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,73700,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,211900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160104 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160104
new file mode 100644
index 00000000..1b2e0951
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160104
@@ -0,0 +1,3 @@
+'3518',4300,85300,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,73600,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,211800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160105 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160105
new file mode 100644
index 00000000..bcc03ebc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160105
@@ -0,0 +1,2 @@
+'3518',4301,84100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54900,,'',0,10000,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,6900,,'',0,14200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160106 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160106
new file mode 100644
index 00000000..31578aa5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160106
@@ -0,0 +1,7 @@
+'3577',4300,150600,,'',0
+'3577',4301,55000,,'',0,27500,,'',0
+'3518',4401,82500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,13800,0,'Sunningdale -',0,35900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,70300,0,'Sunningdale -',0,2800,,'',0,7900,0,'Sunningdale -',0,1200,,'',0,12700,,'',0,16500,0,'Sunningdale -',0,2700,,'',0,21600,0,'Sunningdale -',0,15300,0,'Sunningdale -',0,14800,,'',0,5700,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3589',4401,195400,,'',0
+'3577',4600,82700,,'',0
+'3577',9800,151600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160107 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160107
new file mode 100644
index 00000000..33f6f619
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160107
@@ -0,0 +1,6 @@
+'3577',4300,151000,,'',0
+'3577',4301,81200,0,'Trail',0,1600,,'',0
+'3518',4401,84200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3577',4401,55800,0,'Trail -',0,16200,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,12700,,'',0,17700,0,'Sunningdale -',0,1500,,'',0,26800,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,17600,,'',0,2900,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
+'3589',4401,195900,,'',0
+'3577',9800,152100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160108 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160108
new file mode 100644
index 00000000..5a683d6c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160108
@@ -0,0 +1,3 @@
+'3577',4301,55000,,'',0
+'3518',4401,82900,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,70700,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160109 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160109
new file mode 100644
index 00000000..898e5066
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160109
@@ -0,0 +1,2 @@
+'3518',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3577',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160110 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160110
new file mode 100644
index 00000000..ceb2acf0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160110
@@ -0,0 +1,3 @@
+'3577',4301,55000,,'',0
+'3518',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160111 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160111
new file mode 100644
index 00000000..190705c6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160111
@@ -0,0 +1,3 @@
+'3577',4301,55100,,'',0
+'3518',4401,83000,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,70800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160112 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160112
new file mode 100644
index 00000000..898e5066
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160112
@@ -0,0 +1,2 @@
+'3518',4401,83800,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,17000,0,'Sunningdale -',0
+'3577',4401,55700,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160117 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160117
new file mode 100644
index 00000000..b9d1050e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160117
@@ -0,0 +1,6 @@
+'3577',4300,150900,,'',0
+'3577',4301,81100,0,'Trail',0,1600,,'',0
+'3518',4401,82900,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,18300,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,16500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,30600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,11700,0,'Sunningdale -',0,5300,0,'Sunningdale -',0
+'3577',4401,70700,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,9400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,12700,,'',0,16400,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,1500,,'',0,25500,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,10000,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,17600,,'',0,1600,0,'Sunningdale -',0,1300,0,'Sunningdale -',0,7800,0,'Sunningdale -',0,1300,0,'Sunningdale -',0
+'3589',4401,195900,,'',0
+'3577',9800,152100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160118 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160118
new file mode 100644
index 00000000..853d6a13
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160118
@@ -0,0 +1,2 @@
+'3518',4301,83700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54600,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160119 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160119
new file mode 100644
index 00000000..801578e1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160119
@@ -0,0 +1,3 @@
+'3518',4300,85700,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74000,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160120 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160120
new file mode 100644
index 00000000..273111a5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160120
@@ -0,0 +1,2 @@
+'3518',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160121 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160121
new file mode 100644
index 00000000..5b4fa2bf
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160121
@@ -0,0 +1,3 @@
+'3518',4300,90200,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
+'3577',4300,74500,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3589',4300,212600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160122 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160122
new file mode 100644
index 00000000..7c952e28
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160122
@@ -0,0 +1,3 @@
+'3518',4300,90000,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74300,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160123 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160123
new file mode 100644
index 00000000..eca564ea
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160123
@@ -0,0 +1,2 @@
+'3518',4301,83400,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54400,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160124 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160124
new file mode 100644
index 00000000..273111a5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160124
@@ -0,0 +1,2 @@
+'3518',4301,83300,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54300,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160125 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160125
new file mode 100644
index 00000000..35861e5c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160125
@@ -0,0 +1,3 @@
+'3518',4300,90100,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74400,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160126 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160126
new file mode 100644
index 00000000..4d54d41a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160126
@@ -0,0 +1,6 @@
+'3518',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
+'3577',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,220000,0,'Waneta Only',0
+'3518',4801,75800,0,'Red Mtn - Ski Bus',0
+'3576',4801,75800,0,'Red Mtn - Ski Bus',0
+'3577',4801,75800,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160127 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160127
new file mode 100644
index 00000000..d5f54b38
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160127
@@ -0,0 +1,6 @@
+'3518',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,64400,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214900,,'',0
+'3518',4800,163100,0,'Red Mtn - Ski Bus',0
+'3576',4800,163100,0,'Red Mtn - Ski Bus',0
+'3577',4800,163100,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160128 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160128
new file mode 100644
index 00000000..6aff026e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160128
@@ -0,0 +1,3 @@
+'3518',4300,85900,,'',0,24100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74200,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160129 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160129
new file mode 100644
index 00000000..4b81771f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160129
@@ -0,0 +1,2 @@
+'3518',4301,83500,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54400,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160130 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160130
new file mode 100644
index 00000000..7fef8872
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160130
@@ -0,0 +1,6 @@
+'3518',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,74900,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,213000,,'',0
+'3518',4800,161400,0,'Red Mtn - Ski Bus',0
+'3576',4800,161400,0,'Red Mtn - Ski Bus',0
+'3577',4800,161400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160131 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160131
new file mode 100644
index 00000000..596e9866
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160131
@@ -0,0 +1,5 @@
+'3518',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54000,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
+'3518',4801,81200,0,'Red Mtn - Ski Bus',0
+'3576',4801,81200,0,'Red Mtn - Ski Bus',0
+'3577',4801,81200,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160132 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160132
new file mode 100644
index 00000000..3a6a6775
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160132
@@ -0,0 +1,6 @@
+'3518',4300,90600,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,74900,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3589',4300,213000,,'',0
+'3518',4800,161500,0,'Red Mtn - Ski Bus',0
+'3576',4800,161500,0,'Red Mtn - Ski Bus',0
+'3577',4800,161500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160133 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160133
new file mode 100644
index 00000000..a0062c28
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160133
@@ -0,0 +1,6 @@
+'3518',4300,91700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,71800,0,'Fruitvale',0,8200,0,'Waneta / Walmart -',0,3700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214000,,'',0
+'3518',4800,162400,0,'Red Mtn - Ski Bus',0
+'3576',4800,162400,0,'Red Mtn - Ski Bus',0
+'3577',4800,162400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160134 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160134
new file mode 100644
index 00000000..e69c1fe7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160134
@@ -0,0 +1,2 @@
+'3518',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160135 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160135
new file mode 100644
index 00000000..9504f7d2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160135
@@ -0,0 +1,3 @@
+'3518',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3589',4300,213200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160136 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160136
new file mode 100644
index 00000000..e69c1fe7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160136
@@ -0,0 +1,2 @@
+'3518',4301,82800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,53900,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160137 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160137
new file mode 100644
index 00000000..9504f7d2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160137
@@ -0,0 +1,3 @@
+'3518',4300,90800,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,75100,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3589',4300,213200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160138 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160138
new file mode 100644
index 00000000..789ceb31
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160138
@@ -0,0 +1,3 @@
+'3518',4300,90700,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,75000,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3589',4300,213100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160139 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160139
new file mode 100644
index 00000000..efc0c161
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160139
@@ -0,0 +1,2 @@
+'3518',4301,82900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54000,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160140 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160140
new file mode 100644
index 00000000..512063b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160140
@@ -0,0 +1 @@
+'3577',4500,61300,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160147 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160147
new file mode 100644
index 00000000..2b379b56
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160147
@@ -0,0 +1,2 @@
+'3518',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10800,0,'Sunningdale -',0,30300,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11400,0,'Sunningdale -',0,20400,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160148 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160148
new file mode 100644
index 00000000..6a4f521b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160148
@@ -0,0 +1,3 @@
+'3577',4301,55200,4,'',0
+'3518',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160149 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160149
new file mode 100644
index 00000000..5525da14
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160149
@@ -0,0 +1,2 @@
+'3518',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55500,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160150 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160150
new file mode 100644
index 00000000..6f7e5cd3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160150
@@ -0,0 +1,2 @@
+'3518',4401,83200,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55200,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160151 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160151
new file mode 100644
index 00000000..21a52ae3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160151
@@ -0,0 +1,2 @@
+'3518',4401,83500,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55400,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160152 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160152
new file mode 100644
index 00000000..64a396a4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160152
@@ -0,0 +1,2 @@
+'3518',4401,83300,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55300,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160153 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160153
new file mode 100644
index 00000000..c4d87397
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160153
@@ -0,0 +1,2 @@
+'3518',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55300,0,'Trail -',0,15900,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160154 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160154
new file mode 100644
index 00000000..c146f4ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160154
@@ -0,0 +1,2 @@
+'3518',4401,83400,0,'Sunningdale -',0,19600,0,'Sunningdale -',0,17800,0,'Sunningdale -',0,31900,0,'Sunningdale -',0,13000,0,'Sunningdale -',0
+'3577',4401,55400,0,'Trail -',0,15800,0,'Sunningdale -',0,10700,0,'Sunningdale -',0,30400,0,'Sunningdale -',0,28300,0,'Sunningdale -',0,11300,0,'Sunningdale -',0,20500,0,'Sunningdale -',0,9100,0,'Sunningdale -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160156 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160156
new file mode 100644
index 00000000..77421312
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160156
@@ -0,0 +1,6 @@
+'3518',4600,82900,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3518',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4600,80800,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3577',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3589',4600,210000,,'',0
+'3589',4601,202700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160157 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160157
new file mode 100644
index 00000000..4e5d1124
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160157
@@ -0,0 +1,2 @@
+'3518',4300,80400,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60800,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160158 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160158
new file mode 100644
index 00000000..bd1d26e7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160158
@@ -0,0 +1,9 @@
+'3518',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,215500,4,'',0
+'3518',4800,163600,4,'',0
+'3518',4801,75300,0,'Red Mtn - Ski Bus',0
+'3576',4800,163600,4,'',0
+'3576',4801,75300,0,'Red Mtn - Ski Bus',0
+'3577',4800,163600,4,'',0
+'3577',4801,75300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160159 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160159
new file mode 100644
index 00000000..dfca1d38
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160159
@@ -0,0 +1,2 @@
+'3518',4300,75100,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55500,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160160 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160160
new file mode 100644
index 00000000..6d714c7e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160160
@@ -0,0 +1,6 @@
+'3518',4301,81200,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3577',4301,61400,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,220100,0,'Waneta Only',0
+'3518',4801,75900,0,'Red Mtn - Ski Bus',0
+'3576',4801,75900,0,'Red Mtn - Ski Bus',0
+'3577',4801,75900,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160161 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160161
new file mode 100644
index 00000000..365820ab
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160161
@@ -0,0 +1,6 @@
+'3518',4300,92600,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,64300,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214900,,'',0
+'3518',4800,163000,0,'Red Mtn - Ski Bus',0
+'3576',4800,163000,0,'Red Mtn - Ski Bus',0
+'3577',4800,163000,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160162
new file mode 100644
index 00000000..96ebff5a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160162
@@ -0,0 +1,5 @@
+'3518',4301,194000,0,'Waneta Only',0
+'3589',4301,220200,0,'Waneta Only',0
+'3518',4801,80000,0,'Red Mtn - Ski Bus',0
+'3576',4801,80000,0,'Red Mtn - Ski Bus',0
+'3577',4801,80000,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160163 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160163
new file mode 100644
index 00000000..82bb64d7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160163
@@ -0,0 +1,6 @@
+'3518',4301,82100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,11800,0,'Waneta Only',0
+'3577',4301,62300,0,'Trail',0,9400,0,'Trail',0,400,,'',0,8000,0,'Trail',0,300,,'',0,11600,0,'Trail',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,220500,0,'Waneta Only',0
+'3518',4801,80500,0,'Red Mtn - Ski Bus',0
+'3576',4801,80500,0,'Red Mtn - Ski Bus',0
+'3577',4801,80500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160164 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160164
new file mode 100644
index 00000000..55963059
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160164
@@ -0,0 +1,6 @@
+'3518',4300,91400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,71500,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
+'3589',4300,213700,,'',0
+'3518',4800,162100,0,'Red Mtn - Ski Bus',0
+'3576',4800,162100,0,'Red Mtn - Ski Bus',0
+'3577',4800,162100,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160165 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160165
new file mode 100644
index 00000000..ec105402
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160165
@@ -0,0 +1,2 @@
+'3518',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160166 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160166
new file mode 100644
index 00000000..853b2da6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160166
@@ -0,0 +1,3 @@
+'3518',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160167 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160167
new file mode 100644
index 00000000..ec105402
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160167
@@ -0,0 +1,2 @@
+'3518',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160168 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160168
new file mode 100644
index 00000000..853b2da6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160168
@@ -0,0 +1,3 @@
+'3518',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160169 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160169
new file mode 100644
index 00000000..16c7b926
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160169
@@ -0,0 +1,2 @@
+'3518',4301,81400,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4301,61600,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160170 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160170
new file mode 100644
index 00000000..fcb0bf98
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160170
@@ -0,0 +1,3 @@
+'3518',4300,92400,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,72500,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160171 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160171
new file mode 100644
index 00000000..afb9d3c2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160171
@@ -0,0 +1,6 @@
+'3518',4300,92900,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,64600,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,215200,,'',0
+'3518',4800,163300,0,'Red Mtn - Ski Bus',0
+'3576',4800,163300,0,'Red Mtn - Ski Bus',0
+'3577',4800,163300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160172 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160172
new file mode 100644
index 00000000..4c4f2fc7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160172
@@ -0,0 +1,6 @@
+'3518',4301,81000,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12200,0,'Waneta Only',0
+'3577',4301,61200,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,215800,0,'Waneta Only',0
+'3518',4801,75700,0,'Red Mtn - Ski Bus',0
+'3576',4801,75700,0,'Red Mtn - Ski Bus',0
+'3577',4801,75700,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160173 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160173
new file mode 100644
index 00000000..a4a3bf07
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160173
@@ -0,0 +1,6 @@
+'3518',4300,92800,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,64600,0,'Fruitvale',0,8300,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,215100,,'',0
+'3518',4800,163300,0,'Red Mtn - Ski Bus',0
+'3576',4800,163300,0,'Red Mtn - Ski Bus',0
+'3577',4800,163300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160174 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160174
new file mode 100644
index 00000000..914c4663
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160174
@@ -0,0 +1,6 @@
+'3518',4301,80900,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3577',4301,61100,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,215800,0,'Waneta Only',0
+'3518',4801,75600,0,'Red Mtn - Ski Bus',0
+'3576',4801,75600,0,'Red Mtn - Ski Bus',0
+'3577',4801,75600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160175 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160175
new file mode 100644
index 00000000..4d83dc1b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160175
@@ -0,0 +1,2 @@
+'3518',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160176 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160176
new file mode 100644
index 00000000..4d83dc1b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160176
@@ -0,0 +1,2 @@
+'3518',4300,75500,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55900,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160177 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160177
new file mode 100644
index 00000000..4776a960
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160177
@@ -0,0 +1,2 @@
+'3518',4300,75400,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55800,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160178 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160178
new file mode 100644
index 00000000..e82a8ec3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160178
@@ -0,0 +1,2 @@
+'3518',4300,80000,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60400,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160179 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160179
new file mode 100644
index 00000000..a6d1cd8c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160179
@@ -0,0 +1,2 @@
+'3518',4300,80100,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60500,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160180 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160180
new file mode 100644
index 00000000..2d79516b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160180
@@ -0,0 +1,2 @@
+'3518',4300,75300,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55700,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160181 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160181
new file mode 100644
index 00000000..15ac7d24
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160181
@@ -0,0 +1,2 @@
+'3518',4300,75900,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60300,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160182 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160182
new file mode 100644
index 00000000..6c8a0d47
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160182
@@ -0,0 +1,2 @@
+'3518',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160183 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160183
new file mode 100644
index 00000000..1a46b9e3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160183
@@ -0,0 +1,2 @@
+'3518',4300,75200,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,55600,0,'Fruitvale',0,9400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160184 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160184
new file mode 100644
index 00000000..4474915f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160184
@@ -0,0 +1,5 @@
+'3518',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,72700,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16800,,'',0,20000,,'',0,12800,,'',0
+'3518',4801,81000,0,'Red Mtn - Ski Bus',0
+'3576',4801,81000,0,'Red Mtn - Ski Bus',0
+'3577',4801,81000,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160185 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160185
new file mode 100644
index 00000000..bc58ab6c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160185
@@ -0,0 +1,6 @@
+'3518',4301,80700,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0,12300,0,'Waneta Only',0
+'3577',4301,60900,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,15200,,'',0,25100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
+'3589',4301,215600,0,'Waneta Only',0
+'3518',4801,75400,0,'Red Mtn - Ski Bus',0
+'3576',4801,75400,0,'Red Mtn - Ski Bus',0
+'3577',4801,75400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160186 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160186
new file mode 100644
index 00000000..9080172c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160186
@@ -0,0 +1,6 @@
+'3518',4300,93100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,64800,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,215400,,'',0
+'3518',4800,163500,0,'Red Mtn - Ski Bus',0
+'3576',4800,163500,0,'Red Mtn - Ski Bus',0
+'3577',4800,163500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160187 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160187
new file mode 100644
index 00000000..df073d48
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160187
@@ -0,0 +1,6 @@
+'3518',4300,90500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,74800,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3589',4300,212900,,'',0
+'3518',4800,161400,0,'Red Mtn - Ski Bus',0
+'3576',4800,161400,0,'Red Mtn - Ski Bus',0
+'3577',4800,161400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160188 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160188
new file mode 100644
index 00000000..b97af292
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160188
@@ -0,0 +1,5 @@
+'3518',4301,83000,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54100,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,1100,,'',0,17000,,'',0,19800,,'',0,12900,,'',0
+'3518',4801,81200,0,'Red Mtn - Ski Bus',0
+'3576',4801,81200,0,'Red Mtn - Ski Bus',0
+'3577',4801,81200,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160189 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160189
new file mode 100644
index 00000000..d0166b84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160189
@@ -0,0 +1,6 @@
+'3518',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16700,,'',0,12700,,'',0
+'3577',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17400,,'',0,12700,,'',0
+'3589',4300,212800,,'',0
+'3518',4800,161300,0,'Red Mtn - Ski Bus',0
+'3576',4800,161300,0,'Red Mtn - Ski Bus',0
+'3577',4800,161300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160190 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160190
new file mode 100644
index 00000000..a8c0588e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160190
@@ -0,0 +1,5 @@
+'3518',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54200,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3518',4801,81300,0,'Red Mtn - Ski Bus',0
+'3576',4801,81300,0,'Red Mtn - Ski Bus',0
+'3577',4801,81300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160191 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160191
new file mode 100644
index 00000000..16540c9f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160191
@@ -0,0 +1,5 @@
+'3518',4301,83100,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54100,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,12900,,'',0
+'3518',4801,81300,0,'Red Mtn - Ski Bus',0
+'3576',4801,81300,0,'Red Mtn - Ski Bus',0
+'3577',4801,81300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160192 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160192
new file mode 100644
index 00000000..5de714d1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160192
@@ -0,0 +1,6 @@
+'3518',4300,90400,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74700,0,'Waneta / Walmart -',0,15700,0,'Waneta / Walmart -',0,10900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212900,,'',0
+'3518',4800,161400,0,'Red Mtn - Ski Bus',0
+'3576',4800,161400,0,'Red Mtn - Ski Bus',0
+'3577',4800,161400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160193 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160193
new file mode 100644
index 00000000..9278852c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160193
@@ -0,0 +1,6 @@
+'3518',4600,83000,0,'Trail -',0,30800,0,'Trail -',0,31700,0,'Trail -',0,19600,0,'Trail -',0
+'3518',4601,110300,0,'Rossland -',0,31800,0,'Rossland -',0,19500,0,'Rossland -',0,23700,,'',0
+'3577',4600,80900,,'',0,11600,,'',0,11300,0,'Trail -',0,11700,,'',0,16300,0,'Trail -',0,12000,,'',0,7500,,'',0,11600,0,'Trail -',0,12400,,'',0,17600,,'',0
+'3577',4601,84900,,'',0,15400,0,'Rossland -',0,12100,,'',0,11900,0,'Rossland -',0,15900,,'',0,3500,,'',0,11600,0,'Rossland -',0,16900,,'',0,13600,,'',0
+'3589',4600,210100,,'',0
+'3589',4601,202700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160194 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160194
new file mode 100644
index 00000000..74f9f21e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160194
@@ -0,0 +1,2 @@
+'3518',4101,85400,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75200,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160195 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160195
new file mode 100644
index 00000000..08ec1cd0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160195
@@ -0,0 +1,5 @@
+'3518',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,11600,,'',0,19200,,'',0,3000,,'',0,18100,,'',0,10500,,'',0,1100,,'',0,1200,,'',0,16900,,'',0,19900,,'',0,12800,,'',0
+'3518',4801,81000,0,'Red Mtn - Ski Bus',0
+'3576',4801,81000,0,'Red Mtn - Ski Bus',0
+'3577',4801,81000,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160196 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160196
new file mode 100644
index 00000000..cd9d3d60
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160196
@@ -0,0 +1,6 @@
+'3518',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,75200,0,'Waneta / Walmart -',0,15600,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,12800,,'',0,5800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17400,,'',0,12800,,'',0
+'3589',4300,213300,,'',0
+'3518',4800,161600,0,'Red Mtn - Ski Bus',0
+'3576',4800,161600,0,'Red Mtn - Ski Bus',0
+'3577',4800,161600,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160197 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160197
new file mode 100644
index 00000000..4dd6690e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160197
@@ -0,0 +1,3 @@
+'3518',4300,90900,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12700,,'',0,12700,,'',0
+'3577',4300,75200,0,'Waneta / Walmart -',0,26600,,'',0,21200,,'',0,18600,0,'Waneta / Walmart -',0,11000,,'',0,32900,,'',0
+'3589',4300,213300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160198 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160198
new file mode 100644
index 00000000..d872da4e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160198
@@ -0,0 +1,2 @@
+'3518',4301,82700,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,53800,,'',0,9700,,'',0,9200,,'',0,8300,,'',0,30800,,'',0,21100,,'',0,11600,,'',0,18100,,'',0,32700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160199 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160199
new file mode 100644
index 00000000..b9d1d1ae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160199
@@ -0,0 +1,7 @@
+'3577',4500,62300,,'',0,3000,,'',0,200,,'',0
+'3518',4600,84400,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22200,,'',0
+'3577',4600,63200,,'',0,18700,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,15900,,'',0,13600,,'',0
+'3589',4600,211000,,'',0
+'3518',4800,160500,0,'Red Mtn - Ski Bus',0
+'3576',4800,160500,0,'Red Mtn - Ski Bus',0
+'3577',4800,160500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160200 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160200
new file mode 100644
index 00000000..de20a8aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160200
@@ -0,0 +1,7 @@
+'3577',4500,62200,,'',0,3000,,'',0,200,,'',0
+'3518',4600,84200,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22400,,'',0
+'3577',4600,63200,,'',0,18600,,'',0,11600,,'',0,11600,0,'Trail -',0,15400,,'',0,12600,0,'Trail -',0,11700,,'',0,7500,,'',0,11900,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3589',4600,210900,,'',0
+'3518',4800,160400,0,'Red Mtn - Ski Bus',0
+'3576',4800,160400,0,'Red Mtn - Ski Bus',0
+'3577',4800,160400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160201 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160201
new file mode 100644
index 00000000..40baee3a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160201
@@ -0,0 +1,7 @@
+'3577',4500,62200,,'',0,3000,,'',0,200,,'',0
+'3518',4600,84300,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,19600,0,'Trail -',0,22300,,'',0
+'3577',4600,63200,,'',0,18600,,'',0,11600,,'',0,11700,0,'Trail -',0,15300,,'',0,12700,0,'Trail -',0,11600,,'',0,7500,,'',0,12000,0,'Trail -',0,16000,,'',0,13600,,'',0
+'3589',4600,211000,,'',0
+'3518',4800,160400,0,'Red Mtn - Ski Bus',0
+'3576',4800,160400,0,'Red Mtn - Ski Bus',0
+'3577',4800,160400,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160202 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160202
new file mode 100644
index 00000000..b110f017
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160202
@@ -0,0 +1,8 @@
+'3518',4101,85300,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3518',4601,74800,,'',0,30200,0,'Rossland -',0,35600,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
+'3577',4601,60200,,'',0,13400,,'',0,10300,,'',0,11100,0,'Rossland -',0,16400,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
+'3589',4601,201700,,'',0
+'3518',4801,82300,0,'Red Mtn - Ski Bus',0
+'3576',4801,82300,0,'Red Mtn - Ski Bus',0
+'3577',4801,82300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160203 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160203
new file mode 100644
index 00000000..15094855
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160203
@@ -0,0 +1,8 @@
+'3518',4101,85300,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75100,,'',0,8700,,'',0,32000,,'',0,28000,,'',0,21900,,'',0,9000,,'',0
+'3518',4601,74900,,'',0,30100,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0,24200,,'',0
+'3577',4601,60300,,'',0,13400,,'',0,10300,,'',0,11000,0,'Rossland -',0,16500,,'',0,11400,0,'Rossland -',0,12400,,'',0,7500,,'',0,11100,0,'Rossland -',0,17400,,'',0,13600,,'',0
+'3589',4601,201800,,'',0
+'3518',4801,82300,0,'Red Mtn - Ski Bus',0
+'3576',4801,82300,0,'Red Mtn - Ski Bus',0
+'3577',4801,82300,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160204 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160204
new file mode 100644
index 00000000..cd3ac2d9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160204
@@ -0,0 +1,4 @@
+'3518',4600,83800,0,'Trail -',0,30800,0,'Trail -',0,35700,0,'Trail -',0,15600,0,'Trail -',0
+'3518',4601,105400,0,'Rossland -',0,35700,0,'Rossland -',0,19500,0,'Rossland -',0
+'3577',4600,104600,0,'Trail -',0,28000,0,'Trail -',0,31100,0,'Trail -',0
+'3577',4601,95400,0,'Rossland -',0,27900,0,'Rossland -',0,31000,0,'Rossland -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160205 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160205
new file mode 100644
index 00000000..49a3005e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160205
@@ -0,0 +1,6 @@
+'3518',4600,81100,0,'Trail -',0,30800,0,'Trail -',0,31800,0,'Trail -',0,19500,0,'Trail -',0,27700,,'',0
+'3518',4601,81100,4,'',0,30800,4,'',0,31800,4,'',0,19500,4,'',0,27700,4,'',0
+'3577',4600,75400,,'',0,15100,,'',0,11400,0,'Trail -',0,12100,,'',0,11900,0,'Trail -',0,15900,,'',0,3500,,'',0,15600,0,'Trail -',0,12900,,'',0,17600,,'',0
+'3577',4601,75400,4,'',0,15100,4,'',0,11400,4,'',0,12100,4,'',0,11900,4,'',0,15900,4,'',0,3500,4,'',0,15600,4,'',0,12900,4,'',0,17600,4,'',0
+'3589',4600,204300,,'',0
+'3589',4601,204300,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160206 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160206
new file mode 100644
index 00000000..132ab4f7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160206
@@ -0,0 +1,4 @@
+'3580',5100,135500,,'',0,20000,,'',0
+'3587',5200,94500,,'',0,90600,,'',0
+'3589',5300,104000,,'',0,60000,,'',0
+'3584',7400,182000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160207 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160207
new file mode 100644
index 00000000..bd6eb9a0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160207
@@ -0,0 +1,7 @@
+'3580',5100,131500,,'',0,4000,4,'',0,16000,,'',0,4000,4,'',0
+'3587',5200,94500,4,'',0,90600,4,'',0
+'3587',5201,71000,,'',0,91000,,'',0
+'3589',5300,104000,4,'',0,60000,4,'',0
+'3589',5301,81500,,'',0,53500,,'',0
+'3584',7400,182000,4,'',0
+'3584',7401,80500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160209 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160209
new file mode 100644
index 00000000..87c8d2c8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160209
@@ -0,0 +1,2 @@
+'3518',2001,63300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,55400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160210 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160210
new file mode 100644
index 00000000..f0add741
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160210
@@ -0,0 +1,2 @@
+'3518',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160212 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160212
new file mode 100644
index 00000000..058b9d71
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160212
@@ -0,0 +1,2 @@
+'3518',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160213 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160213
new file mode 100644
index 00000000..8340948d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160213
@@ -0,0 +1,3 @@
+'3518',2000,71200,,'',0,50700,,'',0,43900,0,'Playmor Jct',0,24400,0,'Nelson',0
+'3577',2000,63300,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,93500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160214 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160214
new file mode 100644
index 00000000..4f5f8300
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160214
@@ -0,0 +1,2 @@
+'3518',9900,94000,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65200,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160215 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160215
new file mode 100644
index 00000000..56597f3e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160215
@@ -0,0 +1,5 @@
+'3518',1000,75200,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
+'3577',1000,70100,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
+'3579',1000,130800,,'',0
+'3583',1000,130800,,'',0
+'3586',7601,90700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160216 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160216
new file mode 100644
index 00000000..50cef0fc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160216
@@ -0,0 +1,2 @@
+'3518',4300,80200,0,'Fruitvale',0,14100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60600,0,'Fruitvale',0,9400,0,'Fruitvale',0,4400,0,'Fruitvale',0,15900,0,'Fruitvale',0,14900,,'',0,25200,,'',0,12800,,'',0,16800,,'',0,2700,,'',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160218 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160218
new file mode 100644
index 00000000..78cb20f1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160218
@@ -0,0 +1,2 @@
+'3518',3201,100800,,'',0,14800,,'',0,36500,,'',0
+'3577',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160219 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160219
new file mode 100644
index 00000000..270d1611
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160219
@@ -0,0 +1,4 @@
+'3518',3200,101200,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3518',3201,101200,4,'',0,18800,4,'',0,32500,4,'',0
+'3577',3200,70000,0,'31 N Castlegar',0,5700,,'',0,18700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
+'3577',3201,75700,4,'',0,18700,4,'',0,26400,4,'',0,22100,4,'',0,12500,4,'',0,15900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160220 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160220
new file mode 100644
index 00000000..3ec86f2f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160220
@@ -0,0 +1,2 @@
+'3518',3200,101900,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3577',3200,70700,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160221 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160221
new file mode 100644
index 00000000..bb0b1b03
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160221
@@ -0,0 +1,9 @@
+'3518',3100,85800,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3518',3101,100400,4,'',0,14800,4,'',0,36500,4,'',0
+'3577',3100,70800,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,3500,,'',0,15700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3101,93600,4,'',0,26400,4,'',0,50500,4,'',0,11600,4,'',0
+'3518',3200,102000,4,'',0,18800,4,'',0,32500,4,'',0
+'3518',3201,100400,,'',0,14800,,'',0,36500,,'',0
+'3577',3200,70800,4,'',0,9700,,'',0,14700,4,'',0,26400,4,'',0,22100,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3577',3201,73700,0,'Columbia - Celgar & Robson',0,19900,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,8600,0,'Celgar Only',0,7300,,'',0
+'3585',3800,85000,,'',0,15400,4,'',0,29600,,'',0,11400,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160222 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160222
new file mode 100644
index 00000000..b1650d1d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160222
@@ -0,0 +1,5 @@
+'3518',3100,91100,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3577',3100,72100,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3200,81400,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3518',3400,94100,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,72000,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,7600,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160223 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160223
new file mode 100644
index 00000000..e89e0139
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160223
@@ -0,0 +1,2 @@
+'3577',3201,73300,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3585',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160224 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160224
new file mode 100644
index 00000000..8faf3b70
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160224
@@ -0,0 +1,2 @@
+'3577',3201,73400,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3585',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160225 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160225
new file mode 100644
index 00000000..8df39bf0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160225
@@ -0,0 +1,2 @@
+'3518',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160226 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160226
new file mode 100644
index 00000000..b7451c0b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160226
@@ -0,0 +1,2 @@
+'3518',3101,100100,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160227 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160227
new file mode 100644
index 00000000..8df39bf0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160227
@@ -0,0 +1,2 @@
+'3518',3101,100200,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83300,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160228 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160228
new file mode 100644
index 00000000..0ddfed6d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160228
@@ -0,0 +1,2 @@
+'3518',3100,90100,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71100,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160229 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160229
new file mode 100644
index 00000000..f2fd4c09
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160229
@@ -0,0 +1,2 @@
+'3518',3101,95900,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83000,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160230 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160230
new file mode 100644
index 00000000..22356f49
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160230
@@ -0,0 +1,2 @@
+'3518',3101,95800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,82900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160231 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160231
new file mode 100644
index 00000000..b665022f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160231
@@ -0,0 +1,2 @@
+'3518',3101,100000,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160232 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160232
new file mode 100644
index 00000000..4a55cd91
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160232
@@ -0,0 +1,2 @@
+'3518',3100,90000,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71000,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160233 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160233
new file mode 100644
index 00000000..24771439
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160233
@@ -0,0 +1,2 @@
+'3518',3100,85900,,'',0,16400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,70900,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160234 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160234
new file mode 100644
index 00000000..3f41bcee
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160234
@@ -0,0 +1,4 @@
+'3518',3100,90300,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3518',3101,95700,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3100,71300,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3101,82800,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160236 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160236
new file mode 100644
index 00000000..baced35a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160236
@@ -0,0 +1,2 @@
+'3518',3101,95600,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,82700,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160237 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160237
new file mode 100644
index 00000000..f7ce095d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160237
@@ -0,0 +1,6 @@
+'3518',3100,91000,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3518',3101,95100,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3100,72000,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3101,82200,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3200,81300,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3577',3201,72900,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160238 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160238
new file mode 100644
index 00000000..5fe5b06d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160238
@@ -0,0 +1,6 @@
+'3518',3100,90900,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3518',3101,95000,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3100,71900,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3101,82100,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3200,81200,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3577',3201,72800,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160239 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160239
new file mode 100644
index 00000000..a6d14b25
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160239
@@ -0,0 +1 @@
+'3577',3601,80400,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160240 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160240
new file mode 100644
index 00000000..02d15239
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160240
@@ -0,0 +1 @@
+'3577',3601,80000,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160241 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160241
new file mode 100644
index 00000000..f2860b63
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160241
@@ -0,0 +1 @@
+'3577',3601,75900,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160242 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160242
new file mode 100644
index 00000000..6fa77a22
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160242
@@ -0,0 +1 @@
+'3577',3601,75200,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160243 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160243
new file mode 100644
index 00000000..0673e7d3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160243
@@ -0,0 +1 @@
+'3577',3601,75500,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160244 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160244
new file mode 100644
index 00000000..76e22174
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160244
@@ -0,0 +1 @@
+'3577',3601,75300,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160245 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160245
new file mode 100644
index 00000000..dc8d487d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160245
@@ -0,0 +1 @@
+'3577',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160246 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160246
new file mode 100644
index 00000000..6f3ff5f3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160246
@@ -0,0 +1,2 @@
+'3518',3400,93700,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160247 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160247
new file mode 100644
index 00000000..d6271d08
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160247
@@ -0,0 +1,20 @@
+'3518',3100,91300,4,'',0,12400,4,'',0,18800,4,'',0,17900,4,'',0,14900,4,'',0
+'3518',3101,94800,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3100,72300,4,'',0,12700,4,'',0,15700,4,'',0,3200,4,'',0,7500,4,'',0,11700,4,'',0,10800,4,'',0,16200,4,'',0,3000,4,'',0,9500,4,'',0
+'3577',3101,81900,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,5500,0,'Downtown',0,9400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3200,81600,4,'',0,63200,4,'',0,16500,4,'',0,4600,4,'',0,7300,4,'',0,10000,4,'',0
+'3577',3201,72600,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3518',3300,113100,4,'',0,32500,4,'',0,15900,4,'',0
+'3518',3301,111200,,'',0,32500,,'',0,11900,,'',0
+'3577',3300,83900,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,19500,4,'',0,2700,4,'',0
+'3577',3301,72500,0,'36 Ootischenia',0,9500,,'',0,3200,,'',0,26500,,'',0,28900,,'',0,12200,0,'36 Ootischenia',0,10000,,'',0
+'3518',3400,91600,0,'Kinnaird -',0,2700,4,'',0,9900,0,'Kinnaird -',0,6700,4,'',0,29800,0,'Kinnaird -',0,2700,4,'',0
+'3577',3400,65500,0,'Kinnaird -',0,6700,4,'',0,2800,0,'Kinnaird -',0,6700,4,'',0,3500,0,'Kinnaird -',0,6700,4,'',0,19500,0,'Kinnaird -',0,2700,4,'',0,20400,,'',0,6000,4,'',0,9600,0,'Kinnaird -',0,2700,4,'',0,500,,'',0,2000,4,'',0,8500,,'',0,2000,4,'',0,4200,0,'Kinnaird -',0,2700,4,'',0,1600,,'',0,6000,4,'',0,2900,,'',0,2000,4,'',0
+'3577',3601,81400,4,'',0,42200,,'',0,6700,4,'',0
+'3585',3800,100200,,'',0,41000,,'',0
+'3518',9800,91900,,'',0,38400,,'',0,43800,,'',0
+'3518',9801,94300,,'',0,38400,,'',0,47800,,'',0
+'3577',9800,63200,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3577',9801,65800,,'',0,9100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9800,185900,,'',0
+'3589',9801,192100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160248 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160248
new file mode 100644
index 00000000..9e19447c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160248
@@ -0,0 +1,2 @@
+'3518',3400,92000,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,65900,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160249 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160249
new file mode 100644
index 00000000..ea44ee4f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160249
@@ -0,0 +1,2 @@
+'3518',3400,92100,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70000,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160250 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160250
new file mode 100644
index 00000000..39dd1153
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160250
@@ -0,0 +1,2 @@
+'3518',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160251 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160251
new file mode 100644
index 00000000..39dd1153
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160251
@@ -0,0 +1,2 @@
+'3518',3400,92300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70200,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,26200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160252 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160252
new file mode 100644
index 00000000..bf4cabd8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160252
@@ -0,0 +1,2 @@
+'3518',3400,92400,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70300,0,'Kinnaird -',0,5500,0,'Kinnaird -',0,14200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,23100,,'',0,15600,0,'Kinnaird -',0,3200,,'',0,10500,,'',0,6200,0,'Kinnaird -',0,4300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160253 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160253
new file mode 100644
index 00000000..9218eacc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160253
@@ -0,0 +1,2 @@
+'3518',3400,93600,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160254 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160254
new file mode 100644
index 00000000..ab2931bd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160254
@@ -0,0 +1,2 @@
+'3518',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160255 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160255
new file mode 100644
index 00000000..ab2931bd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160255
@@ -0,0 +1,2 @@
+'3518',3400,93400,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71300,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160256 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160256
new file mode 100644
index 00000000..67cc5557
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160256
@@ -0,0 +1,2 @@
+'3518',3400,93500,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71400,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22400,,'',0,16300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160257 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160257
new file mode 100644
index 00000000..302337c5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160257
@@ -0,0 +1,8 @@
+'3518',3300,112500,,'',0,32500,,'',0,15900,,'',0
+'3577',3300,83300,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3577',3601,74800,,'',0,79300,0,'Selkirk Coll',0
+'3518',9801,93700,,'',0,38400,,'',0,43800,,'',0
+'3577',9801,65200,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3589',9801,191500,,'',0
+'3518',9900,93800,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,35100,,'',0,10000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160258 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160258
new file mode 100644
index 00000000..612f1db7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160258
@@ -0,0 +1,3 @@
+'3518',9800,91700,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,63000,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160259 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160259
new file mode 100644
index 00000000..917ea670
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160259
@@ -0,0 +1,3 @@
+'3518',9801,94600,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160260 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160260
new file mode 100644
index 00000000..4b2dc4d8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160260
@@ -0,0 +1,5 @@
+'3518',3400,93200,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,71100,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3518',9800,91600,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,62900,,'',0,9200,,'',0,29000,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160261 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160261
new file mode 100644
index 00000000..2beb12dc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160261
@@ -0,0 +1,3 @@
+'3518',9801,94700,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,70200,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160262 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160262
new file mode 100644
index 00000000..785f7085
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160262
@@ -0,0 +1,5 @@
+'3518',3400,93300,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,71200,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,22300,,'',0,16400,0,'Kinnaird -',0,2400,,'',0,10500,,'',0,7000,0,'Kinnaird -',0,3500,,'',0,8900,,'',0
+'3518',9800,91600,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,62900,,'',0,9300,,'',0,28900,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,185600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160263 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160263
new file mode 100644
index 00000000..917ea670
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160263
@@ -0,0 +1,3 @@
+'3518',9801,94600,,'',0,38400,,'',0,47800,,'',0
+'3577',9801,70100,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,192400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160264 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160264
new file mode 100644
index 00000000..193f815f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160264
@@ -0,0 +1,2 @@
+'3518',3400,92800,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70700,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160265 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160265
new file mode 100644
index 00000000..937d02b1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160265
@@ -0,0 +1,2 @@
+'3518',3400,92900,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160266 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160266
new file mode 100644
index 00000000..623e588f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160266
@@ -0,0 +1,2 @@
+'3518',3400,92600,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70500,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160267 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160267
new file mode 100644
index 00000000..ed4ebfae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160267
@@ -0,0 +1,2 @@
+'3518',3400,92700,0,'Kinnaird -',0,12600,0,'Kinnaird -',0,36500,0,'Kinnaird -',0
+'3577',3400,70600,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,38700,0,'Kinnaird -',0,19900,0,'Kinnaird -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160268 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160268
new file mode 100644
index 00000000..71c931aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160268
@@ -0,0 +1,2 @@
+'3518',3400,93900,0,'Kinnaird -',0,16600,0,'Kinnaird -',0,32500,0,'Kinnaird -',0
+'3577',3400,71800,0,'Kinnaird -',0,9500,0,'Kinnaird -',0,10200,0,'Kinnaird -',0,22200,0,'Kinnaird -',0,26400,,'',0,12300,0,'Kinnaird -',0,2500,,'',0,10500,,'',0,6900,0,'Kinnaird -',0,3600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160269 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160269
new file mode 100644
index 00000000..7f86e2dd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160269
@@ -0,0 +1,6 @@
+'3518',9800,91200,,'',0,34400,,'',0,47800,,'',0
+'3518',9801,95100,,'',0,38400,,'',0,47800,,'',0
+'3577',9800,62500,,'',0,9100,,'',0,29100,,'',0,22500,,'',0,30900,,'',0,18800,,'',0
+'3577',9801,70600,,'',0,5100,,'',0,29000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9800,185200,,'',0
+'3589',9801,192900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160270 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160270
new file mode 100644
index 00000000..dc8d487d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160270
@@ -0,0 +1 @@
+'3577',3601,75400,,'',0,48900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160271 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160271
new file mode 100644
index 00000000..25c99127
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160271
@@ -0,0 +1,2 @@
+'3518',3201,101100,,'',0,14800,,'',0,36500,,'',0
+'3577',3201,75600,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160272 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160272
new file mode 100644
index 00000000..8e9f6c15
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160272
@@ -0,0 +1,2 @@
+'3518',3100,90200,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71200,,'',0,12700,,'',0,11700,,'',0,7200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160273 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160273
new file mode 100644
index 00000000..fd376bdb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160273
@@ -0,0 +1,6 @@
+'3518',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103600,,'',0
+'3583',101,103600,,'',0
+'3589',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160274 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160274
new file mode 100644
index 00000000..fd376bdb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160274
@@ -0,0 +1,6 @@
+'3518',101,83800,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64100,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103600,,'',0
+'3583',101,103600,,'',0
+'3589',101,153000,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160275 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160275
new file mode 100644
index 00000000..d066da7d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160275
@@ -0,0 +1,4 @@
+'3518',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160276 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160276
new file mode 100644
index 00000000..23f63423
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160276
@@ -0,0 +1,4 @@
+'3518',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72900,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160277 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160277
new file mode 100644
index 00000000..99286af6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160277
@@ -0,0 +1,4 @@
+'3518',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160278 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160278
new file mode 100644
index 00000000..99286af6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160278
@@ -0,0 +1,4 @@
+'3518',301,82300,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72800,0,'Rosemont',0,7800,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162100,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160279 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160279
new file mode 100644
index 00000000..4295edde
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160279
@@ -0,0 +1,4 @@
+'3518',301,82100,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72600,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,161900,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160280 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160280
new file mode 100644
index 00000000..84af887f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160280
@@ -0,0 +1,3 @@
+'3577',300,73700,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3578',300,163000,,'',0,10100,,'',0
+'3589',300,163000,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160281 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160281
new file mode 100644
index 00000000..c8e155be
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160281
@@ -0,0 +1,6 @@
+'3518',101,84000,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64300,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103800,,'',0
+'3583',101,103800,,'',0
+'3589',101,153200,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160282 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160282
new file mode 100644
index 00000000..b1082210
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160282
@@ -0,0 +1,9 @@
+'3577',1400,74600,,'',0,85400,,'',0
+'3579',1400,105000,,'',0,68600,,'',0
+'3583',1400,105000,,'',0,68600,,'',0
+'3518',2001,52400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,44600,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
+'3579',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,62600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3518',9901,84700,,'',0,38400,,'',0,47700,,'',0
+'3577',9901,55900,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160284 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160284
new file mode 100644
index 00000000..c9e7af6e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160284
@@ -0,0 +1,7 @@
+'3518',201,80700,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,62300,,'',0,2400,,'',0,7400,0,'Chahko Mika Mall',0,8100,,'',0,9800,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9100,0,'Fairview - Reverse Route',0,9100,,'',0,10100,,'',0,19700,,'',0
+'3578',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3589',201,153700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11200,,'',0
+'3577',300,82000,4,'',0,3700,4,'',0,16800,4,'',0,3400,4,'',0,49400,4,'',0,15200,4,'',0
+'3578',300,163500,4,'',0,10100,4,'',0
+'3589',300,163500,4,'',0,10100,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160285 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160285
new file mode 100644
index 00000000..47f9b976
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160285
@@ -0,0 +1,6 @@
+'3518',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103500,,'',0
+'3583',101,103500,,'',0
+'3589',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160286 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160286
new file mode 100644
index 00000000..47f9b976
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160286
@@ -0,0 +1,6 @@
+'3518',101,83700,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64000,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103500,,'',0
+'3583',101,103500,,'',0
+'3589',101,152900,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160287 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160287
new file mode 100644
index 00000000..1415ea80
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160287
@@ -0,0 +1,6 @@
+'3518',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103400,,'',0
+'3583',101,103400,,'',0
+'3589',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160288 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160288
new file mode 100644
index 00000000..1415ea80
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160288
@@ -0,0 +1,6 @@
+'3518',101,83600,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63900,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103400,,'',0
+'3583',101,103400,,'',0
+'3589',101,152800,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160289 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160289
new file mode 100644
index 00000000..26c4006e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160289
@@ -0,0 +1,6 @@
+'3518',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103300,,'',0
+'3583',101,103300,,'',0
+'3589',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160290 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160290
new file mode 100644
index 00000000..dcbc7208
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160290
@@ -0,0 +1,12 @@
+'3518',101,95500,,'',0,75100,,'',0
+'3577',101,74700,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152100,0,'Uphill - No Hosp',0
+'3579',101,72500,0,'LVR Express -',0,30200,,'',0
+'3583',101,72500,0,'LVR Express -',0,30200,,'',0
+'3589',101,152100,0,'Uphill - No Hosp',0
+'3518',301,81800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72300,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,161600,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3579',1500,84500,,'',0,56200,,'',0,30900,,'',0
+'3583',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160291 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160291
new file mode 100644
index 00000000..576e7d93
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160291
@@ -0,0 +1,5 @@
+'3577',300,74000,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3578',300,163300,,'',0,10100,,'',0
+'3589',300,163300,,'',0,10100,,'',0
+'3579',1500,85700,,'',0,56200,,'',0,30900,,'',0
+'3583',7200,84400,,'',0,57400,,'',0,42200,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160292 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160292
new file mode 100644
index 00000000..dbfcd80f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160292
@@ -0,0 +1,12 @@
+'3518',101,95600,,'',0,75100,,'',0
+'3577',101,74800,0,'Uphill - No Hosp',0,8900,,'',0,1500,0,'Hosp Only',0,8000,,'',0,7500,,'',0,12000,0,'Hosp Only',0,1200,,'',0,18100,0,'Hosp Only',0,2300,,'',0,15900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152200,0,'Uphill - No Hosp',0
+'3579',101,72600,0,'LVR Express -',0,30200,,'',0
+'3583',101,72600,0,'LVR Express -',0,30200,,'',0
+'3589',101,152200,0,'Uphill - No Hosp',0
+'3518',301,81900,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72400,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,161700,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3579',1500,84500,,'',0,56200,,'',0,30900,,'',0
+'3583',7201,71900,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160293 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160293
new file mode 100644
index 00000000..87870792
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160293
@@ -0,0 +1,10 @@
+'3518',101,95700,,'',0,75100,,'',0
+'3577',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152300,0,'Uphill - No Hosp',0
+'3579',101,102900,,'',0
+'3583',101,102900,,'',0
+'3589',101,152300,0,'Uphill - No Hosp',0
+'3518',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,63400,,'',0,16800,,'',0,45200,,'',0
+'3578',301,193100,,'',0,11700,,'',0,15200,,'',0
+'3589',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160294 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160294
new file mode 100644
index 00000000..627590c1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160294
@@ -0,0 +1,10 @@
+'3518',101,95700,,'',0,75100,,'',0
+'3577',101,74900,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152300,0,'Uphill - No Hosp',0
+'3579',101,102900,,'',0
+'3583',101,102900,,'',0
+'3589',101,152300,0,'Uphill - No Hosp',0
+'3518',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3578',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3589',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160295 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160295
new file mode 100644
index 00000000..82c5d8b2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160295
@@ -0,0 +1,10 @@
+'3518',101,95800,,'',0,75100,,'',0
+'3577',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152400,0,'Uphill - No Hosp',0
+'3579',101,103000,,'',0
+'3583',101,103000,,'',0
+'3589',101,152400,0,'Uphill - No Hosp',0
+'3518',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3578',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3589',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160296 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160296
new file mode 100644
index 00000000..82c5d8b2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160296
@@ -0,0 +1,10 @@
+'3518',101,95800,,'',0,75100,,'',0
+'3577',101,75000,0,'Uphill - No Hosp',0,8900,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,20400,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152400,0,'Uphill - No Hosp',0
+'3579',101,103000,,'',0
+'3583',101,103000,,'',0
+'3589',101,152400,0,'Uphill - No Hosp',0
+'3518',301,83200,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,63500,,'',0,16800,,'',0,45200,,'',0
+'3578',301,193200,,'',0,11700,,'',0,15200,,'',0
+'3589',301,193200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160297 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160297
new file mode 100644
index 00000000..1039a00a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160297
@@ -0,0 +1,10 @@
+'3518',101,83300,0,'Uphill - No Hosp',0,7000,,'',0,5600,,'',0,8200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63600,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103100,,'',0
+'3583',101,103100,,'',0
+'3589',101,152500,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3518',301,83300,4,'',0,7000,4,'',0,13800,4,'',0,9000,4,'',0,12000,4,'',0,15500,4,'',0,11500,4,'',0,3500,4,'',0,34400,4,'',0
+'3577',301,63600,4,'',0,16800,4,'',0,45200,4,'',0
+'3578',301,193300,4,'',0,11700,4,'',0,15200,4,'',0
+'3589',301,193300,4,'',0,11700,4,'',0,15200,4,'',0,10100,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160298 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160298
new file mode 100644
index 00000000..27ca9edd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160298
@@ -0,0 +1,4 @@
+'3518',301,83100,,'',0,7000,,'',0,13800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,63400,,'',0,16800,,'',0,45200,,'',0
+'3578',301,193100,,'',0,11700,,'',0,15200,,'',0
+'3589',301,193100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160299 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160299
new file mode 100644
index 00000000..7a3f69e9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160299
@@ -0,0 +1,7 @@
+'3518',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81300,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3578',101,194200,,'',0,11700,,'',0,15200,,'',0
+'3579',101,72800,0,'LVR Express -',0,31200,,'',0
+'3583',101,72800,0,'LVR Express -',0,31200,,'',0
+'3589',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3586',7601,94600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160300 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160300
new file mode 100644
index 00000000..f26c290a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160300
@@ -0,0 +1,6 @@
+'3518',101,91000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81100,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,194000,,'',0,11700,,'',0,15200,,'',0
+'3579',101,72600,0,'LVR Express -',0,31200,,'',0
+'3583',101,72600,0,'LVR Express -',0,31200,,'',0
+'3589',101,194000,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160301 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160301
new file mode 100644
index 00000000..1675d897
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160301
@@ -0,0 +1,7 @@
+'3518',101,91600,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81900,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,9200,,'',0,12300,,'',0,8100,,'',0,5500,,'',0
+'3578',101,194600,,'',0,15700,,'',0,11200,,'',0
+'3579',101,74200,0,'LVR Express -',0,30200,,'',0
+'3583',101,74200,0,'LVR Express -',0,30200,,'',0
+'3589',101,194600,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3577',200,82800,0,'Fairview -',0,100,0,'Fairview -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160302 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160302
new file mode 100644
index 00000000..c4fff074
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160302
@@ -0,0 +1,5 @@
+'3577',300,73800,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,15200,,'',0,12300,,'',0
+'3578',300,163100,,'',0,10100,,'',0
+'3589',300,163100,,'',0,10100,,'',0
+'3579',1500,85500,,'',0,56200,,'',0,30900,,'',0
+'3583',7200,84300,,'',0,57400,,'',0,42200,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160303 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160303
new file mode 100644
index 00000000..76933d58
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160303
@@ -0,0 +1,6 @@
+'3518',301,82000,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,72500,0,'Rosemont',0,1500,0,'Selkirk Coll',0,6300,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,161800,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3579',1500,84600,,'',0,56200,,'',0,30900,,'',0
+'3583',7201,72000,0,'Salmo',0,52500,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160304 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160304
new file mode 100644
index 00000000..206e9fe1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160304
@@ -0,0 +1,6 @@
+'3518',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103700,,'',0
+'3583',101,103700,,'',0
+'3589',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160305 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160305
new file mode 100644
index 00000000..206e9fe1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160305
@@ -0,0 +1,6 @@
+'3518',101,83900,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,64200,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,15400,,'',0,5000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103700,,'',0
+'3583',101,103700,,'',0
+'3589',101,153100,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160306 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160306
new file mode 100644
index 00000000..26c4006e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160306
@@ -0,0 +1,6 @@
+'3518',101,83500,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63800,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103300,,'',0
+'3583',101,103300,,'',0
+'3589',101,152700,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160307 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160307
new file mode 100644
index 00000000..0ef10373
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160307
@@ -0,0 +1,6 @@
+'3518',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103200,,'',0
+'3583',101,103200,,'',0
+'3589',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160308 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160308
new file mode 100644
index 00000000..e1c606b0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160308
@@ -0,0 +1,7 @@
+'3518',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',300,73400,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3577',301,63100,,'',0,12800,,'',0,49200,,'',0
+'3578',300,162700,,'',0,10100,,'',0
+'3578',301,192800,,'',0,11700,,'',0,11200,,'',0
+'3589',300,162700,,'',0,10100,,'',0
+'3589',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160309 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160309
new file mode 100644
index 00000000..decc36c1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160309
@@ -0,0 +1,7 @@
+'3518',301,82800,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',300,73300,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3577',301,63100,,'',0,12800,,'',0,49200,,'',0
+'3578',300,162600,,'',0,10100,,'',0
+'3578',301,192800,,'',0,11700,,'',0,11200,,'',0
+'3589',300,162600,,'',0,10100,,'',0
+'3589',301,192800,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160310 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160310
new file mode 100644
index 00000000..ca03e343
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160310
@@ -0,0 +1,4 @@
+'3518',301,82600,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,62900,,'',0,10200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,1200,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162400,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160311 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160311
new file mode 100644
index 00000000..3995a391
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160311
@@ -0,0 +1,7 @@
+'3518',301,82700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,30400,,'',0
+'3577',300,73200,,'',0,7800,,'',0,3700,,'',0,6300,,'',0,3800,,'',0,6700,,'',0,3400,,'',0,10000,,'',0,19600,,'',0,10400,,'',0,9400,,'',0,11200,,'',0,16300,,'',0
+'3577',301,63000,,'',0,10200,4,'',0,1400,4,'',0,1200,,'',0,5200,4,'',0,3700,4,'',0,6300,4,'',0,3800,4,'',0,6700,4,'',0,3400,4,'',0,10000,4,'',0,10100,,'',0,9500,4,'',0,10400,4,'',0,9400,4,'',0,11200,4,'',0,16300,4,'',0
+'3578',300,162500,,'',0,10100,,'',0
+'3578',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',300,162500,,'',0,10100,,'',0
+'3589',301,162500,4,'',0,10100,4,'',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160312 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160312
new file mode 100644
index 00000000..0ef10373
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160312
@@ -0,0 +1,6 @@
+'3518',101,83400,0,'Uphill - No Hosp',0,7000,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,3500,,'',0,15400,,'',0,19000,,'',0
+'3577',101,63700,0,'Uphill - No Hosp',0,11500,0,'Uphill - No Hosp',0,5300,,'',0,3600,,'',0,9500,,'',0,7500,,'',0,13200,,'',0,11400,,'',0,9000,,'',0,16100,0,'Uphill - No Hosp',0,4000,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0
+'3579',101,103200,,'',0
+'3583',101,103200,,'',0
+'3589',101,152600,0,'Uphill - No Hosp',0,40800,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160313 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160313
new file mode 100644
index 00000000..827038ac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160313
@@ -0,0 +1,8 @@
+'3518',101,91300,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81500,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3578',101,194300,,'',0,15700,,'',0,11200,,'',0
+'3579',101,72900,0,'LVR Express -',0,31200,,'',0
+'3583',101,72900,0,'LVR Express -',0,31200,,'',0
+'3589',101,194300,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3586',7600,100000,,'',0
+'3586',7601,94800,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160314 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160314
new file mode 100644
index 00000000..e1238ef4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160314
@@ -0,0 +1,7 @@
+'3518',101,91200,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81400,,'',0,3500,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3578',101,194200,,'',0,11700,,'',0,15200,,'',0
+'3579',101,72800,0,'LVR Express -',0,31200,,'',0
+'3583',101,72800,0,'LVR Express -',0,31200,,'',0
+'3589',101,194200,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
+'3586',7601,94700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160315 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160315
new file mode 100644
index 00000000..726cf88d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160315
@@ -0,0 +1,5 @@
+'3577',201,152000,0,'Fairview - Reverse Route',0
+'3518',1001,102900,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,120900,,'',0
+'3583',1001,120900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160316 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160316
new file mode 100644
index 00000000..2b0b4107
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160316
@@ -0,0 +1,8 @@
+'3518',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64200,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,83000,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134600,,'',0
+'3583',1000,134600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160317 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160317
new file mode 100644
index 00000000..46843aaa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160317
@@ -0,0 +1,4 @@
+'3518',400,151300,,'',0
+'3577',400,124800,,'',0,16800,,'',0
+'3578',400,151100,,'',0
+'3589',400,151100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160318 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160318
new file mode 100644
index 00000000..802b28d1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160318
@@ -0,0 +1,8 @@
+'3518',201,81600,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',200,82200,0,'Fairview -',0
+'3577',201,62900,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154600,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3518',1001,71200,0,'Balfour Exp',0
+'3577',1001,62300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,99400,0,'Balfour Exp',0
+'3586',7600,101200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160319 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160319
new file mode 100644
index 00000000..4af2b2aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160319
@@ -0,0 +1,5 @@
+'3577',201,152100,0,'Fairview - Reverse Route',0
+'3518',1001,103000,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,85000,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,121000,,'',0
+'3583',1001,121000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160320 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160320
new file mode 100644
index 00000000..7aeb4078
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160320
@@ -0,0 +1,8 @@
+'3518',200,82900,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64200,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155900,,'',0,14100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,83000,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134600,,'',0
+'3583',1000,134600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160321 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160321
new file mode 100644
index 00000000..76d57314
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160321
@@ -0,0 +1,5 @@
+'3577',201,152100,0,'Fairview - Reverse Route',0
+'3518',1001,103100,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,85100,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,121100,,'',0
+'3583',1001,121100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160322 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160322
new file mode 100644
index 00000000..5d718435
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160322
@@ -0,0 +1,8 @@
+'3518',200,82800,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64100,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155800,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,82900,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134500,,'',0
+'3583',1000,134500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160323 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160323
new file mode 100644
index 00000000..8efc7a6e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160323
@@ -0,0 +1,4 @@
+'3518',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,4,'',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160324 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160324
new file mode 100644
index 00000000..0663ae72
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160324
@@ -0,0 +1 @@
+'3577',200,152200,0,'LVR Express',0,1000,0,'LVR Express',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160325 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160325
new file mode 100644
index 00000000..b7f4bfef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160325
@@ -0,0 +1,4 @@
+'3518',201,81800,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,63100,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154800,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160326 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160326
new file mode 100644
index 00000000..11fd44f3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160326
@@ -0,0 +1,5 @@
+'3518',201,81700,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',200,82200,0,'Fairview -',0
+'3577',201,63000,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,700,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154700,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160327 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160327
new file mode 100644
index 00000000..52a35cb7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160327
@@ -0,0 +1,4 @@
+'3518',200,82400,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63700,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155400,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160328 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160328
new file mode 100644
index 00000000..7c339d85
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160328
@@ -0,0 +1,4 @@
+'3518',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160329 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160329
new file mode 100644
index 00000000..1410b8e6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160329
@@ -0,0 +1,5 @@
+'3577',201,152300,0,'Fairview - Reverse Route',0
+'3518',1001,103200,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,121200,,'',0
+'3583',1001,121200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160330 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160330
new file mode 100644
index 00000000..546d2aa3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160330
@@ -0,0 +1,4 @@
+'3518',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63900,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160332 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160332
new file mode 100644
index 00000000..ff28df23
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160332
@@ -0,0 +1,4 @@
+'3518',200,82600,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63900,,'',0,6400,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155600,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160333 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160333
new file mode 100644
index 00000000..107198ea
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160333
@@ -0,0 +1,5 @@
+'3518',1001,71300,0,'Balfour Exp',0,32000,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,62400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9600,0,'Balfour Exp',0,14300,,'',0,19300,,'',0
+'3579',1001,121300,,'',0
+'3583',1001,121300,,'',0
+'3586',7600,101300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160334 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160334
new file mode 100644
index 00000000..7c339d85
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160334
@@ -0,0 +1,4 @@
+'3518',200,82500,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63800,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155500,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160335 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160335
new file mode 100644
index 00000000..5aea1455
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160335
@@ -0,0 +1,4 @@
+'3518',200,82300,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63600,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155300,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160336 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160336
new file mode 100644
index 00000000..f8a9e19b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160336
@@ -0,0 +1,4 @@
+'3518',201,81900,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,63200,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154900,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160337 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160337
new file mode 100644
index 00000000..15d31055
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160337
@@ -0,0 +1,4 @@
+'3518',201,82000,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,63300,,'',0,2400,,'',0,15500,,'',0,2600,0,'LVR Express',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,155000,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160338 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160338
new file mode 100644
index 00000000..a099ab7a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160338
@@ -0,0 +1,4 @@
+'3518',200,82200,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,9000,0,'LVR Express',0,9400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160339 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160339
new file mode 100644
index 00000000..7e7588fd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160339
@@ -0,0 +1,4 @@
+'3518',200,82200,,'',0,11400,,'',0,11500,,'',0,15400,,'',0,12100,,'',0,11300,,'',0,20100,,'',0,10300,,'',0,7800,,'',0,11300,,'',0
+'3577',200,63500,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10400,,'',0,7100,,'',0,9900,,'',0,9600,,'',0,10500,,'',0,2300,,'',0,9000,0,'LVR Express',0,9300,,'',0,10000,,'',0,19700,,'',0
+'3578',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155200,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160340 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160340
new file mode 100644
index 00000000..89f1ba8a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160340
@@ -0,0 +1,6 @@
+'3518',101,91100,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81200,,'',0,3600,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,4100,,'',0,9500,,'',0
+'3578',101,194100,,'',0,11700,,'',0,15200,,'',0
+'3579',101,72700,0,'LVR Express -',0,31200,,'',0
+'3583',101,72700,0,'LVR Express -',0,31200,,'',0
+'3589',101,194100,,'',0,11700,,'',0,15200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160341 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160341
new file mode 100644
index 00000000..8990d7a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160341
@@ -0,0 +1,7 @@
+'3518',101,91500,,'',0,9600,,'',0,4200,,'',0,9000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,7500,,'',0,11400,,'',0,19000,,'',0
+'3577',101,81800,,'',0,3400,,'',0,500,0,'Hosp Only',0,9000,,'',0,7500,,'',0,11000,0,'Hosp Only',0,2200,,'',0,15400,,'',0,1700,0,'Hosp Only',0,3300,,'',0,14900,0,'Hosp Only',0,5200,,'',0,16300,,'',0,8100,,'',0,5500,,'',0
+'3578',101,194500,,'',0,15700,,'',0,11200,,'',0
+'3579',101,74100,0,'LVR Express -',0,30200,,'',0
+'3583',101,74100,0,'LVR Express -',0,30200,,'',0
+'3589',101,194500,,'',0,15700,,'',0,11200,,'',0,10100,,'',0
+'3577',200,82700,0,'Fairview -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160342 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160342
new file mode 100644
index 00000000..28684865
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160342
@@ -0,0 +1,9 @@
+'3518',201,81400,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,62700,,'',0,2400,,'',0,15500,,'',0,1900,0,'LVR Express',0,600,0,'LVR Express',0,7600,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,8700,0,'Fairview - Reverse Route',0,9500,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',201,154400,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3518',1001,71100,0,'Balfour Exp',0,31700,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,62200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9900,0,'Balfour Exp',0,14000,,'',0,19300,,'',0
+'3579',1001,120800,,'',0
+'3583',1001,120800,,'',0
+'3586',7600,101100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160343 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160343
new file mode 100644
index 00000000..1e23de69
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160343
@@ -0,0 +1 @@
+'3577',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160344 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160344
new file mode 100644
index 00000000..d674c86a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160344
@@ -0,0 +1 @@
+'3577',3601,80300,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160345 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160345
new file mode 100644
index 00000000..1e23de69
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160345
@@ -0,0 +1 @@
+'3577',3601,80200,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160346 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160346
new file mode 100644
index 00000000..249ffb46
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160346
@@ -0,0 +1 @@
+'3577',3601,80100,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160347 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160347
new file mode 100644
index 00000000..5ea98ef9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160347
@@ -0,0 +1,3 @@
+'3518',3100,90600,,'',0,12400,,'',0,18800,,'',0,13900,,'',0,18900,,'',0
+'3577',3100,71600,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,12200,,'',0,7000,,'',0,9500,,'',0
+'3577',3200,81000,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160348 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160348
new file mode 100644
index 00000000..d1829f82
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160348
@@ -0,0 +1,12 @@
+'3518',3100,91200,,'',0,12400,,'',0,18800,,'',0,17900,,'',0,14900,,'',0
+'3577',3100,72200,,'',0,12700,,'',0,15700,,'',0,3200,,'',0,7500,,'',0,11700,,'',0,10800,,'',0,16200,,'',0,3000,,'',0,9500,,'',0
+'3577',3200,81500,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
+'3518',3300,113000,,'',0,32500,,'',0,15900,,'',0
+'3577',3300,83800,,'',0,7200,,'',0,22500,,'',0,28900,,'',0,19500,,'',0,2700,,'',0
+'3518',3400,91700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,10100,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,30000,0,'Kinnaird -',0,2500,0,'Kinnaird -',0
+'3577',3400,65600,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3000,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,3700,0,'Kinnaird -',0,6500,0,'Kinnaird -',0,19700,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,20600,,'',0,5800,,'',0,9800,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,700,,'',0,1800,,'',0,8700,,'',0,1800,,'',0,4400,0,'Kinnaird -',0,2500,0,'Kinnaird -',0,1800,,'',0,5800,,'',0,3100,,'',0,1800,,'',0
+'3577',3601,81300,,'',0,48900,,'',0
+'3585',3800,100100,,'',0,41000,,'',0
+'3518',9801,94200,,'',0,100,,'',0,38300,,'',0,100,,'',0,47700,,'',0,100,,'',0
+'3577',9801,65700,,'',0,100,,'',0,9000,,'',0,100,,'',0,28900,,'',0,100,,'',0,26400,,'',0,100,,'',0,31700,,'',0,100,,'',0,18200,,'',0,100,,'',0
+'3589',9801,192000,,'',0,100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160349 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160349
new file mode 100644
index 00000000..d066da7d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160349
@@ -0,0 +1,4 @@
+'3518',301,82400,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,62700,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162200,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160350 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160350
new file mode 100644
index 00000000..3be39775
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160350
@@ -0,0 +1,11 @@
+'3518',201,81000,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,62500,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3589',201,154000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
+'3518',1001,102400,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,84400,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3579',1001,120400,,'',0
+'3583',1001,120400,,'',0
+'3583',7200,84700,,'',0,57400,,'',0,42100,0,'Nelson',0
+'3584',7401,101900,,'',0
+'3586',7600,100700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160351 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160351
new file mode 100644
index 00000000..eead657e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160351
@@ -0,0 +1,14 @@
+'3518',200,83700,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64600,,'',0,6800,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,14500,,'',0,3000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,160700,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10500,,'',0
+'3518',400,151700,,'',0
+'3577',400,125200,,'',0,16800,,'',0
+'3578',400,151500,,'',0
+'3589',400,151500,,'',0
+'3518',1000,83800,,'',0,37600,,'',0,44500,0,'Nelson Exp',0,37400,,'',0
+'3577',1000,74300,,'',0,10100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17400,,'',0,18000,0,'Nelson Exp',0
+'3579',1000,135400,,'',0
+'3583',1000,135400,,'',0
+'3583',7201,71700,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3586',7601,94000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160352 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160352
new file mode 100644
index 00000000..e2ba0c83
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160352
@@ -0,0 +1,2 @@
+'3518',4300,75600,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,60000,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160353 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160353
new file mode 100644
index 00000000..68024418
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160353
@@ -0,0 +1,2 @@
+'3518',4301,83600,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54600,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160354 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160354
new file mode 100644
index 00000000..fd7f3652
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160354
@@ -0,0 +1,3 @@
+'3518',4300,85800,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,74100,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160355 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160355
new file mode 100644
index 00000000..a36bd44a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160355
@@ -0,0 +1,2 @@
+'3518',4301,83900,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54800,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160356 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160356
new file mode 100644
index 00000000..bfc6cc1a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160356
@@ -0,0 +1,3 @@
+'3518',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160357 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160357
new file mode 100644
index 00000000..caef10e7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160357
@@ -0,0 +1 @@
+'3577',4500,61100,,'',0,3000,,'',0,200,,'',0,88300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160358 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160358
new file mode 100644
index 00000000..5489af7c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160358
@@ -0,0 +1,8 @@
+'3518',201,80900,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',201,62400,,'',0,2400,,'',0,7500,0,'Chahko Mika Mall',0,8000,,'',0,9900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,5700,,'',0,14400,,'',0,2400,,'',0,9000,0,'Fairview - Reverse Route',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3578',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0
+'3589',201,153900,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,15300,,'',0,11100,,'',0
+'3518',1001,102300,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,84300,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3579',1001,120300,,'',0
+'3583',1001,120300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160359 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160359
new file mode 100644
index 00000000..d6ac9530
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160359
@@ -0,0 +1,8 @@
+'3518',200,82100,,'',0,11400,,'',0,11400,,'',0,15500,,'',0,12000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3518',201,82100,4,'',0,11400,4,'',0,11400,4,'',0,15500,4,'',0,12000,4,'',0,11400,4,'',0,20000,4,'',0,10400,4,'',0,7800,4,'',0,11300,4,'',0
+'3577',200,63400,,'',0,2400,,'',0,15500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,9000,0,'LVR Express',0,9200,,'',0,10100,,'',0,19700,,'',0
+'3577',201,63400,4,'',0,2400,4,'',0,15500,4,'',0,2600,4,'',0,7500,4,'',0,2700,4,'',0,10300,4,'',0,7200,4,'',0,9800,4,'',0,9700,4,'',0,10400,4,'',0,2400,4,'',0,9000,4,'',0,9200,4,'',0,10100,4,'',0,19700,4,'',0
+'3578',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3578',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0
+'3589',200,155100,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0,10900,,'',0
+'3589',201,155100,4,'',0,10100,4,'',0,10700,4,'',0,25000,4,'',0,11300,4,'',0,10900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160360 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160360
new file mode 100644
index 00000000..dd783b82
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160360
@@ -0,0 +1,4 @@
+'3518',3101,95400,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,82500,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3585',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160361 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160361
new file mode 100644
index 00000000..270311ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160361
@@ -0,0 +1,4 @@
+'3518',3101,95300,0,'32 Columbia',0,18800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,82400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,5400,0,'32 Columbia',0,15600,0,'32 Columbia',0
+'3577',3201,73100,0,'Columbia - Celgar & Robson',0,68400,,'',0,12500,,'',0,8600,0,'Celgar Only',0
+'3585',3800,100300,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160362 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160362
new file mode 100644
index 00000000..af117dac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160362
@@ -0,0 +1 @@
+'3577',3200,80800,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160363 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160363
new file mode 100644
index 00000000..e2fd0eb4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160363
@@ -0,0 +1 @@
+'3577',3200,80700,,'',0,63200,,'',0,16500,,'',0,4600,,'',0,7300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160364 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160364
new file mode 100644
index 00000000..2d3c5773
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160364
@@ -0,0 +1,3 @@
+'3518',9800,90200,,'',0,34400,,'',0,47800,,'',0
+'3577',9800,61500,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,184200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160365 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160365
new file mode 100644
index 00000000..dee86819
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160365
@@ -0,0 +1,8 @@
+'3518',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,82800,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134400,,'',0
+'3583',1000,134400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160366 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160366
new file mode 100644
index 00000000..ec105402
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160366
@@ -0,0 +1,2 @@
+'3518',4301,81500,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4301,61700,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160367 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160367
new file mode 100644
index 00000000..853b2da6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160367
@@ -0,0 +1,3 @@
+'3518',4300,92300,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,72400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160368 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160368
new file mode 100644
index 00000000..74f0f9bd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160368
@@ -0,0 +1,4 @@
+'3518',301,82500,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',301,62800,,'',0,10200,0,'Rosemont',0,2600,,'',0,5200,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,162300,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160369 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160369
new file mode 100644
index 00000000..1a9769a9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160369
@@ -0,0 +1,3 @@
+'3518',4300,92500,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,72600,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,21200,,'',0,16800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
+'3589',4300,214800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160370 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160370
new file mode 100644
index 00000000..5b6505b8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160370
@@ -0,0 +1,2 @@
+'3518',4301,81300,,'',0,14300,,'',0,20100,,'',0,35000,,'',0,14400,0,'Trail',0,16600,0,'Trail',0
+'3577',4301,61500,0,'Trail',0,9400,0,'Trail',0,4400,0,'Trail',0,15900,0,'Trail',0,19200,,'',0,21100,,'',0,12800,,'',0,16800,,'',0,2700,0,'Trail',0,17300,,'',0,12800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160373 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160373
new file mode 100644
index 00000000..6c8a0d47
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160373
@@ -0,0 +1,2 @@
+'3518',4300,75800,0,'Fruitvale',0,18100,,'',0,20100,,'',0,31000,,'',0,18400,,'',0,16600,,'',0,12700,,'',0
+'3577',4300,60200,0,'Fruitvale',0,5400,0,'Fruitvale',0,8400,0,'Fruitvale',0,11900,0,'Fruitvale',0,18900,,'',0,25200,,'',0,12800,,'',0,12800,,'',0,6700,,'',0,13300,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160376 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160376
new file mode 100644
index 00000000..6807e462
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160376
@@ -0,0 +1,51 @@
+'3518',101,84200,4,'',0,7600,4,'',0,3600,,'',0,6000,4,'',0,4200,4,'',0,9000,4,'',0,16000,4,'',0,11500,4,'',0,11500,4,'',0,7500,4,'',0,9400,,'',0,2000,4,'',0,19000,4,'',0
+'3577',101,64500,4,'',0,10100,0,'Uphill - No Hosp',0,5400,4,'',0,2100,4,'',0,1400,,'',0,1500,0,'Hosp Only',0,500,4,'',0,4500,4,'',0,3000,,'',0,2000,4,'',0,5500,,'',0,2000,4,'',0,10000,0,'Hosp Only',0,1000,4,'',0,200,,'',0,2000,4,'',0,15400,4,'',0,700,0,'Hosp Only',0,1000,4,'',0,1300,,'',0,6000,4,'',0,9900,0,'Hosp Only',0,200,0,'Uphill - No Hosp',0,800,4,'',0,600,4,'',0,2600,,'',0,6000,4,'',0,10300,,'',0,2000,4,'',0,2100,,'',0,6000,4,'',0,3500,,'',0,6000,4,'',0
+'3578',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0
+'3579',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
+'3583',101,72400,0,'LVR Express -',0,2000,4,'',0,28200,,'',0,2000,4,'',0
+'3589',101,152000,0,'Uphill - No Hosp',0,1400,4,'',0,41400,4,'',0,15700,4,'',0,11200,4,'',0,10100,4,'',0
+'3518',200,84000,4,'',0,11400,4,'',0,15600,4,'',0,11300,4,'',0,12200,4,'',0,11200,4,'',0,20200,4,'',0,14200,4,'',0,3800,4,'',0,11300,4,'',0
+'3577',200,64800,4,'',0,6900,4,'',0,2600,4,'',0,9000,4,'',0,2500,4,'',0,7500,4,'',0,6700,4,'',0,10500,4,'',0,3000,4,'',0,10000,4,'',0,9500,4,'',0,10600,4,'',0,2200,4,'',0,7400,4,'',0,1000,4,'',0,10000,4,'',0,9900,4,'',0,19700,4,'',0
+'3577',201,82000,0,'LVR Express',0,600,0,'LVR Express',0
+'3578',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0
+'3589',200,161000,4,'',0,10100,4,'',0,10700,4,'',0,21000,4,'',0,11300,4,'',0,10400,4,'',0
+'3518',301,81700,,'',0,3000,,'',0,17800,,'',0,9000,,'',0,12000,,'',0,11500,,'',0,15500,,'',0,3500,,'',0,30400,,'',0
+'3577',300,74200,4,'',0,17800,4,'',0,3800,4,'',0,20100,4,'',0,19600,4,'',0,10400,4,'',0,36900,4,'',0
+'3577',301,72200,0,'Rosemont',0,1400,0,'Selkirk Coll',0,6400,0,'Rosemont',0,3700,0,'Rosemont',0,6300,0,'Rosemont',0,3800,0,'Rosemont',0,6700,0,'Rosemont',0,3400,0,'Rosemont',0,10000,0,'Rosemont',0,10100,,'',0,9500,0,'Rosemont',0,10400,0,'Rosemont',0,9400,0,'Rosemont',0,11200,0,'Rosemont',0,16300,0,'Rosemont',0
+'3578',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0
+'3589',301,161500,0,'Rosemont',0,10100,0,'Rosemont',0,20100,,'',0,11700,,'',0,11200,,'',0,10100,,'',0
+'3518',400,152200,4,'',0
+'3518',401,140300,,'',0
+'3577',400,125700,4,'',0,16800,4,'',0
+'3577',401,110500,,'',0,20600,,'',0,12500,,'',0
+'3578',400,152000,4,'',0
+'3589',400,152000,4,'',0
+'3518',1000,84100,4,'',0,37600,4,'',0,48300,4,'',0,33600,4,'',0
+'3518',1001,71000,0,'Balfour Exp',0,31100,,'',0,50100,,'',0,32400,,'',0
+'3577',1000,74500,4,'',0,10200,4,'',0,19000,4,'',0,50000,4,'',0,16300,4,'',0,15800,4,'',0,17300,4,'',0,17900,4,'',0
+'3577',1001,62100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,12600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3579',1000,135700,4,'',0
+'3579',1001,120100,,'',0
+'3583',1000,135700,4,'',0
+'3583',1001,120100,,'',0
+'3577',1400,74500,,'',0,10100,4,'',0,71300,,'',0,9700,4,'',0
+'3579',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
+'3583',1400,104900,,'',0,9700,4,'',0,58900,,'',0,9700,4,'',0
+'3579',1500,84400,,'',0,1400,4,'',0,54800,,'',0,1400,4,'',0,29500,,'',0,1400,4,'',0
+'3518',2000,80500,4,'',0,50700,4,'',0,64300,4,'',0
+'3518',2001,52300,,'',0,49200,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0
+'3577',2000,72100,4,'',0,22700,4,'',0,37000,4,'',0,53400,4,'',0,15700,4,'',0
+'3577',2001,44500,,'',0,26200,,'',0,32100,,'',0,53100,0,'Slocan Vly -',0,16600,0,'Slocan Vly -',0
+'3579',2000,71700,4,'',0,12200,4,'',0
+'3579',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2000,71700,4,'',0,12200,4,'',0
+'3583',2001,62500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',7200,84500,,'',0,57400,,'',0,42100,0,'Nelson',0
+'3583',7201,71900,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3584',7401,101900,,'',0
+'3586',7600,100500,,'',0
+'3586',7601,94300,,'',0
+'3518',9900,101900,4,'',0,38400,4,'',0,43900,4,'',0
+'3518',9901,84600,,'',0,38400,,'',0,47700,,'',0
+'3577',9900,73100,4,'',0,9100,4,'',0,11400,4,'',0,18100,4,'',0,22200,4,'',0,31300,4,'',0,9800,4,'',0,8900,4,'',0
+'3577',9901,55800,,'',0,9200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160378 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160378
new file mode 100644
index 00000000..2dcc44f9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160378
@@ -0,0 +1,22 @@
+'3518',200,83400,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3518',201,81300,,'',0,11400,,'',0,11400,,'',0,11500,,'',0,16000,,'',0,11400,,'',0,20000,,'',0,10400,,'',0,7800,,'',0,11300,,'',0
+'3577',200,71100,,'',0,2600,,'',0,11500,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3577',201,72700,4,'',0,17900,,'',0,2700,,'',0,10300,,'',0,7200,,'',0,9800,,'',0,9700,,'',0,10400,,'',0,2400,,'',0,18200,,'',0,10100,,'',0,19700,,'',0
+'3578',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3578',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3589',200,160400,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',201,154300,,'',0,10100,,'',0,10700,,'',0,25000,,'',0,11300,,'',0
+'3518',1000,83500,,'',0,37600,,'',0,81900,,'',0
+'3518',1001,102700,,'',0,50100,,'',0,32400,,'',0
+'3577',1000,84100,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0
+'3577',1001,84700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,10000,0,'Balfour Exp',0,13900,,'',0,19300,,'',0
+'3579',1000,135100,,'',0
+'3579',1001,120700,,'',0
+'3583',1000,135100,,'',0
+'3583',1001,120700,,'',0
+'3583',7200,85000,4,'',0,57400,4,'',0,42100,4,'',0
+'3583',7201,71500,0,'Salmo',0,52400,,'',0,47100,,'',0
+'3584',7400,160500,,'',0
+'3584',7401,102000,4,'',0
+'3586',7600,101100,,'',0
+'3586',7601,93500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160379 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160379
new file mode 100644
index 00000000..2c9ef07e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160379
@@ -0,0 +1,2 @@
+'3518',401,141200,4,'',0
+'3577',401,111400,4,'',0,20600,4,'',0,12500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160381 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160381
new file mode 100644
index 00000000..c170da5f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160381
@@ -0,0 +1,2 @@
+'3518',4101,85500,,'',0,38700,,'',0,30600,,'',0
+'3577',4101,75300,,'',0,8700,,'',0,36000,,'',0,24000,,'',0,21900,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160382 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160382
new file mode 100644
index 00000000..7bc3667d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160382
@@ -0,0 +1,6 @@
+'3518',4300,91500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,10700,,'',0,18400,,'',0,12600,,'',0,16700,,'',0
+'3577',4300,71600,0,'Fruitvale',0,4200,0,'Waneta / Walmart -',0,7700,0,'Fruitvale',0,7900,0,'Waneta / Walmart -',0,11000,,'',0,11200,0,'Waneta / Walmart -',0,10000,,'',0,16800,,'',0,1800,0,'Waneta / Walmart -',0,11000,,'',0,2700,,'',0,17300,,'',0,16800,,'',0
+'3589',4300,213800,,'',0
+'3518',4800,162200,0,'Red Mtn - Ski Bus',0
+'3576',4800,162200,0,'Red Mtn - Ski Bus',0
+'3577',4800,162200,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160383 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160383
new file mode 100644
index 00000000..e14b4653
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160383
@@ -0,0 +1,6 @@
+'3518',9800,85800,,'',0,38400,,'',0,47800,,'',0
+'3518',9801,100400,,'',0,34500,,'',0,47700,,'',0
+'3577',9800,61100,,'',0,9100,,'',0,25100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3577',9801,71900,,'',0,9100,,'',0,29000,,'',0,22600,,'',0,31800,,'',0,18200,,'',0
+'3589',9800,183800,,'',0
+'3589',9801,194200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160384 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160384
new file mode 100644
index 00000000..7f0aaab7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160384
@@ -0,0 +1,3 @@
+'3585',3800,95900,,'',0,45000,,'',0
+'3518',9901,92400,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,63600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160385 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160385
new file mode 100644
index 00000000..64c4dd7e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160385
@@ -0,0 +1 @@
+'3585',3800,85400,,'',0,45000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160386 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160386
new file mode 100644
index 00000000..78cb20f1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160386
@@ -0,0 +1,2 @@
+'3518',3201,100800,,'',0,14800,,'',0,36500,,'',0
+'3577',3201,75300,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160387 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160387
new file mode 100644
index 00000000..5037a4ad
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160387
@@ -0,0 +1,2 @@
+'3518',3200,101700,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3577',3200,70500,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160388 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160388
new file mode 100644
index 00000000..b9ddbc6f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160388
@@ -0,0 +1,2 @@
+'3577',3200,164000,,'',0
+'3577',3201,74500,0,'Columbia - Celgar & Robson',0,89500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160390 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160390
new file mode 100644
index 00000000..708791e6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160390
@@ -0,0 +1 @@
+'3577',3601,80500,,'',0,44900,,'',0,30400,0,'Selkirk Coll',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160391 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160391
new file mode 100644
index 00000000..726cf88d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160391
@@ -0,0 +1,5 @@
+'3577',201,152000,0,'Fairview - Reverse Route',0
+'3518',1001,102900,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,84900,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,120900,,'',0
+'3583',1001,120900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160392 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160392
new file mode 100644
index 00000000..d55aec1c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160392
@@ -0,0 +1,8 @@
+'3518',200,83000,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64300,,'',0,6400,,'',0,11400,0,'Fairview -',0,2700,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,160000,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,83100,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,74000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134700,,'',0
+'3583',1000,134700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160393 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160393
new file mode 100644
index 00000000..aa6ca103
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160393
@@ -0,0 +1,2 @@
+'3518',3200,101500,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3577',3200,70300,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160394 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160394
new file mode 100644
index 00000000..7235de09
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160394
@@ -0,0 +1,3 @@
+'3518',9801,100100,,'',0,34400,,'',0,47800,,'',0
+'3577',9801,71600,,'',0,9100,,'',0,25000,,'',0,26500,,'',0,31800,,'',0,18300,,'',0
+'3589',9801,193900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160395 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160395
new file mode 100644
index 00000000..dee86819
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160395
@@ -0,0 +1,8 @@
+'3518',200,82700,,'',0,11400,,'',0,11600,,'',0,15300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,64000,,'',0,6400,,'',0,11500,0,'Fairview -',0,2600,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,155700,,'',0,10100,,'',0,14700,,'',0,21000,,'',0,11300,,'',0,10900,,'',0
+'3518',1000,82800,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134400,,'',0
+'3583',1000,134400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160396 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160396
new file mode 100644
index 00000000..96e6ec80
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160396
@@ -0,0 +1,5 @@
+'3577',201,152200,0,'Fairview - Reverse Route',0
+'3518',1001,103200,,'',0,50100,,'',0,32400,,'',0
+'3577',1001,85200,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,23900,,'',0,19300,,'',0
+'3579',1001,121200,,'',0
+'3583',1001,121200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160397 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160397
new file mode 100644
index 00000000..4394f160
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160397
@@ -0,0 +1,4 @@
+'3518',1000,82700,,'',0,37600,,'',0,81900,,'',0
+'3577',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0
+'3579',1000,134300,,'',0
+'3583',1000,134300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160398 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160398
new file mode 100644
index 00000000..a22eb6ca
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160398
@@ -0,0 +1,4 @@
+'3518',1001,104800,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,19300,,'',0
+'3579',1001,122800,,'',0
+'3583',1001,122800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160399 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160399
new file mode 100644
index 00000000..3e5a5917
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160399
@@ -0,0 +1,5 @@
+'3518',1001,72400,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123000,,'',0
+'3583',1001,123000,,'',0
+'3586',7600,102500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160400 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160400
new file mode 100644
index 00000000..506c6e5b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160400
@@ -0,0 +1,5 @@
+'3518',1001,72700,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123300,,'',0
+'3583',1001,123300,,'',0
+'3586',7600,102800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160401 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160401
new file mode 100644
index 00000000..ec21026b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160401
@@ -0,0 +1,4 @@
+'3518',1000,80600,,'',0,33600,,'',0,86000,,'',0
+'3577',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
+'3579',1000,132200,,'',0
+'3583',1000,132200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160402 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160402
new file mode 100644
index 00000000..989707e3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160402
@@ -0,0 +1,5 @@
+'3518',1001,73300,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,64400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123800,,'',0
+'3583',1001,123800,,'',0
+'3586',7600,103400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160403 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160403
new file mode 100644
index 00000000..06ef35b2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160403
@@ -0,0 +1,5 @@
+'3518',1001,73400,0,'Balfour Exp',0,32500,,'',0,54100,,'',0,32300,,'',0
+'3577',1001,64500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123900,,'',0
+'3583',1001,123900,,'',0
+'3586',7600,103400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160404 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160404
new file mode 100644
index 00000000..9071ddcd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160404
@@ -0,0 +1,5 @@
+'3518',1001,73500,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,64600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124100,,'',0
+'3583',1001,124100,,'',0
+'3586',7600,103600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160405 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160405
new file mode 100644
index 00000000..e6b9b45c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160405
@@ -0,0 +1,5 @@
+'3518',1001,73600,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124200,,'',0
+'3583',1001,124200,,'',0
+'3586',7600,103700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160406 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160406
new file mode 100644
index 00000000..82e43eca
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160406
@@ -0,0 +1,5 @@
+'3518',1001,73700,0,'Balfour Exp',0,36600,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,64800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124300,,'',0
+'3583',1001,124300,,'',0
+'3586',7600,103800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160407 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160407
new file mode 100644
index 00000000..6001b3d2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160407
@@ -0,0 +1,8 @@
+'3518',1000,75900,,'',0,37600,,'',0,82000,,'',0
+'3518',1001,110400,,'',0,50100,,'',0,32300,,'',0
+'3577',1000,70800,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0
+'3577',1001,92400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1000,131500,,'',0
+'3579',1001,124400,,'',0
+'3583',1000,131500,,'',0
+'3583',1001,124400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160408 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160408
new file mode 100644
index 00000000..4c2f5377
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160408
@@ -0,0 +1,5 @@
+'3518',1001,73900,0,'Balfour Exp',0,36800,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18300,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124700,,'',0
+'3583',1001,124700,,'',0
+'3586',7600,104000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160409 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160409
new file mode 100644
index 00000000..9b1a75ac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160409
@@ -0,0 +1,5 @@
+'3518',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,125100,,'',0
+'3583',1001,125100,,'',0
+'3586',7600,104300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160410 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160410
new file mode 100644
index 00000000..9b1a75ac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160410
@@ -0,0 +1,5 @@
+'3518',1001,74200,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,125100,,'',0
+'3583',1001,125100,,'',0
+'3586',7600,104300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160411 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160411
new file mode 100644
index 00000000..4cc17478
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160411
@@ -0,0 +1,5 @@
+'3518',1001,74300,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65400,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,125200,,'',0
+'3583',1001,125200,,'',0
+'3586',7600,104400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160412 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160412
new file mode 100644
index 00000000..fb0676fa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160412
@@ -0,0 +1,5 @@
+'3518',1001,74500,0,'Balfour Exp',0,37000,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18500,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,125500,,'',0
+'3583',1001,125500,,'',0
+'3586',7600,104600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160413 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160413
new file mode 100644
index 00000000..8acd62c3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160413
@@ -0,0 +1,18 @@
+'3518',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3518',1001,74500,4,'',0,37100,4,'',0,50100,4,'',0,32300,4,'',0
+'3577',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3577',1001,65600,4,'',0,9400,4,'',0,18600,4,'',0,50100,4,'',0,32000,4,'',0,18000,4,'',0,19300,4,'',0
+'3579',1000,130500,,'',0
+'3579',1001,125600,4,'',0
+'3583',1000,130500,,'',0
+'3583',1001,125600,4,'',0
+'3581',7600,130500,,'',0
+'3581',7601,125500,4,'',0
+'3582',7600,180000,,'',0
+'3582',7601,175500,4,'',0
+'3586',7600,104600,,'',0
+'3586',7601,90500,,'',0
+'3587',7600,75500,,'',0
+'3587',7601,74500,4,'',0
+'3588',7600,94000,,'',0,86000,,'',0
+'3588',7601,93500,4,'',0,82000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160414 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160414
new file mode 100644
index 00000000..486e6c4a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160414
@@ -0,0 +1,5 @@
+'3518',1000,74900,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3577',1000,65800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3579',1000,130500,,'',0
+'3583',1000,130500,,'',0
+'3586',7601,90500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160415 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160415
new file mode 100644
index 00000000..b9584b04
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160415
@@ -0,0 +1,5 @@
+'3518',1000,75000,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3577',1000,65900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3579',1000,130600,,'',0
+'3583',1000,130600,,'',0
+'3586',7601,90600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160416 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160416
new file mode 100644
index 00000000..0b9b333d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160416
@@ -0,0 +1,5 @@
+'3518',1000,75300,,'',0,37600,,'',0,49900,0,'Nelson Exp',0,32100,,'',0
+'3577',1000,70200,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18900,0,'Nelson Exp',0
+'3579',1000,130900,,'',0
+'3583',1000,130900,,'',0
+'3586',7601,90800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160417 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160417
new file mode 100644
index 00000000..a1731e2e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160417
@@ -0,0 +1,5 @@
+'3518',1000,75500,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3577',1000,70400,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3579',1000,131100,,'',0
+'3583',1000,131100,,'',0
+'3586',7601,90900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160418 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160418
new file mode 100644
index 00000000..bc89d303
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160418
@@ -0,0 +1,5 @@
+'3518',1000,75700,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3577',1000,70600,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3579',1000,131300,,'',0
+'3583',1000,131300,,'',0
+'3586',7601,91000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160419 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160419
new file mode 100644
index 00000000..96891e02
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160419
@@ -0,0 +1,5 @@
+'3518',1000,75800,,'',0,37600,,'',0,49800,0,'Nelson Exp',0,32200,,'',0
+'3577',1000,70700,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18800,0,'Nelson Exp',0
+'3579',1000,131400,,'',0
+'3583',1000,131400,,'',0
+'3586',7601,91100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160420 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160420
new file mode 100644
index 00000000..b1796155
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160420
@@ -0,0 +1,5 @@
+'3518',1000,80500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,71400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,132100,,'',0
+'3583',1000,132100,,'',0
+'3586',7601,91600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160421 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160421
new file mode 100644
index 00000000..591f9d3a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160421
@@ -0,0 +1,5 @@
+'3518',1000,80900,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,71800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,132500,,'',0
+'3583',1000,132500,,'',0
+'3586',7601,92000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160422 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160422
new file mode 100644
index 00000000..77d03a26
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160422
@@ -0,0 +1,5 @@
+'3518',1000,81100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,132700,,'',0
+'3583',1000,132700,,'',0
+'3586',7601,92200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160423 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160423
new file mode 100644
index 00000000..48ee5053
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160423
@@ -0,0 +1,4 @@
+'3518',1000,81300,,'',0,33600,,'',0,86000,,'',0
+'3577',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3579',1000,132900,,'',0
+'3583',1000,132900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160424 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160424
new file mode 100644
index 00000000..96d7ab98
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160424
@@ -0,0 +1,4 @@
+'3518',1000,81400,,'',0,33600,,'',0,86000,,'',0
+'3577',1000,72300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3579',1000,133000,,'',0
+'3583',1000,133000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160425 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160425
new file mode 100644
index 00000000..dd668aae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160425
@@ -0,0 +1,5 @@
+'3518',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,133100,,'',0
+'3583',1000,133100,,'',0
+'3586',7601,92500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160426 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160426
new file mode 100644
index 00000000..dd668aae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160426
@@ -0,0 +1,5 @@
+'3518',1000,81500,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,133100,,'',0
+'3583',1000,133100,,'',0
+'3586',7601,92500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160427 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160427
new file mode 100644
index 00000000..d7446352
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160427
@@ -0,0 +1,5 @@
+'3518',1000,81600,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,133200,,'',0
+'3583',1000,133200,,'',0
+'3586',7601,92600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160428 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160428
new file mode 100644
index 00000000..ea268af8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160428
@@ -0,0 +1,5 @@
+'3518',1000,81800,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,133400,,'',0
+'3583',1000,133400,,'',0
+'3586',7601,92700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160429 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160429
new file mode 100644
index 00000000..f45f42e2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160429
@@ -0,0 +1,5 @@
+'3518',1000,81900,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36400,,'',0
+'3577',1000,72800,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0,18600,0,'Nelson Exp',0
+'3579',1000,133500,,'',0
+'3583',1000,133500,,'',0
+'3586',7601,92800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160430 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160430
new file mode 100644
index 00000000..9d580331
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160430
@@ -0,0 +1,5 @@
+'3518',1000,82000,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72900,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,133600,,'',0
+'3583',1000,133600,,'',0
+'3586',7601,92800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160431 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160431
new file mode 100644
index 00000000..34318b35
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160431
@@ -0,0 +1,5 @@
+'3518',1000,82100,,'',0,33600,,'',0,49600,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,73000,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,133700,,'',0
+'3583',1000,133700,,'',0
+'3586',7601,92900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160432 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160432
new file mode 100644
index 00000000..caf8c264
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160432
@@ -0,0 +1,5 @@
+'3518',1000,82400,,'',0,37600,,'',0,45500,0,'Nelson Exp',0,36400,,'',0
+'3577',1000,73300,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18600,0,'Nelson Exp',0
+'3579',1000,134000,,'',0
+'3583',1000,134000,,'',0
+'3586',7601,93100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160433 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160433
new file mode 100644
index 00000000..c3b6e430
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160433
@@ -0,0 +1,5 @@
+'3518',1000,82500,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3577',1000,73400,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3579',1000,134100,,'',0
+'3583',1000,134100,,'',0
+'3586',7601,93100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160434 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160434
new file mode 100644
index 00000000..e2d612a3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160434
@@ -0,0 +1,5 @@
+'3518',1000,82600,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3577',1000,73500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3579',1000,134200,,'',0
+'3583',1000,134200,,'',0
+'3586',7601,93200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160435 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160435
new file mode 100644
index 00000000..f621f372
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160435
@@ -0,0 +1,5 @@
+'3518',1001,71400,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,62500,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3579',1001,121500,,'',0
+'3583',1001,121500,,'',0
+'3586',7600,101400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160436 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160436
new file mode 100644
index 00000000..ea61de00
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160436
@@ -0,0 +1,5 @@
+'3518',1001,71500,0,'Balfour Exp',0,32200,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13700,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3579',1001,121700,,'',0
+'3583',1001,121700,,'',0
+'3586',7600,101500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160437 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160437
new file mode 100644
index 00000000..3270c34d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160437
@@ -0,0 +1,5 @@
+'3518',1001,71800,0,'Balfour Exp',0,32300,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,62900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18200,,'',0,15300,,'',0
+'3579',1001,122100,,'',0
+'3583',1001,122100,,'',0
+'3586',7600,101800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160438 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160438
new file mode 100644
index 00000000..0dce64b1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160438
@@ -0,0 +1,4 @@
+'3518',1001,104800,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,90800,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,122800,,'',0
+'3583',1001,122800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160439 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160439
new file mode 100644
index 00000000..2d9d0c0d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160439
@@ -0,0 +1,4 @@
+'3518',1001,104900,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,90900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,122900,,'',0
+'3583',1001,122900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160440 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160440
new file mode 100644
index 00000000..a44f8d84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160440
@@ -0,0 +1,4 @@
+'3518',1001,104900,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,90900,,'',0,50100,,'',0,22200,4,'',0,9800,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,122900,,'',0
+'3583',1001,122900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160441 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160441
new file mode 100644
index 00000000..dea13fb2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160441
@@ -0,0 +1,5 @@
+'3518',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123100,,'',0
+'3583',1001,123100,,'',0
+'3586',7600,102500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160442 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160442
new file mode 100644
index 00000000..ad26075d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160442
@@ -0,0 +1,5 @@
+'3518',1001,72500,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123100,,'',0
+'3583',1001,123100,,'',0
+'3586',7600,102600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160443 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160443
new file mode 100644
index 00000000..026be093
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160443
@@ -0,0 +1,5 @@
+'3518',1001,72800,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123300,,'',0
+'3583',1001,123300,,'',0
+'3586',7600,102900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160444 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160444
new file mode 100644
index 00000000..4c2f7abf
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160444
@@ -0,0 +1,5 @@
+'3518',1001,72900,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123400,,'',0
+'3583',1001,123400,,'',0
+'3586',7600,102900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160445 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160445
new file mode 100644
index 00000000..81b7e9da
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160445
@@ -0,0 +1,5 @@
+'3518',1001,72900,0,'Balfour Exp',0,32600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,64000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18100,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123500,,'',0
+'3583',1001,123500,,'',0
+'3586',7600,103000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160446 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160446
new file mode 100644
index 00000000..8e6a3baf
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160446
@@ -0,0 +1,5 @@
+'3518',1001,73200,0,'Balfour Exp',0,32500,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,64300,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123700,,'',0
+'3583',1001,123700,,'',0
+'3586',7600,103300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160447 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160447
new file mode 100644
index 00000000..b9ef8b6d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160447
@@ -0,0 +1,5 @@
+'3518',1001,73600,0,'Balfour Exp',0,36500,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,64700,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18000,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124100,,'',0
+'3583',1001,124100,,'',0
+'3586',7600,103600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160448 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160448
new file mode 100644
index 00000000..fe8c2f67
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160448
@@ -0,0 +1,5 @@
+'3518',1001,73800,0,'Balfour Exp',0,36700,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,64900,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18200,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124500,,'',0
+'3583',1001,124500,,'',0
+'3586',7600,103900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160449 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160449
new file mode 100644
index 00000000..d5de639a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160449
@@ -0,0 +1,5 @@
+'3518',1001,74000,0,'Balfour Exp',0,36900,,'',0,50100,,'',0,32300,,'',0
+'3577',1001,65100,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,18400,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,124900,,'',0
+'3583',1001,124900,,'',0
+'3586',7600,104100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160450 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160450
new file mode 100644
index 00000000..5a1ab832
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160450
@@ -0,0 +1,5 @@
+'3518',1000,75100,,'',0,37600,,'',0,50000,0,'Nelson Exp',0,32000,,'',0
+'3577',1000,70000,,'',0,5700,,'',0,19000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,19000,0,'Nelson Exp',0
+'3579',1000,130700,,'',0
+'3583',1000,130700,,'',0
+'3586',7601,90600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160455 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160455
new file mode 100644
index 00000000..95063611
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160455
@@ -0,0 +1,5 @@
+'3518',1000,80000,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3577',1000,70900,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,131600,,'',0
+'3583',1000,131600,,'',0
+'3586',7601,91200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160456 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160456
new file mode 100644
index 00000000..29c01d97
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160456
@@ -0,0 +1,5 @@
+'3518',1000,80100,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3577',1000,71000,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,131700,,'',0
+'3583',1000,131700,,'',0
+'3586',7601,91300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160457 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160457
new file mode 100644
index 00000000..ab3309af
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160457
@@ -0,0 +1,5 @@
+'3518',1000,80300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,32300,,'',0
+'3577',1000,71200,,'',0,9700,,'',0,15000,,'',0,50000,,'',0,36100,,'',0,13900,,'',0,18700,0,'Nelson Exp',0
+'3579',1000,131900,,'',0
+'3583',1000,131900,,'',0
+'3586',7601,91500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160458 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160458
new file mode 100644
index 00000000..ec21026b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160458
@@ -0,0 +1,4 @@
+'3518',1000,80600,,'',0,33600,,'',0,86000,,'',0
+'3577',1000,71500,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0
+'3579',1000,132200,,'',0
+'3583',1000,132200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160459 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160459
new file mode 100644
index 00000000..920483ae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160459
@@ -0,0 +1,5 @@
+'3518',1000,80800,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,71700,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,132400,,'',0
+'3583',1000,132400,,'',0
+'3586',7601,91900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160460 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160460
new file mode 100644
index 00000000..e4f5ed9e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160460
@@ -0,0 +1,5 @@
+'3518',1000,81300,,'',0,33600,,'',0,49700,0,'Nelson Exp',0,36300,,'',0
+'3577',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,32100,,'',0,17900,,'',0,14700,0,'Nelson Exp',0
+'3579',1000,132900,,'',0
+'3583',1000,132900,,'',0
+'3586',7601,92400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160461 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160461
new file mode 100644
index 00000000..48ee5053
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160461
@@ -0,0 +1,4 @@
+'3518',1000,81300,,'',0,33600,,'',0,86000,,'',0
+'3577',1000,72200,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17900,,'',0
+'3579',1000,132900,,'',0
+'3583',1000,132900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160462 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160462
new file mode 100644
index 00000000..a1575570
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160462
@@ -0,0 +1,8 @@
+'3577',1400,75100,,'',0
+'3518',2001,52800,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,45000,,'',0,26200,,'',0,32100,,'',0,57200,0,'Slocan Vly -',0,12400,0,'Slocan Vly -',0
+'3579',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,63000,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,161000,,'',0
+'3518',9901,85100,,'',0,38400,,'',0,47700,,'',0
+'3577',9901,60300,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160463 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160463
new file mode 100644
index 00000000..6c51a04f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160463
@@ -0,0 +1,7 @@
+'3518',2001,53000,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,45200,,'',0,26200,,'',0,32100,,'',0,69500,0,'Slocan Vly -',0
+'3579',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,63200,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,161200,,'',0
+'3518',9901,85300,,'',0,38400,,'',0,47700,,'',0
+'3577',9901,60500,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160464 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160464
new file mode 100644
index 00000000..7ced1203
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160464
@@ -0,0 +1,7 @@
+'3518',2001,53100,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,45300,,'',0,26200,,'',0,32100,,'',0,57600,0,'Slocan Vly -',0,11900,0,'Slocan Vly -',0
+'3579',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,63300,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,161300,,'',0
+'3518',9901,85400,,'',0,38400,,'',0,47600,,'',0
+'3577',9901,60600,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160465 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160465
new file mode 100644
index 00000000..051cd74c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160465
@@ -0,0 +1,7 @@
+'3518',2001,53400,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,45600,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,63600,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,161600,,'',0
+'3518',9901,85700,,'',0,38400,,'',0,47600,,'',0
+'3577',9901,60900,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160466 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160466
new file mode 100644
index 00000000..2146c7f5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160466
@@ -0,0 +1,7 @@
+'3518',2001,54100,,'',0,49900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,50300,,'',0,22200,,'',0,32800,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3583',2001,64300,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3584',7400,162600,,'',0
+'3518',9901,90400,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,61600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160467 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160467
new file mode 100644
index 00000000..e56e45ad
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160467
@@ -0,0 +1,7 @@
+'3518',2001,54400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,50500,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3583',2001,64500,0,'Playmor Jct',0,16200,0,'Playmor Jct',0
+'3584',7400,162900,,'',0
+'3518',9901,90600,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,61800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160468 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160468
new file mode 100644
index 00000000..d0776f68
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160468
@@ -0,0 +1,15 @@
+'3518',2000,73800,,'',0,50700,,'',0,47900,4,'',0,20400,0,'Nelson',0
+'3518',2001,54500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2000,65900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3577',2001,50600,,'',0,22200,,'',0,33000,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
+'3579',2001,64600,4,'',0,16200,4,'',0
+'3583',2000,65000,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2001,64600,4,'',0,16200,4,'',0
+'3585',3800,94500,,'',0,41000,,'',0
+'3584',7400,163000,,'',0
+'3584',7401,95500,,'',0
+'3518',9900,95700,,'',0,38400,,'',0,47900,,'',0
+'3518',9901,90700,,'',0,34400,,'',0,47600,,'',0
+'3577',9900,70900,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
+'3577',9901,61900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160469 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160469
new file mode 100644
index 00000000..a10de714
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160469
@@ -0,0 +1,3 @@
+'3585',3800,94600,,'',0,41000,,'',0
+'3518',9901,90800,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160470 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160470
new file mode 100644
index 00000000..3a18ca19
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160470
@@ -0,0 +1,3 @@
+'3585',3800,94700,,'',0,41000,,'',0
+'3518',9901,90900,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160471 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160471
new file mode 100644
index 00000000..4c90f00b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160471
@@ -0,0 +1,3 @@
+'3585',3800,94800,,'',0,41000,,'',0
+'3518',9901,91000,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62200,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160472 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160472
new file mode 100644
index 00000000..7c7220bb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160472
@@ -0,0 +1,3 @@
+'3585',3800,94900,,'',0,41000,,'',0
+'3518',9901,91100,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62300,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160473 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160473
new file mode 100644
index 00000000..e09a93fa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160473
@@ -0,0 +1,3 @@
+'3585',3800,95000,,'',0,45000,,'',0
+'3518',9901,91200,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62400,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160474 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160474
new file mode 100644
index 00000000..ca2b73df
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160474
@@ -0,0 +1,3 @@
+'3585',3800,95100,,'',0,45000,,'',0
+'3518',9901,91300,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62500,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160475 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160475
new file mode 100644
index 00000000..dbc63642
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160475
@@ -0,0 +1,3 @@
+'3585',3800,95200,,'',0,45000,,'',0
+'3518',9901,91400,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160476 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160476
new file mode 100644
index 00000000..dbc63642
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160476
@@ -0,0 +1,3 @@
+'3585',3800,95200,,'',0,45000,,'',0
+'3518',9901,91400,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62600,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160477 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160477
new file mode 100644
index 00000000..c1f7c1d5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160477
@@ -0,0 +1,3 @@
+'3585',3800,95300,,'',0,45000,,'',0
+'3518',9901,91500,,'',0,34400,,'',0,47600,,'',0
+'3577',9901,62700,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160478 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160478
new file mode 100644
index 00000000..40c75e19
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160478
@@ -0,0 +1,3 @@
+'3585',3800,95400,,'',0,45000,,'',0
+'3518',9901,91600,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160479 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160479
new file mode 100644
index 00000000..40c75e19
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160479
@@ -0,0 +1,3 @@
+'3585',3800,95400,,'',0,45000,,'',0
+'3518',9901,91600,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,62800,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160480 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160480
new file mode 100644
index 00000000..d55ad528
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160480
@@ -0,0 +1,3 @@
+'3585',3800,95500,,'',0,45000,,'',0
+'3518',9901,91700,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,62900,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160481 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160481
new file mode 100644
index 00000000..06124167
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160481
@@ -0,0 +1,3 @@
+'3585',3800,95500,,'',0,45000,,'',0
+'3518',9901,91800,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160482 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160482
new file mode 100644
index 00000000..06124167
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160482
@@ -0,0 +1,3 @@
+'3585',3800,95500,,'',0,45000,,'',0
+'3518',9901,91800,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,63000,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160483 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160483
new file mode 100644
index 00000000..25c7a491
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160483
@@ -0,0 +1,3 @@
+'3585',3800,95600,,'',0,45000,,'',0
+'3518',9901,91900,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160484 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160484
new file mode 100644
index 00000000..25c7a491
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160484
@@ -0,0 +1,3 @@
+'3585',3800,95600,,'',0,45000,,'',0
+'3518',9901,91900,,'',0,38400,,'',0,43600,,'',0
+'3577',9901,63100,,'',0,9200,,'',0,11400,,'',0,17900,,'',0,22200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160485 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160485
new file mode 100644
index 00000000..b66b3f50
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160485
@@ -0,0 +1,2 @@
+'3518',9900,94400,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65600,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160486 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160486
new file mode 100644
index 00000000..abe8e414
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160486
@@ -0,0 +1,2 @@
+'3518',9900,94500,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65700,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160487 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160487
new file mode 100644
index 00000000..df8f9102
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160487
@@ -0,0 +1,2 @@
+'3518',9900,94600,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160488 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160488
new file mode 100644
index 00000000..df8f9102
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160488
@@ -0,0 +1,2 @@
+'3518',9900,94600,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65800,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160489 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160489
new file mode 100644
index 00000000..82b1c3b1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160489
@@ -0,0 +1,2 @@
+'3518',9900,94700,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,65900,,'',0,9100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160490 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160490
new file mode 100644
index 00000000..87dbcaef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160490
@@ -0,0 +1,2 @@
+'3518',9900,94900,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,70100,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160491 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160491
new file mode 100644
index 00000000..e1ebc7aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160491
@@ -0,0 +1,2 @@
+'3518',9900,95000,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160492 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160492
new file mode 100644
index 00000000..e1ebc7aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160492
@@ -0,0 +1,2 @@
+'3518',9900,95000,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,70200,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160493 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160493
new file mode 100644
index 00000000..d46f3be3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160493
@@ -0,0 +1,2 @@
+'3518',9900,95100,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,70300,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160494 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160494
new file mode 100644
index 00000000..89ff4041
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160494
@@ -0,0 +1,2 @@
+'3518',9900,95600,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,70800,,'',0,5100,,'',0,15400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160495 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160495
new file mode 100644
index 00000000..8f880fb0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160495
@@ -0,0 +1,7 @@
+'3518',2000,73900,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,70000,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65100,0,'Nelson',0,16200,0,'Nelson',0
+'3584',7401,95600,,'',0
+'3518',9900,95800,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,71000,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160497 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160497
new file mode 100644
index 00000000..f3518dc5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160497
@@ -0,0 +1,7 @@
+'3518',2000,74000,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,70100,,'',0,22200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65200,0,'Nelson',0,16200,0,'Nelson',0
+'3584',7401,95800,,'',0
+'3518',9900,95900,,'',0,38400,,'',0,47900,,'',0
+'3577',9900,71100,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160498 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160498
new file mode 100644
index 00000000..fe2b3db7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160498
@@ -0,0 +1,7 @@
+'3518',2000,74100,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,70300,,'',0,22100,,'',0,33000,,'',0,58000,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65300,0,'Nelson',0,16200,0,'Nelson',0
+'3584',7401,100000,,'',0
+'3518',9900,100100,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,71300,,'',0,9100,,'',0,11400,,'',0,14100,,'',0,26200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160500 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160500
new file mode 100644
index 00000000..5547dd60
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160500
@@ -0,0 +1,7 @@
+'3518',2000,74500,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,70500,,'',0,22300,,'',0,33000,,'',0,57800,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65700,0,'Nelson',0,16200,0,'Nelson',0
+'3584',7401,100200,,'',0
+'3518',9900,100300,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160501 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160501
new file mode 100644
index 00000000..b87c344f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160501
@@ -0,0 +1,7 @@
+'3518',2000,74600,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,70500,,'',0,22400,,'',0,33000,,'',0,57700,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65800,0,'Nelson',0,16200,0,'Nelson',0
+'3584',7401,100300,,'',0
+'3518',9900,100300,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,71500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160502 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160502
new file mode 100644
index 00000000..f0506ed0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160502
@@ -0,0 +1,4 @@
+'3577',2000,70700,,'',0,113100,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,100500,,'',0
+'3518',9900,100500,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,71700,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160503 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160503
new file mode 100644
index 00000000..e43664dc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160503
@@ -0,0 +1,7 @@
+'3518',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3577',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3584',7401,100900,,'',0
+'3518',9900,100800,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160504 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160504
new file mode 100644
index 00000000..e43664dc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160504
@@ -0,0 +1,7 @@
+'3518',2000,75400,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3577',2000,71000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,11700,0,'Nelson',0
+'3579',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,70600,0,'Nelson',0,12200,0,'Nelson',0
+'3584',7401,100900,,'',0
+'3518',9900,100800,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,72000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31100,,'',0,10000,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160505 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160505
new file mode 100644
index 00000000..fdddccbb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160505
@@ -0,0 +1,7 @@
+'3518',2000,75900,,'',0,54700,,'',0,64300,0,'Nelson',0
+'3577',2000,71500,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3579',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,71100,0,'Nelson',0,12200,0,'Nelson',0
+'3584',7401,101500,,'',0
+'3518',9900,101300,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,72500,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160506 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160506
new file mode 100644
index 00000000..c98f453c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160506
@@ -0,0 +1,7 @@
+'3518',2000,80000,,'',0,50700,,'',0,64300,0,'Nelson',0
+'3577',2000,71600,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3579',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,71200,0,'Nelson',0,12200,0,'Nelson',0
+'3584',7401,101700,,'',0
+'3518',9900,101400,,'',0,34400,,'',0,47900,,'',0
+'3577',9900,72600,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31200,,'',0,9900,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160507 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160507
new file mode 100644
index 00000000..9cde8c3b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160507
@@ -0,0 +1,2 @@
+'3583',7200,80500,,'',0,53400,,'',0,47100,0,'Nelson',0
+'3583',7201,75000,4,'',0,57400,4,'',0,43100,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160508 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160508
new file mode 100644
index 00000000..7d0d413d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160508
@@ -0,0 +1,2 @@
+'3518',2000,64500,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60600,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160509 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160509
new file mode 100644
index 00000000..058b9d71
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160509
@@ -0,0 +1,2 @@
+'3518',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160510 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160510
new file mode 100644
index 00000000..17db4866
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160510
@@ -0,0 +1,4 @@
+'3518',2000,64400,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3518',2001,63400,4,'',0,50700,4,'',0,48400,4,'',0,20300,4,'',0
+'3577',2000,60500,,'',0,22200,,'',0,33000,,'',0,58400,0,'Nelson',0,11700,0,'Nelson',0
+'3577',2001,55500,4,'',0,26200,4,'',0,33000,4,'',0,58400,4,'',0,11700,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160511 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160511
new file mode 100644
index 00000000..6bb6fec3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160511
@@ -0,0 +1,8 @@
+'3577',1400,74900,,'',0
+'3518',2001,52700,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,44900,,'',0,26200,,'',0,32100,,'',0,57100,0,'Slocan Vly -',0,12500,0,'Slocan Vly -',0
+'3579',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,62900,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,160800,,'',0
+'3518',9901,85000,,'',0,38400,,'',0,47700,,'',0
+'3577',9901,60200,,'',0,5200,,'',0,15400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160514 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160514
new file mode 100644
index 00000000..c6d60613
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160514
@@ -0,0 +1,2 @@
+'3518',2000,71100,,'',0,50700,,'',0
+'3577',2000,63200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160515 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160515
new file mode 100644
index 00000000..8de3ea93
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160515
@@ -0,0 +1,8 @@
+'3518',200,83100,,'',0,11400,,'',0,15600,,'',0,11300,,'',0,12200,,'',0,11200,,'',0,20200,,'',0,10200,,'',0,7800,,'',0,11300,,'',0
+'3577',200,70800,,'',0,14100,,'',0,7500,,'',0,2700,,'',0,10500,,'',0,7000,,'',0,10000,,'',0,9500,,'',0,10600,,'',0,2200,,'',0,18400,,'',0,9900,,'',0,19700,,'',0
+'3578',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3589',200,160100,,'',0,10100,,'',0,10700,,'',0,21000,,'',0,11300,,'',0
+'3518',1000,83200,,'',0,37600,,'',0,45100,0,'Nelson Exp',0,36800,,'',0
+'3577',1000,74100,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18200,0,'Nelson Exp',0
+'3579',1000,134800,,'',0
+'3583',1000,134800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160516 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160516
new file mode 100644
index 00000000..23f96639
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160516
@@ -0,0 +1,5 @@
+'3518',1000,82700,,'',0,37600,,'',0,45400,0,'Nelson Exp',0,36500,,'',0
+'3577',1000,73600,,'',0,9700,,'',0,19000,,'',0,50000,,'',0,12300,,'',0,19800,,'',0,17800,,'',0,18500,0,'Nelson Exp',0
+'3579',1000,134300,,'',0
+'3583',1000,134300,,'',0
+'3586',7601,93300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160518 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160518
new file mode 100644
index 00000000..1dbe04a4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160518
@@ -0,0 +1,3 @@
+'3518',2001,54700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,50800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,163100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160519 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160519
new file mode 100644
index 00000000..2723da70
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160519
@@ -0,0 +1,3 @@
+'3518',2001,55200,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,51300,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,163400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160520 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160520
new file mode 100644
index 00000000..a9b57241
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160520
@@ -0,0 +1,3 @@
+'3518',2001,55400,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,51500,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,163500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160521 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160521
new file mode 100644
index 00000000..81e3a80c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160521
@@ -0,0 +1,3 @@
+'3518',2001,55500,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,51600,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,163600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160522 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160522
new file mode 100644
index 00000000..f2492e47
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160522
@@ -0,0 +1,3 @@
+'3518',2001,55600,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,51700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,163700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160523 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160523
new file mode 100644
index 00000000..419567ce
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160523
@@ -0,0 +1,3 @@
+'3518',2001,55700,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,51800,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,163800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160524 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160524
new file mode 100644
index 00000000..61de738e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160524
@@ -0,0 +1,3 @@
+'3518',2001,55900,,'',0,50000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,52000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,164000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160525 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160525
new file mode 100644
index 00000000..30396af2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160525
@@ -0,0 +1,3 @@
+'3518',2001,60600,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,52700,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,164700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160526 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160526
new file mode 100644
index 00000000..2a5827d6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160526
@@ -0,0 +1,3 @@
+'3518',2001,60900,,'',0,50000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,53000,,'',0,22200,,'',0,37000,,'',0,53700,0,'Slocan Vly -',0,15700,0,'Slocan Vly -',0
+'3584',7400,165000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160527 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160527
new file mode 100644
index 00000000..508a2d8a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160527
@@ -0,0 +1,3 @@
+'3518',2001,60900,,'',0
+'3577',2001,53000,,'',0,22200,,'',0,37000,,'',0
+'3584',7400,165000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160528 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160528
new file mode 100644
index 00000000..80d342ff
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160528
@@ -0,0 +1,3 @@
+'3518',2001,61000,,'',0
+'3577',2001,53100,,'',0,22200,,'',0,37000,,'',0
+'3584',7400,165100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160529 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160529
new file mode 100644
index 00000000..63830642
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160529
@@ -0,0 +1,3 @@
+'3518',2001,61100,,'',0
+'3577',2001,53200,,'',0,22200,,'',0,37000,,'',0
+'3584',7400,165200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160530 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160530
new file mode 100644
index 00000000..be91d692
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160530
@@ -0,0 +1,3 @@
+'3518',2001,61600,,'',0
+'3577',2001,53700,,'',0,22200,,'',0,37000,,'',0
+'3584',7400,165800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160531 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160531
new file mode 100644
index 00000000..75b83067
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160531
@@ -0,0 +1,3 @@
+'3518',2001,61700,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,53800,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,165800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160532 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160532
new file mode 100644
index 00000000..2767389b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160532
@@ -0,0 +1,3 @@
+'3518',2001,61800,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,53900,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160533 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160533
new file mode 100644
index 00000000..26ee303f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160533
@@ -0,0 +1,3 @@
+'3518',2001,62100,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,54200,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160534 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160534
new file mode 100644
index 00000000..6934d0ed
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160534
@@ -0,0 +1,3 @@
+'3518',2001,62300,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,54400,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160535 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160535
new file mode 100644
index 00000000..67a5c268
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160535
@@ -0,0 +1,3 @@
+'3518',2001,62400,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,54500,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160536 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160536
new file mode 100644
index 00000000..046632b8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160536
@@ -0,0 +1,3 @@
+'3518',2001,62600,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,54700,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160537 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160537
new file mode 100644
index 00000000..f2b3bc6e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160537
@@ -0,0 +1,3 @@
+'3518',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160538 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160538
new file mode 100644
index 00000000..08678630
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160538
@@ -0,0 +1,3 @@
+'3518',2001,63000,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,55100,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,170900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160539 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160539
new file mode 100644
index 00000000..405bd413
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160539
@@ -0,0 +1,3 @@
+'3518',2001,63200,,'',0,50700,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,55300,,'',0,26200,,'',0,33000,,'',0,58400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3584',7400,171000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160540 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160540
new file mode 100644
index 00000000..7bf75d4b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160540
@@ -0,0 +1,3 @@
+'3518',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,91600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160541 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160541
new file mode 100644
index 00000000..7bf75d4b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160541
@@ -0,0 +1,3 @@
+'3518',2000,64700,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,91600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160542 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160542
new file mode 100644
index 00000000..f0e0b90a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160542
@@ -0,0 +1,3 @@
+'3518',2000,64800,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,60900,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,91700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160543 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160543
new file mode 100644
index 00000000..384c6015
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160543
@@ -0,0 +1,3 @@
+'3518',2000,65000,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61100,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,91900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160544 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160544
new file mode 100644
index 00000000..3d308e50
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160544
@@ -0,0 +1,3 @@
+'3518',2000,65200,,'',0,50700,,'',0,48400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61300,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160545 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160545
new file mode 100644
index 00000000..38d29c2c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160545
@@ -0,0 +1,3 @@
+'3518',2000,65400,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61500,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160546 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160546
new file mode 100644
index 00000000..da5f4a91
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160546
@@ -0,0 +1,3 @@
+'3518',2000,164700,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,175300,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160547 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160547
new file mode 100644
index 00000000..fc94f056
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160547
@@ -0,0 +1,3 @@
+'3518',2000,65600,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61700,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160548 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160548
new file mode 100644
index 00000000..f254d4dc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160548
@@ -0,0 +1,3 @@
+'3518',2000,65700,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61800,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160549 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160549
new file mode 100644
index 00000000..b763767b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160549
@@ -0,0 +1,3 @@
+'3518',2000,65800,,'',0,54700,,'',0,44500,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,61900,,'',0,22200,,'',0,37000,,'',0,54500,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160550 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160550
new file mode 100644
index 00000000..2c2a2dad
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160550
@@ -0,0 +1,3 @@
+'3518',2000,65900,,'',0,54700,,'',0,44400,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,62000,,'',0,22200,,'',0,37000,,'',0,54400,0,'Nelson',0,15700,0,'Nelson',0
+'3584',7401,92700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160551 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160551
new file mode 100644
index 00000000..daffbd01
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160551
@@ -0,0 +1,3 @@
+'3518',2000,71500,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,63600,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,93800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160552 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160552
new file mode 100644
index 00000000..c5a668df
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160552
@@ -0,0 +1,3 @@
+'3518',2000,71600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,63700,,'',0,22200,,'',0,37000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,93800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160553 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160553
new file mode 100644
index 00000000..346f8829
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160553
@@ -0,0 +1,3 @@
+'3518',2000,71700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,63800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,93900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160554 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160554
new file mode 100644
index 00000000..a17bad18
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160554
@@ -0,0 +1,3 @@
+'3518',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160555 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160555
new file mode 100644
index 00000000..a17bad18
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160555
@@ -0,0 +1,3 @@
+'3518',2000,72400,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64500,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160556 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160556
new file mode 100644
index 00000000..1db64822
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160556
@@ -0,0 +1,3 @@
+'3518',2000,72600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160557 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160557
new file mode 100644
index 00000000..efb1a6b0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160557
@@ -0,0 +1,3 @@
+'3518',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160558 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160558
new file mode 100644
index 00000000..efb1a6b0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160558
@@ -0,0 +1,3 @@
+'3518',2000,72700,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64800,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160559 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160559
new file mode 100644
index 00000000..3b866979
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160559
@@ -0,0 +1,3 @@
+'3518',2000,72900,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,65000,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,95000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160560 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160560
new file mode 100644
index 00000000..aebcb495
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160560
@@ -0,0 +1,3 @@
+'3518',2000,73100,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,65200,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,95100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160561 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160561
new file mode 100644
index 00000000..7f0ea9fd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160561
@@ -0,0 +1,4 @@
+'3518',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3585',3800,93400,,'',0,41000,,'',0
+'3584',7401,95400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160562 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160562
new file mode 100644
index 00000000..377efed6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160562
@@ -0,0 +1,4 @@
+'3518',2000,73600,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,65700,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3585',3800,93500,,'',0,41000,,'',0
+'3584',7401,95400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160563 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160563
new file mode 100644
index 00000000..c2f71b8e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160563
@@ -0,0 +1,2 @@
+'3518',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160564 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160564
new file mode 100644
index 00000000..c2f71b8e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160564
@@ -0,0 +1,2 @@
+'3518',2001,111000,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170000,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160565 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160565
new file mode 100644
index 00000000..a171f268
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160565
@@ -0,0 +1,2 @@
+'3518',2001,111100,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170100,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160566 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160566
new file mode 100644
index 00000000..0761b2bb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160566
@@ -0,0 +1,2 @@
+'3518',2001,111300,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
+'3577',2001,170300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160567 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160567
new file mode 100644
index 00000000..afe87cc0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160567
@@ -0,0 +1,2 @@
+'3518',2001,111400,0,'Slocan Vly -',0,44400,0,'Slocan Vly -',0,24300,0,'Slocan Vly -',0
+'3577',2001,170400,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160568 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160568
new file mode 100644
index 00000000..dd8e71ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160568
@@ -0,0 +1,2 @@
+'3518',2001,111600,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170600,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160569 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160569
new file mode 100644
index 00000000..e814a49c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160569
@@ -0,0 +1,2 @@
+'3518',2001,111800,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170800,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160570 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160570
new file mode 100644
index 00000000..eb09008c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160570
@@ -0,0 +1,2 @@
+'3518',2001,111900,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,170900,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160571 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160571
new file mode 100644
index 00000000..c6d60613
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160571
@@ -0,0 +1,2 @@
+'3518',2000,71100,,'',0,50700,,'',0
+'3577',2000,63200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160572 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160572
new file mode 100644
index 00000000..9d520c23
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160572
@@ -0,0 +1,2 @@
+'3518',2000,65900,,'',0,54700,,'',0
+'3577',2000,62000,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160573 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160573
new file mode 100644
index 00000000..562705af
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160573
@@ -0,0 +1,2 @@
+'3518',2000,70000,,'',0,50700,,'',0
+'3577',2000,62100,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160574 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160574
new file mode 100644
index 00000000..8e3bcfd9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160574
@@ -0,0 +1,2 @@
+'3518',2000,70100,,'',0,50700,,'',0
+'3577',2000,62200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160575 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160575
new file mode 100644
index 00000000..8e3bcfd9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160575
@@ -0,0 +1,2 @@
+'3518',2000,70100,,'',0,50700,,'',0
+'3577',2000,62200,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160576 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160576
new file mode 100644
index 00000000..ece3d795
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160576
@@ -0,0 +1,2 @@
+'3518',2000,70700,,'',0,50700,,'',0
+'3577',2000,62800,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160577 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160577
new file mode 100644
index 00000000..8cfbbe7c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160577
@@ -0,0 +1,2 @@
+'3518',2000,70800,,'',0,50700,,'',0
+'3577',2000,62900,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160580 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160580
new file mode 100644
index 00000000..7e463855
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160580
@@ -0,0 +1,2 @@
+'3518',3101,100300,0,'32 Columbia',0,14800,0,'32 Columbia',0,19700,0,'Downtown',0,16800,0,'32 Columbia',0
+'3577',3101,83400,0,'Downtown',0,10100,0,'32 Columbia',0,8800,0,'Downtown',0,3500,0,'Downtown',0,10100,0,'32 Columbia',0,16400,0,'Downtown',0,12200,0,'Downtown',0,7000,0,'Downtown',0,9500,0,'Downtown',0,9400,0,'32 Columbia',0,11600,0,'32 Columbia',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160581 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160581
new file mode 100644
index 00000000..8913745e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160581
@@ -0,0 +1,2 @@
+'3518',3200,101600,0,'31 N Castlegar',0,18800,0,'31 N Castlegar',0,32500,0,'31 N Castlegar',0
+'3577',3200,70400,0,'31 N Castlegar',0,9700,,'',0,14700,0,'31 N Castlegar',0,26400,0,'31 N Castlegar',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160582 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160582
new file mode 100644
index 00000000..a2055d99
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160582
@@ -0,0 +1,2 @@
+'3518',3201,100900,,'',0,14800,,'',0,36500,,'',0
+'3577',3201,75400,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160583 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160583
new file mode 100644
index 00000000..9a8407ae
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160583
@@ -0,0 +1,2 @@
+'3518',3201,101200,,'',0,18800,,'',0,32500,,'',0
+'3577',3201,75700,0,'Columbia - Celgar & Robson',0,18700,,'',0,26400,,'',0,22100,,'',0,12500,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160584 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160584
new file mode 100644
index 00000000..b1d52aad
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160584
@@ -0,0 +1 @@
+'3589',5301,85700,,'',0,57600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160585 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160585
new file mode 100644
index 00000000..0ebf063e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160585
@@ -0,0 +1 @@
+'3589',5300,95800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160586 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160586
new file mode 100644
index 00000000..e4c7ed76
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160586
@@ -0,0 +1,5 @@
+'3518',4301,170800,0,'Trail',0,12600,0,'Trail',0
+'3577',4301,63000,0,'Trail',0,9600,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
+'3518',4801,81500,0,'Red Mtn - Ski Bus',0
+'3576',4801,81500,0,'Red Mtn - Ski Bus',0
+'3577',4801,81500,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160587 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160587
new file mode 100644
index 00000000..b6e86097
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160587
@@ -0,0 +1,4 @@
+'3577',4500,60200,,'',0,3200,,'',0
+'3518',9800,85300,,'',0,38400,,'',0,47800,,'',0
+'3577',9800,60600,,'',0,5100,,'',0,29100,,'',0,26500,,'',0,30900,,'',0,18800,,'',0
+'3589',9800,183300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160588 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160588
new file mode 100644
index 00000000..ccf3cbd4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160588
@@ -0,0 +1 @@
+'3577',4300,63300,0,'Fruitvale',0,7700,0,'Fruitvale',0,11900,0,'Fruitvale',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160589 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160589
new file mode 100644
index 00000000..89402cb5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160589
@@ -0,0 +1,2 @@
+'3518',4301,170400,0,'Trail',0,12600,0,'Trail',0
+'3577',4301,62700,0,'Trail',0,9500,0,'Trail',0,8300,0,'Trail',0,12000,0,'Trail',0,72600,0,'Trail',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160590 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160590
new file mode 100644
index 00000000..ae375459
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160590
@@ -0,0 +1,2 @@
+'3518',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54700,,'',0,9900,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160591 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160591
new file mode 100644
index 00000000..14679ecd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160591
@@ -0,0 +1,3 @@
+'3518',4300,85600,,'',0,20100,,'',0,24300,0,'Waneta / Walmart -',0,10700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,73900,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160592 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160592
new file mode 100644
index 00000000..4bcb6b1a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160592
@@ -0,0 +1,2 @@
+'3518',4301,83800,,'',0,18300,,'',0,20100,,'',0,12000,,'',0,19000,,'',0
+'3577',4301,54800,,'',0,9800,,'',0,9200,,'',0,8300,,'',0,11500,,'',0,19300,,'',0,2900,,'',0,18200,,'',0,10400,,'',0,1200,,'',0,5100,,'',0,13000,,'',0,19800,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160593 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160593
new file mode 100644
index 00000000..bfc6cc1a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160593
@@ -0,0 +1,3 @@
+'3518',4300,85500,,'',0,20100,,'',0,20300,0,'Waneta / Walmart -',0,14700,,'',0,14400,,'',0,16800,,'',0,12700,,'',0
+'3577',4300,73800,0,'Waneta / Walmart -',0,11700,0,'Waneta / Walmart -',0,14900,,'',0,11300,0,'Waneta / Walmart -',0,9900,,'',0,12900,,'',0,5700,0,'Waneta / Walmart -',0,11000,,'',0,2800,,'',0,17500,,'',0,12700,,'',0
+'3589',4300,212000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160594 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160594
new file mode 100644
index 00000000..f83c2d94
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160594
@@ -0,0 +1,8 @@
+'3518',3301,112200,4,'',0,32500,4,'',0,15900,4,'',0
+'3577',3301,83000,4,'',0,7200,4,'',0,22500,4,'',0,28900,4,'',0,22200,4,'',0
+'3518',9800,92900,4,'',0,38400,4,'',0,43800,4,'',0
+'3518',9801,93400,,'',0,38400,,'',0,43800,,'',0
+'3577',9800,64200,4,'',0,9300,4,'',0,28900,4,'',0,22500,4,'',0,30900,4,'',0,18800,4,'',0
+'3577',9801,64900,,'',0,9100,,'',0,29000,,'',0,22500,,'',0,35800,,'',0,14300,,'',0
+'3589',9800,190900,4,'',0
+'3589',9801,191200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160611 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160611
new file mode 100644
index 00000000..fc77ac9e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160611
@@ -0,0 +1,10 @@
+'3577',1400,84500,,'',0,81000,,'',0
+'3579',1400,114500,,'',0,68600,,'',0
+'3583',1400,114500,,'',0,68600,,'',0
+'3518',2000,80400,,'',0,50700,,'',0,64300,0,'Nelson',0
+'3577',2000,72000,,'',0,22700,,'',0,37000,,'',0,53400,0,'Nelson',0,15700,0,'Nelson',0
+'3579',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,71600,0,'Nelson',0,12200,0,'Nelson',0
+'3584',7401,101800,,'',0
+'3518',9900,101800,,'',0,38400,,'',0,43900,,'',0
+'3577',9900,73000,,'',0,9100,,'',0,11400,,'',0,18100,,'',0,22200,,'',0,31300,,'',0,9800,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160613 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160613
new file mode 100644
index 00000000..78aa52d1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160613
@@ -0,0 +1,2 @@
+'3587',5201,75500,,'',0,95000,,'',0
+'3584',7401,85000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160614 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160614
new file mode 100644
index 00000000..1fab8eda
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160614
@@ -0,0 +1,5 @@
+'3518',1001,103500,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,85500,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3579',1001,121500,,'',0
+'3583',1001,121500,,'',0
+'3586',7600,101400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160615 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160615
new file mode 100644
index 00000000..044c6a88
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160615
@@ -0,0 +1,5 @@
+'3518',1001,71500,0,'Balfour Exp',0,32100,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,62600,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,13600,,'',0,50100,,'',0,26200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,14200,,'',0,19300,,'',0
+'3579',1001,121600,,'',0
+'3583',1001,121600,,'',0
+'3586',7600,101500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160616 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160616
new file mode 100644
index 00000000..d7bd3e2b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160616
@@ -0,0 +1,5 @@
+'3518',1001,71700,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,62800,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9700,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
+'3579',1001,122100,,'',0
+'3583',1001,122100,,'',0
+'3586',7600,101800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160617 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160617
new file mode 100644
index 00000000..04746446
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160617
@@ -0,0 +1,5 @@
+'3518',1001,71900,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36400,,'',0
+'3577',1001,63000,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18100,,'',0,15300,,'',0
+'3579',1001,122300,,'',0
+'3583',1001,122300,,'',0
+'3586',7600,102000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160618 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160618
new file mode 100644
index 00000000..cf0fa271
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_160618
@@ -0,0 +1,5 @@
+'3518',1001,72100,0,'Balfour Exp',0,32400,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,63200,0,'Balfour Exp',0,9400,0,'Balfour Exp',0,17900,,'',0,50100,,'',0,22200,0,'6 Mile Only',0,9800,0,'Balfour Exp',0,18000,,'',0,15300,,'',0
+'3579',1001,122500,,'',0
+'3583',1001,122500,,'',0
+'3586',7600,102100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560000
new file mode 100644
index 00000000..e47272be
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560000
@@ -0,0 +1,2 @@
+'3518',3101,134900,4,'',0
+'3577',3101,83500,4,'',0,18900,4,'',0,3500,4,'',0,26500,4,'',0,12200,4,'',0,7000,4,'',0,9500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560003 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560003
new file mode 100644
index 00000000..406102d2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560003
@@ -0,0 +1 @@
+'3585',3800,92000,,'',0,41000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560005
new file mode 100644
index 00000000..906cf05c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560005
@@ -0,0 +1,4 @@
+'3518',400,151400,,'',0
+'3577',400,124900,,'',0,16800,,'',0
+'3578',400,151200,,'',0
+'3589',400,151200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560007
new file mode 100644
index 00000000..eff21f9b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560007
@@ -0,0 +1,5 @@
+'3518',1001,105600,,'',0,50100,,'',0,36300,,'',0
+'3577',1001,91600,,'',0,50100,,'',0,32000,0,'Balfour Exp',0,18000,,'',0,19300,,'',0
+'3579',1001,123600,,'',0
+'3583',1001,123600,,'',0
+'3586',7600,103200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560008
new file mode 100644
index 00000000..274c785d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560008
@@ -0,0 +1,3 @@
+'3577',1400,161100,,'',0
+'3579',1400,110100,,'',0,64600,,'',0
+'3583',1400,110100,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560009
new file mode 100644
index 00000000..ad2b02c8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560009
@@ -0,0 +1,3 @@
+'3577',1400,80700,,'',0,81000,,'',0
+'3579',1400,110700,,'',0,64600,,'',0
+'3583',1400,110700,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560010
new file mode 100644
index 00000000..e3098cff
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560010
@@ -0,0 +1,3 @@
+'3577',1400,81200,,'',0,81000,,'',0
+'3579',1400,111200,,'',0,64600,,'',0
+'3583',1400,111200,,'',0,64600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560011
new file mode 100644
index 00000000..1203cc42
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560011
@@ -0,0 +1,3 @@
+'3577',1400,81500,,'',0,81000,,'',0
+'3579',1400,111500,,'',0,68600,,'',0
+'3583',1400,111500,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560012
new file mode 100644
index 00000000..b327ed61
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560012
@@ -0,0 +1,3 @@
+'3577',1400,81800,,'',0,81000,,'',0
+'3579',1400,111800,,'',0,68600,,'',0
+'3583',1400,111800,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560013
new file mode 100644
index 00000000..6b19261d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560013
@@ -0,0 +1,3 @@
+'3577',1400,82400,,'',0,81000,,'',0
+'3579',1400,112400,,'',0,68600,,'',0
+'3583',1400,112400,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560014
new file mode 100644
index 00000000..8c9221c2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560014
@@ -0,0 +1,3 @@
+'3577',1400,83200,,'',0,81000,,'',0
+'3579',1400,113200,,'',0,68600,,'',0
+'3583',1400,113200,,'',0,68600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560015
new file mode 100644
index 00000000..07cdff55
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560015
@@ -0,0 +1,3 @@
+'3579',1500,85000,,'',0,56200,,'',0,30900,,'',0
+'3583',7200,83800,,'',0,57400,,'',0
+'3583',7201,125000,,'',0,47100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560017
new file mode 100644
index 00000000..5b6c8d84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560017
@@ -0,0 +1,3 @@
+'3518',2000,72800,,'',0,50700,,'',0,47900,0,'Playmor Jct',0,20400,0,'Nelson',0
+'3577',2000,64900,,'',0,26200,,'',0,33000,,'',0,57900,0,'Nelson',0,11700,0,'Nelson',0
+'3584',7401,94900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560021
new file mode 100644
index 00000000..b744f6ba
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560021
@@ -0,0 +1,12 @@
+'3589',5700,90000,,'',0,5500,4,'',0,19000,,'',0
+'3588',5801,63500,,'',0,21000,4,'',0,100500,,'',0,20500,4,'',0
+'3581',7600,134000,4,'',0
+'3581',7601,122000,0,'Balfour Only',0
+'3582',7600,183500,4,'',0
+'3582',7601,172000,0,'Balfour Only',0
+'3586',7600,112100,4,'',0
+'3586',7601,83000,,'',0
+'3587',7600,83000,4,'',0
+'3587',7601,71000,0,'Balfour Only',0
+'3588',7600,101500,4,'',0,82000,4,'',0
+'3588',7601,90000,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560022
new file mode 100644
index 00000000..4d3fc712
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560022
@@ -0,0 +1,2 @@
+'3589',5700,91000,,'',0,24500,4,'',0
+'3588',5801,64500,,'',0,125500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560023
new file mode 100644
index 00000000..44aae2ed
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560023
@@ -0,0 +1 @@
+'3589',5700,92500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560024
new file mode 100644
index 00000000..2e7eb077
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560024
@@ -0,0 +1 @@
+'3589',5700,94500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560025
new file mode 100644
index 00000000..98800d97
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560025
@@ -0,0 +1 @@
+'3589',5700,95000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560026
new file mode 100644
index 00000000..d928dcd0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560026
@@ -0,0 +1 @@
+'3589',5700,92000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560027
new file mode 100644
index 00000000..2806f790
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560027
@@ -0,0 +1 @@
+'3584',7400,160600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560034
new file mode 100644
index 00000000..d21cfcce
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560034
@@ -0,0 +1,2 @@
+'3518',2000,70400,,'',0,50700,,'',0
+'3577',2000,62500,,'',0,22200,,'',0,37000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560035
new file mode 100644
index 00000000..ef79d29f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560035
@@ -0,0 +1,2 @@
+'3518',2001,112300,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0,20300,0,'Slocan Vly -',0
+'3577',2001,171300,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560036
new file mode 100644
index 00000000..c10b9d52
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560036
@@ -0,0 +1,5 @@
+'3581',7601,123500,0,'Balfour Only',0
+'3582',7601,173500,0,'Balfour Only',0
+'3586',7601,84500,,'',0
+'3587',7601,72500,0,'Balfour Only',0
+'3588',7601,91500,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560037
new file mode 100644
index 00000000..ff4fbdd8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560037
@@ -0,0 +1,5 @@
+'3581',7600,132500,,'',0
+'3582',7600,182000,,'',0
+'3586',7600,110600,,'',0
+'3587',7600,81500,,'',0
+'3588',7600,100000,,'',0,82000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560038
new file mode 100644
index 00000000..37e21821
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560038
@@ -0,0 +1,2 @@
+'3589',5300,92500,,'',0,60000,,'',0
+'3589',5301,92000,4,'',0,60000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560039
new file mode 100644
index 00000000..9af7afd8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560039
@@ -0,0 +1,7 @@
+'3518',2001,53300,,'',0,49200,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,45500,,'',0,26200,,'',0,32100,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3583',2001,63500,0,'Playmor Jct',0,12200,0,'Playmor Jct',0
+'3584',7400,161500,,'',0
+'3518',9901,85600,,'',0,38400,,'',0,47600,,'',0
+'3577',9901,60800,,'',0,9200,,'',0,11400,,'',0,13900,,'',0,26200,,'',0,30800,,'',0,10600,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560041
new file mode 100644
index 00000000..27a62b3a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560041
@@ -0,0 +1,2 @@
+'3518',2001,103000,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2001,104300,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560042
new file mode 100644
index 00000000..5a967cd8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560042
@@ -0,0 +1,4 @@
+'3518',2000,74900,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3577',2000,93200,,'',0,37000,,'',0
+'3579',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
+'3583',2000,70100,0,'Nelson',0,12200,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560043
new file mode 100644
index 00000000..51535731
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560043
@@ -0,0 +1,6 @@
+'3518',2000,74200,,'',0,50700,,'',0,68300,0,'Nelson',0
+'3518',2001,103500,0,'Slocan Vly -',0,48400,0,'Slocan Vly -',0
+'3577',2000,92500,,'',0,33000,,'',0
+'3577',2001,104900,,'',0,57700,0,'Slocan Vly -',0,11700,0,'Slocan Vly -',0
+'3579',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
+'3583',2000,65400,0,'Nelson',0,16200,0,'Nelson',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560046
new file mode 100644
index 00000000..924aafce
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560046
@@ -0,0 +1 @@
+'3583',7201,131200,,'',0,43100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560047
new file mode 100644
index 00000000..547da80f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560047
@@ -0,0 +1 @@
+'3583',7200,81500,,'',0,53400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560048
new file mode 100644
index 00000000..a4f73e81
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560048
@@ -0,0 +1 @@
+'3588',5801,72000,,'',0,128500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560050
new file mode 100644
index 00000000..2985ce66
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560050
@@ -0,0 +1 @@
+'3580',5100,133500,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560051
new file mode 100644
index 00000000..0a3f832e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560051
@@ -0,0 +1,2 @@
+'3587',5200,93500,,'',0,90600,,'',0
+'3584',7400,181000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560052 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560052
new file mode 100644
index 00000000..9a0d6433
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560052
@@ -0,0 +1,2 @@
+'3587',5201,72000,,'',0,91000,,'',0
+'3584',7401,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560053
new file mode 100644
index 00000000..0c7f508e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560053
@@ -0,0 +1,2 @@
+'3587',5200,92500,,'',0,90600,,'',0
+'3584',7400,180000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560054
new file mode 100644
index 00000000..5447de03
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560054
@@ -0,0 +1,2 @@
+'3587',5201,73000,,'',0,91000,,'',0
+'3584',7401,82500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560055
new file mode 100644
index 00000000..968f3d20
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560055
@@ -0,0 +1,2 @@
+'3587',5200,90500,,'',0,90600,,'',0
+'3584',7400,174000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560056
new file mode 100644
index 00000000..cb759211
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560056
@@ -0,0 +1,2 @@
+'3587',5201,75000,,'',0,95000,,'',0
+'3584',7401,84500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560058
new file mode 100644
index 00000000..4be3b468
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560058
@@ -0,0 +1,2 @@
+'3587',5200,90000,,'',0,90600,,'',0
+'3584',7400,173500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560059
new file mode 100644
index 00000000..13caaaf1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560059
@@ -0,0 +1 @@
+'3589',5301,83000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560060
new file mode 100644
index 00000000..9a9e1ca4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560060
@@ -0,0 +1 @@
+'3589',5300,102500,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560061
new file mode 100644
index 00000000..76571022
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560061
@@ -0,0 +1 @@
+'3589',5301,84000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560062
new file mode 100644
index 00000000..a5b878ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560062
@@ -0,0 +1 @@
+'3589',5300,101500,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560065
new file mode 100644
index 00000000..f03e2c02
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560065
@@ -0,0 +1 @@
+'3589',5301,85500,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560066
new file mode 100644
index 00000000..27a5bc1d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560066
@@ -0,0 +1 @@
+'3589',5300,100000,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560067
new file mode 100644
index 00000000..7beab913
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560067
@@ -0,0 +1 @@
+'3588',5801,72500,,'',0,128500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560068
new file mode 100644
index 00000000..b666d42b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560068
@@ -0,0 +1 @@
+'3588',5801,71400,,'',0,124000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560069
new file mode 100644
index 00000000..b8098839
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560069
@@ -0,0 +1 @@
+'3588',5801,75000,,'',0,119000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560070
new file mode 100644
index 00000000..cf0bb511
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560070
@@ -0,0 +1,5 @@
+'3581',7601,122500,0,'Balfour Only',0
+'3582',7601,172500,0,'Balfour Only',0
+'3586',7601,83500,,'',0
+'3587',7601,71500,0,'Balfour Only',0
+'3588',7601,90500,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560071
new file mode 100644
index 00000000..12202374
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560071
@@ -0,0 +1,5 @@
+'3581',7600,133500,,'',0
+'3582',7600,183000,,'',0
+'3586',7600,111600,,'',0
+'3587',7600,82500,,'',0
+'3588',7600,101000,,'',0,82000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560072
new file mode 100644
index 00000000..9d919bb7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560072
@@ -0,0 +1,5 @@
+'3581',7601,124000,0,'Balfour Only',0
+'3582',7601,174000,0,'Balfour Only',0
+'3586',7601,85000,,'',0
+'3587',7601,73000,0,'Balfour Only',0
+'3588',7601,92000,0,'Balfour Only',0,82000,0,'Balfour Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560073 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560073
new file mode 100644
index 00000000..2550c76f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560073
@@ -0,0 +1,5 @@
+'3581',7600,132000,,'',0
+'3582',7600,181500,,'',0
+'3586',7600,110100,,'',0
+'3587',7600,81000,,'',0
+'3588',7600,95500,,'',0,86000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560082
new file mode 100644
index 00000000..060e23f9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560082
@@ -0,0 +1,2 @@
+'3518',401,141100,,'',0
+'3577',401,111300,,'',0,20600,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560088
new file mode 100644
index 00000000..dc0734a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560088
@@ -0,0 +1 @@
+'3588',5801,83000,,'',0,121000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560093
new file mode 100644
index 00000000..53a8e9ff
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560093
@@ -0,0 +1,4 @@
+'3577',1400,75500,,'',0
+'3577',2000,71300,,'',0
+'3577',2001,161000,0,'Slocan Vly -',0
+'3577',9900,110900,,'',0,53300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560140 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560140
new file mode 100644
index 00000000..c15b6cc4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560140
@@ -0,0 +1,2 @@
+'3577',4500,60500,,'',0,3000,,'',0,200,,'',0,88300,,'',0
+'3577',4600,63500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560142 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560142
new file mode 100644
index 00000000..f9264f42
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560142
@@ -0,0 +1,2 @@
+'3587',5200,83500,,'',0,90600,,'',0
+'3584',7400,171000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560143 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560143
new file mode 100644
index 00000000..0753b6e4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560143
@@ -0,0 +1,2 @@
+'3587',5201,82000,4,'',0,91000,4,'',0
+'3584',7401,91500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560162
new file mode 100644
index 00000000..935eb9da
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_560162
@@ -0,0 +1,3 @@
+'3518',4800,162900,0,'Red Mtn - Ski Bus',0
+'3576',4800,162900,0,'Red Mtn - Ski Bus',0
+'3577',4800,162900,0,'Red Mtn - Ski Bus',0
diff --git a/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
new file mode 100644
index 00000000..90d84096
--- /dev/null
+++ b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <bool name="next_gtfs_rts_schedule_available">true</bool>
+    <bool name="next_gtfs_rts_frequency_available">false</bool>
+    <string name="next_gtfs_rts_area_min_lat">49.07157</string>
+    <string name="next_gtfs_rts_area_max_lat">50.2967</string>
+    <string name="next_gtfs_rts_area_min_lng">-118.14054</string>
+    <string name="next_gtfs_rts_area_max_lng">-116.89681</string>
+    <integer name="next_gtfs_rts_first_departure_in_sec">1734182580</integer><!-- 2024/12/14 05:23:00 PST -->
+    <integer name="next_gtfs_rts_last_departure_in_sec">1736123760</integer><!-- 2025/01/05 16:36:00 PST -->
+</resources>
diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml
index 944c6f32..23a4cbb7 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">20241001</integer>
+    <integer name="gtfs_rts_db_version">20241015</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_west_kootenay_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>