diff --git a/src/main/Exercise2.png b/src/main/Exercise2.png
new file mode 100644
index 0000000..34a1f66
Binary files /dev/null and b/src/main/Exercise2.png differ
diff --git a/src/main/java/com/booleanuk/core/TodoItem.java b/src/main/java/com/booleanuk/core/TodoItem.java
index 655d825..06b2d66 100644
--- a/src/main/java/com/booleanuk/core/TodoItem.java
+++ b/src/main/java/com/booleanuk/core/TodoItem.java
@@ -1,9 +1,9 @@
 package com.booleanuk.core;
 
 public class TodoItem {
-    public String title;
-    public String detail;
-    public String status;
+    private String title;
+    private String detail;
+    private String status;
 
     public TodoItem(String title, String detail, String status) {
         this.title = title;
diff --git a/src/main/java/com/booleanuk/core/User.java b/src/main/java/com/booleanuk/core/User.java
new file mode 100644
index 0000000..5f1f30e
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/User.java
@@ -0,0 +1,55 @@
+package com.booleanuk.core;
+
+public class User {
+    private String password;
+    private String email;
+    private boolean isDisabled = true;
+
+    public User() {}
+
+    public User(String password, String email) {
+        setEmail(email);
+        setPassword(password);
+    }
+
+    public boolean isDisabled() {
+        return isDisabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        isDisabled = disabled;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String setEmail(String email) {
+        if (email.contains("@")) {
+            this.email = email;
+            return "email added";
+        } else
+            return "invalid email";
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String setPassword(String password) {
+        if (password.length() >= 8) {
+            this.password = password;
+            return "password created";
+        } else
+            return "invalid password";
+
+    }
+    public String loginCapabilities() {
+
+        if (isDisabled())
+            return "Account Disabled: user cannot login";
+
+        return "Account Enabled: user can login";
+    }
+
+}
diff --git a/src/test/java/com/booleanuk/core/TodoItemTest.java b/src/test/java/com/booleanuk/core/TodoItemTest.java
index 095af82..d78aff1 100644
--- a/src/test/java/com/booleanuk/core/TodoItemTest.java
+++ b/src/test/java/com/booleanuk/core/TodoItemTest.java
@@ -4,5 +4,11 @@
 import org.junit.jupiter.api.Test;
 
 class TodoItemTest {
+    @Test
+    public void shouldNotWork () {
+        TodoItem toDo = new TodoItem("title", "detail", "status");
+
+        Assertions.assertThrows(NoSuchFieldException.class, () -> TodoItem.class.getField("detail"));
+        }
 
 }
diff --git a/src/test/java/com/booleanuk/core/UserTest.java b/src/test/java/com/booleanuk/core/UserTest.java
new file mode 100644
index 0000000..9bc26e2
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/UserTest.java
@@ -0,0 +1,37 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class UserTest {
+    User user = new User();
+
+    @Test
+    public void shouldCreatePassword() {
+
+        Assertions.assertEquals("invalid password", user.setPassword("Tjena"));
+
+        Assertions.assertEquals("password created", user.setPassword("TjabbaTjena"));
+
+    }
+
+    @Test
+    public void shouldCreateEmail() {
+
+        Assertions.assertEquals("invalid email", user.setEmail("Hanna.hAThotmail.com"));
+
+        Assertions.assertEquals("email added", user.setEmail("Hanna.h@hotmail.com"));
+
+    }
+
+    @Test
+    public void shouldNotBeAbleToLogin() {
+
+        Assertions.assertEquals("Account Disabled: user cannot login", user.loginCapabilities());
+
+        user.setDisabled(false);
+        Assertions.assertEquals("Account Enabled: user can login", user.loginCapabilities());
+    }
+
+
+}