diff --git a/AndroidTestAutomationStarter/app/build.gradle b/AndroidTestAutomationStarter/app/build.gradle
index df7788ef..0bec9926 100644
--- a/AndroidTestAutomationStarter/app/build.gradle
+++ b/AndroidTestAutomationStarter/app/build.gradle
@@ -36,8 +36,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:recyclerview-v7:26.1.0'
-    kapt 'com.google.dagger:dagger-compiler:2.11'
-    implementation 'com.google.dagger:dagger:2.11'
+    kapt 'com.google.dagger:dagger-compiler:2.10'
+    implementation 'com.google.dagger:dagger:2.10'
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.3.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
diff --git a/AndroidTestAutomationStarter/app/src/main/AndroidManifest.xml b/AndroidTestAutomationStarter/app/src/main/AndroidManifest.xml
index c481b0d9..9459ab83 100644
--- a/AndroidTestAutomationStarter/app/src/main/AndroidManifest.xml
+++ b/AndroidTestAutomationStarter/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
         <activity android:name=".activities.ProductListActivity" />
         <activity android:name=".activities.ProductDetailsActivity" />
         <activity android:name=".activities.BasketActivity"></activity>
+        <activity android:name=".activities.CheckoutActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/BasketActivity.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/BasketActivity.kt
index 1db595dc..e678f16c 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/BasketActivity.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/BasketActivity.kt
@@ -1,19 +1,23 @@
 package com.novoda.androidstoreexample.activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
+import android.view.View
 import com.novoda.androidstoreexample.R
 import com.novoda.androidstoreexample.adapters.BasketAdapter
 import com.novoda.androidstoreexample.dagger.basket.BasketModule
 import com.novoda.androidstoreexample.dagger.component.AppComponent
+import com.novoda.androidstoreexample.listener.BasketAdapterListener
 import com.novoda.androidstoreexample.models.Order
+import com.novoda.androidstoreexample.models.Product
 import com.novoda.androidstoreexample.mvp.presenter.BasketPresenter
 import com.novoda.androidstoreexample.mvp.view.BasketView
+import com.novoda.androidstoreexample.utilities.PRODUCT_ID_EXTRA
 import kotlinx.android.synthetic.main.activity_basket.*
 import javax.inject.Inject
 
 class BasketActivity : BaseActivity(), BasketView {
-
     @Inject
     lateinit var presenter: BasketPresenter
 
@@ -30,16 +34,43 @@ class BasketActivity : BaseActivity(), BasketView {
     }
 
     override fun showBasketItems(orders: List<Order>) {
-        val basketAdapter = BasketAdapter(this, orders) {
+        val listener = object: BasketAdapterListener {
+            override fun onProductImageClicked(product: Product) {
+                presenter.onBasketItemClicked(product)
+            }
+
+            override fun onIncreaseAmountClicked(product: Product) {
+                presenter.onIncreaseItemClicked(product)
+            }
+
+            override fun onDecreaseAmountClicked(product: Product) {
+                presenter.onDecreaseAmountClicked(product)
+            }
         }
+        val basketAdapter = BasketAdapter(this, orders, listener)
         basketList.layoutManager = LinearLayoutManager(this)
         basketList.adapter = basketAdapter
     }
 
+    override fun showTotalAmountOfBasket(totalPrice: Int) {
+        basket_total_text_field.text = applicationContext.getString(R.string.price_template, totalPrice)
+    }
+
+    override fun onProductClicked(product: Product) {
+        val intent = Intent(this, ProductDetailsActivity::class.java)
+        intent.putExtra(PRODUCT_ID_EXTRA, product.id)
+        startActivity(intent)
+    }
+
     override fun getActivityLayout(): Int {
         return R.layout.activity_basket
     }
 
+    override fun onCheckoutClicked(view: View) {
+        val intent = Intent(this, CheckoutActivity::class.java)
+        startActivity(intent)
+    }
+
     override fun injectDependencies(appComponent: AppComponent) {
         appComponent.injectBasket(BasketModule(this)).inject(this)
     }
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/CheckoutActivity.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/CheckoutActivity.kt
new file mode 100644
index 00000000..6c99f6c5
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/CheckoutActivity.kt
@@ -0,0 +1,36 @@
+package com.novoda.androidstoreexample.activities
+
+import android.os.Bundle
+import com.novoda.androidstoreexample.R
+import com.novoda.androidstoreexample.dagger.checkout.CheckoutModule
+import com.novoda.androidstoreexample.dagger.component.AppComponent
+import com.novoda.androidstoreexample.mvp.presenter.CheckoutPresenter
+import kotlinx.android.synthetic.main.activity_checkout.*
+import javax.inject.Inject
+    
+class CheckoutActivity : BaseActivity() {
+    @Inject
+    lateinit var presenter: CheckoutPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_checkout)
+        buy_button.setOnClickListener {
+            presenter.onBuyClick()
+        }
+    }
+
+    override fun getActivityLayout(): Int {
+        return R.layout.activity_checkout
+    }
+
+    override fun injectDependencies(appComponent: AppComponent) {
+        appComponent.injectCheckout(CheckoutModule(this)).inject(this)
+    }
+
+    override fun showProgress() {
+    }
+
+    override fun hideProgress() {
+    }
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ConfirmationActivity.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ConfirmationActivity.kt
new file mode 100644
index 00000000..379c4f52
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ConfirmationActivity.kt
@@ -0,0 +1,46 @@
+package com.novoda.androidstoreexample.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import com.novoda.androidstoreexample.R
+import com.novoda.androidstoreexample.dagger.component.AppComponent
+import com.novoda.androidstoreexample.dagger.confirmation.ConfirmationModule
+import com.novoda.androidstoreexample.mvp.presenter.ConfirmationPresenter
+import com.novoda.androidstoreexample.mvp.view.ConfirmationView
+import kotlinx.android.synthetic.main.activity_purchase_confirmation.*
+import javax.inject.Inject
+
+class ConfirmationActivity : BaseActivity(), ConfirmationView {
+    override fun getActivityLayout(): Int {
+        return R.layout.activity_purchase_confirmation
+    }
+
+    @Inject
+    lateinit var presenter: ConfirmationPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_purchase_confirmation)
+        home_button.setOnClickListener {
+            presenter.onHomeClicked()
+        }
+    }
+
+    override fun injectDependencies(appComponent: AppComponent) {
+        appComponent.injectConfirmation(ConfirmationModule(this)).inject(this)
+    }
+
+
+    override fun onHomeClicked(view: View) {
+        val intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
+    }
+
+    override fun showProgress() {
+    }
+
+    override fun hideProgress() {
+    }
+
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ProductDetailsActivity.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ProductDetailsActivity.kt
index a5b5c188..cde40292 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ProductDetailsActivity.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/activities/ProductDetailsActivity.kt
@@ -32,7 +32,7 @@ class ProductDetailsActivity : BaseActivity(), ProductDetailView {
         productDetailImage.setImageResource(resourceId)
         productDetailTitle.text = product.title
         productDetailDescription.text = product.productDescription
-        productDetailPrice.text = product.price
+        productDetailPrice.text = applicationContext.getString(R.string.price_template, product.price)
     }
 
     override fun getActivityLayout(): Int {
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/BasketAdapter.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/BasketAdapter.kt
index 8017ce7d..02f8fccd 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/BasketAdapter.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/BasketAdapter.kt
@@ -5,21 +5,23 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import com.novoda.androidstoreexample.R
+import com.novoda.androidstoreexample.listener.BasketAdapterListener
 import com.novoda.androidstoreexample.models.Order
 import com.novoda.androidstoreexample.utilities.ImageHelper
 
 class BasketAdapter(
     private val context: Context,
     private val orders: List<Order>,
-    private val itemClicked: (Int) -> Unit
+    private val listener: BasketAdapterListener
 ) : RecyclerView.Adapter<BasketAdapter.Holder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): Holder {
         val view = LayoutInflater.from(context).inflate(R.layout.basket_item, parent, false)
-        return Holder(view, itemClicked)
+        return Holder(view, listener)
     }
 
     override fun getItemCount(): Int {
@@ -30,16 +32,33 @@ class BasketAdapter(
         holder?.bindProducts(orders[position], context)
     }
 
-    inner class Holder(itemView: View, private val itemClicked: (Int) -> Unit) : RecyclerView.ViewHolder(itemView) {
+    inner class Holder(itemView: View, private val productListener: BasketAdapterListener) : RecyclerView.ViewHolder(itemView) {
         private val productImage = itemView.findViewById<ImageView>(R.id.basketProductImage)
         private val productTitle = itemView.findViewById<TextView>(R.id.basketProductTitle)
-        private val numberOfProducts = itemView.findViewById<TextView>(R.id.NumberOfItemsTextField)
+        private val plusButton = itemView.findViewById<Button>(R.id.basket_view_increase_button)
+        private val minusButton = itemView.findViewById<Button>(R.id.basket_view_decrease_button)
+        private val numberOfProducts = itemView.findViewById<TextView>(R.id.number_of_items_text_field)
+        private val priceField = itemView.findViewById<TextView>(R.id.price_per_item_textview)
+        private val totalField = itemView.findViewById<TextView>(R.id.total_text_view)
 
         fun bindProducts(order: Order, context: Context) {
-            val resourceId: Int = ImageHelper().getResourceIdForImage(context, order.product.image)
-            productImage?.setImageResource(resourceId)
-            productTitle?.text = order.product.title
-            numberOfProducts?.text = order.numberOfItems.toString()
+            with(order) {
+                val resourceId: Int = ImageHelper().getResourceIdForImage(context, product.image)
+                productImage?.setImageResource(resourceId)
+                productImage?.setOnClickListener{
+                    productListener.onProductImageClicked(product)
+                }
+                plusButton?.setOnClickListener{
+                    productListener.onIncreaseAmountClicked(product)
+                }
+                minusButton?.setOnClickListener{
+                    productListener.onDecreaseAmountClicked(product)
+                }
+                priceField?.text = context.getString(R.string.price_template, product.price)
+                totalField?.text = context.getString(R.string.price_template, amount)
+                productTitle?.text = order.product.title
+                numberOfProducts?.text = order.numberOfItems.toString()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/ProductListAdapter.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/ProductListAdapter.kt
index 5eb36f2e..79055ffa 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/ProductListAdapter.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/adapters/ProductListAdapter.kt
@@ -1,6 +1,7 @@
 package com.novoda.androidstoreexample.adapters
 
 import android.content.Context
+import android.content.res.Resources
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
@@ -40,7 +41,7 @@ class ProductListAdapter(
             val resourceId: Int = ImageHelper().getResourceIdForImage(context, product.image)
             productImage?.setImageResource(resourceId)
             productName?.text = product.title
-            productPrice?.text = product.price
+            productPrice?.text = context.getString(R.string.price_template, product.price)
             itemView.setOnClickListener { itemClick(product.id) }
         }
     }
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/App.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/App.kt
index 60763453..9f000c42 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/App.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/App.kt
@@ -15,4 +15,4 @@ class App : Application() {
         super.onCreate()
         component = DaggerAppComponent.create()
     }
-}
\ No newline at end of file
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutComponent.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutComponent.kt
new file mode 100644
index 00000000..bccaf300
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutComponent.kt
@@ -0,0 +1,9 @@
+package com.novoda.androidstoreexample.dagger.checkout
+
+import com.novoda.androidstoreexample.activities.CheckoutActivity
+import dagger.Subcomponent
+
+@Subcomponent(modules = arrayOf(CheckoutModule::class))
+interface CheckoutComponent {
+    fun inject(checkoutActivity: CheckoutActivity)
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutModule.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutModule.kt
new file mode 100644
index 00000000..bcf72518
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/checkout/CheckoutModule.kt
@@ -0,0 +1,18 @@
+package com.novoda.androidstoreexample.dagger.checkout
+
+import com.novoda.androidstoreexample.mvp.presenter.CheckoutPresenter
+import com.novoda.androidstoreexample.mvp.presenter.impl.CheckoutPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+@Module
+class CheckoutModule(private val checkoutView: CheckoutView) {
+
+    @Provides
+    fun providesView(): CheckoutView = checkoutView
+
+    @Provides
+    fun providePresenter(checkoutPresenter: CheckoutPresenterImpl): CheckoutPresenter {
+        return checkoutPresenter
+    }
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/component/AppComponent.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/component/AppComponent.kt
index 8b09b580..341ab868 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/component/AppComponent.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/component/AppComponent.kt
@@ -6,6 +6,10 @@ import com.novoda.androidstoreexample.dagger.categoryList.CategoryListComponent
 import com.novoda.androidstoreexample.dagger.categoryList.CategoryListModule
 import com.novoda.androidstoreexample.dagger.categoryList.ProductListComponent
 import com.novoda.androidstoreexample.dagger.categoryList.ProductListModule
+import com.novoda.androidstoreexample.dagger.checkout.CheckoutComponent
+import com.novoda.androidstoreexample.dagger.checkout.CheckoutModule
+import com.novoda.androidstoreexample.dagger.confirmation.ConfirmationComponent
+import com.novoda.androidstoreexample.dagger.confirmation.ConfirmationModule
 import com.novoda.androidstoreexample.dagger.module.BasketServiceModule
 import com.novoda.androidstoreexample.dagger.module.ClientModule
 import com.novoda.androidstoreexample.dagger.module.HostModule
@@ -22,4 +26,6 @@ interface AppComponent {
     fun injectProducts(productListModule: ProductListModule): ProductListComponent
     fun injectProductDetails(productDetailsModule: ProductDetailsModule): ProductDetailsComponent
     fun injectBasket(basketModule: BasketModule): BasketComponent
-}
\ No newline at end of file
+    fun injectCheckout(checkoutModule: CheckoutModule): CheckoutComponent
+    fun injectConfirmation(confirmationModule: ConfirmationModule): ConfirmationComponent
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationComponent b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationComponent
new file mode 100644
index 00000000..8340fbf6
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationComponent
@@ -0,0 +1,9 @@
+package com.novoda.androidstoreexample.dagger.confirmation
+
+import com.novoda.androidstoreexample.activities.ConfirmationActivity
+import dagger.Subcomponent
+
+@Subcomponent(modules = [ConfirmationModule::class])
+interface ConfirmationComponent {
+    fun inject(confirmationActivity: ConfirmationActivity)
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationModule.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationModule.kt
new file mode 100644
index 00000000..4cadb190
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/dagger/confirmation/ConfirmationModule.kt
@@ -0,0 +1,19 @@
+package com.novoda.androidstoreexample.dagger.confirmation
+
+import com.novoda.androidstoreexample.mvp.presenter.ConfirmationPresenter
+import com.novoda.androidstoreexample.mvp.presenter.impl.ConfirmationPresenterImpl
+import com.novoda.androidstoreexample.mvp.view.ConfirmationView
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ConfirmationModule(private val confirmationView: ConfirmationView) {
+
+    @Provides
+    fun providesView(): ConfirmationView = confirmationView
+
+    @Provides
+    fun providePresenter(confirmationPresenter: ConfirmationPresenterImpl): ConfirmationPresenter {
+        return confirmationPresenter
+    }
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/listener/BasketAdapterListener.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/listener/BasketAdapterListener.kt
new file mode 100644
index 00000000..875e6319
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/listener/BasketAdapterListener.kt
@@ -0,0 +1,11 @@
+package com.novoda.androidstoreexample.listener
+
+import com.novoda.androidstoreexample.models.Product
+
+interface BasketAdapterListener {
+    fun onProductImageClicked(product: Product)
+
+    fun onIncreaseAmountClicked(product: Product)
+
+    fun onDecreaseAmountClicked(product: Product)
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Order.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Order.kt
index ef130af1..2cb6b191 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Order.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Order.kt
@@ -1,3 +1,5 @@
 package com.novoda.androidstoreexample.models
 
-data class Order(val product: Product, val numberOfItems: Int)
\ No newline at end of file
+data class Order(val product: Product, val numberOfItems: Int) {
+    val amount: Int = product.price * numberOfItems
+}
\ No newline at end of file
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Product.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Product.kt
index 0eee014b..e184ea38 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Product.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/models/Product.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 data class Product(
     val id: Int,
     val title: String,
-    val price: String,
+    val price: Int,
     val image: String,
     @Json(name = "product_description") val productDescription: String
 )
\ No newline at end of file
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/BasketPresenter.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/BasketPresenter.kt
index 2d5a62a0..d4e8911f 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/BasketPresenter.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/BasketPresenter.kt
@@ -1,6 +1,16 @@
 package com.novoda.androidstoreexample.mvp.presenter
 
+import com.novoda.androidstoreexample.models.Product
+
 interface BasketPresenter {
 
     fun loadBasket()
-}
\ No newline at end of file
+
+    fun onBasketItemClicked(product: Product)
+
+    fun onIncreaseItemClicked(product: Product)
+
+    fun onDecreaseAmountClicked(product: Product)
+
+    fun onCheckoutClicked()
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/CheckoutPresenter.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/CheckoutPresenter.kt
new file mode 100644
index 00000000..ffadbba6
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/CheckoutPresenter.kt
@@ -0,0 +1,5 @@
+package com.novoda.androidstoreexample.mvp.presenter
+
+interface CheckoutPresenter {
+    fun onBuyClick()
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/ConfirmationPresenter.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/ConfirmationPresenter.kt
new file mode 100644
index 00000000..1dd9e417
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/ConfirmationPresenter.kt
@@ -0,0 +1,5 @@
+package com.novoda.androidstoreexample.mvp.presenter
+
+interface ConfirmationPresenter{
+    fun onHomeClicked()
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/BasketPresenterImpl.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/BasketPresenterImpl.kt
index 2bd4112f..2151d8c2 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/BasketPresenterImpl.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/BasketPresenterImpl.kt
@@ -1,5 +1,6 @@
 package com.novoda.androidstoreexample.mvp.presenter.impl
 
+import com.novoda.androidstoreexample.models.Product
 import com.novoda.androidstoreexample.mvp.presenter.BasketPresenter
 import com.novoda.androidstoreexample.mvp.view.BasketView
 import com.novoda.androidstoreexample.services.BasketService
@@ -7,8 +8,8 @@ import javax.inject.Inject
 
 class BasketPresenterImpl : BasketPresenter {
     val basketView: BasketView
-    val basketService: BasketService
 
+    val basketService: BasketService
     @Inject
     constructor(basketView: BasketView, basketService: BasketService) {
         this.basketView = basketView
@@ -18,6 +19,25 @@ class BasketPresenterImpl : BasketPresenter {
     override fun loadBasket() {
         basketView.showProgress()
         basketView.showBasketItems(basketService.getBasket())
+        basketView.showTotalAmountOfBasket(basketService.getTotalAmount())
         basketView.hideProgress()
     }
-}
\ No newline at end of file
+
+    override fun onBasketItemClicked(product: Product) {
+        basketView.onProductClicked(product)
+    }
+
+    override fun onIncreaseItemClicked(product: Product) {
+        basketService.increaseNumberOf(product)
+        loadBasket()
+    }
+
+    override fun onDecreaseAmountClicked(product: Product) {
+        basketService.decreaseNumberOf(product)
+        loadBasket()
+    }
+
+    override fun onCheckoutClicked() {
+
+    }
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/CheckoutPresenterImpl.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/CheckoutPresenterImpl.kt
new file mode 100644
index 00000000..195759e7
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/CheckoutPresenterImpl.kt
@@ -0,0 +1,17 @@
+package com.novoda.androidstoreexample.mvp.presenter.impl
+
+import com.novoda.androidstoreexample.mvp.presenter.CheckoutPresenter
+import com.novoda.androidstoreexample.mvp.view.CheckoutView
+import com.novoda.androidstoreexample.services.BasketService
+import javax.inject.Inject
+
+
+class CheckoutPresenterImpl @Inject constructor(private val checkoutView: CheckoutView, private val basketService: BasketService) : CheckoutPresenter
+{
+
+    override fun onBuyClick() {
+        basketService.emptyBasket()
+        checkoutView.goToConfirmationScreen()
+    }
+
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/ConfirmationPresenterImpl.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/ConfirmationPresenterImpl.kt
new file mode 100644
index 00000000..9b337fb3
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/presenter/impl/ConfirmationPresenterImpl.kt
@@ -0,0 +1,14 @@
+package com.novoda.androidstoreexample.mvp.presenter.impl
+
+import com.novoda.androidstoreexample.mvp.presenter.ConfirmationPresenter
+import com.novoda.androidstoreexample.mvp.view.ConfirmationView
+import javax.inject.Inject
+
+class ConfirmationPresenterImpl @Inject constructor(private val confirmationView: ConfirmationView) : ConfirmationPresenter
+{
+
+    override fun onHomeClicked() {
+        confirmationView.goToHomeScreen()
+    }
+
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/BasketView.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/BasketView.kt
index 519ecba6..61f851d1 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/BasketView.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/BasketView.kt
@@ -1,7 +1,12 @@
 package com.novoda.androidstoreexample.mvp.view
 
+import android.view.View
 import com.novoda.androidstoreexample.models.Order
+import com.novoda.androidstoreexample.models.Product
 
 interface BasketView : BaseView {
     fun showBasketItems(orders: List<Order>)
-}
\ No newline at end of file
+    fun onProductClicked(product: Product)
+    fun onCheckoutClicked(view: View)
+    fun showTotalAmountOfBasket(orders: Int)
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/CheckoutView.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/CheckoutView.kt
new file mode 100644
index 00000000..2879991b
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/CheckoutView.kt
@@ -0,0 +1,6 @@
+package com.novoda.androidstoreexample.mvp.view
+
+interface CheckoutView: BaseView {
+
+    fun goToConfirmationScreen()
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/ConfirmationView.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/ConfirmationView.kt
new file mode 100644
index 00000000..32155be3
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/mvp/view/ConfirmationView.kt
@@ -0,0 +1,7 @@
+package com.novoda.androidstoreexample.mvp.view
+
+import android.view.View
+
+interface ConfirmationView :BaseView {
+    fun onHomeClicked(view: View)
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/services/BasketService.kt b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/services/BasketService.kt
index 76bb053d..3583c6cd 100644
--- a/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/services/BasketService.kt
+++ b/AndroidTestAutomationStarter/app/src/main/java/com/novoda/androidstoreexample/services/BasketService.kt
@@ -22,4 +22,26 @@ class BasketService {
         }
         return orders
     }
-}
\ No newline at end of file
+
+    fun increaseNumberOf(product: Product) {
+        basket[product]?.let {
+            basket[product] = it + 1
+        }
+    }
+
+    fun decreaseNumberOf(product: Product) {
+        basket[product]?.let {
+            if (it > 1) {
+                basket[product] = it - 1
+            }
+        }
+    }
+
+    fun getTotalAmount(): Int {
+        return getBasket().fold(0) { sum, element -> sum + element.amount}
+    }
+
+    fun emptyBasket() {
+        basket.clear()
+    }
+}
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_basket.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_basket.xml
index afe1dc7c..1147200e 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_basket.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_basket.xml
@@ -22,13 +22,45 @@
         android:id="@+id/basketList"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        app:layout_constraintTop_toBottomOf="@id/basketTextField"
+        android:layout_marginBottom="122dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/basketTextField" />
+
+    <TextView
+        android:id="@+id/basket_total_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="124dp"
+        android:text="@string/total"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/basketList" />
+
+    <TextView
+        android:id="@+id/basket_total_text_field"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintStart_toEndOf="@+id/basket_total_label"
+        app:layout_constraintTop_toBottomOf="@+id/basketList"
+        tools:text="$ 100023" />
+
+    <Button
+        android:id="@+id/checkout_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="32dp"
+        android:text="@string/checkout"
+        android:onClick="onCheckoutClicked"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/basket_total_label" />
 
 </android.support.constraint.ConstraintLayout>
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_checkout.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_checkout.xml
new file mode 100644
index 00000000..e83a66f4
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_checkout.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.novoda.androidstoreexample.activities.CheckoutActivity">
+
+    <EditText
+        android:id="@+id/checkout_customer_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:hint="Name"
+        android:inputType="textPersonName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/checkout_customer_address"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:hint="Address Line 1"
+        android:inputType="textPostalAddress"
+        android:maxLength="32"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkout_customer_name" />
+
+    <EditText
+        android:id="@+id/checkout_customer_address2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:hint="Address Line 2 (optional)"
+        android:inputType="textPostalAddress"
+        android:maxLength="32"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkout_customer_address" />
+
+    <EditText
+        android:id="@+id/checkout_customer_post_code"
+        android:layout_width="133dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:ems="10"
+        android:hint="Post Code"
+        android:inputType="textPostalAddress"
+        android:maxLength="10"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkout_customer_address2" />
+
+    <EditText
+        android:id="@+id/checkout_customer_city"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:hint="City"
+        android:inputType="textPostalAddress"
+        android:maxLength="10"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/checkout_customer_post_code"
+        app:layout_constraintTop_toBottomOf="@+id/checkout_customer_address2" />
+
+    <Button
+        android:id="@+id/buy_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:onClick="onCheckoutClicked"
+        android:text="Buy!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_product_details.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_product_details.xml
index 2cafd24d..20a15716 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_product_details.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_product_details.xml
@@ -14,7 +14,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button3"
         tools:srcCompat="@drawable/hat1" />
 
     <TextView
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/activity_purchase_confirmation.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_purchase_confirmation.xml
new file mode 100644
index 00000000..7b90d18f
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/activity_purchase_confirmation.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.novoda.androidstoreexample.activities.ConfirmationActivity">
+
+    <TextView
+        android:id="@+id/confirmation_text_header"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:text="Purchase succesful!"
+        android:textSize="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/confirmation_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:text="Your stuff is on its way and should be there in 3-5 working days"
+        android:textSize="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/confirmation_text_header" />
+
+    <Button
+        android:id="@+id/home_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:onClick="onHomeClicked"
+        android:text="Return to Home"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/basket_item.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/basket_item.xml
index 837bd028..14cf6acc 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/layout/basket_item.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/basket_item.xml
@@ -3,17 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="200dp">
 
     <ImageView
         android:id="@+id/basketProductImage"
         android:layout_width="100dp"
         android:layout_height="100dp"
-        android:layout_marginBottom="8dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="24dp"
         android:contentDescription="@string/basket_item_images"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@drawable/hat3" />
@@ -28,47 +26,87 @@
         app:layout_constraintTop_toTopOf="@+id/basketProductImage"
         tools:text="Looooooooooong title" />
 
+    <TextView
+        android:id="@+id/number_of_items_text_field"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:layout_constraintStart_toStartOf="@+id/price_per_item_textview"
+        app:layout_constraintTop_toBottomOf="@+id/price_per_item_textview"
+        tools:text="100" />
+
     <Button
-        android:id="@+id/increaseButton"
+        android:id="@+id/basket_view_decrease_button"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="32dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="32dp"
+        android:text="@string/minus"
+        app:layout_constraintStart_toEndOf="@+id/basketProductImage"
+        app:layout_constraintTop_toBottomOf="@+id/basketProductTitle" />
+
+    <Button
+        android:id="@+id/basket_view_increase_button"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
         android:text="@string/plus"
-        app:layout_constraintBottom_toBottomOf="@+id/basketProductImage"
-        app:layout_constraintStart_toEndOf="@+id/basketProductImage" />
+        app:layout_constraintBottom_toBottomOf="@+id/basket_view_decrease_button"
+        app:layout_constraintStart_toEndOf="@+id/basket_view_decrease_button"
+        app:layout_constraintTop_toTopOf="@+id/basket_view_decrease_button"/>
+
+    <TextView
+        android:id="@+id/price_per_item_textview"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        app:layout_constraintStart_toEndOf="@+id/price_label"
+        app:layout_constraintTop_toTopOf="@+id/price_label"
+        tools:text="£ 15" />
 
     <TextView
-        android:id="@+id/NumberOfItemsTextField"
+        android:id="@+id/price_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/increaseButton"
-        app:layout_constraintStart_toEndOf="@+id/increaseButton"
-        app:layout_constraintTop_toTopOf="@+id/increaseButton"
-        tools:text="1" />
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="12dp"
+        android:text="Price"
+        app:layout_constraintStart_toEndOf="@+id/basket_view_increase_button"
+        app:layout_constraintTop_toBottomOf="@+id/basketProductTitle" />
 
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:text="@string/minus"
-        app:layout_constraintBottom_toBottomOf="@+id/increaseButton"
-        app:layout_constraintStart_toEndOf="@+id/NumberOfItemsTextField"
-        app:layout_constraintTop_toTopOf="@+id/increaseButton" />
+    <TextView
+        android:id="@+id/amount_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/amount"
+        app:layout_constraintStart_toStartOf="@+id/price_label"
+        app:layout_constraintTop_toBottomOf="@+id/price_label" />
 
-    <ImageButton
-        android:id="@+id/deleteButton"
+    <TextView
+        android:id="@+id/basket_item_total_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@android:drawable/btn_dialog" />
+        android:layout_marginTop="16dp"
+        android:text="@string/total"
+        app:layout_constraintStart_toStartOf="@+id/amount_label"
+        app:layout_constraintTop_toBottomOf="@+id/amount_label" />
+
+    <TextView
+        android:id="@+id/total_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:layout_constraintStart_toStartOf="@+id/number_of_items_text_field"
+        app:layout_constraintTop_toBottomOf="@+id/number_of_items_text_field"
+        android:text="0"
+        tools:text="$ 123" />
+
+    <Button
+        android:id="@+id/remove_from_basket_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Remove"
+        app:layout_constraintStart_toStartOf="@+id/basket_view_decrease_button"
+        app:layout_constraintTop_toBottomOf="@+id/total_text_view" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/AndroidTestAutomationStarter/app/src/main/res/layout/product_list_item.xml b/AndroidTestAutomationStarter/app/src/main/res/layout/product_list_item.xml
index 10acb6d8..379c9541 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/layout/product_list_item.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/layout/product_list_item.xml
@@ -9,9 +9,9 @@
         android:id="@+id/productImage"
         android:layout_width="150dp"
         android:layout_height="150dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -21,9 +21,9 @@
         android:id="@+id/productTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
         android:textAlignment="center"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -35,14 +35,14 @@
         android:id="@+id/productPrice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/price_template"
         android:textAlignment="center"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/productTitle"
         tools:text="$19" />
diff --git a/AndroidTestAutomationStarter/app/src/main/res/values/dimens.xml b/AndroidTestAutomationStarter/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..59a0b0c4
--- /dev/null
+++ b/AndroidTestAutomationStarter/app/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/AndroidTestAutomationStarter/app/src/main/res/values/strings.xml b/AndroidTestAutomationStarter/app/src/main/res/values/strings.xml
index 8865eaa0..a012cf65 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/values/strings.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/values/strings.xml
@@ -10,4 +10,9 @@
     <string name="minus">-</string>
     <string name="basket">Basket</string>
     <string name="to_the_basket">To the basket</string>
+    <string name="total">Total</string>
+    <string name="amount">Amount</string>
+    <string name="price_template">£ %1$d</string>
+    <string name="checkout">Checkout</string>
+    <string name="title_activity_purchase_confirmation">PurchaseConfirmationActivity</string>
 </resources>
diff --git a/AndroidTestAutomationStarter/app/src/main/res/values/styles.xml b/AndroidTestAutomationStarter/app/src/main/res/values/styles.xml
index 5885930d..545b9c6d 100644
--- a/AndroidTestAutomationStarter/app/src/main/res/values/styles.xml
+++ b/AndroidTestAutomationStarter/app/src/main/res/values/styles.xml
@@ -8,4 +8,13 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
diff --git a/AndroidTestAutomationStarter/build.gradle b/AndroidTestAutomationStarter/build.gradle
index 7f72d291..652437be 100644
--- a/AndroidTestAutomationStarter/build.gradle
+++ b/AndroidTestAutomationStarter/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.20'
+    ext.kotlin_version = '1.2.51'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/AndroidTestAutomationStarter/gradle/wrapper/gradle-wrapper.properties b/AndroidTestAutomationStarter/gradle/wrapper/gradle-wrapper.properties
index 6bfb95dc..9a4163a4 100644
--- a/AndroidTestAutomationStarter/gradle/wrapper/gradle-wrapper.properties
+++ b/AndroidTestAutomationStarter/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Apr 03 20:07:43 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/AndroidTestAutomationStarter/gradlew b/AndroidTestAutomationStarter/gradlew
index 9d82f789..cccdd3d5 100755
--- a/AndroidTestAutomationStarter/gradlew
+++ b/AndroidTestAutomationStarter/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/AndroidTestAutomationStarter/gradlew.bat b/AndroidTestAutomationStarter/gradlew.bat
index aec99730..e95643d6 100644
--- a/AndroidTestAutomationStarter/gradlew.bat
+++ b/AndroidTestAutomationStarter/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/database/InMemoryDatabase.kt b/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/database/InMemoryDatabase.kt
index 5b22166f..e3e271a5 100644
--- a/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/database/InMemoryDatabase.kt
+++ b/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/database/InMemoryDatabase.kt
@@ -10,24 +10,24 @@ class InMemoryDatabase {
     private val descriptionFour = "Chuck consectetur chicken drumstick short ribs in tenderloin frankfurter eiusmod lorem. Dolore magna excepteur venison. Tempor enim rump ut fugiat minim esse."
     private val articles = hashMapOf(
             0 to arrayListOf(
-                    Article(id = 4, title = "Hat Green", price = "$18", image = "shirt1", productDescription = descriptionOne),
-                    Article(id = 5, title = "Hat Green", price = "$18", image = "shirt2", productDescription = descriptionOne),
-                    Article(id = 6, title = "Hat Green", price = "$18", image = "shirt3", productDescription = descriptionOne),
-                    Article(id = 7, title = "Hat Green", price = "$18", image = "shirt4", productDescription = descriptionOne)
+                    Article(id = 4, title = "Hat Green", price = 18, image = "shirt1", productDescription = descriptionOne),
+                    Article(id = 5, title = "Hat Green", price = 18, image = "shirt2", productDescription = descriptionOne),
+                    Article(id = 6, title = "Hat Green", price = 18, image = "shirt3", productDescription = descriptionOne),
+                    Article(id = 7, title = "Hat Green", price = 18, image = "shirt4", productDescription = descriptionOne)
             ),
             1 to arrayListOf(
-                    Article(id = 8, title = "Hat Green", price = "$18", image = "hoodie1", productDescription = descriptionOne),
-                    Article(id = 9, title = "Hat Green", price = "$18", image = "hoodie2", productDescription = descriptionOne),
-                    Article(id = 10, title = "Hat Green", price = "$18", image = "hoodie3", productDescription = descriptionOne),
-                    Article(id = 11, title = "Hat Green", price = "$18", image = "hoodie4", productDescription = descriptionOne)
+                    Article(id = 8, title = "Hat Green", price = 18, image = "hoodie1", productDescription = descriptionOne),
+                    Article(id = 9, title = "Hat Green", price = 18, image = "hoodie2", productDescription = descriptionOne),
+                    Article(id = 10, title = "Hat Green", price = 18, image = "hoodie3", productDescription = descriptionOne),
+                    Article(id = 11, title = "Hat Green", price = 18, image = "hoodie4", productDescription = descriptionOne)
             ),
             2 to arrayListOf(
-                    Article(id = 0, title = "Hat Green", price = "$18", image = "hat1", productDescription = descriptionOne),
-                    Article(id = 1, title = "Hat Back", price = "$12", image = "hat2", productDescription = descriptionTwo),
-                    Article(id = 2, title = "Hat White", price = "$11", image = "hat3", productDescription = descriptionThree),
-                    Article(id = 3, title = "Hat Blue", price = "$29", image = "hat4", productDescription = descriptionFour)),
+                    Article(id = 0, title = "Hat Green", price = 18, image = "hat1", productDescription = descriptionOne),
+                    Article(id = 1, title = "Hat Back", price = 12, image = "hat2", productDescription = descriptionTwo),
+                    Article(id = 2, title = "Hat White", price = 11, image = "hat3", productDescription = descriptionThree),
+                    Article(id = 3, title = "Hat Blue", price = 19, image = "hat4", productDescription = descriptionFour)),
             3 to arrayListOf(
-                    Article(id = 12, title = "Hat Green", price = "$18", image = "hat1", productDescription = descriptionOne)
+                    Article(id = 12, title = "Hat Green", price = 18, image = "hat1", productDescription = descriptionOne)
             ))
 
     private val categories = arrayListOf(
diff --git a/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/model/Article.kt b/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/model/Article.kt
index 76ed393b..3bda76eb 100644
--- a/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/model/Article.kt
+++ b/AndroidTestAutomationStarter/kotlinapi/src/main/java/com/novoda/kotlinapi/model/Article.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 data class Article(
     val id: Int,
     val title: String,
-    val price: String,
+    val price: Int,
     val image: String,
     @get:JsonProperty("product_description") val productDescription: String
 )