diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index f775443..9daa365 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -1,14 +1,43 @@
 package com.example.oplogy;
 
-import androidx.appcompat.app.AppCompatActivity;
-
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.DialogFragment;
 import android.os.Bundle;
+import android.app.TimePickerDialog;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.TimePicker;
+import java.util.Locale;
 
-public class SetUpActivity extends AppCompatActivity {
+
+public class SetUpActivity extends FragmentActivity
+        implements TimePickerDialog.OnTimeSetListener {
+
+    private TextView startTime;
+    private TextView endTime;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_set_up);
+
+        startTime = findViewById(R.id.startTime);
+        endTime = findViewById(R.id.endTime);
     }
-}
\ No newline at end of file
+
+    @Override
+    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+
+        String str = String.format(Locale.US, "%d:%d", hourOfDay, minute);
+
+        startTime.setText(str);
+        endTime.setText(str);
+
+    }
+
+    public void showTimePickerDialog(View v) {
+        DialogFragment newFragment = new TimePick();
+        newFragment.show(getSupportFragmentManager(), "timePicker");
+
+    }
+}
diff --git a/app/src/main/java/com/example/oplogy/SetupActivity.java b/app/src/main/java/com/example/oplogy/SetupActivity.java
deleted file mode 100644
index 13a4902..0000000
--- a/app/src/main/java/com/example/oplogy/SetupActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class SetupActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.setup);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/TimePick.java b/app/src/main/java/com/example/oplogy/TimePick.java
new file mode 100644
index 0000000..c2caaa1
--- /dev/null
+++ b/app/src/main/java/com/example/oplogy/TimePick.java
@@ -0,0 +1,30 @@
+package com.example.oplogy;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.widget.TimePicker;
+import java.util.Calendar;
+
+public class TimePick extends DialogFragment implements
+        TimePickerDialog.OnTimeSetListener{
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Calendar c = Calendar.getInstance();
+        int hour = c.get(Calendar.HOUR_OF_DAY);
+        int minute = c.get(Calendar.MINUTE);
+
+        return new TimePickerDialog((Context) getActivity(),
+                (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, true);
+    }
+
+    @Override
+    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+
+    }
+}
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index a919523..fdc7fb8 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -79,6 +79,7 @@
             android:id="@+id/startTime"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:onClick="showTimePickerDialog"
             android:autofillHints=""
             android:inputType=""
             tools:ignore="LabelFor"/>
@@ -102,6 +103,7 @@
             android:id="@+id/endTime"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:onClick="showTimePickerDialog"
             android:autofillHints=""
             android:inputType=""
             tools:ignore="LabelFor"/>