diff --git a/app/build.gradle b/app/build.gradle
index 679dbba4..1ad0af3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "otus.homework.coroutines"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -42,4 +42,10 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
+
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+    testImplementation 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe34985b..fa531f7d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Coroutines">
-        <activity android:name=".MainActivity"
+        <activity android:name=".presentation.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
deleted file mode 100644
index e4b05120..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class CatsPresenter(
-    private val catsService: CatsService
-) {
-
-    private var _catsView: ICatsView? = null
-
-    fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
-
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
-    }
-
-    fun attachView(catsView: ICatsView) {
-        _catsView = catsView
-    }
-
-    fun detachView() {
-        _catsView = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
deleted file mode 100644
index 479b2cfb..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.http.GET
-
-interface CatsService {
-
-    @GET("fact")
-    fun getCatFact() : Call<Fact>
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
deleted file mode 100644
index 30ac2531..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package otus.homework.coroutines
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-
-class CatsView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
-
-    var presenter :CatsPresenter? = null
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
-        }
-    }
-
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
-    }
-}
-
-interface ICatsView {
-
-    fun populate(fact: Fact)
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..6b810d17 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -1,10 +1,27 @@
 package otus.homework.coroutines
 
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+import java.net.SocketTimeoutException
+
 object CrashMonitor {
 
-    /**
-     * Pretend this is Crashlytics/AppCenter
-     */
-    fun trackWarning() {
+    private const val SOCKET_TIME_EXCEPTION_ANSWER = "Не удалось получить ответ от сервера."
+
+    fun trackWarning(e: Throwable) {
+        Log.d(this.toString(), e.toString())
+    }
+
+    fun trackWarning(context: Context, e: Throwable) {
+        when(e) {
+            is SocketTimeoutException -> {
+                Toast.makeText(context, SOCKET_TIME_EXCEPTION_ANSWER, Toast.LENGTH_SHORT).show()
+            }
+            else -> {
+                Log.d(this.toString(), e.toString())
+                Toast.makeText(context, e.message, Toast.LENGTH_SHORT).show()
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
deleted file mode 100644
index a9dafb3b..00000000
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package otus.homework.coroutines
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-
-    lateinit var catsPresenter: CatsPresenter
-
-    private val diContainer = DiContainer()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
-        setContentView(view)
-
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
-    }
-
-    override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.detachView()
-        }
-        super.onStop()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatsService.kt b/app/src/main/java/otus/homework/coroutines/data/CatsService.kt
new file mode 100644
index 00000000..99787b22
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatsService.kt
@@ -0,0 +1,13 @@
+package otus.homework.coroutines.data
+
+import otus.homework.coroutines.domain.CatImage
+import otus.homework.coroutines.domain.Fact
+import retrofit2.http.GET
+
+interface CatsService {
+    @GET("fact")
+    suspend fun getCatFact(): Fact
+
+    @GET("https://api.thecatapi.com/v1/images/search")
+    suspend fun getCatImage(): List<CatImage>
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/data/DiContainer.kt
similarity index 90%
rename from app/src/main/java/otus/homework/coroutines/DiContainer.kt
rename to app/src/main/java/otus/homework/coroutines/data/DiContainer.kt
index 23ddc3b2..bbef489a 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/data/DiContainer.kt
@@ -1,4 +1,4 @@
-package otus.homework.coroutines
+package otus.homework.coroutines.data
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt b/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt
new file mode 100644
index 00000000..7419d6ae
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.domain
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+data class CatImage(
+    @SerializedName("url")
+    @Expose
+    val imageUrl: String?
+)
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatModel.kt b/app/src/main/java/otus/homework/coroutines/domain/CatModel.kt
new file mode 100644
index 00000000..13e5cddd
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatModel.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines.domain
+
+data class CatModel(
+    val fact: Fact,
+    val image: CatImage?
+)
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/domain/Fact.kt
similarity index 86%
rename from app/src/main/java/otus/homework/coroutines/Fact.kt
rename to app/src/main/java/otus/homework/coroutines/domain/Fact.kt
index 15c6c7ae..8253932f 100644
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ b/app/src/main/java/otus/homework/coroutines/domain/Fact.kt
@@ -1,4 +1,4 @@
-package otus.homework.coroutines
+package otus.homework.coroutines.domain
 
 import com.google.gson.annotations.SerializedName
 
@@ -20,5 +20,7 @@ data class Fact(
 	@field:SerializedName("user")
 	val user: String,
 	@field:SerializedName("updatedAt")
-	val updatedAt: String
+	val updatedAt: String,
+
+	val fact: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/domain/Result.kt b/app/src/main/java/otus/homework/coroutines/domain/Result.kt
new file mode 100644
index 00000000..bc085097
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/Result.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines.domain
+
+sealed class Result {
+    class Error(val exception: Throwable): Result()
+    class Success(val catModel: CatModel): Result()
+}
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatViewModel.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatViewModel.kt
new file mode 100644
index 00000000..9689f457
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatViewModel.kt
@@ -0,0 +1,53 @@
+package otus.homework.coroutines.presentation
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.data.DiContainer
+import otus.homework.coroutines.domain.CatImage
+import otus.homework.coroutines.domain.CatModel
+import otus.homework.coroutines.domain.Fact
+import otus.homework.coroutines.domain.Result
+import java.net.SocketTimeoutException
+
+class CatViewModel: ViewModel(){
+
+    private val catsService = DiContainer().service
+
+    private val _result = MutableLiveData<Result>()
+    val result: LiveData<Result> get() = _result
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        _result.value = Result.Error(throwable)
+    }
+
+    fun onInitComplete() {
+        viewModelScope.launch(exceptionHandler) {
+
+            val deferredFact = async(Dispatchers.IO) {
+                    try {
+                        catsService.getCatFact()
+                    } catch (e: SocketTimeoutException) {
+                        _result.value = Result.Error(e)
+                    }
+                }
+
+            val deferredImage = async(Dispatchers.IO) {
+                    try {
+                        catsService.getCatImage()
+                    } catch (e: SocketTimeoutException) {
+                        _result.value = Result.Error(e)
+                    }
+                }
+
+            val fact = deferredFact.await() as Fact
+            val catImage = (deferredImage.await() as List<CatImage>).first()
+            _result.value = Result.Success(CatModel(fact, catImage))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
new file mode 100644
index 00000000..6b3817a6
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsPresenter.kt
@@ -0,0 +1,68 @@
+package otus.homework.coroutines.presentation
+
+import kotlinx.coroutines.*
+import otus.homework.coroutines.CrashMonitor
+import otus.homework.coroutines.ICatsView
+import otus.homework.coroutines.data.CatsService
+import otus.homework.coroutines.domain.CatImage
+import otus.homework.coroutines.domain.CatModel
+import otus.homework.coroutines.domain.Fact
+import java.net.SocketTimeoutException
+
+class CatsPresenter(
+    private val catsService: CatsService
+) {
+
+    private var _catsView: ICatsView? = null
+    private val presenterScope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+
+    fun onInitComplete() {
+        presenterScope.launch {
+
+            val deferredFact = async(Dispatchers.IO) {
+                try {
+                    catsService.getCatFact()
+                } catch (e: SocketTimeoutException) {
+                    _catsView?.showExceptionMessage("Не удалось получить ответ от сервера.")
+                    showExceptionMessage("Не удалось получить ответ от сервера.")
+                } catch (e: Exception) {
+                    CrashMonitor.trackWarning(e)
+                    showExceptionMessage(e.message ?: "")
+                }
+            }
+
+            val deferredImage = async(Dispatchers.IO) {
+                try {
+                    catsService.getCatImage()
+                } catch (e: SocketTimeoutException) {
+                    showExceptionMessage("Не удалось получить ответ от сервера.")
+                } catch (e: Exception) {
+                    CrashMonitor.trackWarning(e)
+                    showExceptionMessage(e.message ?: "")
+                }
+            }
+
+            try {
+                val fact = deferredFact.await() as Fact
+                val catImage = (deferredImage.await() as List<CatImage>).first()
+                _catsView?.populate(CatModel(fact, catImage))
+            } catch (e: ClassCastException) {
+                CrashMonitor.trackWarning(e)
+            }
+        }
+    }
+
+    private fun showExceptionMessage(text: String) {
+        _catsView?.showExceptionMessage(text)
+    }
+
+    fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+    fun detachView() {
+        _catsView = null
+    }
+    fun cancelAllJobs() {
+        presenterScope.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
new file mode 100644
index 00000000..8102d8b8
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/CatsView.kt
@@ -0,0 +1,50 @@
+package otus.homework.coroutines
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
+import otus.homework.coroutines.domain.CatModel
+import otus.homework.coroutines.presentation.CatViewModel
+import otus.homework.coroutines.presentation.CatsPresenter
+
+class CatsView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
+
+    var presenter : CatsPresenter? = null
+
+    var catViewModel: CatViewModel? = null
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        findViewById<Button>(R.id.button).setOnClickListener {
+            //catViewModel?.onInitComplete()
+            presenter?.onInitComplete()
+        }
+    }
+
+    override fun populate(model: CatModel) {
+        findViewById<TextView>(R.id.fact_textView).text = model.fact.fact
+
+        Picasso.get()
+            .load(model.image?.imageUrl)
+            .into(findViewById<ImageView>(R.id.iv_cat))
+    }
+
+    override fun showExceptionMessage(text: String) {
+        Toast.makeText(context, text, Toast.LENGTH_SHORT).show()
+    }
+}
+
+interface ICatsView {
+    fun populate(model: CatModel)
+
+    fun showExceptionMessage(text: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
new file mode 100644
index 00000000..a4721052
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/presentation/MainActivity.kt
@@ -0,0 +1,51 @@
+package otus.homework.coroutines.presentation
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
+import otus.homework.coroutines.CatsView
+import otus.homework.coroutines.CrashMonitor
+import otus.homework.coroutines.R
+import otus.homework.coroutines.data.DiContainer
+import otus.homework.coroutines.domain.Result
+
+class MainActivity : AppCompatActivity() {
+    lateinit var catsPresenter: CatsPresenter
+
+    private val diContainer = DiContainer()
+
+    private val catViewModel by lazy {
+        ViewModelProvider(this)[CatViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        setContentView(view)
+
+        catsPresenter = CatsPresenter(diContainer.service)
+        view.presenter = catsPresenter
+        catsPresenter.attachView(view)
+        catsPresenter.onInitComplete()
+
+        view.catViewModel = catViewModel
+
+        catViewModel.result.observe(this) {
+            when(it) {
+                is Result.Success -> view.populate(it.catModel)
+                is Result.Error -> CrashMonitor.trackWarning(this, it.exception)
+            }
+        }
+
+        //catViewModel.onInitComplete()
+    }
+
+    override fun onStop() {
+        catsPresenter.cancelAllJobs()
+        if (isFinishing) {
+            catsPresenter.detachView()
+        }
+        super.onStop()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..0e930431 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,17 @@
     android:layout_width="match_parent"
     android:padding="16dp"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_cat"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"
+        />
 
     <TextView
         android:id="@+id/fact_textView"
diff --git a/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt b/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
index 566b967d..d63aa287 100644
--- a/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
+++ b/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
@@ -1,8 +1,8 @@
 package otus.homework.coroutines
 
-import org.junit.Test
 
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).