diff --git a/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt b/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt
index 445e157..df7c5e1 100644
--- a/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt
+++ b/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt
@@ -27,14 +27,14 @@ abstract class WooDroidActivity<T : ViewModel> : BaseActivity() {
         super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase))
     }
 
-    private fun showLoading(title: String, message: String) {
+    fun showLoading(title: String, message: String) {
         val manager = supportFragmentManager
         progressDialog = ProgressDialogFragment.newInstance(title, message)
         progressDialog.isCancelable = false
         progressDialog.show(manager, "progress")
     }
 
-    private fun stopShowingLoading() {
+    fun stopShowingLoading() {
         progressDialog.dismiss()
     }
 
diff --git a/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt b/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt
index 890b942..d2c3ebe 100644
--- a/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt
+++ b/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt
@@ -1,19 +1,20 @@
 package me.gilo.wc.ui.customer
 
+import android.arch.lifecycle.Observer
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v7.app.AppCompatActivity
+import android.widget.Toast
+import com.google.firebase.auth.FirebaseAuth
 import io.github.inflationx.viewpump.ViewPumpContextWrapper
+import kotlinx.android.synthetic.main.customer_basic_details.*
 import me.gilo.wc.R
-
-import kotlinx.android.synthetic.main.activity_basic_customer_details.*
-import me.gilo.raison.ui.user.onboarding.SignInActivity
-import me.gilo.wc.common.BaseActivity
+import me.gilo.wc.common.Status
+import me.gilo.wc.models.User
 import me.gilo.wc.ui.WooDroidActivity
-import me.gilo.wc.ui.state.ProgressDialogFragment
+import me.gilo.wc.ui.home.HomeActivity
 import me.gilo.wc.viewmodels.CustomerViewModel
-import me.gilo.wc.viewmodels.UserViewModel
+import me.gilo.woodroid.models.Customer
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -21,6 +22,8 @@ class BasicCustomerDetailsActivity : WooDroidActivity<CustomerViewModel>() {
 
 
     override lateinit var viewModel : CustomerViewModel
+    private val pattern = Pattern.compile(EMAIL_PATTERN)
+    private var matcher: Matcher? = null
 
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase))
@@ -33,6 +36,96 @@ class BasicCustomerDetailsActivity : WooDroidActivity<CustomerViewModel>() {
         viewModel = getViewModel(CustomerViewModel::class.java)
         title = "Basic Details"
 
+        etEmail.setText(FirebaseAuth.getInstance().currentUser!!.email)
+
+        flSave.setOnClickListener{save()}
+
+    }
+
+    private fun save() {
+        if (validates()) {
+            val email = etEmail.text.toString()
+            val firstName =  etFirstName.text.toString()
+            val lastName = etLastName.text.toString()
+            val username = etUsername.text.toString()
+
+            var customer = Customer()
+            customer.email = email
+            customer.firstName = firstName
+            customer.lastName = lastName
+            customer.username = username
+
+            viewModel.create(customer).observe(this, Observer {
+                    response->
+                when (response!!.status()){
+                    Status.LOADING ->{
+                        showLoading("Uploading account details", "This will only take a short while")
+                    }
+
+                    Status.SUCCESS ->{
+                        stopShowingLoading()
+                        startActivity(Intent(baseContext, BillingAddressActivity::class.java))
+                    }
+
+                    Status.ERROR ->{
+                        stopShowingLoading()
+                        Toast.makeText(baseContext, response.error().message.toString(), Toast.LENGTH_LONG).show()
+                    }
+
+                    Status.EMPTY ->{
+
+                    }
+
+                }
+            })
+
+
+
+        } else {
+            Toast.makeText(this, "Please correct the information entered", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun validates(): Boolean {
+        tilEmail.isErrorEnabled = false
+        tilFirstName.isErrorEnabled = false
+        tilLastName.isErrorEnabled = false
+        tilUsername.isErrorEnabled = false
+
+        var validation = true
+
+        val email = tilEmail.editText!!.text.toString()
+        val firstName =  etFirstName.text.toString()
+        val lastName = etLastName.text.toString()
+      val username = etUsername.text.toString()
+
+
+
+        if (!validateEmail(email)) {
+            tilEmail.error = "Not a valid email address!"
+            validation = false
+        }
+
+        if (firstName.isEmpty()) {
+            tilFirstName.error = "Please fill this"
+            validation = false
+        }
+
+        if (lastName.isEmpty()) {
+            tilLastName.error = "Please fill this"
+            validation = false
+        }
+
+        return validation
+    }
+
+    private fun validateEmail(email: String): Boolean {
+        matcher = pattern.matcher(email)
+        return matcher!!.matches()
+    }
+
+    companion object {
+        private const val EMAIL_PATTERN = "^[a-zA-Z0-9#_~!$&'()*+,;=:.\"(),:;<>@\\[\\]\\\\]+@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*$"
     }
 
 }
diff --git a/app/src/main/res/layout/customer_basic_details.xml b/app/src/main/res/layout/customer_basic_details.xml
index 4f17c67..5cb0899 100644
--- a/app/src/main/res/layout/customer_basic_details.xml
+++ b/app/src/main/res/layout/customer_basic_details.xml
@@ -147,7 +147,7 @@
 		  android:layout_height="wrap_content"
 		  android:layout_marginTop="16dp"
 		  android:textColorHint="#9e9e9e"
-		  android:id="@+id/tilPassword"
+		  android:id="@+id/tilUsername"
 		  android:theme="@style/OnboardingTextLabel"
 		  android:visibility="visible">
 
@@ -155,7 +155,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="Username"
-			android:id="@+id/etPassword"
+			android:id="@+id/etUsername"
 			android:inputType="textPassword"
 			android:paddingBottom="16dp"
 			android:textColor="#5f6368"
@@ -187,7 +187,7 @@
 	android:layout_margin="16dp"
 	android:gravity="center"
 	android:elevation="2dp"
-	android:id="@+id/flSignup"
+	android:id="@+id/flSave"
 	>
 
 	<TextView