diff --git a/setup-wizard/src/app/app-routing.module.ts b/setup-wizard/src/app/app-routing.module.ts
index 7348a7dc9..e478807fc 100644
--- a/setup-wizard/src/app/app-routing.module.ts
+++ b/setup-wizard/src/app/app-routing.module.ts
@@ -13,6 +13,10 @@ const routes: Routes = [
     path: 'embassy',
     loadChildren: () => import('./pages/embassy/embassy.module').then( m => m.EmbassyPageModule),
   },
+  {
+    path: 'loading',
+    loadChildren: () => import('./pages/loading/loading.module').then( m => m.LoadingPageModule),
+  },
 ];
 
 @NgModule({
diff --git a/setup-wizard/src/app/pages/embassy/embassy.page.ts b/setup-wizard/src/app/pages/embassy/embassy.page.ts
index e9089929e..1e38156a2 100644
--- a/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ModalController, NavController } from '@ionic/angular'
+import { AlertController, ModalController, NavController } from '@ionic/angular'
 import { ApiService, EmbassyDrive } from 'src/app/services/api/api.service'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../password/password.page'
@@ -18,7 +18,8 @@ export class EmbassyPage {
     private readonly apiService: ApiService,
     private readonly navCtrl: NavController,
     private modalController: ModalController,
-    private stateService: StateService
+    private stateService: StateService,
+    private readonly alertCtrl: AlertController,
   ) {}
 
   async ngOnInit() {
@@ -30,12 +31,31 @@ export class EmbassyPage {
     const modal = await this.modalController.create({
       component: PasswordPage,
       componentProps: {
-        embassyDrive: drive,
-        verify: false
+        embassyDrive: drive
       }
     })
     modal.onDidDismiss().then(async ret => {
-      if (!ret.data) return
+      if (!ret.data && !ret.data.success) return
+
+      if(!!this.stateService.recoveryDrive) {
+        await this.navCtrl.navigateForward(`/loading`, { animationDirection: 'forward' })
+      } else {
+        const alert = await this.alertCtrl.create({
+          cssClass: 'success-alert',
+          header: 'Success!',
+          subHeader: `Your Embassy is set up and ready to go.`,
+          backdropDismiss: false,
+          buttons: [
+            {
+              text: 'Go To Embassy',
+              handler: () => {
+                window.location.reload()
+              }
+            }
+          ]
+        })
+        await alert.present()
+      }
     })
     await modal.present();
   }
diff --git a/setup-wizard/src/app/pages/loading/loading-routing.module.ts b/setup-wizard/src/app/pages/loading/loading-routing.module.ts
new file mode 100644
index 000000000..615b57e24
--- /dev/null
+++ b/setup-wizard/src/app/pages/loading/loading-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { LoadingPage } from './loading.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: LoadingPage,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LoadingPageRoutingModule {}
diff --git a/setup-wizard/src/app/pages/loading/loading.module.ts b/setup-wizard/src/app/pages/loading/loading.module.ts
new file mode 100644
index 000000000..886cb4594
--- /dev/null
+++ b/setup-wizard/src/app/pages/loading/loading.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { IonicModule } from '@ionic/angular';
+import { FormsModule } from '@angular/forms';
+import { LoadingPage } from './loading.page';
+import { PasswordPageModule } from '../password/password.module';
+import { LoadingPageRoutingModule } from './loading-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    LoadingPageRoutingModule,
+    PasswordPageModule,
+  ],
+  declarations: [LoadingPage]
+})
+export class LoadingPageModule {}
diff --git a/setup-wizard/src/app/pages/loading/loading.page.html b/setup-wizard/src/app/pages/loading/loading.page.html
new file mode 100644
index 000000000..a63cbd3d3
--- /dev/null
+++ b/setup-wizard/src/app/pages/loading/loading.page.html
@@ -0,0 +1,36 @@
+<ion-content color="light">
+  <ion-grid style="padding-top: 32px; height: 100%; max-width: 540px;">
+    <ion-row class="ion-align-items-center" style="height: 100%;">
+      <ion-col class="ion-text-center">
+
+        <div style="padding-bottom: 32px;">
+          <img src="assets/png/logo.png" style="max-width: 240px;" />
+        </div>
+
+        <ion-card color="dark">
+          <ion-card-header>
+            <ion-card-title style="font-size: 40px;">Loading Embassy</ion-card-title>
+            <ion-card-subtitle>Progress: {{(stateService.dataProgress * 100).toFixed(0) }}%</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content class="ion-margin">
+            <ion-progress-bar color="primary" style="max-width: 700px; margin: auto; padding-bottom: 20px; margin-bottom: 40px;" value="{{stateService.dataProgress}}"></ion-progress-bar>
+            
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+</ion-content>
+
+<!-- <div *ngIf="stateService.polling" style="width: 100%; text-align: center;">
+              <ion-progress-bar color="primary" style="max-width: 700px; margin: auto; padding-bottom: 20px; margin-bottom: 40px;" value="{{stateService.dataProgress}}"></ion-progress-bar>
+              <ion-button 
+                (click)="navToEmbassy()"
+                [disabled]="stateService.dataProgress !== 1"
+                style="text-align:center"
+                class="claim-button"
+              >
+                Go To Embassy
+              </ion-button>
+            </div> -->
\ No newline at end of file
diff --git a/setup-wizard/src/app/pages/loading/loading.page.scss b/setup-wizard/src/app/pages/loading/loading.page.scss
new file mode 100644
index 000000000..506e177dd
--- /dev/null
+++ b/setup-wizard/src/app/pages/loading/loading.page.scss
@@ -0,0 +1,43 @@
+.selected {
+  border: 4px solid gray;
+}
+ion-card-title {
+  margin: 24px 0;
+  font-family: 'Montserrat';
+  font-size: x-large;
+  --color: var(--ion-color-light);
+}
+
+ion-item {
+  --border-radius: 4px;
+  --border-style: solid;
+  --border-width: 1px;
+  --border-color: var(--ion-color-light);
+}
+
+.input-label {
+  text-align: left;
+  padding-bottom: 2px;
+  font-size: small;
+  color: var(--ion-color-light);
+  font-weight: bold;
+}
+
+.claim-button {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+  margin-top: 24px;
+  height: 48px;
+  --background: linear-gradient(45deg, var(--ion-color-light) 16%, var(--ion-color-medium) 150%);
+}
+
+.card-footer {
+  text-align: left;
+  --background: rgb(222, 222, 222);
+  border-top: solid;
+  border-width: 1px;
+  border-color: var(--ion-color-medium);
+  ion-item {
+    --border-color: var(--ion-color-medium);
+  }
+}
\ No newline at end of file
diff --git a/setup-wizard/src/app/pages/loading/loading.page.ts b/setup-wizard/src/app/pages/loading/loading.page.ts
new file mode 100644
index 000000000..91184d906
--- /dev/null
+++ b/setup-wizard/src/app/pages/loading/loading.page.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core'
+import { AlertController, NavController } from '@ionic/angular'
+import { BehaviorSubject } from 'rxjs'
+import { StateService } from 'src/app/services/state.service'
+
+@Component({
+  selector: 'loading',
+  templateUrl: 'loading.page.html',
+  styleUrls: ['loading.page.scss'],
+})
+export class LoadingPage {
+  constructor(
+    private stateService: StateService,
+    private alertCtrl: AlertController
+  ) {}
+
+  ngOnInit () {
+    this.stateService.pollDataTransferProgress()
+    const progSub = this.stateService.dataProgSubject.subscribe(async progress => {
+      if(progress === 1) {
+        await this.successAlert()
+        progSub.unsubscribe()
+      }
+    })
+  }
+
+  async successAlert () {
+    const alert = await this.alertCtrl.create({
+      cssClass: 'success-alert',
+      header: 'Success!',
+      subHeader: `Your Embassy is set up and ready to go.`,
+      backdropDismiss: false,
+      buttons: [
+        {
+          text: 'Go To Embassy',
+          handler: () => {
+            window.location.reload()
+          }
+        }
+      ]
+    })
+    await alert.present()
+  }
+}
+
diff --git a/setup-wizard/src/app/pages/password/password.page.html b/setup-wizard/src/app/pages/password/password.page.html
index cac59071c..538bfdc5e 100644
--- a/setup-wizard/src/app/pages/password/password.page.html
+++ b/setup-wizard/src/app/pages/password/password.page.html
@@ -1,27 +1,26 @@
 <ion-header>
   <ion-toolbar color="light">
     <ion-title>
-      <span *ngIf="verify">Verify Recovery Drive Password</span>
-      <span *ngIf="!verify">Set Password</span>
+      <span *ngIf="!!recoveryDrive">Verify Recovery Drive Password</span>
+      <span *ngIf="!recoveryDrive">Set Password</span>
     </ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content color="light">
   <div style="padding: 8px 24px;">
-    <ng-container *ngIf="verify">
+    <ng-container *ngIf="!!recoveryDrive">
       <p style="padding: 3px 0">Password:</p>
       <ion-input (click)="error = ''" color="light"  type="password" [(ngModel)]="password"  placeholder="*********"></ion-input>
     </ng-container>
 
-    <div *ngIf="!verify">
+    <div *ngIf="!recoveryDrive">
       <p *ngIf="embassyDrive.used > 0" style="padding-bottom: 15px;color: var(--ion-color-warning);"><b>Warning:</b> After submit, any data currently stored on <b>{{ embassyDrive.labels.length ? embassyDrive.labels.join(' / ') : embassyDrive.logicalname }}</b> will be wiped.</p>
       <p style="padding: 3px 0">Password:</p>
       <ion-input 
         (click)="error = ''"
         color="light"
         (focusout)="validate()"
-        (keyup)="error = ''"
         type="password"
         [(ngModel)]="password"
         placeholder="*********"
@@ -29,9 +28,7 @@
       
       <p style="padding: 3px 0">Verify Password:</p>
       <ion-input
-        (focusout)="validate()"
         color="light"
-        (keyup)="error = ''"
         type="password"
         [(ngModel)]="passwordVer"
         placeholder="*********"
@@ -47,8 +44,8 @@
       <ion-button class="claim-button" (click)="cancel()">
         Cancel
       </ion-button>
-      <ion-button class="claim-button" (click)="verify ? verifyPw() : submitPw()">
-        {{ verify ? 'Verify Password' : 'Submit' }}
+      <ion-button class="claim-button" (click)="!!recoveryDrive ? verifyPw() : submitPw()">
+        {{ !recoveryDrive ? 'Verify Password' : 'Submit' }}
       </ion-button>
     </ion-buttons>
   </ion-toolbar>
diff --git a/setup-wizard/src/app/pages/password/password.page.ts b/setup-wizard/src/app/pages/password/password.page.ts
index a33266b88..4ef50f274 100644
--- a/setup-wizard/src/app/pages/password/password.page.ts
+++ b/setup-wizard/src/app/pages/password/password.page.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
 import { ApiService, EmbassyDrive, RecoveryDrive } from 'src/app/services/api/api.service'
+import { StateService } from 'src/app/services/state.service'
 
 @Component({
   selector: 'password',
@@ -10,7 +11,6 @@ import { ApiService, EmbassyDrive, RecoveryDrive } from 'src/app/services/api/ap
 export class PasswordPage {
   @Input() recoveryDrive: RecoveryDrive
   @Input() embassyDrive: EmbassyDrive
-  @Input() verify: boolean
 
   error = ''
   password = ''
@@ -19,7 +19,8 @@ export class PasswordPage {
   constructor(
     private modalController: ModalController,
     private apiService: ApiService,
-    private loadingCtrl: LoadingController
+    private loadingCtrl: LoadingController,
+    private stateService: StateService
   ) {}
 
   ngOnInit() { }
@@ -48,16 +49,34 @@ export class PasswordPage {
 
   async submitPw () {
     this.validate()
+    if (!this.error && this.password !== this.passwordVer) {
+      this.error="*passwords dont match"
+    }
+
     if(this.error) return
+    const loader = await this.loadingCtrl.create({
+      message: 'Setting up your Embassy!'
+    })
+    
+    await loader.present()
 
 
+    this.stateService.embassyDrive = this.embassyDrive
+    this.stateService.embassyPassword = this.password
+
+    try {
+      await this.stateService.setupEmbassy()
+      this.modalController.dismiss({ success: true })
+    } catch (e) {
+      this.error = e.message
+    } finally {
+      loader.dismiss()
+    }
   }
 
   validate () {
     if (this.password.length < 12) {
-      this.error="*passwords must be 12 characters or greater"
-    } else if (this.password !== this.passwordVer) {
-      this.error="*passwords dont match"
+      this.error="*password must be 12 characters or greater"
     } else {
       this.error = ''
     }
diff --git a/setup-wizard/src/app/pages/recover/recover.page.html b/setup-wizard/src/app/pages/recover/recover.page.html
index 4f5f15765..59db3c6d7 100644
--- a/setup-wizard/src/app/pages/recover/recover.page.html
+++ b/setup-wizard/src/app/pages/recover/recover.page.html
@@ -60,18 +60,6 @@
                   Next
                 </ion-button>
             </ion-item-group>
-
-            <!-- <div *ngIf="stateService.polling" style="width: 100%; text-align: center;">
-              <ion-progress-bar color="primary" style="max-width: 700px; margin: auto; padding-bottom: 20px; margin-bottom: 40px;" value="{{stateService.dataProgress}}"></ion-progress-bar>
-              <ion-button 
-                (click)="navToEmbassy()"
-                [disabled]="stateService.dataProgress !== 1"
-                style="text-align:center"
-                class="claim-button"
-              >
-                Go To Embassy
-              </ion-button>
-            </div> -->
           </ion-card-content>
         </ion-card>
       </ion-col>
diff --git a/setup-wizard/src/app/pages/recover/recover.page.ts b/setup-wizard/src/app/pages/recover/recover.page.ts
index f61d62685..63a9f91be 100644
--- a/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -41,8 +41,7 @@ export class RecoverPage {
     const modal = await this.modalController.create({
       component: PasswordPage,
       componentProps: {
-        recoveryDrive: this.selectedDrive,
-        verify: true
+        recoveryDrive: this.selectedDrive
       }
     })
     modal.onDidDismiss().then(async ret => {
diff --git a/setup-wizard/src/app/services/api/api.service.ts b/setup-wizard/src/app/services/api/api.service.ts
index b9ed35fc7..fa371189f 100644
--- a/setup-wizard/src/app/services/api/api.service.ts
+++ b/setup-wizard/src/app/services/api/api.service.ts
@@ -4,12 +4,15 @@ export abstract class ApiService {
   protected error$: Subject<string> = new Subject();
   watchError$ = this.error$.asObservable();
   abstract getEmbassyDrives (): Promise<EmbassyDrive[]>;
-  abstract selectEmbassyDrive (logicalName: string): Promise<void>;
   abstract getRecoveryDrives (): Promise<RecoveryDrive[]>;
-  abstract selectRecoveryDrive (logicalName: string, password: string): Promise<void>;
   abstract getDataTransferProgress (): Promise<TransferProgress>;
-  abstract submitPassword (password: string): Promise<void>;
   abstract verifyRecoveryPassword (logicalname: string, password: string): Promise<boolean>;
+  abstract setupEmbassy (setupInfo: {
+    embassyLogicalname: string,
+    embassyPassword: string
+    recoveryLogicalname?: string,
+    recoveryPassword?: string
+  }): Promise<void>
 }
 
 export interface TransferProgress {
diff --git a/setup-wizard/src/app/services/api/mock-api.service.ts b/setup-wizard/src/app/services/api/mock-api.service.ts
index e69218543..475bf6f3d 100644
--- a/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -58,11 +58,6 @@ export class MockApiService extends ApiService {
     ]
   }
 
-  async selectEmbassyDrive(drive) {
-    await pauseFor(2000)
-    return
-  }
-
   async getRecoveryDrives() {
     await pauseFor(2000)
     return [
@@ -79,20 +74,15 @@ export class MockApiService extends ApiService {
     ]
   }
 
-  async selectRecoveryDrive(logicalName, password) {
-    await pauseFor(2000)
-    return
-  }
-
-  async submitPassword(password) {
-    await pauseFor(2000)
-    return
-  }
-
   async verifyRecoveryPassword(logicalname, password) {
     await pauseFor(2000)
     return password.length > 8
   }
+
+  async setupEmbassy (setupInfo){
+    await pauseFor(2000)
+    return
+  }
 }
 
 let tries = 0
diff --git a/setup-wizard/src/app/services/state.service.ts b/setup-wizard/src/app/services/state.service.ts
index 1f2957145..87d563c37 100644
--- a/setup-wizard/src/app/services/state.service.ts
+++ b/setup-wizard/src/app/services/state.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core'
+import { BehaviorSubject } from 'rxjs';
 import { ApiService, EmbassyDrive, RecoveryDrive } from './api/api.service'
 
 @Injectable({
@@ -8,11 +9,12 @@ export class StateService {
   polling = false
 
   embassyDrive: EmbassyDrive;
+  embassyPassword: string
   recoveryDrive: RecoveryDrive;
   recoveryPassword: string
   dataTransferProgress: { bytesTransfered: number; totalBytes: number } | null;
   dataProgress = 0;
-
+  dataProgSubject = new BehaviorSubject(this.dataProgress)
   constructor(
     private readonly apiService: ApiService
   ) {}
@@ -21,15 +23,16 @@ export class StateService {
     this.polling = false
 
     this.embassyDrive = null
+    this.embassyPassword = null
     this.recoveryDrive = null
     this.recoveryPassword = null
     this.dataTransferProgress = null
     this.dataProgress = 0
   }
 
-  async pollDataTransferProgress() {
+  async pollDataTransferProgress(callback?: () => void) {
     this.polling = true
-    await pauseFor(7000)
+    await pauseFor(1000)
 
     if (
       this.dataTransferProgress?.totalBytes &&
@@ -43,8 +46,18 @@ export class StateService {
     }
     if (this.dataTransferProgress.totalBytes) {
       this.dataProgress = this.dataTransferProgress.bytesTransfered / this.dataTransferProgress.totalBytes
+      this.dataProgSubject.next(this.dataProgress)
     }
-    this.pollDataTransferProgress()
+    this.pollDataTransferProgress(callback)
+  }
+
+  async setupEmbassy () {
+    await this.apiService.setupEmbassy({
+      embassyLogicalname: this.embassyDrive.logicalname,
+      embassyPassword: this.embassyPassword,
+      recoveryLogicalname: this.recoveryDrive?.logicalname,
+      recoveryPassword: this.recoveryPassword
+    })
   }
 }
 
diff --git a/setup-wizard/src/global.scss b/setup-wizard/src/global.scss
index 8597f7fd0..467d346a4 100644
--- a/setup-wizard/src/global.scss
+++ b/setup-wizard/src/global.scss
@@ -69,4 +69,14 @@ ion-item {
     font-size: 28px;
     margin-right: 10px;
   }
+}
+
+.success-alert .alert-wrapper {
+  box-shadow: 4px 4px 30px var(--ion-color-light);
+  border: 1px solid rgba(255,255,255,.3);
+  background: var(--ion-color-light);
+}
+
+.success-alert .alert-title {
+  color: var(--ion-color-success);
 }
\ No newline at end of file