diff --git a/src/main/kotlin/xyz/atnrch/wrench/Main.kt b/src/main/kotlin/xyz/atnrch/wrench/Main.kt
deleted file mode 100644
index 81388a9..0000000
--- a/src/main/kotlin/xyz/atnrch/wrench/Main.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package xyz.atnrch.wrench
-
-import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.window.Window
-import androidx.compose.ui.window.application
-import xyz.atnrch.wrench.display.WrenchDisplay
-import xyz.atnrch.wrench.logger.Logger
-import xyz.atnrch.wrench.watcher.Watcher
-
-@Composable
-@Preview
-fun App() {
-    MaterialTheme {
-        val watcher = remember { Watcher() }
-        WrenchDisplay(
-            onStartButtonClick = watcher::start,
-            onStopButtonClick = watcher::stop,
-            onAddButtonClick = {}
-        )
-    }
-}
-
-fun main() = application {
-    Window(onCloseRequest = {
-        Logger.info("Stopping Wrench...")
-        Logger.info("bye!")
-        ::exitApplication.invoke()
-    }, title = "Wrench") {
-        Logger.info("Starting Wrench...")
-        App()
-    }
-}
diff --git a/src/main/kotlin/xyz/atnrch/wrench/scaffold/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/scaffold/WrenchScaffold.kt
new file mode 100644
index 0000000..7ea2e09
--- /dev/null
+++ b/src/main/kotlin/xyz/atnrch/wrench/scaffold/WrenchScaffold.kt
@@ -0,0 +1,49 @@
+package xyz.atnrch.wrench.scaffold
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun WrenchScaffold() {
+    Scaffold(
+        topBar = {
+            TopAppBar {
+                Text("Wrench")
+            }
+        },
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = { /* ... */ },
+                backgroundColor = Color.Black
+            ) {
+                Icon(
+                    Icons.Filled.PlayArrow,
+                    tint = Color.White,
+                    contentDescription = "Start",
+                    modifier = Modifier.size(24.dp)
+                )
+            }
+        },
+        isFloatingActionButtonDocked = true,
+        bottomBar = {
+            BottomAppBar(
+                cutoutShape = MaterialTheme.shapes.small.copy(
+                    CornerSize(percent = 50)
+                ),
+                backgroundColor = Color.Black
+            ) {
+
+            }
+        }
+    ) {
+        // Screen content
+    }
+
+}
\ No newline at end of file