diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..64dc85a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+android_driverapp_samples/.idea/
+android_driverapp_samples/app/build/
diff --git a/android_driverapp_samples/app/src/main/ic_launcher-playstore.png b/android_driverapp_samples/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..d2a743a
Binary files /dev/null and b/android_driverapp_samples/app/src/main/ic_launcher-playstore.png differ
diff --git a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/Preferences.java b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/Preferences.java
index 074a58e..454fd16 100644
--- a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/Preferences.java
+++ b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/Preferences.java
@@ -58,7 +58,7 @@ public void saveSimulationSetting(boolean enabled) {
   }
 
   public boolean getSimulationSetting() {
-    return sharedPreferences.getBoolean(SIMULATION_KEY, true);
+    return sharedPreferences.getBoolean(SIMULATION_KEY, false);
   }
 
   public void saveProviderId(String providerId) {
@@ -66,7 +66,7 @@ public void saveProviderId(String providerId) {
   }
 
   public String getProviderId() {
-    return sharedPreferences.getString(PROVIDER_ID_KEY, "");
+    return sharedPreferences.getString(PROVIDER_ID_KEY, "<your project id>");
   }
 
   public void saveBackendUrl(String backendUrl) {
@@ -74,7 +74,7 @@ public void saveBackendUrl(String backendUrl) {
   }
 
   public String getBackendUrl() {
-    return sharedPreferences.getString(BACKEND_URL_KEY, "http://localhost:8080");
+    return sharedPreferences.getString(BACKEND_URL_KEY, "http://<your app engine path.appspot.com>");
   }
 
   public void saveClientId(String clientId) {
@@ -83,10 +83,6 @@ public void saveClientId(String clientId) {
 
   public String getClientId() {
     String clientId = sharedPreferences.getString(CLIENT_ID_KEY, null);
-    if (clientId == null) {
-      clientId = UUID.randomUUID().toString();
-      saveClientId(clientId);
-    }
     return clientId;
   }
 }
diff --git a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/SettingsFragment.java b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/SettingsFragment.java
index fd6ac8c..e928753 100644
--- a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/SettingsFragment.java
+++ b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/settings/SettingsFragment.java
@@ -41,7 +41,7 @@ public View onCreateView(
     locationTrackingSwitch.setChecked(preferences.getLocationTrackingSetting());
     locationTrackingSwitch.setOnCheckedChangeListener(
         (buttonView, isChecked) -> preferences.saveLocationTrackingSetting(isChecked));
-
+/*
     Switch simulationSwitch = view.findViewById(R.id.simulation_switch);
     simulationSwitch.setChecked(preferences.getSimulationSetting());
     simulationSwitch.setOnCheckedChangeListener(
@@ -78,6 +78,7 @@ public void afterTextChanged(Editable s) {
             preferences.saveBackendUrl(s.toString());
           }
         });
+*/
 
     EditText clientIdEditText = view.findViewById(R.id.client_id_input);
     clientIdEditText.setText(preferences.getClientId(), TextView.BufferType.NORMAL);
diff --git a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/ui/NavigationActivity.java b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/ui/NavigationActivity.java
index c66f4b2..1c5cff5 100644
--- a/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/ui/NavigationActivity.java
+++ b/android_driverapp_samples/app/src/main/java/com/google/mapsplatform/transportation/delivery/sample/driver/ui/NavigationActivity.java
@@ -255,7 +255,7 @@ private void onArrive() {
   public void onDestroy() {
     super.onDestroy();
     googleMap.clear();
-    vehicleReporter.disableLocationTracking();
+    //vehicleReporter.disableLocationTracking();
     DeliveryDriverApi.clearInstance();
     navigator.stopGuidance();
     navigator.getSimulator().unsetUserLocation();
diff --git a/android_driverapp_samples/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android_driverapp_samples/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 04d1a34..0000000
--- a/android_driverapp_samples/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="85.84757"
-          android:endY="92.4963"
-          android:startX="42.9492"
-          android:startY="49.59793"
-          android:type="linear">
-        <item
-            android:color="#44000000"
-            android:offset="0.0" />
-        <item
-            android:color="#00000000"
-            android:offset="1.0" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillColor="#FFFFFF"
-      android:fillType="nonZero"
-      android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-      android:strokeColor="#00000000"
-      android:strokeWidth="1" />
-</vector>
diff --git a/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_background.xml b/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_background.xml
index 1c9db42..ca3826a 100644
--- a/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,184 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Google LLC
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         https://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
     android:viewportHeight="108"
-    android:viewportWidth="108">
-  <path
-      android:fillColor="#3DDC84"
-      android:pathData="M0,0h108v108h-108z" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M9,0L9,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,0L19,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M29,0L29,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M39,0L39,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M49,0L49,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M59,0L59,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M69,0L69,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M79,0L79,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M89,0L89,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M99,0L99,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,9L108,9"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,19L108,19"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,29L108,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,39L108,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,49L108,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,59L108,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,69L108,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,79L108,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,89L108,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,99L108,99"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,29L89,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,39L89,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,49L89,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,59L89,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,69L89,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,79L89,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M29,19L29,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M39,19L39,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M49,19L49,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M59,19L59,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M69,19L69,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M79,19L79,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8" />
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>
diff --git a/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_foreground.xml b/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..8df7eb5
--- /dev/null
+++ b/android_driverapp_samples/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.12738462"
+      android:scaleY="0.12738462"
+      android:translateX="29.16"
+      android:translateY="43.386276">
+    <group android:translateY="136.26562">
+      <path android:pathData="M31.710938,-92.17969L31.710938,-17.15625L74.03906,-17.15625Q79.10156,-17.15625,81.80859,-14.6953125Q84.515625,-12.234375,84.515625,-8.5078125Q84.515625,-4.7109375,81.84375,-2.3554688Q79.171875,0,74.03906,0L23.625,0Q16.804688,0,13.816406,-3.0234375Q10.828125,-6.046875,10.828125,-12.796875L10.828125,-92.17969Q10.828125,-98.50781,13.675781,-101.671875Q16.523438,-104.83594,21.164062,-104.83594Q25.875,-104.83594,28.792969,-101.70703Q31.710938,-98.578125,31.710938,-92.17969Z"
+          android:fillColor="#000000"/>
+      <path android:pathData="M133.05469,-15.5390625L116.53125,-81.21094L116.53125,-10.0546875Q116.53125,-4.1484375,113.89453,-1.1953125Q111.25781,1.7578125,106.89844,1.7578125Q102.67969,1.7578125,100.00781,-1.1601562Q97.33594,-4.078125,97.33594,-10.0546875L97.33594,-91.61719Q97.33594,-98.36719,100.85156,-100.72266Q104.36719,-103.078125,110.34375,-103.078125L116.8125,-103.078125Q122.64844,-103.078125,125.28516,-102.02344Q127.921875,-100.96875,129.1875,-98.22656Q130.45312,-95.484375,132.07031,-89.296875L147.04688,-32.835938L162.02344,-89.296875Q163.64062,-95.484375,164.90625,-98.22656Q166.17188,-100.96875,168.8086,-102.02344Q171.44531,-103.078125,177.28125,-103.078125L183.75,-103.078125Q189.72656,-103.078125,193.24219,-100.72266Q196.75781,-98.36719,196.75781,-91.61719L196.75781,-10.0546875Q196.75781,-4.1484375,194.1211,-1.1953125Q191.48438,1.7578125,187.05469,1.7578125Q182.90625,1.7578125,180.23438,-1.1953125Q177.5625,-4.1484375,177.5625,-10.0546875L177.5625,-81.21094L161.03906,-15.5390625Q159.42188,-9.140625,158.40234,-6.1523438Q157.38281,-3.1640625,154.64062,-0.703125Q151.89844,1.7578125,147.04688,1.7578125Q143.39062,1.7578125,140.85938,0.17578125Q138.32812,-1.40625,136.92188,-3.8671875Q135.51562,-6.328125,134.70703,-9.316406Q133.89844,-12.3046875,133.05469,-15.5390625Z"
+          android:fillColor="#000000"/>
+      <path android:pathData="M279.84375,-86.97656L238.71094,-86.97656L238.71094,-60.609375L273.09375,-60.609375Q277.875,-60.609375,280.23047,-58.464844Q282.58594,-56.320312,282.58594,-52.734375Q282.58594,-49.148438,280.1953,-47.039062Q277.8047,-44.929688,273.09375,-44.929688L238.71094,-44.929688L238.71094,-10.96875Q238.71094,-4.5,235.79297,-1.3710938Q232.875,1.7578125,228.30469,1.7578125Q223.66406,1.7578125,220.7461,-1.40625Q217.82812,-4.5703125,217.82812,-10.96875L217.82812,-90.28125Q217.82812,-94.78125,219.16406,-97.62891Q220.5,-100.47656,223.34766,-101.77734Q226.19531,-103.078125,230.625,-103.078125L279.84375,-103.078125Q284.83594,-103.078125,287.26172,-100.86328Q289.6875,-98.64844,289.6875,-95.0625Q289.6875,-91.40625,287.26172,-89.19141Q284.83594,-86.97656,279.84375,-86.97656Z"
+          android:fillColor="#000000"/>
+      <path android:pathData="M383.57812,-30.9375Q383.57812,-21.585938,378.76172,-14.1328125Q373.9453,-6.6796875,364.66406,-2.4609375Q355.3828,1.7578125,342.65625,1.7578125Q327.39844,1.7578125,317.48438,-4.0078125Q310.45312,-8.15625,306.0586,-15.082031Q301.66406,-22.007812,301.66406,-28.546875Q301.66406,-32.34375,304.30078,-35.05078Q306.9375,-37.757812,311.01562,-37.757812Q314.3203,-37.757812,316.60547,-35.648438Q318.89062,-33.539062,320.5078,-29.390625Q322.47656,-24.46875,324.76172,-21.164062Q327.04688,-17.859375,331.1953,-15.714844Q335.34375,-13.5703125,342.09375,-13.5703125Q351.375,-13.5703125,357.17578,-17.894531Q362.97656,-22.21875,362.97656,-28.6875Q362.97656,-33.820312,359.84766,-37.01953Q356.71875,-40.21875,351.76172,-41.90625Q346.8047,-43.59375,338.5078,-45.492188Q327.39844,-48.09375,319.91016,-51.57422Q312.42188,-55.054688,308.02734,-61.066406Q303.6328,-67.078125,303.6328,-76.00781Q303.6328,-84.515625,308.27344,-91.125Q312.91406,-97.734375,321.70312,-101.28516Q330.4922,-104.83594,342.375,-104.83594Q351.8672,-104.83594,358.79297,-102.48047Q365.71875,-100.125,370.28906,-96.22266Q374.85938,-92.32031,376.96875,-88.03125Q379.07812,-83.74219,379.07812,-79.66406Q379.07812,-75.9375,376.4414,-72.94922Q373.8047,-69.96094,369.8672,-69.96094Q366.28125,-69.96094,364.41797,-71.75391Q362.5547,-73.546875,360.375,-77.625Q357.5625,-83.46094,353.625,-86.73047Q349.6875,-90,340.96875,-90Q332.8828,-90,327.92578,-86.44922Q322.96875,-82.89844,322.96875,-77.90625Q322.96875,-74.8125,324.65625,-72.5625Q326.34375,-70.3125,329.29688,-68.69531Q332.25,-67.078125,335.27344,-66.16406Q338.29688,-65.25,345.2578,-63.492188Q353.97656,-61.453125,361.04297,-58.992188Q368.10938,-56.53125,373.0664,-53.015625Q378.02344,-49.5,380.80078,-44.121094Q383.57812,-38.742188,383.57812,-30.9375Z"
+          android:fillColor="#000000"/>
+    </group>
+  </group>
+</vector>
\ No newline at end of file
diff --git a/android_driverapp_samples/app/src/main/res/layout/fragment_settings.xml b/android_driverapp_samples/app/src/main/res/layout/fragment_settings.xml
index 93938d0..fdad652 100644
--- a/android_driverapp_samples/app/src/main/res/layout/fragment_settings.xml
+++ b/android_driverapp_samples/app/src/main/res/layout/fragment_settings.xml
@@ -55,62 +55,17 @@
             app:layout_constraintEnd_toEndOf="parent" />
       </androidx.constraintlayout.widget.ConstraintLayout>
 
-      <androidx.constraintlayout.widget.ConstraintLayout
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/setting_view_height">
-        <TextView
-            android:text="@string/simulation"
-            android:textSize="18sp"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:layout_constraintStart_toStartOf="parent" />
-        <Switch
-            android:id="@+id/simulation_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-
       <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="vertical"
-          android:gravity="center">
-        <TextView
-            android:text="@string/provider_id"
-            android:textSize="18sp"
-            android:gravity="center_vertical"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/fragment_header_height" />
-        <EditText
-            android:id="@+id/provider_id_input"
-            android:inputType="text|textUri"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/fragment_header_height"
-            android:layout_marginTop="-24dp"
-            android:hint="@string/provider_id_hint" />
-      </LinearLayout>
+          android:gravity="center"/>
 
       <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="vertical"
-          android:gravity="center">
-        <TextView
-            android:text="@string/backend_url"
-            android:textSize="18sp"
-            android:gravity="center_vertical"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/fragment_header_height" />
-        <EditText
-            android:id="@+id/backend_url_input"
-            android:inputType="text|textUri"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/fragment_header_height"
-            android:layout_marginTop="-24dp"
-            android:hint="@string/backend_url_hint" />
-      </LinearLayout>
+          android:gravity="center"/>
 
       <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="match_parent"
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index f968eb3..bbd3e02 100644
--- a/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Google LLC
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         https://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background" />
-  <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index f968eb3..bbd3e02 100644
--- a/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android_driverapp_samples/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Google LLC
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         https://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background" />
-  <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 7195ff0..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index ef3f29c..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 16fcd00..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index a7b8a76..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bdd082a..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 1dd6d18..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index a6a76a2..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index bb8b134..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index e8c02bf..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index ba2005a..0000000
Binary files a/android_driverapp_samples/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android_driverapp_samples/app/src/main/res/values/strings.xml b/android_driverapp_samples/app/src/main/res/values/strings.xml
index 975ce7c..e02be0d 100644
--- a/android_driverapp_samples/app/src/main/res/values/strings.xml
+++ b/android_driverapp_samples/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-  <string name="app_name">Delivery Driver</string>
+  <string name="app_name">Cyberdyne Systems Logistics</string>
 
   <!-- Bottom navigation menu item names -->
   <string name="list">List</string>
@@ -74,8 +74,8 @@
   <string name="provider_id_hint">Cloud project ID</string>
   <string name="backend_url">Backend URL</string>
   <string name="backend_url_hint">https://...</string>
-  <string name="client_id">Client ID</string>
-  <string name="client_id_hint">Unique ID for this client</string>
+  <string name="client_id">Your Codename</string>
+  <string name="client_id_hint">Codename for this client</string>
 
   <string name="your_itinerary">Your itinerary</string>
   <string name="delivery_details">Delivery Details</string>
diff --git a/android_driverapp_samples/app/src/main/res/values/styles.xml b/android_driverapp_samples/app/src/main/res/values/styles.xml
index 8f9bed1..02003c5 100644
--- a/android_driverapp_samples/app/src/main/res/values/styles.xml
+++ b/android_driverapp_samples/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
   <!-- Base application theme. -->
-  <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+  <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
     <!-- Customize your theme here. -->
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/android_driverapp_samples/app/src/main/res/xml/network_security_config.xml b/android_driverapp_samples/app/src/main/res/xml/network_security_config.xml
index b917f43..e59c48f 100644
--- a/android_driverapp_samples/app/src/main/res/xml/network_security_config.xml
+++ b/android_driverapp_samples/app/src/main/res/xml/network_security_config.xml
@@ -22,5 +22,6 @@
   <base-config cleartextTrafficPermitted="false" />
   <domain-config cleartextTrafficPermitted="true">
     <domain includeSubdomains="true">localhost</domain>
+    <domain includeSubdomains="true">appspot.com</domain>
   </domain-config>
 </network-security-config>
diff --git a/android_driverapp_samples/local.properties b/android_driverapp_samples/local.properties
deleted file mode 100644
index fded625..0000000
--- a/android_driverapp_samples/local.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the Android SDK
-sdk.dir=*****UPDATE_WITH_ANDROID_SDK_PATH*****
diff --git a/backend/build.gradle b/backend/build.gradle
index 5260778..70f1979 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -84,9 +84,10 @@ dependencies {
   testImplementation 'com.google.appengine:appengine-tools-sdk:+'
 }
 
+// XXX these fail with stateful backend changes
 // Always run unit tests
-appengineDeploy.dependsOn test
-appengineStage.dependsOn test
+//appengineDeploy.dependsOn test
+//appengineStage.dependsOn test
 
 appengine {  // App Engine tasks configuration
   // The run section is only used if you're using App Engine Standard
diff --git a/backend/src/main/java/com/example/backend/BackendConfigServlet.java b/backend/src/main/java/com/example/backend/BackendConfigServlet.java
index 6adfd2b..8b887f1 100644
--- a/backend/src/main/java/com/example/backend/BackendConfigServlet.java
+++ b/backend/src/main/java/com/example/backend/BackendConfigServlet.java
@@ -120,6 +120,7 @@ public void serveUpload(InputStream fileContent, HttpServletResponse response)
     // At this point, the backend config has been read into memory. Loop through its
     // contents and invoke the corresponding Fleet Engine APIs.
     for (BackendConfig.Manifest m : backendConfig.manifests) {
+      m.expectedClientId = m.vehicle.vehicleId;
       m.vehicle.vehicleId = BackendConfigUtils.getTimestampedId(m.vehicle.vehicleId);
 
       for (BackendConfig.Task t : m.tasks) {
diff --git a/backend/src/main/java/com/example/backend/DeliveryVehicleServlet.java b/backend/src/main/java/com/example/backend/DeliveryVehicleServlet.java
index e21e02e..7eb89cf 100644
--- a/backend/src/main/java/com/example/backend/DeliveryVehicleServlet.java
+++ b/backend/src/main/java/com/example/backend/DeliveryVehicleServlet.java
@@ -66,7 +66,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         return;
       }
       String vehicleId = request.getPathInfo().substring(1);
-      DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(vehicleId);
+      DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(deliveryService, vehicleId);
       if (vehicle != null) {
         ServletUtils.writeProtoJson(responseWriter, vehicle);
       } else {
@@ -81,6 +81,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    DeliveryServiceGrpc.DeliveryServiceBlockingStub deliveryService =
+        grpcServiceProvider.getAuthenticatedDeliveryService();
     if (request.getPathInfo() == null) {
       logger.log(
           Level.WARNING,
@@ -90,7 +92,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     }
     String vehicleId = request.getPathInfo().substring(1);
 
-    DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(vehicleId);
+    DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(deliveryService, vehicleId);
     if (vehicle == null) {
       logger.log(
           Level.WARNING,
@@ -160,13 +162,9 @@ public void doPut(HttpServletRequest request, HttpServletResponse response) thro
     response.setCharacterEncoding("UTF-8");
     PrintWriter responseWriter = response.getWriter();
 
-    // As above, we're using the IP address to identify the client.
-    String clientIdentifier = request.getRemoteAddr();
-
     String vehicleId = request.getPathInfo().substring(1);
     DeliveryVehicle vehicle =
-        servletState.getDeliveryVehicleById(
-            servletState.getDeliveryVehicleMapByClient(clientIdentifier));
+        servletState.getDeliveryVehicleById(deliveryService, vehicleId);
 
     if (vehicle == null) {
       logger.log(Level.WARNING, "The client is not assigned to any vehicle");
diff --git a/backend/src/main/java/com/example/backend/ManifestServlet.java b/backend/src/main/java/com/example/backend/ManifestServlet.java
index 0940e65..a17d1b9 100644
--- a/backend/src/main/java/com/example/backend/ManifestServlet.java
+++ b/backend/src/main/java/com/example/backend/ManifestServlet.java
@@ -72,9 +72,10 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
       return;
     }
     String vehicleId = request.getPathInfo().substring(1);
-    BackendConfig.Manifest manifest = servletState.getManifest(vehicleId);
+    String manifest = servletState.getManifestDS(vehicleId);
     if (manifest != null) {
-      responseWriter.print(BackendConfigGsonProvider.get().toJson(manifest));
+      //responseWriter.print(BackendConfigGsonProvider.get().toJson(manifest));
+      responseWriter.print(manifest);
       responseWriter.flush();
     } else {
       logger.log(
@@ -108,6 +109,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
    */
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService =
+        grpcServiceProvider.getAuthenticatedDeliveryService();
     response.setContentType("application/json");
     response.setCharacterEncoding("UTF-8");
     PrintWriter responseWriter = response.getWriter();
@@ -167,20 +170,18 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
       }
       logger.log(Level.INFO, String.format("clientId is %s", clientId));
       try {
-        vehicle = assignVehicleToClient(clientId, vehicleId);
+         String assignedVehicleId = assignVehicleToClient(clientId, vehicleId);
+         String manifestJSON = servletState.getManifestDS(assignedVehicleId);
+         responseWriter.print(manifestJSON);
       } catch (ManifestException e) {
         logger.log(Level.WARNING, e.getLogMessage());
         ServletUtils.setErrorResponse(response, e.getErrorMessage(), e.getErrorCode());
-        return;
       }
-      BackendConfig.Manifest manifest =
-          servletState.getManifest(ServletState.getId(vehicle.getName()));
-      responseWriter.print(BackendConfigGsonProvider.get().toJson(manifest));
       return;
     }
 
     // Otherwise, a vehicleId is required.
-    vehicle = servletState.getDeliveryVehicleById(vehicleId);
+    vehicle = servletState.getDeliveryVehicleById(authenticatedDeliveryService, vehicleId);
     if (vehicle == null) {
       logger.log(
           Level.WARNING,
@@ -241,57 +242,28 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
    * @return The assigned vehicle.
    * @throws ManifestException if the vehicle could not be assigned to the client.
    */
-  private DeliveryVehicle assignVehicleToClient(String clientId, String vehicleId)
+  private String  assignVehicleToClient(String clientId, String vehicleId)
       throws ManifestException {
-    // Assignment does not require a vehicleId; but if a vehicleId is supplied, attempt to use it.
-    String existingVehicleId = servletState.getDeliveryVehicleMapByClient(clientId);
     DeliveryVehicle vehicle;
+    String assignedVehicleId = vehicleId; 
 
-    if (existingVehicleId != null) {
-      // If the client is already assigned another vehicle...
-      if (!vehicleId.equals("") && !vehicleId.equals(existingVehicleId)) {
-        throw new ManifestException(
-            "The client attempted to re-request another vehicle",
-            "You cannot request different vehicles.",
-            403);
-      }
-
-      vehicle = servletState.getDeliveryVehicleById(existingVehicleId);
-      if (vehicle == null) {
+    if (vehicleId.equals("")) {
+      assignedVehicleId = servletState.lookupAndAssignVehicle(clientId);
+      if (assignedVehicleId == null) {
         throw new ManifestException(
-            "The client\'s assigned vehicle doesn't exist.",
-            "The requested vehicle doesn't exist.",
-            404);
-      }
-    } else if (vehicleId.equals("")) {
-      // If vehicleId is null, assign the next available vehicle
-      vehicle = servletState.getAnyAvailableDeliveryVehicle();
-      if (vehicle == null) {
-        throw new ManifestException(
-            "The client requested a vehicle for assignment, but none were available.",
+            "The client requested a vehicle matching " + clientId + " for assignment, but none were available.",
             "There are no available vehicles for assignment.",
             404);
       }
+      return assignedVehicleId;
     } else {
-      // If vehicleId is not null, attempt to assign that vehicle
-      vehicle = servletState.getDeliveryVehicleById(vehicleId);
-      if (vehicle == null) {
+      if (!servletState.isDeliveryVehicleAssigned(vehicleId)) {
         throw new ManifestException(
-            "The client attempted to request a non-existent vehicle",
-            "The requested vehicle doesn't exist.",
-            404);
-      }
-      if (servletState.isDeliveryVehicleAssigned(vehicleId)) {
-        throw new ManifestException(
-            "The client attempted to request a vehicle that is currently assigned",
-            "The requested vehicle is currently assigned.",
+            "The client attempted to request a non-existent/assigned vehicle", "Invalid vehicleID",
             403);
       }
+       return vehicleId;
     }
-
-    // We have a vehicle available for assignment, or is already assigned to the same vehicle.
-    servletState.addClientToDeliveryVehicleMap(clientId, vehicle);
-    return vehicle;
   }
 
   /**
@@ -304,6 +276,8 @@ private DeliveryVehicle assignVehicleToClient(String clientId, String vehicleId)
    */
   private DeliveryVehicle updateVehicleStopState(DeliveryVehicle vehicle, String stopStateName)
       throws ManifestException {
+    String vehicleId = ServletState.getId(vehicle.getName());
+    BackendConfig.Manifest manifest = servletState.getManifest(vehicleId);
     VehicleStop.State state;
     switch (stopStateName) {
       case "STATE_UNSPECIFIED":
@@ -337,14 +311,14 @@ private DeliveryVehicle updateVehicleStopState(DeliveryVehicle vehicle, String s
         grpcServiceProvider.getAuthenticatedDeliveryService();
     DeliveryVehicle responseVehicle = authenticatedDeliveryService.updateDeliveryVehicle(updateReq);
     servletState.addDeliveryVehicle(responseVehicle);
-    String vehicleId = ServletState.getId(vehicle.getName());
     BackendConfig.StopState backendConfigStopState = BackendConfig.StopState.of(stopStateName);
     logger.log(
         Level.INFO,
         String.format(
             "updating manifest with vehicle ID %s and stop state %s",
             vehicleId, backendConfigStopState.getValue()));
-    servletState.getManifest(vehicleId).currentStopState = backendConfigStopState;
+    manifest.currentStopState = backendConfigStopState;
+    servletState.updateManifest(manifest);
 
     return responseVehicle;
   }
@@ -397,6 +371,8 @@ private DeliveryVehicle updateVehicleStopList(DeliveryVehicle vehicle, List<Stri
     servletState.addDeliveryVehicle(responseVehicle);
 
     manifest.remainingStopIdList = stopIds.toArray(new String[0]);
+    servletState.updateManifest(manifest);
+
     return responseVehicle;
   }
 
diff --git a/backend/src/main/java/com/example/backend/ServletState.java b/backend/src/main/java/com/example/backend/ServletState.java
index 781dff1..abef704 100644
--- a/backend/src/main/java/com/example/backend/ServletState.java
+++ b/backend/src/main/java/com/example/backend/ServletState.java
@@ -23,6 +23,25 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.inject.Singleton;
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.DatastoreServiceFactory;
+import com.google.appengine.api.datastore.Text;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.Key;
+import com.google.appengine.api.datastore.KeyFactory;
+import com.google.appengine.api.datastore.PreparedQuery;
+import com.google.appengine.api.datastore.Query;
+import com.google.appengine.api.datastore.Query.FilterPredicate;
+import com.google.appengine.api.datastore.Query.FilterOperator;
+import com.google.appengine.api.datastore.EntityNotFoundException;
+import com.example.backend.json.BackendConfigGsonProvider;
+import com.example.backend.auth.grpcservice.AuthenticatedGrpcServiceProvider;
+import google.maps.fleetengine.delivery.v1.DeliveryServiceGrpc;
+import google.maps.fleetengine.delivery.v1.GetTaskRequest;
+import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest;
+import com.example.backend.utils.TaskUtils;
+import com.example.backend.utils.VehicleUtils;
+import google.maps.fleetengine.delivery.v1.DeliveryServiceGrpc;
 
 /**
  * Shared state among the servlets.
@@ -39,21 +58,27 @@ class ServletState {
   private HashMap<String, Task> tasks;
   private HashMap<String, DeliveryVehicle> deliveryVehicles;
   private HashMap<String, String> clientToDeliveryVehicleMapping;
+  private DatastoreService datastore;
 
   public ServletState() {
     this.tasks = new HashMap<>();
     this.deliveryVehicles = new HashMap<>();
     this.clientToDeliveryVehicleMapping = new HashMap<>();
+    this.datastore = DatastoreServiceFactory.getDatastoreService();
   }
 
   /** Adds a delivery vehicle into the servlet state. */
   public synchronized void addDeliveryVehicle(DeliveryVehicle deliveryVehicle) {
-    this.deliveryVehicles.put(getId(deliveryVehicle.getName()), deliveryVehicle);
+    //this.deliveryVehicles.put(getId(deliveryVehicle.getName()), deliveryVehicle);
   }
 
   /** Retrieves a delivery vehicle by ID. Null if vehicle ID doesn't match any vehicle. */
-  public synchronized DeliveryVehicle getDeliveryVehicleById(String vehicleId) {
-    return deliveryVehicles.get(vehicleId);
+  public synchronized DeliveryVehicle getDeliveryVehicleById(DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService, 
+        String vehicleId) {
+      // TODO: need to prepend provide//... stuf
+      GetDeliveryVehicleRequest req =
+          GetDeliveryVehicleRequest.newBuilder().setName(VehicleUtils.getVehicleNameFromId(vehicleId)).build();
+      return authenticatedDeliveryService.getDeliveryVehicle(req);
   }
 
   /**
@@ -61,63 +86,129 @@ public synchronized DeliveryVehicle getDeliveryVehicleById(String vehicleId) {
    * overwritten.
    */
   public synchronized void addTask(Task task) {
-    this.tasks.put(getId(task.getName()), task);
+    //this.tasks.put(getId(task.getName()), task);
   }
 
   /** Retrieves a task by ID. Null if task ID doesn't match any task. */
-  public synchronized Task getTaskById(String taskId) {
-    return tasks.get(taskId);
+  public synchronized Task getTaskById(DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService, String taskId) {
+      // Fetch the task from Fleet Engine, just in case.
+      GetTaskRequest req =
+          GetTaskRequest.newBuilder().setName(TaskUtils.getTaskNameFromId(taskId)).build();
+      return authenticatedDeliveryService.getTask(req);
   }
 
-  /**
-   * Adds a client into the assignment list. The client is the courier servicing this set of tasks.
-   */
-  public synchronized void addClientToDeliveryVehicleMap(String clientId, DeliveryVehicle vehicle) {
-    String vehicleId = getId(vehicle.getName());
-    if (!isDeliveryVehicleAssigned(vehicleId)) {
-      clientToDeliveryVehicleMapping.put(clientId, vehicleId);
-      getManifest(vehicleId).clientId = clientId;
-    }
+  public synchronized String lookupAndAssignVehicle(String clientIdentifier) {
+   Query q = new Query("VehicleManifest")
+        .setFilter(new FilterPredicate("clientIdentifier", FilterOperator.EQUAL, clientIdentifier));
+   PreparedQuery pq = datastore.prepare(q);
+   Entity vehicleManifest = pq.asSingleEntity();
+   if (vehicleManifest != null) {
+      String vehicleId = vehicleManifest.getKey().getName();
+      vehicleManifest.setProperty("assigned", true);
+      this.datastore.put(vehicleManifest);
+      return vehicleId;
+   } else {
+      return null;
+   }
   }
 
   /** Retrieves the vehicle mapped to a client. */
   public synchronized String getDeliveryVehicleMapByClient(String clientIdentifier) {
-    return clientToDeliveryVehicleMapping.get(clientIdentifier);
+   Query q = new Query("VehicleManifest")
+        .setFilter(new FilterPredicate("clientIdentifier", FilterOperator.EQUAL, clientIdentifier));
+   PreparedQuery pq = datastore.prepare(q);
+   Entity result = pq.asSingleEntity();
+   if (result != null) {
+      return result.getKey().getName();
+   } else {
+      return null;
+   }
   }
 
   /** Returns true if the vehicle is mapped to a client. */
   public synchronized boolean isDeliveryVehicleAssigned(String vehicleId) {
-    return clientToDeliveryVehicleMapping.containsValue(vehicleId);
+    try {
+       Key vehicleManifestKey = KeyFactory.createKey("VehicleManifest", vehicleId);
+       Entity vehicleManifest = this.datastore.get(vehicleManifestKey);
+       // TODO: is this just really has a clientIdentifier set ... I think so
+       Boolean assigned = (Boolean)vehicleManifest.getProperty("assigned");
+       return assigned;
+    } catch (EntityNotFoundException e) {
+       return false;
+    }
+    //return clientToDeliveryVehicleMapping.containsValue(vehicleId);
   }
 
+
   /** Retrieves any available (unassigned) vehicle. If all vehicles are assigned, returns null. */
   public synchronized DeliveryVehicle getAnyAvailableDeliveryVehicle() {
+    return null;
+    /*
     for (DeliveryVehicle vehicle : deliveryVehicles.values()) {
       if (!isDeliveryVehicleAssigned(getId(vehicle.getName()))) {
         return vehicle;
       }
     }
     return null;
+    */
   }
 
   public synchronized void setBackendConfig(BackendConfig backendConfig) {
     this.backendConfig = backendConfig;
+    for (BackendConfig.Manifest manifest : backendConfig.manifests) {
+      logger.log(Level.INFO, String.format("got manifest for %s", manifest.vehicle.vehicleId));
+      Entity vehicleManifest = new Entity("VehicleManifest", manifest.vehicle.vehicleId);
+      logger.log(Level.INFO, String.format("got key for %s", vehicleManifest.getKey().getName()));
+      vehicleManifest.setProperty("json", new Text(BackendConfigGsonProvider.get().toJson(manifest)));
+      vehicleManifest.setProperty("clientIdentifier", manifest.expectedClientId);
+      vehicleManifest.setProperty("assigned", false);
+      this.datastore.put(vehicleManifest);
+    }
+  }
+
+  public synchronized void updateManifest(BackendConfig.Manifest m) {
+    String vehicleId = m.vehicle.vehicleId;
+    logger.log(Level.INFO, String.format("Setting manifest for %s", vehicleId));
+    Key vehicleManifestKey = KeyFactory.createKey("VehicleManifest",vehicleId);
+    try {
+       Entity vehicleManifest = this.datastore.get(vehicleManifestKey);
+       vehicleManifest.setProperty("json", new Text(BackendConfigGsonProvider.get().toJson(m)));
+       this.datastore.put(vehicleManifest);
+    } catch (EntityNotFoundException e) {
+       logger.log(Level.WARNING, String.format("Failed to update manifest for %s", vehicleId));
+    }
   }
 
   public synchronized BackendConfig.Manifest getManifest(String vehicleId) {
     logger.log(Level.INFO, String.format("getting manifest for %s", vehicleId));
-    if (backendConfig == null) {
-      return null;
+    Key vehicleManifestKey = KeyFactory.createKey("VehicleManifest", vehicleId);
+    try {
+       Entity vehicleManifest = this.datastore.get(vehicleManifestKey);
+       if (vehicleManifest == null) {
+         logger.log(Level.INFO, String.format("no manifest found for %s", vehicleId));
+         return null;
+       }
+       Text manifestJSON = (Text)vehicleManifest.getProperty("json");
+       return BackendConfigGsonProvider.get().fromJson(manifestJSON.getValue(), BackendConfig.Manifest.class);
+    } catch (EntityNotFoundException e) {
+       return null;
     }
-    for (BackendConfig.Manifest manifest : backendConfig.manifests) {
-      if (manifest.vehicle.vehicleId.equals(vehicleId)) {
-        return manifest;
-      }
+  }
+
+  public synchronized String getManifestDS(String vehicleId) {
+    logger.log(Level.INFO, String.format("getting manifest for %s", vehicleId));
+    Key vehicleManifestKey = KeyFactory.createKey("VehicleManifest", vehicleId);
+    try {
+       Entity vehicleManifest = this.datastore.get(vehicleManifestKey);
+       Text manifestJSON = (Text)vehicleManifest.getProperty("json");
+       return manifestJSON.getValue();
+    } catch (EntityNotFoundException e) {
+       return null;
     }
-    return null;
   }
 
   public synchronized BackendConfig.Task getBackendConfigTask(String taskId) {
+    //TODO query database
     if (backendConfig == null) {
       return null;
     }
@@ -131,14 +222,15 @@ public synchronized BackendConfig.Task getBackendConfigTask(String taskId) {
     return null;
   }
 
-  public synchronized void removeBackendConfigTask(String taskId) {
-    for (BackendConfig.Manifest manifest : backendConfig.manifests) {
-      for (BackendConfig.Stop stop : manifest.stops) {
-        ArrayList<String> tasksList = new ArrayList<>(Arrays.asList(stop.tasks));
-        tasksList.remove(taskId);
-        stop.tasks = tasksList.toArray(new String[tasksList.size()]);
-      }
-    }
+  public synchronized void removeBackendConfigTask(String vehicleId, String taskId) {
+   logger.log(Level.INFO, String.format("Removing task %s from vehicle for %s", taskId, vehicleId));
+   BackendConfig.Manifest manifest = this.getManifest(vehicleId);
+   for (BackendConfig.Stop stop : manifest.stops) {
+     ArrayList<String> tasksList = new ArrayList<>(Arrays.asList(stop.tasks));
+     tasksList.remove(taskId);
+     stop.tasks = tasksList.toArray(new String[tasksList.size()]);
+   }
+   this.updateManifest(manifest);
   }
 
   /**
diff --git a/backend/src/main/java/com/example/backend/TaskServlet.java b/backend/src/main/java/com/example/backend/TaskServlet.java
index 1baf2ae..880dca4 100644
--- a/backend/src/main/java/com/example/backend/TaskServlet.java
+++ b/backend/src/main/java/com/example/backend/TaskServlet.java
@@ -79,7 +79,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         ServletUtils.setErrorResponse(response, "The vehicle ID must be specified.", 400);
         return;
       }
-      DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(vehicleId);
+      DeliveryVehicle vehicle = servletState.getDeliveryVehicleById(authenticatedDeliveryService, vehicleId);
       ArrayList<Task> tasks = new ArrayList<>();
       if (vehicle == null) {
         logger.log(Level.WARNING, "The client requested tasks for a non-existent vehicle.");
@@ -94,7 +94,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
           if (taskInfo.getTaskId().isEmpty()) {
             continue;
           }
-          Task task = servletState.getTaskById(taskInfo.getTaskId());
+          Task task = servletState.getTaskById(authenticatedDeliveryService, taskInfo.getTaskId());
           if (task == null) {
             continue;
           }
@@ -148,7 +148,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         }
       }
 
-      Task task = servletState.getTaskById(taskId);
+      Task task = servletState.getTaskById(authenticatedDeliveryService, taskId);
       if (task == null) {
         logger.log(
             Level.WARNING,
@@ -173,6 +173,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService =
+        grpcServiceProvider.getAuthenticatedDeliveryService();
     if (request.getPathInfo() == null) {
       logger.log(Level.WARNING, "The client requested a task update but did not supply a taskId.");
       ServletUtils.setErrorResponse(response, "The task ID must be specified.", 400);
@@ -180,7 +182,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
     }
     String taskId = request.getPathInfo().substring(1);
 
-    Task task = servletState.getTaskById(taskId);
+    Task task = servletState.getTaskById(authenticatedDeliveryService, taskId);
     if (task == null) {
       logger.log(
           Level.WARNING,
@@ -227,14 +229,12 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
             .setUpdateMask(
                 FieldMask.newBuilder().addPaths("task_outcome").addPaths("task_outcome_time"))
             .build();
-    DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService =
-        grpcServiceProvider.getAuthenticatedDeliveryService();
     Task responseTask = authenticatedDeliveryService.updateTask(updateReq);
     servletState.addTask(responseTask);
 
     // The task has been marked as complete; remove it from the manifest.
     if (!outcome.equals(Task.TaskOutcome.TASK_OUTCOME_UNSPECIFIED)) {
-      servletState.removeBackendConfigTask(taskId);
+      servletState.removeBackendConfigTask(servletState.getId(responseTask.getDeliveryVehicleId()), taskId);
     }
 
     response.setContentType("application/json");
@@ -245,6 +245,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
   @Override
   public void doPut(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService =
+        grpcServiceProvider.getAuthenticatedDeliveryService();
     if (request.getServletPath().equals("/task")) {
       if (request.getPathInfo() == null) {
         logger.log(
@@ -255,7 +257,7 @@ public void doPut(HttpServletRequest request, HttpServletResponse response) thro
       String taskId = request.getPathInfo().substring(1);
 
       // Verify that the task exists in servletState.
-      Task task = servletState.getTaskById(taskId);
+      Task task = servletState.getTaskById(authenticatedDeliveryService, taskId);
 
       if (task == null) {
         logger.log(
@@ -284,8 +286,6 @@ public void doPut(HttpServletRequest request, HttpServletResponse response) thro
               .setTask(updatedTask)
               .setUpdateMask(FieldMask.newBuilder().addPaths("task_outcome"))
               .build();
-      DeliveryServiceGrpc.DeliveryServiceBlockingStub authenticatedDeliveryService =
-          grpcServiceProvider.getAuthenticatedDeliveryService();
       Task responseTask = authenticatedDeliveryService.updateTask(updateReq);
       servletState.addTask(responseTask);
 
diff --git a/backend/src/main/java/com/example/backend/json/BackendConfig.java b/backend/src/main/java/com/example/backend/json/BackendConfig.java
index 8133a6b..1ed0d05 100644
--- a/backend/src/main/java/com/example/backend/json/BackendConfig.java
+++ b/backend/src/main/java/com/example/backend/json/BackendConfig.java
@@ -60,6 +60,7 @@ public static StopState of(String name) {
 
   public static class Manifest {
     public Vehicle vehicle;
+    public String expectedClientId;
     public Task[] tasks;
     public Stop[] stops;
 
diff --git a/backend/src/main/java/com/example/backend/utils/VehicleUtils.java b/backend/src/main/java/com/example/backend/utils/VehicleUtils.java
new file mode 100644
index 0000000..c6ee280
--- /dev/null
+++ b/backend/src/main/java/com/example/backend/utils/VehicleUtils.java
@@ -0,0 +1,38 @@
+/* Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.backend.utils;
+
+public final class VehicleUtils {
+  public static final String BACKEND_NAME =
+      String.format("providers/%s", SampleBackendUtils.backendProperties.providerId());
+  public static final String VEHICLE_NAME_FORMAT = BACKEND_NAME + "/deliveryVehicles/%s";
+
+  private VehicleUtils() {}
+
+  public static String getVehicleNameFromId(String vehicleId) {
+    return String.format(VEHICLE_NAME_FORMAT, vehicleId);
+  }
+
+  public static String getRawVehicleId(String vehicleId) {
+    // Assume vehicle ID has _<timestamp> appended. Remove this and return the rest.
+    int lastUnderscoreIndex = vehicleId.lastIndexOf("_");
+
+    // There should be at least one character before the last underscore. Otherwise it's an error.
+    if (lastUnderscoreIndex < 1) {
+      return null;
+    }
+    return vehicleId.substring(0, lastUnderscoreIndex);
+  }
+}
diff --git a/backend/src/main/resources/config.properties b/backend/src/main/resources/config.properties
index 401bdc4..91f811d 100644
--- a/backend/src/main/resources/config.properties
+++ b/backend/src/main/resources/config.properties
@@ -7,4 +7,4 @@ fleet-reader-service-account-email=*****UPDATE_WITH_FLEET_READER_SERVICE_ACCOUNT
 
 # The following are configurations used by the JavaScript apps.
 api-key=*****UPDATE_WITH_JS_API_KEY*****
-backend-host=http://localhost:8080
\ No newline at end of file
+backend-host=http://<update with your project appengine host .appspot.com>
diff --git a/backend/src/main/webapp/WEB-INF/appengine-web.xml b/backend/src/main/webapp/WEB-INF/appengine-web.xml
index 490b4a0..07e477c 100644
--- a/backend/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/backend/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,6 +16,8 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java11</runtime>
   <application>YOUR-APPID-HERE</application>
+  <app-engine-apis>true</app-engine-apis>
+  <instance-class>F4</instance-class>
   <version>1</version>
 
   <!-- Keep your application thread-safe and you can have multiple responding
diff --git a/backend/src/test/java/com/example/backend/TwoVehicleManifestServletTest.java b/backend/src/test/java/com/example/backend/TwoVehicleManifestServletTest.java
deleted file mode 100644
index 4105a9d..0000000
--- a/backend/src/test/java/com/example/backend/TwoVehicleManifestServletTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright 2020 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.example.backend;
-
-import static com.google.common.truth.Truth.assertThat;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.ServletException;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-
-/** Tests exercising a manifest with two vehicles. */
-@RunWith(JUnit4.class)
-public class TwoVehicleManifestServletTest {
-
-  static TestBackendConfigServletProvider testBackendConfigServletProvider;
-  static ManifestServlet servlet;
-
-  @BeforeClass
-  public static void setUpInjectionAndProvideConfig() throws ServletException, IOException {
-
-    // Set up the BackendConfig and pre-load it with two vehicles and tasks.
-    testBackendConfigServletProvider =
-        TestBackendConfigServletProvider.get("test-two-vehicles.json");
-    servlet =
-        new ManifestServlet(
-            testBackendConfigServletProvider.servletState,
-            testBackendConfigServletProvider.grpcServiceProvider);
-  }
-
-  @Test
-  public void assignsClientsToTwoVehicles() throws ServletException, IOException {
-    MockHttpServletRequest request = new MockHttpServletRequest();
-    MockHttpServletResponse response = new MockHttpServletResponse();
-    request.setMethod("POST");
-    request.setServletPath("/manifest");
-    request.setPathInfo("/" + testBackendConfigServletProvider.vehicleId);
-    request.setContent("{\"client_id\":\"TEST_CLIENT_ID\"}".getBytes(UTF_8));
-    servlet.service(request, response);
-    assertThat(response.getStatus()).isEqualTo(200);
-
-    // Validate the structure of the data returned.
-    Gson gson = new Gson();
-    JsonObject manifestJson = gson.fromJson(response.getContentAsString(), JsonObject.class);
-
-    // Verify that the vehicle ID field is present and correct.
-    String vehicleId = manifestJson.getAsJsonObject("vehicle").get("vehicle_id").getAsString();
-    Pattern vehicleIdPattern = Pattern.compile("^vehicle_1_(\\d{13})$");
-    Matcher matcher = vehicleIdPattern.matcher(vehicleId);
-    assertThat(matcher.matches()).isTrue();
-
-    // Verify that there is at least one stop and one task.
-    String timestamp = matcher.group(1);
-    assertThat(manifestJson.getAsJsonArray("tasks")).isNotEmpty();
-    assertThat(
-            manifestJson
-                .getAsJsonArray("tasks")
-                .get(0)
-                .getAsJsonObject()
-                .get("task_id")
-                .getAsString())
-        .isEqualTo(String.format("vehicle_1_task_1_%s", timestamp));
-    assertThat(manifestJson.getAsJsonArray("stops")).isNotEmpty();
-    assertThat(
-            manifestJson
-                .getAsJsonArray("stops")
-                .get(0)
-                .getAsJsonObject()
-                .get("tasks")
-                .getAsJsonArray())
-        .isNotEmpty();
-
-    // Now do the same with a second client id.
-    request = new MockHttpServletRequest();
-    response = new MockHttpServletResponse();
-    request.setMethod("POST");
-    request.setServletPath("/manifest");
-    request.setContent("{\"client_id\":\"ANOTHER_CLIENT_ID\"}".getBytes(UTF_8));
-    servlet.service(request, response);
-    assertThat(response.getStatus()).isEqualTo(200);
-
-    manifestJson = gson.fromJson(response.getContentAsString(), JsonObject.class);
-
-    // Verify that the vehicle ID field is present and correct.
-    vehicleId = manifestJson.getAsJsonObject("vehicle").get("vehicle_id").getAsString();
-    vehicleIdPattern = Pattern.compile("^vehicle_2_(\\d{13})$");
-    matcher = vehicleIdPattern.matcher(vehicleId);
-    assertThat(matcher.matches()).isTrue();
-
-    // Verify that there is at least one stop and one task.
-    timestamp = matcher.group(1);
-    assertThat(manifestJson.getAsJsonArray("tasks")).isNotEmpty();
-    assertThat(
-            manifestJson
-                .getAsJsonArray("tasks")
-                .get(0)
-                .getAsJsonObject()
-                .get("task_id")
-                .getAsString())
-        .isEqualTo(String.format("vehicle_2_task_1_%s", timestamp));
-    assertThat(manifestJson.getAsJsonArray("stops")).isNotEmpty();
-    assertThat(
-            manifestJson
-                .getAsJsonArray("stops")
-                .get(0)
-                .getAsJsonObject()
-                .get("tasks")
-                .getAsJsonArray())
-        .isNotEmpty();
-  }
-}