diff --git a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
index 8f487319..9254b7ef 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
@@ -19,11 +19,12 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class MainActivityViewModel @Inject constructor(
-    userDataRepository: UserDataRepository,
+    private val userDataRepository: UserDataRepository,
     private val notePadRepository: INotePadRepository,
     private val labelRepository: ILabelRepository,
 
@@ -34,7 +35,7 @@ class MainActivityViewModel @Inject constructor(
         }.stateIn(
             scope = viewModelScope,
             initialValue = MainActivityUiState.Loading,
-            started = SharingStarted.WhileSubscribed(5_000),
+            started = SharingStarted.WhileSubscribed(),
         )
 
     val labels = labelRepository
@@ -113,6 +114,12 @@ class MainActivityViewModel @Inject constructor(
         )
         return notePadRepository.upsert(notePad)
     }
+
+    fun setMainData(mainData: Long) {
+        viewModelScope.launch {
+            userDataRepository.setMainData(mainData)
+        }
+    }
 }
 
 sealed interface MainActivityUiState {
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
index 73f0b7f7..50667fb0 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
@@ -13,6 +13,7 @@ import com.mshdabiola.data.repository.INotePadRepository
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
 import com.mshdabiola.model.Label
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NoteImage
 import com.mshdabiola.model.NotePad
 import com.mshdabiola.model.ThemeBrand
@@ -156,6 +157,7 @@ sealed interface SharedActivityUiState {
             useDynamicColor = false,
             shouldHideOnboarding = false,
             contrast = Contrast.High,
+            mainData = MainData.Note,
         ),
         val notepad: NotePad = NotePad(),
         val labels: List<Label> = emptyList(),
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
index c645020a..7d29ccf0 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
@@ -41,7 +41,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.navOptions
 import com.mshdabiola.about.navigateToAbout
 import com.mshdabiola.designsystem.component.NoteBackground
 import com.mshdabiola.designsystem.component.NoteGradientBackground
@@ -53,6 +52,8 @@ import com.mshdabiola.detail.navigation.navigateToDetail
 import com.mshdabiola.drawing.navigateToDrawing
 import com.mshdabiola.labelscreen.navigateToLabel
 import com.mshdabiola.main.navigation.navigateToMain
+import com.mshdabiola.model.MainData
+import com.mshdabiola.playnotepad.MainActivityUiState
 import com.mshdabiola.playnotepad.MainActivityViewModel
 import com.mshdabiola.playnotepad.navigation.NoteNavHost
 import com.mshdabiola.setting.navigation.navigateToSetting
@@ -69,6 +70,7 @@ fun NoteApp(
 ) {
     val shouldShowGradientBackground = true
     val labels = viewModel.labels.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     var showAudio by remember { mutableStateOf(false) }
     var showImage by remember { mutableStateOf(false) }
 
@@ -98,17 +100,12 @@ fun NoteApp(
                 drawerContent = {
                     MainNavigation(
                         labels = labels.value,
-                        currentMainArg = appState.mainArg,
+                        currentMainArg = (uiState as? MainActivityUiState.Success)
+                            ?.userData?.mainData?.index ?: MainData.Note.index,
                         onNavigation = {
-                            //  onNavigationNoteType(it)
-//                            appState.navController.navigateToMain()
+                            viewModel.setMainData(it)
                             appState.navController.popBackStack()
-                            appState.navController.navigateToMain(
-                                it,
-                                navOptions {
-                                    //  this.launchSingleTop=true
-                                },
-                            )
+                            appState.navController.navigateToMain()
                             appState.closeDrawer()
                         },
                         navigateToLevel = {
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
index 31e9e1a1..e3e22de6 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
@@ -17,8 +17,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.mshdabiola.data.util.NetworkMonitor
 import com.mshdabiola.main.navigation.MainRoute
-import com.mshdabiola.main.navigation.TypeArg
-import com.mshdabiola.model.NoteType
 import com.mshdabiola.ui.TrackDisposableJank
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
@@ -61,10 +59,10 @@ class NoteAppState(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination?.route ?: ""
 
-    val mainArg: Long
-        @Composable get() = navController.currentBackStackEntryAsState().value?.arguments?.getLong(
-            TypeArg,
-        ) ?: NoteType.NOTE.index
+//    val mainArg: Long
+//        @Composable get() = navController.currentBackStackEntryAsState().value?.arguments?.getLong(
+//            TypeArg,
+//        ) ?: NoteType.NOTE.index
 
     //            navController
 //            .currentBackStackEntryAsState().value?.toRoute<Main>() ?:
diff --git a/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt b/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
index f6ec0b4d..106a7137 100644
--- a/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
+++ b/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
@@ -9,6 +9,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
 import com.mshdabiola.data.repository.ILabelRepository
+import com.mshdabiola.data.repository.UserDataRepository
+import com.mshdabiola.model.MainData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.collectLatest
@@ -20,6 +22,7 @@ import javax.inject.Inject
 class LabelViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val labelRepository: ILabelRepository,
+    private val userDataRepository: UserDataRepository,
 ) : ViewModel() {
 
     var labelScreenUiState by mutableStateOf(LabelScreenUiState())
@@ -58,6 +61,7 @@ class LabelViewModel @Inject constructor(
         labels.removeAt(index)
         labelScreenUiState = labelScreenUiState.copy(labels = labels.toImmutableList())
         viewModelScope.launch {
+            userDataRepository.setMainData(MainData.Note.index)
             labelRepository.delete(id)
         }
     }
diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
index 1a534ddf..432d7bd8 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
@@ -1,5 +1,6 @@
 package com.mshdabiola.main
 
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NotePad
 import com.mshdabiola.model.NoteType
 
@@ -13,6 +14,7 @@ sealed class MainState {
         val color: List<SearchSort.Color> = emptyList(),
         val label: List<SearchSort.Label> = emptyList(),
         val searchSort: SearchSort? = null,
+        val mainData: MainData = MainData.Note,
 
     ) : MainState()
 
diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
index c706551d..71a18f34 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
@@ -11,7 +11,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mshdabiola.common.IAlarmManager
 import com.mshdabiola.data.repository.INotePadRepository
-import com.mshdabiola.main.navigation.MainArg
+import com.mshdabiola.data.repository.UserDataRepository
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NoteType
 import com.mshdabiola.ui.state.DateDialogUiData
 import com.mshdabiola.ui.state.DateListUiState
@@ -25,6 +26,8 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -49,14 +52,22 @@ internal class MainViewModel
     savedStateHandle: SavedStateHandle,
     private val notepadRepository: INotePadRepository,
     private val alarmManager: IAlarmManager,
+    userDataRepository: UserDataRepository,
 ) : ViewModel() {
 
     val searchState = TextFieldState()
-    private val mainArg = MainArg(savedStateHandle)
+
     private val _mainState = MutableStateFlow<MainState>(MainState.Loading)
     val mainState = _mainState.asStateFlow()
 
     init {
+        viewModelScope.launch {
+            userDataRepository.userData.collectLatest {
+                if (mainState.value is MainState.Success) {
+                    _mainState.value = getSuccess().copy(mainData = it.mainData)
+                }
+            }
+        }
 
         viewModelScope.launch {
             combine(
@@ -120,18 +131,18 @@ internal class MainViewModel
                     } else {
 
                         val list =
-                            when (mainArg.noteType) {
-                                NoteType.LABEL -> {
-                                    notepad.filter { it.labels.any { it.id == mainArg.type } }
+                            when (mainState.mainData) {
+                                is MainData.Label -> {
+                                    notepad.filter { it.labels.any { it.id == mainState.mainData.index } }
                                 }
 
-                                NoteType.REMAINDER -> {
+                                is MainData.Remainder -> {
                                     notepad.filter { it.reminder > 0 }
                                 }
 
                                 else -> {
                                     notepad.filter {
-                                        it.noteType == mainArg.noteType
+                                        it.noteType.index == mainState.mainData.index
                                     }
                                 }
                             }
@@ -140,9 +151,10 @@ internal class MainViewModel
                         )
                     }
                 } else {
-
+                    val mainData = userDataRepository.userData.mapLatest { it.mainData }.firstOrNull() ?: MainData.Note
                     _mainState.value = MainState.Success(
                         notePads = emptyList(),
+                        mainData = mainData,
                     )
 
                     initDate()
diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
index 682d757b..5738ede7 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
@@ -7,24 +7,18 @@ package com.mshdabiola.main.navigation
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 import com.mshdabiola.main.MainRoute
-import com.mshdabiola.model.NoteType
 
 fun NavController.navigateToMain(
-    type: Long,
     navOptions: NavOptions = androidx.navigation.navOptions { },
-) = navigate(route = "$MainRoute/$type", navOptions)
+) = navigate(route = MainRoute, navOptions)
 
 const val MainRoute = "main"
-const val TypeArg = "mainArg"
-const val FullMainRoute = "$MainRoute/{$TypeArg}"
+const val FullMainRoute = MainRoute
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 fun NavGraphBuilder.mainScreen(
@@ -37,12 +31,6 @@ fun NavGraphBuilder.mainScreen(
 ) {
     composable(
         route = FullMainRoute,
-        arguments = listOf(
-            navArgument(TypeArg) {
-                type = NavType.LongType
-                defaultValue = -1L
-            },
-        ),
     ) {
         MainRoute(
             modifier = modifier,
@@ -55,22 +43,3 @@ fun NavGraphBuilder.mainScreen(
         )
     }
 }
-
-//
-//
-internal class MainArg(val type: Long) {
-    val noteType: NoteType = when (type) {
-        NoteType.NOTE.index -> NoteType.NOTE
-        NoteType.ARCHIVE.index -> NoteType.ARCHIVE
-        NoteType.TRASH.index -> NoteType.TRASH
-        NoteType.REMAINDER.index -> NoteType.REMAINDER
-        else -> NoteType.LABEL
-    }
-
-    constructor(savedStateHandle: SavedStateHandle) :
-        this(
-            type = checkNotNull(savedStateHandle[TypeArg]),
-
-        )
-}
-//
diff --git a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
index c707da27..ed22518e 100644
--- a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
+++ b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
@@ -45,4 +45,8 @@ internal class OfflineFirstUserDataRepository @Inject constructor(
         userPreferencesRepository.setShouldHideOnboarding(shouldHideOnboarding)
         analyticsHelper.logOnboardingStateChanged(shouldHideOnboarding)
     }
+
+    override suspend fun setMainData(mainData: Long) {
+        userPreferencesRepository.setMainData(mainData)
+    }
 }
diff --git a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
index 422b982c..1a91e468 100644
--- a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
+++ b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
@@ -35,4 +35,5 @@ interface UserDataRepository {
      * Sets whether the user has completed the onboarding process.
      */
     suspend fun setShouldHideOnboarding(shouldHideOnboarding: Boolean)
+    suspend fun setMainData(mainData: Long)
 }
diff --git a/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt b/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
index f38c05a4..ade379d6 100644
--- a/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
+++ b/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
@@ -9,6 +9,7 @@ import com.mshdabiola.datastore.UserPreferencesRepository
 import com.mshdabiola.datastore.di.testUserPreferencesDataStore
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.ThemeBrand
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.flow.first
@@ -57,6 +58,7 @@ class OfflineFirstUserDataRepositoryTest {
                 useDynamicColor = false,
                 shouldHideOnboarding = false,
                 contrast = Contrast.Normal,
+                mainData = MainData.Label(0),
             ),
             subject.userData.first(),
         )
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt
deleted file mode 100644
index 8cbb7046..00000000
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-/**
- * Class summarizing the local version of each model for sync
- */
-data class ChangeListVersions(
-    val topicVersion: Int = -1,
-    val newsResourceVersion: Int = -1,
-)
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt
deleted file mode 100644
index 4c9c70b5..00000000
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-import androidx.datastore.core.DataMigration
-
-/**
- * Migrates saved ids from [Int] to [String] types
- */
-internal object IntToStringIdsMigration : DataMigration<UserPreferences> {
-
-    override suspend fun cleanUp() = Unit
-
-    override suspend fun migrate(currentData: UserPreferences): UserPreferences =
-        currentData.copy {
-            // Migrate topic ids
-        }
-
-    override suspend fun shouldMigrate(currentData: UserPreferences): Boolean =
-        true
-}
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
index fb0eb3d4..c3665404 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
@@ -6,6 +6,7 @@ package com.mshdabiola.datastore
 
 import androidx.datastore.core.DataStore
 import com.mshdabiola.model.Contrast
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -53,6 +54,13 @@ class UserPreferencesRepository @Inject constructor(
 
                     ThemeContrastProto.THEME_CONTRAST_MEDIUM -> Contrast.Medium
                 },
+                mainData = when (it.mainScreenType) {
+                    MainData.Note.index -> MainData.Note
+                    MainData.Achieve.index -> MainData.Achieve
+                    MainData.Trash.index -> MainData.Trash
+                    MainData.Remainder.index -> MainData.Remainder
+                    else -> MainData.Label(it.mainScreenType)
+                },
             )
         }
 
@@ -104,4 +112,9 @@ class UserPreferencesRepository @Inject constructor(
             it.copy { this.shouldHideOnboarding = shouldHideOnboarding }
         }
     }
+    suspend fun setMainData(index: Long) {
+        userPreferences.updateData {
+            it.copy { this.mainScreenType = index }
+        }
+    }
 }
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
index 722f4587..a30b9f7c 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
@@ -11,7 +11,6 @@ import androidx.datastore.dataStoreFile
 import com.mshdabiola.common.network.Dispatcher
 import com.mshdabiola.common.network.SkDispatchers.IO
 import com.mshdabiola.common.network.di.ApplicationScope
-import com.mshdabiola.datastore.IntToStringIdsMigration
 import com.mshdabiola.datastore.UserPreferences
 import com.mshdabiola.datastore.UserPreferencesSerializer
 import dagger.Module
@@ -38,9 +37,6 @@ object DataStoreModule {
         DataStoreFactory.create(
             serializer = userPreferencesSerializer,
             scope = CoroutineScope(scope.coroutineContext + ioDispatcher),
-            migrations = listOf(
-                IntToStringIdsMigration,
-            ),
         ) {
             context.dataStoreFile("user_preferences.pb")
         }
diff --git a/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto b/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
index 889c9e74..25016c02 100644
--- a/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
+++ b/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
@@ -19,6 +19,7 @@ message UserPreferences {
 
     ThemeContrastProto contrast = 5;
 
+    int64 main_screen_type = 6;
 
-    // NEXT AVAILABLE ID: 6
+    // NEXT AVAILABLE ID: 7 // Update this comment for the next person
 }
diff --git a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt b/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt
deleted file mode 100644
index 4333cecc..00000000
--- a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-
-/**
- * Unit test for [IntToStringIdsMigration]
- */
-class IntToStringIdsMigrationTest {
-
-    @Test
-    fun IntToStringIdsMigration_should_migrate_topic_ids() = runTest {
-    }
-}
diff --git a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt b/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt
deleted file mode 100644
index c9c77808..00000000
--- a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-class ListToMapMigrationTest {
-//
-//    @Test
-//    fun ListToMapMigration_should_migrate_topic_ids() = runTest {
-//        // Set up existing preferences with topic ids
-//        val preMigrationUserPreferences = userPreferences {
-//            deprecatedFollowedTopicIds.addAll(listOf("1", "2", "3"))
-//        }
-//        // Assert that there are no topic ids in the map yet
-//        assertEquals(
-//            emptyMap<String, Boolean>(),
-//            preMigrationUserPreferences.followedTopicIdsMap,
-//        )
-//
-//        // Run the migration
-//        val postMigrationUserPreferences =
-//            ListToMapMigration.migrate(preMigrationUserPreferences)
-//
-//        // Assert the deprecated topic ids have been migrated to the topic ids map
-//        assertEquals(
-//            mapOf("1" to true, "2" to true, "3" to true),
-//            postMigrationUserPreferences.followedTopicIdsMap,
-//        )
-//
-//        // Assert that the migration has been marked complete
-//        assertTrue(postMigrationUserPreferences.hasDoneListToMapMigration)
-//    }
-//
-//    @Test
-//    fun ListToMapMigration_should_migrate_author_ids() = runTest {
-//        // Set up existing preferences with author ids
-//        val preMigrationUserPreferences = userPreferences {
-//            deprecatedFollowedAuthorIds.addAll(listOf("4", "5", "6"))
-//        }
-//        // Assert that there are no author ids in the map yet
-//        assertEquals(
-//            emptyMap<String, Boolean>(),
-//            preMigrationUserPreferences.followedAuthorIdsMap,
-//        )
-//
-//        // Run the migration
-//        val postMigrationUserPreferences =
-//            ListToMapMigration.migrate(preMigrationUserPreferences)
-//
-//        // Assert the deprecated author ids have been migrated to the author ids map
-//        assertEquals(
-//            mapOf("4" to true, "5" to true, "6" to true),
-//            postMigrationUserPreferences.followedAuthorIdsMap,
-//        )
-//
-//        // Assert that the migration has been marked complete
-//        assertTrue(postMigrationUserPreferences.hasDoneListToMapMigration)
-//    }
-}
diff --git a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
new file mode 100644
index 00000000..4431ff9e
--- /dev/null
+++ b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
@@ -0,0 +1,9 @@
+package com.mshdabiola.model
+
+sealed class MainData(val index: Long) {
+    object Note : MainData(-1L)
+    object Achieve : MainData(-2L)
+    object Trash : MainData(-3L)
+    data class Label(val id: Long) : MainData(index = id) // Assigning a default index like in the original enum
+    object Remainder : MainData(-4L)
+}
diff --git a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
index d85c4333..6e7c97d3 100644
--- a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
+++ b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
@@ -13,4 +13,5 @@ data class UserData(
     val useDynamicColor: Boolean,
     val shouldHideOnboarding: Boolean,
     val contrast: Contrast,
+    val mainData: MainData,
 )
diff --git a/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt b/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
index 2ac482b3..0ee979e7 100644
--- a/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
+++ b/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
@@ -45,4 +45,8 @@ class FakeUserDataRepository @Inject constructor(
     override suspend fun setShouldHideOnboarding(shouldHideOnboarding: Boolean) {
         userPreferencesRepository.setShouldHideOnboarding(shouldHideOnboarding)
     }
+
+    override suspend fun setMainData(mainData: Long) {
+        userPreferencesRepository.setMainData(mainData)
+    }
 }
diff --git a/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt b/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
index 6ab45960..83fa144f 100644
--- a/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
+++ b/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
@@ -7,6 +7,7 @@ package com.mshdabiola.testing.repository
 import com.mshdabiola.data.repository.UserDataRepository
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.ThemeBrand
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
@@ -20,6 +21,7 @@ val emptyUserData = UserData(
     useDynamicColor = false,
     shouldHideOnboarding = false,
     contrast = Contrast.High,
+    mainData = MainData.Note,
 )
 
 class TestUserDataRepository : UserDataRepository {
@@ -59,6 +61,12 @@ class TestUserDataRepository : UserDataRepository {
         }
     }
 
+    override suspend fun setMainData(mainData: Long) {
+        currentUserData.let { current ->
+            _userData.tryEmit(current.copy(mainData = MainData.Note))
+        }
+    }
+
     /**
      * A test-only API to allow setting of user data directly.
      */