diff --git a/src/controller/profile.php b/src/controller/profile.php
index a7a6066..a5b09d7 100644
--- a/src/controller/profile.php
+++ b/src/controller/profile.php
@@ -1,5 +1,7 @@
 <?php //-->
 
+use Cradle\Module\Utility\File;
+
 /**
  * Render Profile JS
  *
@@ -34,10 +36,40 @@
     // 2. Render Template
     //set the class name
     $class = 'page-profile-update page-profile';
+    //----------------------------//
+    // 3. Prepare Data
+    //Prepare body
+    $data = ['item' => $request->getPost()];
 
     //determine the title
     $data['title'] = $global->translate('Update Profile');
 
+    // add CDN
+    $config = $this->package('global')->service('s3-main');
+    $data['cdn_config'] = File::getS3Client($config);
+
+    //add CSRF
+    $this->trigger('csrf-load', $request, $response);
+    $data['csrf'] = $response->getResults('csrf');
+
+    //If no post
+    if (!$request->hasPost('profile_name')) {
+        //set default data
+        $data['item'] = $request->getSession('me');
+    }
+
+    if ($response->isError()) {
+        $response->setFlash($response->getMessage(), 'error');
+        $data['errors'] = $response->getValidation();
+    }
+
+    //if there are file fields
+    if (!empty($data['schema']['files'])) {
+        //add CDN
+        $config = $this->package('global')->service('s3-main');
+        $data['cdn_config'] = File::getS3Client($config);
+    }
+
     $template = dirname(__DIR__) . '/template';
     if (is_dir($response->getPage('template_root'))) {
         $template = $response->getPage('template_root');
@@ -91,6 +123,25 @@
 
     //determine the title
     $data['title'] = $global->translate('Update Profile');
+    
+    // add CDN
+    $config = $this->package('global')->service('s3-main');
+    $data['cdn_config'] = File::getS3Client($config);
+
+    //add CSRF
+    $this->trigger('csrf-load', $request, $response);
+    $data['csrf'] = $response->getResults('csrf');
+
+    //If no post
+    if (!$request->hasPost('profile_name')) {
+        //set default data
+        $data['item'] = $request->getSession('me');
+    }
+
+    if ($response->isError()) {
+        $response->setFlash($response->getMessage(), 'error');
+        $data['errors'] = $response->getValidation();
+    }
 
     $template = dirname(__DIR__) . '/template';
     if (is_dir($response->getPage('template_root'))) {
@@ -102,6 +153,12 @@
         $partials = $response->getPage('partials_root');
     }
 
+        //If no post
+    if (!$request->hasPost('profile_name')) {
+        //set default data
+        $data['item'] = $request->getSession('me');
+    }
+
     //render the body
     $body = $this
         ->package('cradlephp/cradle-website')
@@ -210,6 +267,7 @@
     //set the class name
     $class = 'page-profile-address-create page-profile';
 
+    $data = ['item' => $request->getPost()];
     //determine the title
     $data['title'] = $global->translate('Update Profile');
 
@@ -268,6 +326,16 @@
     //determine the title
     $data['title'] = $global->translate('Update Profile');
 
+    $addressId = $request->getStage('address_id');
+
+    $request
+        ->setStage('schema', 'address')
+        ->setStage('address_id', $addressId);
+
+    $this->trigger('system-model-detail', $request, $response);
+
+    $data['item'] = $response->getResults();
+
     $template = dirname(__DIR__) . '/template';
     if (is_dir($response->getPage('template_root'))) {
         $template = $response->getPage('template_root');
@@ -305,3 +373,328 @@
 
     $this->trigger('www-render-page', $request, $response);
 });
+
+
+/**
+ * Render profile address create page
+ *
+ * @param Request $request
+ * @param Response $response
+ */
+$this->get('/profile/address/remove/:address_id', function($request, $response) {
+    $global = $this->package('global');
+
+    //----------------------------//
+    // 2. Render Template
+    $redirect = '/profile/address';
+    $request
+        ->setStage('schema', 'address')
+        ->setStage('address_id', $request->getStage('address_id'));
+
+    //----------------------------//
+    // 2. Process Request
+    $this->trigger('system-model-remove', $request, $response);
+
+    if ($response->isError()) {
+        //add a flash
+        $this->package('global')->flash($response->getMessage(), 'danger');
+        $this->package('global')->redirect($redirect);
+    } 
+       
+    //add a flash
+    $message = $this->package('global')->translate('Address was Removed');
+    $this->package('global')->flash($message, 'success');
+
+    $this->package('global')->redirect($redirect);
+});
+
+/**
+ * Process the Address Create Page
+ *
+ * @param Request $request
+ * @param Response $response
+ */
+$this->post('/profile/address/create', function ($request, $response) {
+    //----------------------------//
+    // 1. Setup Overrides
+    //determine route
+    $route = '/profile/address/create';
+    if ($request->hasStage('route')) {
+        $route = $request->getStage('route');
+    }
+
+    //determine redirect
+    $redirect = '/profile/address';
+
+    //----------------------------//
+    // 2. Security Checks
+    //need to be online
+    $this->package('global')->requireLogin();
+
+    if ($response->isError()) {
+        $response->setFlash($response->getMessage(), 'error');
+        $data['errors'] = $response->getValidation();
+    }
+
+    //csrf check
+    $this->trigger('csrf-validate', $request, $response);
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //----------------------------//
+    // 3. Prepare Data
+    $errors =[];
+    $data = ['item' => $request->getPost()];
+
+    //set the address_id
+    $request->setStage('address', $request->getStage('address_id'));
+    $request->setStage('schema', 'address');
+    //----------------------------//
+    // 4. Process Request
+    //trigger the job
+    $this->trigger('system-model-create', $request, $response);
+    //----------------------------//
+    // 5. Interpret Results
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //if we dont want to redirect
+    if ($redirect === 'false') {
+        return;
+    }
+
+    //add a flash
+    $message = $this->package('global')->translate('Address Added');
+    $this->package('global')->flash($message, 'success');
+
+    $this->package('global')->redirect($redirect);
+});
+/**
+ * Process the Account Page
+ *
+ * @param Request $request
+ * @param Response $response
+ */
+$this->post('/profile/address/update/:address_id', function ($request, $response) {
+    //----------------------------//
+    // 1. Setup Overrides
+    //determine route
+    $route = '/profile/address/update/'. $request->getStage('address_id');
+    if ($request->hasStage('route')) {
+        $route = $request->getStage('route');
+    }
+
+    //determine redirect
+    $redirect = '/profile/address/update/'. $request->getStage('address_id');
+
+    //----------------------------//
+    // 2. Security Checks
+    //need to be online
+    $this->package('global')->requireLogin();
+
+    //csrf check
+    $this->trigger('csrf-validate', $request, $response);
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //----------------------------//
+    // 3. Prepare Data
+    $errors =[];
+    $data = ['item' => $request->getPost()];
+
+    //set the address_id
+    $request->setStage('address', $request->getStage('address_id'));
+    $request->setStage('schema', 'address');
+    //----------------------------//
+    // 4. Process Request
+    //trigger the job
+    $this->trigger('system-model-update', $request, $response);
+    //----------------------------//
+    // 5. Interpret Results
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //if we dont want to redirect
+    if ($redirect === 'false') {
+        return;
+    }
+
+    //add a flash
+    $message = $this->package('global')->translate('Update Successful');
+    $this->package('global')->flash($message, 'success');
+
+    $this->package('global')->redirect($redirect);
+});
+
+/**
+ * Process the Account Page
+ *
+ * @param Request $request
+ * @param Response $response
+ */
+$this->post('/profile/account', function ($request, $response) {
+    //----------------------------//
+    // 1. Setup Overrides
+    //determine route
+    $route = '/profile/account';
+    if ($request->hasStage('route')) {
+        $route = $request->getStage('route');
+    }
+
+    //determine redirect
+    $redirect = '/profile/account';
+
+    //----------------------------//
+    // 2. Security Checks
+    //need to be online
+    $this->package('global')->requireLogin();
+
+    //csrf check
+    $this->trigger('csrf-validate', $request, $response);
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //----------------------------//
+    // 3. Prepare Data
+    $errors =[];
+    $data = ['item' => $request->getPost()];
+    if (isset($data['item']['auth_password']) && empty($data['item']['auth_password'])) {
+        $errors['auth_password'] = 'Cannot be empty';
+    }
+
+    if (isset($data['item']['confirm']) && empty($data['item']['confirm'])) {
+        $errors['confirm'] = 'Cannot be empty';
+    }
+
+    //confirm
+    if ((
+        !empty($data['item']['auth_password']) || !empty($data['item']['confirm'])
+        )
+        && $data['item']['confirm'] !== $data['item']['auth_password']
+    ) {
+        $errors['confirm'] = 'Passwords do not match';
+    }
+
+    if ($errors) {
+        $response->setError(true, 'Invalid Parameters');
+        $response->set('json', 'validation', $errors);
+        return $this->routeTo('get', $route, $request, $response);
+    }
+    
+    //set the auth_id and profile_id
+    $request->setStage('auth_id', $request->getSession('me', 'auth_id'));
+    $request->setStage('schema', 'auth');
+    //----------------------------//
+    // 4. Process Request
+    //trigger the job
+    $this->trigger('system-model-update', $request, $response);
+    //----------------------------//
+    // 5. Interpret Results
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //setup a new RnR
+    $payload = $this->makePayload();
+
+    //it was good
+    //update the session
+    $payload['request']->setStage('auth_id', $request->getSession('me', 'auth_id'));
+    $payload['request']->setStage('schema', 'auth');
+    $this->trigger(
+        'system-model-detail', 
+        $payload['request'], 
+        $payload['response']
+    );
+
+    //update session me
+    $request->setSession('me', $payload['response']->getResults());
+
+    //if we dont want to redirect
+    if ($redirect === 'false') {
+        return;
+    }
+
+    //add a flash
+    $message = $this->package('global')->translate('Update Successful');
+    $this->package('global')->flash($message, 'success');
+
+    $this->package('global')->redirect($redirect);
+});
+
+/**
+ * Process the Profile Update Page
+ *
+ * @param Request $request
+ * @param Response $response
+ */
+$this->post('/profile/update', function ($request, $response) {
+    //----------------------------//
+    // 1. Setup Overrides
+    //determine route
+    $route = '/profile/update';
+    if ($request->hasStage('route')) {
+        $route = $request->getStage('route');
+    }
+
+    //determine redirect
+    $redirect = '/profile/update';
+
+    //----------------------------//
+    // 2. Security Checks
+    //need to be online
+    $this->package('global')->requireLogin();
+
+    //csrf check
+    $this->trigger('csrf-validate', $request, $response);
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //----------------------------//
+    // 3. Prepare Data
+    //set the auth_id and profile_id
+    $request->setStage('profile_id', $request->getSession('me', 'profile_id'));
+    $request->setStage('schema', 'profile');
+
+    //----------------------------//
+    // 4. Process Request
+    //trigger the job
+    $this->trigger('system-model-update', $request, $response);
+    //----------------------------//
+    // 5. Interpret Results
+    if ($response->isError()) {
+        return $this->routeTo('get', $route, $request, $response);
+    }
+
+    //setup a new RnR
+    $payload = $this->makePayload();
+
+    //it was good
+    //update the session
+    $payload['request']->setStage('auth_id', $request->getSession('me', 'auth_id'));
+    $payload['request']->setStage('schema', 'auth');
+    $this->trigger(
+        'system-model-detail', 
+        $payload['request'], 
+        $payload['response']
+    );
+    //update session me
+    $request->setSession('me', $payload['response']->getResults());
+
+    //if we dont want to redirect
+    if ($redirect === 'false') {
+        return;
+    }
+
+    //add a flash
+    $message = $this->package('global')->translate('Update Successful');
+    $this->package('global')->flash($message, 'success');
+
+    $this->package('global')->redirect($redirect);
+});
\ No newline at end of file
diff --git a/src/template/profile/account.html b/src/template/profile/account.html
index 4a24bdb..815867f 100644
--- a/src/template/profile/account.html
+++ b/src/template/profile/account.html
@@ -30,24 +30,37 @@ <h1 class="mt-4">
             {{> profile_menu}}
         </div>
         <div class="col-md-9">
-            {{#format 'field' 'auth' item}}
-                {{#each formats}}
-                    {{#notin 'auth_type' @key}}
-                        {{> profile_fieldset}}
-                    {{/notin}}
-                    {{#when @key '===' 'auth_password'}}
-                        <div class="form-group mt-2">
-                            <label class="control-label">{{_ 'Confirm'}}</label>
-                            <div class="form-password system-form-field" data-name="auth_password">
-                                <input autocomplete="confirm" class="form-control system-form-control" name="confirm" type="password" placeholder="Confirm password" />
+            <form method="post">
+                {{#format 'field' 'auth' item}}
+                    {{#each formats}}
+                        {{#notin 'auth_type' @key}}
+                            {{> profile_fieldset}}
+                        {{/notin}}
+                        {{#when @key '===' 'auth_password'}}
+                            <div class="form-group mt-2 
+                                {{#response 'json'}}
+                                   {{#if validation.confirm}}has-error{{/if}}
+                                {{/response}}"
+                            >
+                                <label class="control-label">{{_ 'Confirm'}}</label>
+                                <div class="form-password system-form-field" data-name="auth_password">
+                                    <input autocomplete="confirm" class="form-control system-form-control" name="confirm" type="password" placeholder="Confirm password" />
+                                </div>
+
+                                {{#response 'json'}}
+                                    {{#if validation.confirm}}
+                                        <span class="help-text">{{validation.confirm}}</span>
+                                    {{/if}}
+                                {{/response}}
                             </div>
-                        </div>
-                    {{/when}}
-                {{/each}}
-            {{/format}}
-            <div class="form-group mt-2">
-                <button class="btn btn-primary">{{_ 'Submit'}}</button>
-            </div>
+                        {{/when}}
+                    {{/each}}
+                {{/format}}
+                <div class="form-group mt-2">
+                    <input type="hidden" name="csrf" value="{{csrf}}" />
+                    <button class="btn btn-primary">{{_ 'Submit'}}</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>
diff --git a/src/template/profile/address/create.html b/src/template/profile/address/create.html
index 1b169cb..84fd618 100644
--- a/src/template/profile/address/create.html
+++ b/src/template/profile/address/create.html
@@ -37,7 +37,7 @@ <h1 class="mt-4">
         </div>
         <div class="col-md-9">
             <form method="post">
-                {{#format 'field' 'address'}}
+                {{#format 'field' 'address' item}}
                     {{#each formats}}
                         {{#notin 'address_latitude,address_longitude' @key}}
                             {{> profile_fieldset}}
diff --git a/src/template/profile/address/update.html b/src/template/profile/address/update.html
index 025c980..84fd618 100644
--- a/src/template/profile/address/update.html
+++ b/src/template/profile/address/update.html
@@ -1 +1,54 @@
 <link href="/styles/profile.css" rel="stylesheet" type="text/css" />
+<div class="profile-layout container">
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="/">
+                    <i class="fas fa-home"></i> {{_ 'Home'}}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="/profile/address">
+                    <i class="fas fa-map-marker-alt"></i>
+                    {{_ 'My Addresses'}}
+                </a>
+            </li>
+            <li class="breadcrumb-item active" aria-current="page">
+                <i class="fas fa-plus"></i>
+                {{_ 'Add Address'}}
+            </li>
+        </ol>
+    </nav>
+    <h1 class="mt-4">
+        <i class="fas fa-plus"></i>
+        &nbsp;
+        {{_ 'Add Address'}}
+    </h1>
+    <hr />
+    <div class="row">
+        <div class="col-md-3">
+            {{#if profile_image}}
+                <img src="{{profile_image}}" width="100%" />
+            {{else}}
+                <img src="/images/default-avatar.png" width="100%" />
+            {{/if}}
+
+            {{> profile_menu}}
+        </div>
+        <div class="col-md-9">
+            <form method="post">
+                {{#format 'field' 'address' item}}
+                    {{#each formats}}
+                        {{#notin 'address_latitude,address_longitude' @key}}
+                            {{> profile_fieldset}}
+                        {{/notin}}
+                    {{/each}}
+                {{/format}}
+
+                <div class="form-group mt-2">
+                    <button class="btn btn-primary">{{_ 'Submit'}}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/src/template/profile/update.html b/src/template/profile/update.html
index 27711f1..75828df 100644
--- a/src/template/profile/update.html
+++ b/src/template/profile/update.html
@@ -34,16 +34,19 @@ <h1 class="mt-4">
             {{> profile_menu}}
         </div>
         <div class="col-md-9">
-            {{#format 'field' 'profile' item}}
-                {{#each formats}}
-                    {{#notin 'profile_image' @key}}
-                        {{> profile_fieldset}}
-                    {{/notin}}
-                {{/each}}
-            {{/format}}
-            <div class="form-group mt-2">
-                <button class="btn btn-primary">{{_ 'Submit'}}</button>
-            </div>
+            <form method="post">
+                {{#format 'field' 'profile' item}}
+                    {{#each formats}}
+                        {{#notin 'profile_image' @key}}
+                            {{> profile_fieldset}}
+                        {{/notin}}
+                    {{/each}}
+                {{/format}}
+                <div class="form-group mt-2">
+                    <input type="hidden" name="csrf" value="{{csrf}}" />
+                    <button class="btn btn-primary">{{_ 'Submit'}}</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>