diff --git a/JokeApp/app/build.gradle b/JokeApp/app/build.gradle
index b66e789..9242f30 100644
--- a/JokeApp/app/build.gradle
+++ b/JokeApp/app/build.gradle
@@ -19,9 +19,10 @@ android {
         targetSdk 30
         versionCode 1
         versionName "1.0"
-
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
+        manifestPlaceholders = [auth0Domain: "dev-18w6525q.us.auth0.com", auth0Scheme: "demo"]
     }
 
     buildTypes {
@@ -50,15 +51,20 @@ android {
 
 
 dependencies {
-
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.test.ext:junit-ktx:1.1.3'
+    implementation 'androidx.room:room-common:2.3.0'
+    implementation 'androidx.room:room-ktx:2.3.0'
+    implementation 'com.auth0.android:auth0:2.+'
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha02'
     testImplementation 'junit:junit:4.+'
     testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation "androidx.room:room-testing:2.2.6"
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     testImplementation "org.robolectric:robolectric:4.5.1"
@@ -67,6 +73,7 @@ dependencies {
     implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    kapt "androidx.room:room-compiler:2.3.0"
 
 }
 
diff --git a/JokeApp/app/src/androidTest/java/com/example/jokeapp/JokeDatabaseTest.kt b/JokeApp/app/src/androidTest/java/com/example/jokeapp/JokeDatabaseTest.kt
new file mode 100644
index 0000000..aa11cf8
--- /dev/null
+++ b/JokeApp/app/src/androidTest/java/com/example/jokeapp/JokeDatabaseTest.kt
@@ -0,0 +1,58 @@
+package com.example.jokeapp
+
+import android.util.Log
+import androidx.room.Room
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+
+import com.example.jokeapp.database.jokes.Joke
+import com.example.jokeapp.database.jokes.JokeDatabase
+import com.example.jokeapp.database.jokes.JokeDatabaseDao
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.IOException
+
+/**
+ * This is not meant to be a full set of tests. For simplicity, most of your samples do not
+ * include tests. However, when building the Room, it is helpful to make sure it works before
+ * adding the UI.
+ */
+
+@RunWith(AndroidJUnit4::class)
+class JokeDatabaseTest {
+
+    private lateinit var jokeDao: JokeDatabaseDao
+    private lateinit var db: JokeDatabase
+
+    @Before
+    fun createDb() {
+        Log.i("before", "running before")
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        // Using an in-memory database because the information stored here disappears when the
+        // process is killed.
+        db = Room.inMemoryDatabaseBuilder(context, JokeDatabase::class.java)
+            // Allowing main thread queries, just for testing.
+            .allowMainThreadQueries()
+            .build()
+        jokeDao = db.jokeDatabaseDao
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun insertAndGetJoke() = runBlocking {
+        val joke = Joke()
+        jokeDao.insert(joke)
+        val lastJoke = jokeDao.getLastJoke()
+        assertEquals(lastJoke?.punchline, "")
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/AndroidManifest.xml b/JokeApp/app/src/main/AndroidManifest.xml
index e0f9cb8..f18dcec 100644
--- a/JokeApp/app/src/main/AndroidManifest.xml
+++ b/JokeApp/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.jokeapp">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".JokeApplication"
         android:allowBackup="true"
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/MainActivity.kt b/JokeApp/app/src/main/java/com/example/jokeapp/MainActivity.kt
index 1fb058b..ddd66da 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/MainActivity.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/MainActivity.kt
@@ -6,6 +6,7 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
+
 import com.google.android.material.navigation.NavigationView
 import timber.log.Timber
 
@@ -15,6 +16,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var drawerLayout: DrawerLayout
     private lateinit var appBarConfiguration: AppBarConfiguration
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         //setContentView(R.layout.activity_main)
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/Joke.kt b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/Joke.kt
new file mode 100644
index 0000000..23fb7c2
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/Joke.kt
@@ -0,0 +1,21 @@
+package com.example.jokeapp.database.jokes
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "custom_joke_table")
+data class Joke(
+    @PrimaryKey(autoGenerate = true)
+    var jokeId: Long = 0L,
+
+    @ColumnInfo(name = "joke_setup")
+    var jokeSetup: String = "",
+
+    @ColumnInfo(name = "joke_type")
+    var jokeType: String = "",
+
+    @ColumnInfo(name = "joke_punchline")
+    var punchline: String = "",
+
+)
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabase.kt b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabase.kt
new file mode 100644
index 0000000..80b6506
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabase.kt
@@ -0,0 +1,36 @@
+package com.example.jokeapp.database.jokes
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(entities = [Joke::class], version = 1, exportSchema = false)
+abstract class JokeDatabase : RoomDatabase() {
+
+    abstract val jokeDatabaseDao: JokeDatabaseDao
+
+    companion object {
+
+        @Volatile
+        private var INSTANCE: JokeDatabase? = null
+
+        fun getInstance(context: Context): JokeDatabase {
+            synchronized(this) {
+                var instance = INSTANCE
+
+                if (instance == null) {
+                    instance = Room.databaseBuilder(
+                        context.applicationContext,
+                        JokeDatabase::class.java,
+                        "custom_joke_database"
+                    )
+                        .fallbackToDestructiveMigration()
+                        .build()
+                    INSTANCE = instance
+                }
+                return instance
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabaseDao.kt b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabaseDao.kt
new file mode 100644
index 0000000..1e70728
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/database/jokes/JokeDatabaseDao.kt
@@ -0,0 +1,38 @@
+package com.example.jokeapp.database.jokes
+
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Update
+
+/**
+ * Defines methods for using the SleepNight class with Room.
+ */
+@Dao
+interface JokeDatabaseDao {
+
+    @Insert
+    suspend fun insert(joke: Joke)
+
+    @Update
+    suspend fun update(joke: Joke)
+
+    @Query("SELECT * from custom_joke_table WHERE jokeId = :key")
+    suspend fun get(key: Long): Joke?
+
+    @Query("DELETE FROM custom_joke_table")
+    suspend fun clear()
+
+    @Query("SELECT * FROM custom_joke_table ORDER BY jokeId DESC")
+    suspend fun getAllJokes(): List<Joke>
+
+    //get the joke with the highest ID (last joke added)
+    @Query("SELECT * FROM custom_joke_table ORDER BY jokeId DESC LIMIT 1")
+    suspend fun getLastJoke(): Joke?
+
+    //get the number of jokes present
+    @Query("SELECT COUNT(*) FROM custom_joke_table")
+    suspend fun numberOfJokes(): Int
+}
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/login/CredentialsManager.kt b/JokeApp/app/src/main/java/com/example/jokeapp/login/CredentialsManager.kt
new file mode 100644
index 0000000..aee71b9
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/login/CredentialsManager.kt
@@ -0,0 +1,45 @@
+package com.example.jokeapp.login
+
+import android.content.Context
+import com.auth0.android.result.Credentials
+import android.content.SharedPreferences
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKeys
+
+
+object CredentialsManager {
+    private val ACCESS_TOKEN = "access_token"
+
+    private lateinit var editor: SharedPreferences.Editor
+
+    fun saveCredentials(context: Context, credentials: Credentials) {
+
+        val masterKeyAlias: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
+
+        val sp: SharedPreferences = EncryptedSharedPreferences.create(
+            "secret_shared_prefs",
+            masterKeyAlias,
+            context,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
+
+        editor = sp.edit()
+        editor.putString(ACCESS_TOKEN, credentials.accessToken)
+            .apply()
+    }
+
+    fun getAccessToken(context: Context): String? {
+        val masterKeyAlias: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
+
+        val sp: SharedPreferences = EncryptedSharedPreferences.create(
+            "secret_shared_prefs",
+            masterKeyAlias,
+            context,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        )
+
+        return sp.getString(ACCESS_TOKEN, null)
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/login/LoginFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/login/LoginFragment.kt
new file mode 100644
index 0000000..b0f6db9
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/login/LoginFragment.kt
@@ -0,0 +1,154 @@
+package com.example.jokeapp.login
+
+import android.app.Activity
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
+import com.example.jokeapp.MainActivity
+import com.example.jokeapp.R
+import com.auth0.android.Auth0
+import com.auth0.android.authentication.AuthenticationAPIClient
+import com.auth0.android.authentication.AuthenticationException
+import com.auth0.android.callback.Callback
+import com.auth0.android.provider.WebAuthProvider
+import com.auth0.android.result.Credentials
+import com.auth0.android.result.UserProfile
+import timber.log.Timber
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [LoginFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class LoginFragment : Fragment() {
+
+    private lateinit var account : Auth0
+    private lateinit var loggedInText: TextView
+    private var loggedIn = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        val view =  inflater.inflate(R.layout.fragment_login, container, false)
+
+        //OAUTH
+        account = Auth0(
+            getString(R.string.auth_client_id),
+            getString(R.string.auth_domain)
+        )
+
+
+        val button = view.findViewById<Button>(R.id.loginbutton)
+        button?.setOnClickListener {
+            loginWithBrowser()
+        }
+
+        val logoutbutton = view.findViewById<Button>(R.id.logout_button)
+        logoutbutton?.setOnClickListener {
+            logout()
+        }
+        loggedInText = view.findViewById(R.id.logged_in_textview)
+
+        checkIfToken()
+        setLoggedInText()
+
+        return view
+    }
+
+    private fun checkIfToken(){
+        val token = CredentialsManager.getAccessToken(requireContext())
+        if(token != null){
+            //checking if the token works...
+            showUserProfile(token)
+        }
+        else {
+            Toast.makeText(context, "Token doesn't exist", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun setLoggedInText() {
+        if(loggedIn) {loggedInText.text = "you're logged in"}
+        else {loggedInText.text = "not logged in"}
+    }
+
+
+    private fun loginWithBrowser() {
+        // Setup the WebAuthProvider, using the custom scheme and scope.
+
+        WebAuthProvider.login(account)
+            .withScheme("demo")
+            .withScope("openid profile email")
+            // Launch the authentication passing the callback where the results will be received
+            .start(requireContext(), object : Callback<Credentials, AuthenticationException> {
+                // Called when there is an authentication failure
+                override fun onFailure(exception: AuthenticationException) {
+                    loggedIn = false
+                }
+
+                // Called when authentication completed successfully
+                override fun onSuccess(credentials: Credentials) {
+                    // Get the access token from the credentials object.
+                    // This can be used to call APIs
+                    val accessToken = credentials.accessToken
+                    Toast.makeText(context, accessToken, Toast.LENGTH_SHORT).show()
+
+                    CredentialsManager.saveCredentials(requireContext(), credentials)
+                    checkIfToken()
+                    setLoggedInText()
+                }
+            })
+    }
+
+    private fun logout() {
+        WebAuthProvider.logout(account)
+            .withScheme("demo")
+            .start(requireContext(), object: Callback<Void?, AuthenticationException> {
+                override fun onSuccess(payload: Void?) {
+                    Toast.makeText(context, "logout OK", Toast.LENGTH_SHORT).show()
+                    loggedIn = false
+                    setLoggedInText()
+                }
+
+                override fun onFailure(error: AuthenticationException) {
+                    Toast.makeText(context, "logout NOK", Toast.LENGTH_SHORT).show()
+                }
+            })
+    }
+
+    private fun showUserProfile(accessToken: String){
+        var client = AuthenticationAPIClient(account)
+
+        // With the access token, call `userInfo` and get the profile from Auth0.
+        client.userInfo(accessToken)
+            .start(object : Callback<UserProfile, AuthenticationException> {
+                override fun onFailure(exception: AuthenticationException) {
+                    Timber.i(exception.stackTraceToString())
+                    loggedIn = false
+                    setLoggedInText()
+                }
+
+                override fun onSuccess(profile: UserProfile) {
+                    // We have the user's profile!
+                    Timber.i("SUCCESS! got the user profile")
+                    val email = profile.email
+                    val name = profile.name
+                    loggedIn = true
+                    setLoggedInText()
+                }
+            })
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeFragment.kt
new file mode 100644
index 0000000..e1001d2
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeFragment.kt
@@ -0,0 +1,59 @@
+package com.example.jokeapp.screens.addJoke
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.findNavController
+import com.example.jokeapp.R
+import com.example.jokeapp.database.jokes.JokeDatabase
+import com.example.jokeapp.databinding.FragmentAddJokeBinding
+import com.example.jokeapp.screens.jokes.JokeFragmentDirections
+import com.example.jokeapp.screens.jokes.JokeViewModelFactory
+
+class AddJokeFragment : Fragment()  {
+
+    lateinit var binding : FragmentAddJokeBinding
+    lateinit var viewModel : AddJokeViewModel
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_add_joke, container, false)
+
+        //Get an instance of the appContext to setup the database
+        val appContext = requireNotNull(this.activity).application
+        val dataSource = JokeDatabase.getInstance(appContext).jokeDatabaseDao
+
+        //use a factory to pass the database reference to the viewModel
+        val viewModelFactory = AddJokeViewModelFactory(dataSource, appContext)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(AddJokeViewModel::class.java)
+
+        binding.viewModel = viewModel
+
+        //this call allows to automatically update the livedata
+        //Meaning: no more resets or whatsoever
+        binding.setLifecycleOwner (this)
+
+        viewModel.saveEvent.observe(viewLifecycleOwner, Observer {
+            saveEvent -> if(saveEvent){
+                viewModel.saveJoke(binding.editTextTextPersonName.text.toString())
+                //navigate back to the joke screen
+               view?.findNavController()?.navigate(AddJokeFragmentDirections.actionAddJokeFragmentToJokeFragment())
+                viewModel.saveEventDone()
+            }
+        })
+
+
+        return binding.root
+
+    }
+
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModel.kt
new file mode 100644
index 0000000..e8ac59e
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModel.kt
@@ -0,0 +1,39 @@
+package com.example.jokeapp.screens.addJoke
+
+import android.app.Application
+import androidx.lifecycle.*
+import com.example.jokeapp.database.jokes.Joke
+import com.example.jokeapp.database.jokes.JokeDatabaseDao
+import kotlinx.coroutines.launch
+
+class AddJokeViewModel(val database: JokeDatabaseDao, application: Application): AndroidViewModel(application) {
+
+    private val _saveEvent = MutableLiveData<Boolean>()
+    val saveEvent: LiveData<Boolean>
+        get() = _saveEvent
+
+    init {
+        _saveEvent.value = false
+    }
+
+    fun saveJokeClick(){
+        _saveEvent.value = true
+    }
+
+    fun saveEventDone(){
+        _saveEvent.value = false
+    }
+
+    fun saveJoke(newJoke : String){
+        viewModelScope.launch{
+            val joke = Joke()
+            joke.punchline = newJoke
+            saveJokeToDatabase(joke)
+        }
+    }
+
+    //suspend methods
+    suspend fun saveJokeToDatabase(newJoke: Joke){
+        database.insert(newJoke)
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModelFactory.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModelFactory.kt
new file mode 100644
index 0000000..f70551a
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/addJoke/AddJokeViewModelFactory.kt
@@ -0,0 +1,16 @@
+package com.example.jokeapp.screens.addJoke
+
+import android.app.Application
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.example.jokeapp.database.jokes.JokeDatabaseDao
+
+class AddJokeViewModelFactory (private val dataSource: JokeDatabaseDao, private val application: Application): ViewModelProvider.Factory {
+    override fun <T: ViewModel?> create(modelClass: Class<T>): T {
+        if(modelClass.isAssignableFrom(AddJokeViewModel::class.java)) {
+            return AddJokeViewModel(dataSource, application) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index 1e12d70..3c67377 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -1,5 +1,6 @@
 package com.example.jokeapp.screens.jokes
 
+import android.app.Activity
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
@@ -8,8 +9,10 @@ import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.Navigation
 import androidx.navigation.findNavController
 import com.example.jokeapp.R
+import com.example.jokeapp.database.jokes.JokeDatabase
 import com.example.jokeapp.databinding.FragmentJokeBinding
 import kotlin.random.Random
 
@@ -20,14 +23,13 @@ import kotlin.random.Random
  */
 class JokeFragment : Fragment() {
 
+    private lateinit var binding: FragmentJokeBinding
+    private lateinit var viewModel : JokeViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
     }
 
-    lateinit var binding: FragmentJokeBinding
-    lateinit var viewModel : JokeViewModel
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -41,7 +43,13 @@ class JokeFragment : Fragment() {
         //It needs to be special to survive e.g. config changes
         //viewModel = JokeViewModel()
 
-        viewModel = ViewModelProvider(this).get(JokeViewModel::class.java)
+        //Get an instance of the appContext to setup the database
+        val appContext = requireNotNull(this.activity).application
+        val dataSource = JokeDatabase.getInstance(appContext).jokeDatabaseDao
+
+        //use a factory to pass the database reference to the viewModel
+        val viewModelFactory = JokeViewModelFactory(dataSource, appContext)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(JokeViewModel::class.java)
 
         binding.jokes = viewModel
 
@@ -49,17 +57,9 @@ class JokeFragment : Fragment() {
         //Meaning: no more resets or whatsoever
         binding.setLifecycleOwner (this)
 
-        //This is now no longer needed --> you can just call it from the XML
-        /*viewModel.currentJoke.observe(viewLifecycleOwner, Observer {
-            newJoke -> binding.jokeTextview.text = newJoke
-        })*/
-
-
         viewModel.shouldEvaluate.observe(viewLifecycleOwner, Observer { shouldEveluate ->
             if(shouldEveluate){
-
                 view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToHappyComedian(viewModel.happyJokes, viewModel.badJokes))
-
                 viewModel.evaluationComplete()
             }
         })
@@ -71,6 +71,10 @@ class JokeFragment : Fragment() {
             }
         })
 
+        binding.addJokeButton.setOnClickListener(
+            Navigation.createNavigateOnClickListener(R.id.addJokeFragment)
+        )
+
         return binding.root
     }
 
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index a2663f9..4162b40 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -1,25 +1,34 @@
 package com.example.jokeapp.screens.jokes
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
+import android.app.Activity
+import android.app.Application
+import androidx.lifecycle.*
+import com.example.jokeapp.database.jokes.Joke
+import com.example.jokeapp.database.jokes.JokeDatabase
+import com.example.jokeapp.database.jokes.JokeDatabaseDao
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import kotlin.random.Random
 
-class JokeViewModel: ViewModel() {
+class JokeViewModel(val database: JokeDatabaseDao, application: Application): AndroidViewModel(application) {
 
     var happyJokes = 0
     var badJokes = 0
 
-    private val jokes = listOf(
-        "My wife said I should do lunges to stay in shape. That would be a big step forward.",
-        "I thought the dryer was shrinking my clothes. Turns out it was the refrigerator all along",
-        "I only know 25 letters of the alphabet. I don't know y.",
-        "I asked my dog what's two minus two. He said nothing.",
-        "This graveyard looks overcrowded. People must be dying to get in.",
-        "I have a joke about chemistry, but I don't think it will get a reaction.",
-        "I used to be addicted to soap, but I'm clean now."
-    )
+    /*private val jokes = listOf(
+        "My wife said I should do lunges to stay in shape. That would be a big step forward...."
+    )*/
+
+    private lateinit var jokes: List<Joke>
+    private val numberOfJokes = MutableLiveData<Int>()
+
+    val numberOfJokesString = Transformations.map(numberOfJokes){
+        number -> number.toString()
+    }
+
+    val buttonVisible = Transformations.map(numberOfJokes){
+        it > 0
+    }
 
     private val _currentJoke = MutableLiveData<String>()
     val currentJoke: LiveData<String>
@@ -34,8 +43,14 @@ class JokeViewModel: ViewModel() {
         get() = _showSmileyEvent
 
     init {
-        Timber.i("init is called")
-        changeCurrentJoke()
+        initializeLiveData()
+    }
+
+    private fun initializeLiveData(){
+        viewModelScope.launch{
+            numberOfJokes.value = getNumberOfJokesFromDatabase()
+            changeCurrentJoke()
+        }
     }
 
     fun changeCurrentJoke() {
@@ -45,13 +60,26 @@ class JokeViewModel: ViewModel() {
             startOver()
             return
         }
+        viewModelScope.launch {
+            jokes = getAllJokes()
 
-        var randomListNumber = Random.nextInt(jokes.size)
-        if(_currentJoke.value == jokes[randomListNumber]) randomListNumber = randomListNumber.plus(1).mod(jokes.size)
-        //use mod to stay in the correct range
-        _currentJoke.value = jokes[randomListNumber]
+            _currentJoke.value = "Create some jokes first"
+            if (numberOfJokes.value == null) return@launch
+
+            //don't change the joke if there are no jokes
+            if (numberOfJokes.value!! == 0) return@launch
+
+            var randomListNumber = Random.nextInt(numberOfJokes.value!!)
+
+            //use the livedata joke list to get a random joke
+            if (_currentJoke.value == jokes.get(randomListNumber).punchline) randomListNumber =
+                randomListNumber.plus(1).mod(numberOfJokes.value!!)
+            //use mod to stay in the correct range
+            _currentJoke.value = jokes.get(randomListNumber).punchline
+        }
     }
 
+
     fun evaluationComplete(){
         _shouldEvaluate.value = false
     }
@@ -84,4 +112,12 @@ class JokeViewModel: ViewModel() {
 
 
 
+    //Suspend functions
+    private suspend fun getNumberOfJokesFromDatabase(): Int{
+        return database.numberOfJokes()
+    }
+
+    private suspend fun getAllJokes(): List<Joke>{
+        return database.getAllJokes()
+    }
 }
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModelFactory.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModelFactory.kt
new file mode 100644
index 0000000..fb820ef
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModelFactory.kt
@@ -0,0 +1,15 @@
+package com.example.jokeapp.screens.jokes
+
+import android.app.Application
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.example.jokeapp.database.jokes.JokeDatabaseDao
+
+class JokeViewModelFactory(private val dataSource: JokeDatabaseDao, private val application: Application): ViewModelProvider.Factory {
+    override fun <T: ViewModel?> create(modelClass: Class<T>): T {
+        if(modelClass.isAssignableFrom(JokeViewModel::class.java)) {
+            return JokeViewModel(dataSource, application) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
diff --git a/JokeApp/app/src/main/res/layout/fragment_add_joke.xml b/JokeApp/app/src/main/res/layout/fragment_add_joke.xml
new file mode 100644
index 0000000..440496f
--- /dev/null
+++ b/JokeApp/app/src/main/res/layout/fragment_add_joke.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.example.jokeapp.screens.addJoke.AddJokeViewModel" />
+    </data>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".AddJokeFragment">
+
+
+        <EditText
+            android:id="@+id/editTextTextPersonName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:ems="10"
+            android:hint="Write a joke here"
+            android:inputType="textPersonName"
+            android:text=""
+            tools:text="A new joke is written here"
+            app:layout_constraintBottom_toTopOf="@+id/save_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <Button
+            android:id="@+id/save_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:text="Save"
+            android:onClickListener="@{() -> viewModel.saveJokeClick()}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
diff --git a/JokeApp/app/src/main/res/layout/fragment_joke.xml b/JokeApp/app/src/main/res/layout/fragment_joke.xml
index 5b1eb35..db1eab1 100644
--- a/JokeApp/app/src/main/res/layout/fragment_joke.xml
+++ b/JokeApp/app/src/main/res/layout/fragment_joke.xml
@@ -54,11 +54,13 @@
             android:layout_marginBottom="@dimen/margin_bottom"
             android:text="@string/next_joke"
             android:onClick="@{()-> jokes.badJoke()}"
+            android:enabled="@{jokes.buttonVisible}"
             app:layout_constraintBottom_toTopOf="@+id/happy_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/joke_textview" />
+            app:layout_constraintTop_toBottomOf="@+id/joke_textview"
+            />
 
         <Button
             android:id="@+id/happy_button"
@@ -67,12 +69,36 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/good_one"
             android:onClick="@{()->jokes.goodJoke()}"
+            android:enabled="@{jokes.buttonVisible}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/nextjoke_button" />
 
+        <TextView
+            android:id="@+id/jokecount_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@{jokes.numberOfJokesString}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/add_joke_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="32dp"
+            android:clickable="true"
+            android:contentDescription="Add a joke button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@android:drawable/ic_input_add"
+            tools:ignore="SpeakableTextPresentCheck" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/JokeApp/app/src/main/res/layout/fragment_login.xml b/JokeApp/app/src/main/res/layout/fragment_login.xml
new file mode 100644
index 0000000..7dd26bb
--- /dev/null
+++ b/JokeApp/app/src/main/res/layout/fragment_login.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/frameLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".LoginFragment">
+
+    <Button
+        android:id="@+id/loginbutton"
+        android:layout_width="378dp"
+        android:layout_height="83dp"
+        android:text="Login"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/logout_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Logout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loginbutton" />
+
+    <TextView
+        android:id="@+id/logged_in_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Logged in"
+        app:layout_constraintBottom_toTopOf="@+id/loginbutton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/menu/navdrawer_menu.xml b/JokeApp/app/src/main/res/menu/navdrawer_menu.xml
index c1d0af6..9aa3036 100644
--- a/JokeApp/app/src/main/res/menu/navdrawer_menu.xml
+++ b/JokeApp/app/src/main/res/menu/navdrawer_menu.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/aboutFragment"
         android:title="About" />
-</menu>
\ No newline at end of file
+    <item
+        android:id="@+id/loginFragment2"
+        android:title="Login" />
+</menu>
+
diff --git a/JokeApp/app/src/main/res/navigation/navigation.xml b/JokeApp/app/src/main/res/navigation/navigation.xml
index 5026d75..7550b98 100644
--- a/JokeApp/app/src/main/res/navigation/navigation.xml
+++ b/JokeApp/app/src/main/res/navigation/navigation.xml
@@ -23,6 +23,9 @@
         <action
             android:id="@+id/action_jokeFragment_to_happyComedian"
             app:destination="@id/happyComedian" />
+        <action
+            android:id="@+id/action_jokeFragment_to_addJokeFragment"
+            app:destination="@id/addJokeFragment" />
     </fragment>
     <fragment
         android:id="@+id/happyComedian"
@@ -51,4 +54,16 @@
         android:id="@+id/aboutFragment"
         android:name="com.example.jokeapp.screens.utils.AboutFragment"
         android:label="AboutFragment" />
+    <fragment
+        android:id="@+id/addJokeFragment"
+        android:name="com.example.jokeapp.screens.addJoke.AddJokeFragment"
+        android:label="AddJokeFragment" >
+        <action
+            android:id="@+id/action_addJokeFragment_to_jokeFragment"
+            app:destination="@id/jokeFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/loginFragment2"
+        android:name="com.example.jokeapp.login.LoginFragment"
+        android:label="LoginFragment" />
 </navigation>
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/values/strings.xml b/JokeApp/app/src/main/res/values/strings.xml
index d224608..5ff4b8e 100644
--- a/JokeApp/app/src/main/res/values/strings.xml
+++ b/JokeApp/app/src/main/res/values/strings.xml
@@ -10,4 +10,6 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="welcome_to_this_wonderful_app">Welcome to this wonderful app!</string>
+    <string name="auth_client_id">ZGxJU5DHPQcOyGlyRAz7K6eDFvuxcIfX</string>
+    <string name="auth_domain">dev-18w6525q.us.auth0.com</string>
 </resources>
\ No newline at end of file
diff --git a/JokeApp/build.gradle b/JokeApp/build.gradle
index 6330089..b795e63 100644
--- a/JokeApp/build.gradle
+++ b/JokeApp/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:7.0.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30"
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
 
         // NOTE: Do not place your application dependencies here; they belong