diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/TimePickerButtonComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/TimePickerButtonComposable.kt
new file mode 100644
index 0000000..869d724
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/TimePickerButtonComposable.kt
@@ -0,0 +1,47 @@
+package be.ugent.sel.studeez.common.composable
+
+import android.app.TimePickerDialog
+import android.app.TimePickerDialog.OnTimeSetListener
+import android.content.Context
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonColors
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSeconds
+import java.util.*
+
+// TODO codeduplicatie met Tibo, later wegdoen
+@Composable
+fun TimePickerButton(
+    hoursMinutesSeconds: HoursMinutesSeconds,
+    modifier: Modifier = Modifier,
+    colors: ButtonColors = ButtonDefaults.buttonColors(),
+    border: BorderStroke? = null,
+    onTimeSetListener: OnTimeSetListener
+) {
+    val context = LocalContext.current
+    Button(
+        onClick = { pickDuration(context, onTimeSetListener) },
+        modifier = modifier,
+        shape = RoundedCornerShape(20.dp),
+        colors = colors,
+        border = border
+    ) {
+        Text(text = hoursMinutesSeconds.toString())
+    }
+}
+
+// TODO idem codedup Tibo
+private fun pickDuration(context: Context, listener: OnTimeSetListener) {
+    val mCalendar = Calendar.getInstance()
+    val mHour = mCalendar[Calendar.HOUR]
+    val mMinute = mCalendar[Calendar.MINUTE]
+    val mTimePickerDialog = TimePickerDialog(context, listener, mHour, mMinute, true)
+    mTimePickerDialog.show()
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/data/EditTimerState.kt b/app/src/main/java/be/ugent/sel/studeez/data/EditTimerState.kt
new file mode 100644
index 0000000..9686e94
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/data/EditTimerState.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.data
+
+class EditTimerState {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_info/TimerInfoVisitor.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_info/TimerInfoVisitor.kt
new file mode 100644
index 0000000..0dedc94
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_info/TimerInfoVisitor.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.data.local.models.timer_info
+
+interface TimerInfoVisitor {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/GetTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/GetTimerEditScreen.kt
new file mode 100644
index 0000000..c6579e8
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/GetTimerEditScreen.kt
@@ -0,0 +1,35 @@
+package be.ugent.sel.studeez.screens.timer_edit
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import be.ugent.sel.studeez.R
+import be.ugent.sel.studeez.common.composable.BasicButton
+import be.ugent.sel.studeez.common.ext.basicButton
+import be.ugent.sel.studeez.data.local.models.timer_info.CustomTimerInfo
+import be.ugent.sel.studeez.data.local.models.timer_info.EndlessTimerInfo
+import be.ugent.sel.studeez.data.local.models.timer_info.PomodoroTimerInfo
+import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfoVisitor
+
+class GetTimerEditView: TimerInfoVisitor<Unit> {
+
+    @SuppressLint("ComposableNaming")
+    override fun visitCustomTimerInfo(customTimerInfo: CustomTimerInfo) {
+
+    }
+
+    @SuppressLint("ComposableNaming")
+    override fun visitEndlessTimerInfo(endlessTimerInfo: EndlessTimerInfo) {
+
+    }
+
+    @SuppressLint("ComposableNaming")
+    override fun visitBreakTimerInfo(pomodoroTimerInfo: PomodoroTimerInfo) {
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt
new file mode 100644
index 0000000..ac1ff8a
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt
@@ -0,0 +1,2 @@
+package be.ugent.sel.studeez.screens.timer_edit
+
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditViewModel.kt
new file mode 100644
index 0000000..20f5952
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditViewModel.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timer_edit
+
+class TimerEditViewModel {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/AbstractTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/AbstractTimerEditScreen.kt
new file mode 100644
index 0000000..59b04e7
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/AbstractTimerEditScreen.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timer_edit
+
+abstract class AbstractTimerEditScreen {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt
new file mode 100644
index 0000000..1405682
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timer_edit.editScreens
+
+class BreakTimerEditScreen {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt
new file mode 100644
index 0000000..bbe66ec
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timer_edit
+
+class CustomTimerEditScreen {
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EndlessTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EndlessTimerEditScreen.kt
new file mode 100644
index 0000000..5c6263d
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EndlessTimerEditScreen.kt
@@ -0,0 +1,4 @@
+package be.ugent.sel.studeez.screens.timer_edit.editScreens
+
+class EndlessTimerEditScreen {
+}
\ No newline at end of file