diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..8aa7ff3
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+assignment1
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment1/EventButton.java b/app/src/main/java/com/example/assignment1/EventButton.java
index 728fa31..d90a4f8 100644
--- a/app/src/main/java/com/example/assignment1/EventButton.java
+++ b/app/src/main/java/com/example/assignment1/EventButton.java
@@ -1,7 +1,17 @@
 package com.example.assignment1;
 
-public enum EventButton{
-    FIRST,
-    SECOND,
-    THIRD
-}
+public enum EventButton {
+    FIRST("FirstEventButton"),
+    SECOND("SecondEventButton"),
+    THIRD("ThirdEventButton");
+
+    private String url;
+
+    EventButton(String envUrl) {
+        this.url = envUrl;
+    }
+
+    public String getEventButton() {
+        return url;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment1/EventButtonSharedPreferenceHelper.java b/app/src/main/java/com/example/assignment1/EventButtonSharedPreferenceHelper.java
index 8cc9458..5f2eb3e 100644
--- a/app/src/main/java/com/example/assignment1/EventButtonSharedPreferenceHelper.java
+++ b/app/src/main/java/com/example/assignment1/EventButtonSharedPreferenceHelper.java
@@ -10,16 +10,16 @@ public class EventButtonSharedPreferenceHelper {
     private SharedPreferences sharedPreferences;
 
     public EventButtonSharedPreferenceHelper(Context context, EventButton eventButton) {
-        sharedPreferences = context.getSharedPreferences("FirstEventButtonName", Context.MODE_PRIVATE);
+        sharedPreferences = context.getSharedPreferences(eventButton.getEventButton(), Context.MODE_PRIVATE);
     }
 
-    public void saveEventButtonName(String eventButtonName) {
+    public void saveEventButtonName(EventButton eventButton, String eventButtonName) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString("FirstEventButtonName", eventButtonName);
+        editor.putString(eventButton.getEventButton(), eventButtonName);
         editor.apply();
     }
 
-    public String getEventButtonName() {
-        return sharedPreferences.getString("FirstEventButtonName", null);
+    public String getEventButtonName(EventButton eventButton) {
+        return sharedPreferences.getString(eventButton.getEventButton(), null);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/assignment1/MainActivity.java b/app/src/main/java/com/example/assignment1/MainActivity.java
index 415fbf8..f97edbe 100644
--- a/app/src/main/java/com/example/assignment1/MainActivity.java
+++ b/app/src/main/java/com/example/assignment1/MainActivity.java
@@ -9,12 +9,22 @@ import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
+    protected EventButtonSharedPreferenceHelper firstEventButton;
+    protected EventButtonSharedPreferenceHelper secondEventButton;
+    protected EventButtonSharedPreferenceHelper thirdEventButton;
+
+    protected Button settingsButton = null;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Button settingsButton = findViewById(R.id.settings_button);
+        settingsButton = findViewById(R.id.settings_button);
+
+        firstEventButton = new EventButtonSharedPreferenceHelper(MainActivity.this, EventButton.FIRST);
+        secondEventButton = new EventButtonSharedPreferenceHelper(MainActivity.this, EventButton.SECOND);
+        thirdEventButton = new EventButtonSharedPreferenceHelper(MainActivity.this, EventButton.THIRD);
 
         settingsButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -25,6 +35,19 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
+    protected void onStart()
+    {
+        super.onStart();
+
+        if(
+            firstEventButton.getEventButtonName(EventButton.FIRST) == null ||
+            secondEventButton.getEventButtonName(EventButton.SECOND) == null ||
+            thirdEventButton.getEventButtonName(EventButton.THIRD) == null) {
+
+            goToSettingsActivity();
+        }
+    }
+
     private void goToSettingsActivity() {
         Intent intent = new Intent(MainActivity.this, SettingsActivity.class);
         startActivity(intent);