diff --git a/app/build.gradle b/app/build.gradle
index 4a3a24a..9799834 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,4 +47,5 @@ dependencies {
     implementation libs.picasso
     implementation libs.rxjava
     implementation libs.rxandroid
+    implementation libs.rxadapter
 }
diff --git a/app/src/main/java/otus/homework/reactivecats/CatsService.kt b/app/src/main/java/otus/homework/reactivecats/CatsService.kt
index f30b3aa..d4ef436 100644
--- a/app/src/main/java/otus/homework/reactivecats/CatsService.kt
+++ b/app/src/main/java/otus/homework/reactivecats/CatsService.kt
@@ -1,11 +1,9 @@
 package otus.homework.reactivecats
 
-import retrofit2.Call
+import io.reactivex.Single
 import retrofit2.http.GET
 
 interface CatsService {
-
-    //@GET("random?animal_type=cat")
     @GET("fact")
-    fun getCatFact(): Call<Fact>
+    fun getCatFact(): Single<Fact>
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/reactivecats/CatsUtils.kt b/app/src/main/java/otus/homework/reactivecats/CatsUtils.kt
new file mode 100644
index 0000000..c9f8c27
--- /dev/null
+++ b/app/src/main/java/otus/homework/reactivecats/CatsUtils.kt
@@ -0,0 +1,3 @@
+package otus.homework.reactivecats
+
+const val CAT_INTERVAL = 2000L
diff --git a/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt b/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt
index d62eaf9..f0d85a3 100644
--- a/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/reactivecats/CatsViewModel.kt
@@ -5,40 +5,51 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import io.reactivex.Flowable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import java.util.concurrent.TimeUnit
 
 class CatsViewModel(
-    catsService: CatsService,
-    localCatFactsGenerator: LocalCatFactsGenerator,
+    private val catsService: CatsService,
+    private val localCatFactsGenerator: LocalCatFactsGenerator,
     context: Context
 ) : ViewModel() {
 
     private val _catsLiveData = MutableLiveData<Result>()
     val catsLiveData: LiveData<Result> = _catsLiveData
+    private val disposables = CompositeDisposable()
 
     init {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsLiveData.value = Success(response.body()!!)
-                } else {
-                    _catsLiveData.value = Error(
-                        response.errorBody()?.string() ?: context.getString(
-                            R.string.default_error_text
-                        )
-                    )
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                _catsLiveData.value = ServerError
+        getFacts()
+    }
+    fun getFacts() {
+        val disposable = Flowable
+            .interval(0, CAT_INTERVAL, TimeUnit.MILLISECONDS)
+            .flatMapSingle {
+                catsService.getCatFact()
+                    .subscribeOn(Schedulers.io())
+                    .onErrorResumeNext { _ ->
+                        localCatFactsGenerator.generateCatFact()
+                    }
             }
-        })
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                { fact ->
+                    _catsLiveData.value = Success(fact)
+                },
+                { throwable ->
+                    _catsLiveData.value = Error(throwable.message ?: "Critical Error")
+                }
+            )
+        disposables.add(disposable)
     }
 
-    fun getFacts() {}
+    override fun onCleared() {
+        disposables.clear()
+        super.onCleared()
+    }
 }
 
 class CatsViewModelFactory(
diff --git a/app/src/main/java/otus/homework/reactivecats/DiContainer.kt b/app/src/main/java/otus/homework/reactivecats/DiContainer.kt
index bbccfc7..63aff9f 100644
--- a/app/src/main/java/otus/homework/reactivecats/DiContainer.kt
+++ b/app/src/main/java/otus/homework/reactivecats/DiContainer.kt
@@ -2,14 +2,15 @@ package otus.homework.reactivecats
 
 import android.content.Context
 import retrofit2.Retrofit
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
     private val retrofit by lazy {
         Retrofit.Builder()
-            //.baseUrl("https://cat-fact.herokuapp.com/facts/")
             .baseUrl("https://catfact.ninja/")
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
diff --git a/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt b/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt
index 4481062..be4dc4d 100644
--- a/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt
+++ b/app/src/main/java/otus/homework/reactivecats/LocalCatFactsGenerator.kt
@@ -3,7 +3,7 @@ package otus.homework.reactivecats
 import android.content.Context
 import io.reactivex.Flowable
 import io.reactivex.Single
-import kotlin.random.Random
+import java.util.concurrent.TimeUnit
 
 class LocalCatFactsGenerator(
     private val context: Context
@@ -15,7 +15,9 @@ class LocalCatFactsGenerator(
      * обернутую в подходящий стрим(Flowable/Single/Observable и т.п)
      */
     fun generateCatFact(): Single<Fact> {
-        return Single.never()
+        val randomFact = context.resources.getStringArray(R.array.local_cat_facts)
+            .random()
+        return Single.just(Fact(randomFact))
     }
 
     /**
@@ -24,7 +26,12 @@ class LocalCatFactsGenerator(
      * Если вновь заэмиченный Fact совпадает с предыдущим - пропускаем элемент.
      */
     fun generateCatFactPeriodically(): Flowable<Fact> {
-        val success = Fact(context.resources.getStringArray(R.array.local_cat_facts)[Random.nextInt(5)])
-        return Flowable.empty()
+        val facts = context.resources.getStringArray(R.array.local_cat_facts)
+        return Flowable
+            .interval(CAT_INTERVAL, TimeUnit.MILLISECONDS)
+            .map {
+                Fact(facts.random())
+            }
+            .distinctUntilChanged()
     }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46c9578..45a1de5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ picasso = "2.71828"
 retrofit = "2.9.0"
 rxandroid = "2.1.1"
 rxjava = "2.2.21"
+rxadapter = "3.0.0"
 
 [libraries]
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
@@ -33,6 +34,7 @@ retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref =
 retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
 rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxandroid" }
 rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava" }
+rxadapter = { group = "com.squareup.retrofit2", name = "adapter-rxjava2", version.ref = "rxadapter"}
 
 [bundles]
 network = ["okhttp", "okhttp-logging-interceptor", "retrofit", "retrofit-converter-gson"]