diff --git a/app/build.gradle b/app/build.gradle
index 0d0fa1b..61b1353 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,11 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildToolsVersion '34.0.0'
+
+    viewBinding {
+        enabled = true
+    }
 }
 
 dependencies {
@@ -42,20 +47,53 @@ dependencies {
     implementation libs.androidx.constraintlayout
     // dagger
     implementation libs.dagger
+    implementation libs.core.ktx
     kapt libs.dagger.compiler
 
     //retrofit
     implementation libs.retrofit
+    implementation libs.converter.gson
     implementation libs.retrofit.rx.adapter
 
     //glide
     implementation libs.glide
+    kapt libs.compiler
 
     //reactive x
     implementation libs.rx.android
     implementation libs.rx.java
     implementation libs.rx.kotlin
 
+    //Room database
+    implementation libs.androidx.room.runtime.android
+    kapt libs.room.compiler
+    implementation libs.androidx.room.ktx
+    implementation libs.androidx.room.rxjava2
+
+    //RecyclerView
+    implementation libs.androidx.recyclerview
+
+    //CardView
+    implementation libs.androidx.cardview
+
+    // Mockito for mocking dependencies
+    testImplementation libs.mockito.core
+    testImplementation libs.mockito.inline
+
+    // Mockito for Android instrumented tests
+    androidTestImplementation libs.mockito.android
+
+    // MockWebServer
+    testImplementation libs.mockwebserver
+
+    // For room DB test
+    testImplementation libs.androidx.core.testing  // For LiveData and Room testing
+    testImplementation libs.androidx.room.testing  // For Room in-memory database testing
+
+    // Material Design
+    implementation libs.material
+
+    androidTestImplementation libs.androidx.runner
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espresso.core
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a18c7a..a65ab29 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools">
 
+	<uses-permission android:name="android.permission.INTERNET" />
+
 	<application
+		android:name=".MyApplication"
 		android:allowBackup="true"
 		android:dataExtractionRules="@xml/data_extraction_rules"
 		android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/com/example/otchallenge/MainActivity.kt b/app/src/main/java/com/example/otchallenge/MainActivity.kt
index d35da32..9f51c84 100644
--- a/app/src/main/java/com/example/otchallenge/MainActivity.kt
+++ b/app/src/main/java/com/example/otchallenge/MainActivity.kt
@@ -1,22 +1,77 @@
 package com.example.otchallenge
 
 import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import com.example.otchallenge.databinding.ActivityMainBinding
+import com.example.otchallenge.model.Book
+import com.example.otchallenge.presenter.BooksContract
+import com.example.otchallenge.presenter.BooksPresenter
+import com.example.otchallenge.repository.BookRepository
+import com.example.otchallenge.view.BooksAdapter
+import javax.inject.Inject
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), BooksContract.View {
+
+	@Inject
+	lateinit var repository: BookRepository
+
+	private lateinit var presenter: BooksPresenter
+	private lateinit var adapter: BooksAdapter
+
+	//viewBinding
+	private lateinit var mainBinding: ActivityMainBinding
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		(application as MyApplication).appComponent.inject(this)
 		super.onCreate(savedInstanceState)
-		enableEdgeToEdge()
-		setContentView(R.layout.activity_main)
-		ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-			val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-			v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-			insets
+
+		mainBinding = ActivityMainBinding.inflate(layoutInflater)
+		setContentView(mainBinding.root)
+
+		presenter = BooksPresenter(repository)
+		presenter.attach(this)
+
+		setupRecyclerView()
+
+		// Fetch the books when the activity is created
+		presenter.fetchBooks()
+	}
+
+	// RecyclerView, Adapter setting
+	private fun setupRecyclerView(){
+		adapter = BooksAdapter(emptyList())
+		mainBinding.recyclerView.apply {
+			layoutManager = LinearLayoutManager(this@MainActivity)
+			adapter = this@MainActivity.adapter
 		}
 	}
+
+	override fun showProgress() {
+		mainBinding.progressBar.visibility = View.VISIBLE
+	}
+
+	override fun hideProgress() {
+		println("hideProgress()")
+		mainBinding.progressBar.visibility = View.GONE
+	}
+
+	override fun displayBooks(books: List<Book>) {
+		adapter.updateBooks(books)
+		mainBinding.recyclerView.visibility = View.VISIBLE
+	}
+
+	override fun showError(message: String) {
+		Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+	}
+
+	override fun onDestroy() {
+		presenter.detach()
+		super.onDestroy()
+	}
 }
diff --git a/app/src/main/java/com/example/otchallenge/MyApplication.kt b/app/src/main/java/com/example/otchallenge/MyApplication.kt
index ba66e70..91c5721 100644
--- a/app/src/main/java/com/example/otchallenge/MyApplication.kt
+++ b/app/src/main/java/com/example/otchallenge/MyApplication.kt
@@ -1,8 +1,12 @@
 package com.example.otchallenge
 
 import android.app.Application
+import android.net.Network
 import com.example.otchallenge.di.AppComponent
 import com.example.otchallenge.di.DaggerAppComponent
+import com.example.otchallenge.di.DatabaseModule
+import com.example.otchallenge.di.NetworkModule
+import com.example.otchallenge.di.RepositoryModule
 
 class MyApplication : Application() {
 
@@ -10,6 +14,10 @@ class MyApplication : Application() {
 
 	override fun onCreate() {
 		super.onCreate()
-		appComponent = DaggerAppComponent.builder().build()
+		appComponent = DaggerAppComponent.builder()
+			.networkModule(NetworkModule())
+			.databaseModule(DatabaseModule(this))
+			.repositoryModule(RepositoryModule())
+			.build()
 	}
 }
diff --git a/app/src/main/java/com/example/otchallenge/dao/BookDao.kt b/app/src/main/java/com/example/otchallenge/dao/BookDao.kt
new file mode 100644
index 0000000..b15d243
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/dao/BookDao.kt
@@ -0,0 +1,22 @@
+package com.example.otchallenge.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import com.example.otchallenge.model.Book
+import io.reactivex.Single
+import io.reactivex.Completable
+
+@Dao
+interface BookDao {
+    @Query("SELECT * FROM books ORDER BY rank ASC")
+    fun getAllBooks(): Single<List<Book>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertBooks(books: List<Book>): Completable
+
+    @Query("DELETE FROM books")
+    fun deleteAllBooks(): Completable
+}
diff --git a/app/src/main/java/com/example/otchallenge/di/AppComponent.kt b/app/src/main/java/com/example/otchallenge/di/AppComponent.kt
index d3c83c6..fe6a4f1 100644
--- a/app/src/main/java/com/example/otchallenge/di/AppComponent.kt
+++ b/app/src/main/java/com/example/otchallenge/di/AppComponent.kt
@@ -1,11 +1,13 @@
 package com.example.otchallenge.di
 
+import android.content.Context
 import com.example.otchallenge.MainActivity
+import dagger.BindsInstance
 import dagger.Component
 import javax.inject.Singleton
 
 @Singleton
-@Component
+@Component(modules = [NetworkModule::class, DatabaseModule::class, RepositoryModule::class])
 interface AppComponent {
 	fun inject(activity: MainActivity)
 }
diff --git a/app/src/main/java/com/example/otchallenge/di/DatabaseModule.kt b/app/src/main/java/com/example/otchallenge/di/DatabaseModule.kt
new file mode 100644
index 0000000..c671238
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/di/DatabaseModule.kt
@@ -0,0 +1,25 @@
+package com.example.otchallenge.di
+
+import android.content.Context
+import androidx.room.Room
+import com.example.otchallenge.dao.BookDao
+import com.example.otchallenge.repository.BookDatabase
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class DatabaseModule(private val context: Context) {
+
+    @Provides
+    @Singleton
+    fun provideDatabase(): BookDatabase {
+        return Room.databaseBuilder(context, BookDatabase::class.java, "books_db")
+            .build()
+    }
+
+    @Provides
+    fun provideBookDao(bookDatabase: BookDatabase): BookDao{
+        return bookDatabase.bookDao()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/di/NetworkModule.kt b/app/src/main/java/com/example/otchallenge/di/NetworkModule.kt
new file mode 100644
index 0000000..23f4e0f
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/di/NetworkModule.kt
@@ -0,0 +1,28 @@
+package com.example.otchallenge.di
+
+import com.example.otchallenge.libs.ApiService
+import dagger.Module
+import dagger.Provides
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import javax.inject.Singleton
+
+@Module
+class NetworkModule {
+    @Provides
+    @Singleton
+    fun provideRetrofit(): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl("https://api.nytimes.com/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideApiService(retrofit: Retrofit): ApiService {
+        return retrofit.create(ApiService::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/di/RepositoryModule.kt b/app/src/main/java/com/example/otchallenge/di/RepositoryModule.kt
new file mode 100644
index 0000000..4ca759e
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/di/RepositoryModule.kt
@@ -0,0 +1,17 @@
+package com.example.otchallenge.di
+
+import android.content.Context
+import com.example.otchallenge.dao.BookDao
+import com.example.otchallenge.libs.ApiService
+import com.example.otchallenge.repository.BookRepository
+import dagger.Module
+import dagger.Provides
+
+@Module
+class RepositoryModule {
+
+    @Provides
+    fun provideBookRepository(apiService: ApiService, bookDao: BookDao): BookRepository{
+        return BookRepository(apiService, bookDao)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/libs/ApiService.kt b/app/src/main/java/com/example/otchallenge/libs/ApiService.kt
new file mode 100644
index 0000000..5f1520a
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/libs/ApiService.kt
@@ -0,0 +1,14 @@
+package com.example.otchallenge.libs
+
+import com.example.otchallenge.model.ApiResponse
+import io.reactivex.Single
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface ApiService {
+    @GET("svc/books/v3/lists/current/hardcover-fiction.json")
+    fun getBooks(
+        @Query("api-key") apiKey: String,
+        @Query("offset") offset: Int=0
+    ): Single<ApiResponse>
+}
diff --git a/app/src/main/java/com/example/otchallenge/model/ApiResponse.kt b/app/src/main/java/com/example/otchallenge/model/ApiResponse.kt
new file mode 100644
index 0000000..cd2742d
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/model/ApiResponse.kt
@@ -0,0 +1,5 @@
+package com.example.otchallenge.model
+
+data class ApiResponse(
+    val results: ApiResults
+)
diff --git a/app/src/main/java/com/example/otchallenge/model/ApiResults.kt b/app/src/main/java/com/example/otchallenge/model/ApiResults.kt
new file mode 100644
index 0000000..3c70107
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/model/ApiResults.kt
@@ -0,0 +1,5 @@
+package com.example.otchallenge.model
+
+data class ApiResults(
+    val books: List<Book>
+)
diff --git a/app/src/main/java/com/example/otchallenge/model/Book.kt b/app/src/main/java/com/example/otchallenge/model/Book.kt
new file mode 100644
index 0000000..0a445fe
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/model/Book.kt
@@ -0,0 +1,16 @@
+package com.example.otchallenge.model
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+//import androidx.room.ColumnInfo
+
+@Entity(tableName = "books")
+data class Book(
+    @PrimaryKey
+    val primary_isbn13: String,
+    val rank: Int,
+    val title: String,
+    val author: String,
+    val description: String,
+    val book_image: String
+)
diff --git a/app/src/main/java/com/example/otchallenge/presenter/BooksContract.kt b/app/src/main/java/com/example/otchallenge/presenter/BooksContract.kt
new file mode 100644
index 0000000..e670d9f
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/presenter/BooksContract.kt
@@ -0,0 +1,18 @@
+package com.example.otchallenge.presenter
+
+import com.example.otchallenge.model.Book
+
+interface BooksContract {
+    interface View {
+        fun showProgress()
+        fun hideProgress()
+        fun displayBooks(books: List<Book>)
+        fun showError(message: String)
+    }
+
+    interface Presenter {
+        fun attach(view: View)
+        fun detach()
+        fun fetchBooks()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/presenter/BooksPresenter.kt b/app/src/main/java/com/example/otchallenge/presenter/BooksPresenter.kt
new file mode 100644
index 0000000..5b8e170
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/presenter/BooksPresenter.kt
@@ -0,0 +1,46 @@
+package com.example.otchallenge.presenter
+
+import com.example.otchallenge.libs.ApiService
+import com.example.otchallenge.model.ApiResponse
+import com.example.otchallenge.repository.BookRepository
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.exceptions.CompositeException
+
+class BooksPresenter(private val repository: BookRepository) : BooksContract.Presenter{
+    private var view: BooksContract.View? = null
+    private val disposable = CompositeDisposable()
+
+    override fun attach(view: BooksContract.View) {
+        this.view = view
+    }
+
+    override fun detach() {
+        view = null
+        disposable.clear()
+    }
+
+    override fun fetchBooks() {
+        view?.showProgress()
+
+        val disposableTask = repository.fetchBooks()
+            .observeOn(AndroidSchedulers.mainThread())  // Use MainThread for Book list updates
+            .subscribe({books ->
+                view?.hideProgress()
+                view?.displayBooks(books)
+            }, {error ->
+                view?.hideProgress()
+                if (error is CompositeException) {
+                    // Log each exception separately
+                    error.exceptions.forEach {
+                        println("Exception occurred: ${it.message}")
+                    }
+                } else {
+                    println("Single exception: ${error.message}")
+                }
+                view?.showError(error.message ?: "An error occurred")
+            })
+
+        disposable.add(disposableTask)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/repository/BookDatabase.kt b/app/src/main/java/com/example/otchallenge/repository/BookDatabase.kt
new file mode 100644
index 0000000..6efa71c
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/repository/BookDatabase.kt
@@ -0,0 +1,11 @@
+package com.example.otchallenge.repository
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.example.otchallenge.dao.BookDao
+import com.example.otchallenge.model.Book
+
+@Database(entities = [Book::class], version = 1, exportSchema = false)
+abstract class BookDatabase : RoomDatabase() {
+    abstract fun bookDao() : BookDao
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/repository/BookRepository.kt b/app/src/main/java/com/example/otchallenge/repository/BookRepository.kt
new file mode 100644
index 0000000..8fd94cf
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/repository/BookRepository.kt
@@ -0,0 +1,64 @@
+package com.example.otchallenge.repository
+
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+import com.example.otchallenge.dao.BookDao
+import com.example.otchallenge.libs.ApiService
+import com.example.otchallenge.model.Book
+import com.google.gson.Gson
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+class BookRepository (private val apiService: ApiService, private val bookDao: BookDao){
+
+    private val apiKey = "KoRB4K5LRHygfjCL2AH6iQ7NeUqDAGAB"
+    private val gson = Gson() // Gson instance for conversion
+
+    fun fetchBooks(): Single<List<Book>> {
+        return apiService.getBooks(apiKey)
+            .subscribeOn(Schedulers.io())   // Running network task on io scheduler
+            .map{   // map Apiresponse to a book classes
+                response ->
+
+                // Convert response to plain text (JSON) and log it
+                val plainTextResponse = gson.toJson(response)
+                Log.d("API_RESPONSE", plainTextResponse) // This will output the entire response as a plain text JSON string
+
+                response.results.books.map {
+                    println(it)
+                    Book(
+                        primary_isbn13 = it.primary_isbn13,
+                        rank = it.rank,
+                        title = it.title,
+                        author = it.author,
+                        description = it.description,
+                        book_image = it.book_image
+                    )
+                }
+            }
+            .flatMap{   // Cache the book list in Room DB
+                books->bookDao.deleteAllBooks()
+                    .andThen(bookDao.insertBooks(books))    // insert books list
+                    .doOnComplete {
+                        Log.d("DB_INSERT", "Books successfully inserted into the database")
+                    }
+                    .andThen(Single.just(books))    // emit the books list
+            }
+            .onErrorResumeNext {
+                // If network fails, fetch from the DB
+                bookDao.getAllBooks()
+                    .subscribeOn(Schedulers.io())   // Use io scheduler for DB operation
+                    .flatMap { cachedBooks ->
+                        if (cachedBooks.isNotEmpty()) {
+                            Single.just(cachedBooks)
+                        }else{
+                            //Single.error(it)
+                            Single.just(emptyList())
+                        }
+                    }
+            }
+            .observeOn(AndroidSchedulers.mainThread()) // Process UI task on mainThread
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/otchallenge/view/BooksAdapter.kt b/app/src/main/java/com/example/otchallenge/view/BooksAdapter.kt
new file mode 100644
index 0000000..07bc157
--- /dev/null
+++ b/app/src/main/java/com/example/otchallenge/view/BooksAdapter.kt
@@ -0,0 +1,50 @@
+package com.example.otchallenge.view
+
+import android.text.Layout
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.otchallenge.R
+import com.example.otchallenge.databinding.ItemBookBinding
+import com.example.otchallenge.model.Book
+
+class BooksAdapter(private var books: List<Book>) : RecyclerView.Adapter<BooksAdapter.BookViewHolder>() {
+
+    fun updateBooks(newBooks: List<Book>){
+        books = newBooks
+        notifyDataSetChanged()
+    }
+    class BookViewHolder(private val binding: ItemBookBinding) : RecyclerView.ViewHolder(binding.root){
+        fun bind(book: Book){
+            binding.titleTextView.text = book.title
+            binding.authorTextView.text = book.author
+            binding.descriptionTextView.text = book.description
+
+            //Use Glide to load the book image
+            Glide.with(itemView.context)
+                .load(book.book_image)
+                .placeholder(R.drawable.placeholder)
+                .into(binding.bookImageView)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val binding = ItemBookBinding.inflate(layoutInflater, parent, false)
+        return BookViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return books.size
+    }
+
+    override fun onBindViewHolder(holder: BookViewHolder, position: Int) {
+        val book = books[position]
+        holder.bind(book)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/placeholder.xml b/app/src/main/res/drawable/placeholder.xml
new file mode 100644
index 0000000..fd890ce
--- /dev/null
+++ b/app/src/main/res/drawable/placeholder.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c7a2d54..4ab4110 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:id="@+id/main"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:context=".MainActivity">
+    android:orientation="vertical"
+    tools:context=".MainActivity">
+	<com.google.android.material.appbar.MaterialToolbar
+		android:id="@+id/materialToolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/colorPrimary"
+		android:minHeight="?attr/actionBarSize"
+		android:theme="?attr/actionBarTheme"
+		android:layout_marginLeft="0dp"
+		android:layout_marginEnd="0dp"
+		app:title="@string/app_name"
+		app:titleTextAppearance="@style/Toolbar.TitleText"
+		/>
+<!--	<ProgressBar-->
+	<com.google.android.material.progressindicator.LinearProgressIndicator
+		android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="10dp"
+		android:indeterminate="true"
+		android:visibility="gone" />
 
-	<TextView
-		android:layout_width="wrap_content"
+	
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:text="Hello World!"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		android:layout_marginTop="4dp"
+		android:visibility="gone" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_book.xml b/app/src/main/res/layout/item_book.xml
new file mode 100644
index 0000000..6672f8c
--- /dev/null
+++ b/app/src/main/res/layout/item_book.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.cardview.widget.CardView
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        card_view:cardCornerRadius="8dp"
+        card_view:cardElevation="4dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="4dp">
+            <ImageView
+                android:id="@+id/bookImageView"
+                android:layout_width="80dp"
+                android:layout_height="100dp"
+                android:scaleType="fitCenter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="8dp">
+
+                <TextView
+                    android:id="@+id/titleTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:id="@+id/authorTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:id="@+id/descriptionTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fa5fc6f..2582baa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
 	<color name="black">#FF000000</color>
 	<color name="white">#FFFFFFFF</color>
+    <color name="gray">#A9A9A9</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2875b2..c0ee257 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
-	<string name="app_name">AndroidOTChallenge</string>
+	<string name="app_name">NY Times Book List</string>
+    <string name="book_image">Book image</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c9c411a..b0a363c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,5 +5,10 @@
 		<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
 	</style>
 
+	<style name="Toolbar.TitleText" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+		<item name="android:textSize">24sp</item>
+		<item name="android:textColor">@color/white</item>
+	</style>
+
 	<style name="Theme.AndroidOTChallenge" parent="Base.Theme.AndroidOTChallenge" />
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/example/otchallenge/BooksPresenterTest.kt b/app/src/test/java/com/example/otchallenge/BooksPresenterTest.kt
new file mode 100644
index 0000000..9b5034a
--- /dev/null
+++ b/app/src/test/java/com/example/otchallenge/BooksPresenterTest.kt
@@ -0,0 +1,114 @@
+package com.example.otchallenge
+
+import com.example.otchallenge.model.Book
+import com.example.otchallenge.presenter.BooksContract
+import com.example.otchallenge.presenter.BooksPresenter
+import com.example.otchallenge.repository.BookRepository
+import io.reactivex.Single
+import io.reactivex.android.plugins.RxAndroidPlugins
+import io.reactivex.plugins.RxJavaPlugins
+import io.reactivex.schedulers.Schedulers
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.*
+
+class BooksPresenterTest {
+    // Mock repository and view
+    private lateinit var repository: BookRepository
+    private lateinit var view: BooksContract.View
+    private lateinit var presenter: BooksPresenter
+
+    @Before
+    fun setUp() {
+        repository = mock(BookRepository::class.java)
+        view = mock(BooksContract.View::class.java)
+
+        presenter = BooksPresenter(repository)
+
+        // Ensure that all RxJava operations run on a single thread in tests
+        RxJavaPlugins.setIoSchedulerHandler { Schedulers.trampoline() }
+        RxJavaPlugins.setComputationSchedulerHandler { Schedulers.trampoline() }
+        RxJavaPlugins.setNewThreadSchedulerHandler { Schedulers.trampoline() }
+
+        // Replace AndroidSchedulers.mainThread() with trampoline scheduler in tests
+        RxAndroidPlugins.setInitMainThreadSchedulerHandler { Schedulers.trampoline() }
+    }
+
+    @Test
+    fun fetchBooks_success() {
+        // Create a fake book list
+        val books = listOf(
+            Book(
+                "9781250289568",
+                14,
+                "PASSIONS IN DEATH",
+                "J.D. Robb",
+                "The 59th book of the In Death series. Bad memories come up for Eve Dallas at a crime scene.",
+                "https://storage.googleapis.com/du-prd/books/images/9781250289568.jpg"
+            ),
+            Book(
+                "9780385550369",
+                15,
+                "",
+                //"JAMES",
+                "Percival Everett",
+                "A reimagining of “Adventures of Huckleberry Finn” shines a different light on Mark Twain's classic, revealing new facets of the character of Jim.",
+                "https://storage.googleapis.com/du-prd/books/images/9780385550369.jpg"
+            )
+        )
+
+        // Mock repository to return the book list by Single
+        `when`(repository.fetchBooks()).thenReturn(Single.just(books))
+
+        // Attach the view to the presenter
+        presenter.attach(view)
+
+        // Call fetchBooks method
+        presenter.fetchBooks()
+
+        // Verify that the view shows the progress bar
+        verify(view).showProgress()
+
+        // Verify that the view shows the book list
+        verify(view).displayBooks(books)
+
+        // Verify that the progress bar is hidden after fetching the books
+        verify(view).hideProgress()
+
+        // Verify that no errors were shown
+        verify(view, never()).showError(anyString())
+
+    }
+
+    @Test
+    fun fetchBooks_fail() {
+        // Simulate a failure by returning an empty list or throwing an exception
+        `when`(repository.fetchBooks()).thenReturn(Single.error(RuntimeException("Data load failed")))
+
+        // Attach the view to the presenter
+        presenter.attach(view)
+
+        // Call fetchBooks method
+        presenter.fetchBooks()
+
+        // Verify that the view shows the progress bar first
+        verify(view).showProgress()
+
+        // Verify that an error message is shown when the fetching fails
+        verify(view).showError("Data load failed")
+
+        // Verify that the progress bar is hidden after the failure
+        verify(view).hideProgress()
+
+        // Verify that no books are displayed
+        verify(view, never()).displayBooks(anyList())
+    }
+
+    @After
+    fun tearDown() {
+        // Reset plugins after each test to avoid any impact on other tests
+        RxAndroidPlugins.reset()
+        RxJavaPlugins.reset()
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4664302..a45ae61 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,11 @@
 [versions]
-agp = "8.4.2"
+agp = "8.6.0"
+arrowCore = "1.1.5"
+cardview = "1.0.0"
+compiler = "4.12.0"
+coreTesting = "2.2.0"
+dexmakerMockitoInline = "2.28.1"
+gson = "2.10.1"
 kotlin = "1.9.0"
 coreKtx = "1.13.1"
 junit = "4.13.2"
@@ -10,14 +16,37 @@ material = "1.12.0"
 activity = "1.9.0"
 constraintlayout = "2.1.4"
 dagger = "2.51.1"
+mockitoCore = "5.0.0"
+mockitoInline = "5.0.0"
+mockwebserver = "4.10.0"
+recyclerview = "1.3.2"
 retrofit = "2.11.0"
 glide = "4.16.0"
+roomCompiler = "2.5.2"
+roomKtx = "2.5.2"
+roomRuntimeAndroid = "2.7.0-alpha08"
+roomTesting = "2.6.1"
+runner = "1.6.2"
 rx-android = "2.1.1"
 rx-java = "2.2.21"
 rx-kotlin = "2.4.0"
+coreKtxVersion = "1.6.1"
 
 [libraries]
+androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomKtx" }
+androidx-room-runtime-android = { module = "androidx.room:room-runtime-android", version.ref = "roomRuntimeAndroid" }
+androidx-room-rxjava2 = { module = "androidx.room:room-rxjava2", version.ref = "roomCompiler" }
+androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "roomTesting" }
+androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
+arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrowCore" }
+compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "compiler" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+dexmaker-mockito-inline = { module = "com.linkedin.dexmaker:dexmaker-mockito-inline", version.ref = "dexmakerMockitoInline" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
@@ -27,12 +56,18 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 dagger = { group = "com.google.dagger", name = "dagger", version.ref = "dagger" }
 dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "dagger" }
+mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockitoCore" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
+mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
+mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-rx-adapter = { group = "com.squareup.retrofit2", name = "adapter-rxjava2", version.ref = "retrofit" }
 glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
+room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomCompiler" }
 rx-java = {group = "io.reactivex.rxjava2", name="rxjava", version.ref = "rx-java"}
 rx-android = {group = "io.reactivex.rxjava2", name="rxandroid", version.ref = "rx-android"}
 rx-kotlin = {group = "io.reactivex.rxjava2", name="rxkotlin", version.ref = "rx-kotlin"}
+core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "coreKtxVersion" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae276f2..0ba6436 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 20 10:23:16 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists