diff --git a/TaskManager/.idea/appInsightsSettings.xml b/TaskManager/.idea/appInsightsSettings.xml
new file mode 100644
index 0000000..371f2e2
--- /dev/null
+++ b/TaskManager/.idea/appInsightsSettings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="PLACEHOLDER" />
+                  <option name="mobileSdkAppId" value="" />
+                  <option name="projectId" value="" />
+                  <option name="projectNumber" value="" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/TaskManager/.idea/deploymentTargetSelector.xml b/TaskManager/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/TaskManager/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/TaskManager/.idea/material_theme_project_new.xml b/TaskManager/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000..dcdbed5
--- /dev/null
+++ b/TaskManager/.idea/material_theme_project_new.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="userId" value="30ad04cc:198925cc970:-7fe8" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/TaskManager/.idea/migrations.xml b/TaskManager/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/TaskManager/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/TaskManager/.idea/vcs.xml b/TaskManager/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/TaskManager/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/TaskManager/app/src/main/java/com/example/taskmanager/MainActivity.kt b/TaskManager/app/src/main/java/com/example/taskmanager/MainActivity.kt
index ef0be1d..5b6417d 100644
--- a/TaskManager/app/src/main/java/com/example/taskmanager/MainActivity.kt
+++ b/TaskManager/app/src/main/java/com/example/taskmanager/MainActivity.kt
@@ -1,70 +1,85 @@
-package com.example.taskmanager
+    package com.example.taskmanager
 
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.example.taskmanager.ui.theme.TaskManagerTheme
+    import android.os.Bundle
+    import androidx.activity.ComponentActivity
+    import androidx.activity.compose.setContent
+    import androidx.compose.foundation.Image
+    import androidx.compose.foundation.layout.*
+    import androidx.compose.material.MaterialTheme
+    import androidx.compose.material.Surface
+    import androidx.compose.material.Text
+    import androidx.compose.runtime.Composable
+    import androidx.compose.ui.Alignment
+    import androidx.compose.ui.Modifier
+    import androidx.compose.ui.res.painterResource
+    import androidx.compose.ui.res.stringResource
+    import androidx.compose.ui.text.font.FontWeight
+    import androidx.compose.ui.tooling.preview.Preview
+    import androidx.compose.ui.unit.dp
+    import androidx.compose.ui.unit.sp
+    import com.example.taskmanager.ui.theme.TaskManagerTheme
+    import androidx.compose.foundation.lazy.LazyColumn
+    import androidx.compose.foundation.lazy.items
+    import androidx.compose.material.Button
+    import androidx.compose.material.Card
+    import androidx.compose.material.Icon
+    import androidx.compose.material.IconButton
+    import androidx.compose.material.TextField
+    import androidx.compose.material.icons.Icons
+    import androidx.compose.material.icons.filled.Check
+    import androidx.compose.runtime.*
+    import com.example.taskmanager.ui.TaskManagerScreenPreview
 
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            TaskManagerTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colors.background
-                ) {
-                    TaskManagerScreen()
+    class MainActivity : ComponentActivity() {
+        override fun onCreate(savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            setContent {
+                TaskManagerTheme {
+                    // A surface container using the 'background' color from the theme
+                    Surface(
+                        modifier = Modifier.fillMaxSize(),
+                        color = MaterialTheme.colors.background
+                    ) {
+                        TaskManagerScreenPreview()
+//                        TaskManagerScreen()
+                    }
                 }
             }
         }
     }
-}
 
-@Composable
-fun TaskManagerScreen() {
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .fillMaxHeight(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        val image = painterResource(R.drawable.task_completed)
-        Image(painter = image, contentDescription = null)
-        Text(
-            text = stringResource(R.string.task_completed),
-            fontWeight = FontWeight.Bold,
-            modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)
-        )
-        Text(
-            text = stringResource(R.string.comment_text),
-            fontSize = 16.sp
-        )
+    @Composable
+    fun TaskManagerScreen() {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            val image = painterResource(R.drawable.task_completed)
+            Image(painter = image, contentDescription = null)
+            Text(
+                text = stringResource(R.string.task_completed),
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)
+            )
+            Text(
+                text = stringResource(R.string.comment_text),
+                fontSize = 16.sp
+            )
+        }
     }
-}
 
-@Preview(showBackground = true)
-@Composable
-fun TaskCompletedPreview() {
-    TaskManagerTheme {
-        Surface {
-            TaskManagerScreen()
+    @Preview(showBackground = true)
+    @Composable
+    fun TaskCompletedPreview() {
+        TaskManagerTheme {
+            Surface {
+                TaskManagerScreen()
+            }
         }
     }
-}
\ No newline at end of file
+
+
+
diff --git a/TaskManager/app/src/main/java/com/example/taskmanager/ui/TaskManagerScreen.kt b/TaskManager/app/src/main/java/com/example/taskmanager/ui/TaskManagerScreen.kt
new file mode 100644
index 0000000..2146987
--- /dev/null
+++ b/TaskManager/app/src/main/java/com/example/taskmanager/ui/TaskManagerScreen.kt
@@ -0,0 +1,2 @@
+package com.example.taskmanager.ui
+