diff --git a/src/main/java/com/booleanuk/core/Account.java b/src/main/java/com/booleanuk/core/Account.java
new file mode 100644
index 0000000..9ce75ba
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/Account.java
@@ -0,0 +1,59 @@
+package com.booleanuk.core;
+
+public class Account {
+
+    private String email;
+
+
+    private String password;
+
+    private boolean enabled;
+
+    public Account(String email, String password) {
+        this.setEmail(email);
+        this.setPassword(password);
+        this.enabled = false;
+
+    }
+
+    public String getEmail() {
+        return this.email;
+    }
+
+    public String setEmail(String email) {
+        if(email.contains("@")) {
+            this.email = email;
+            return "valid email";
+        }
+        return "invalid email";
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    public String setPassword(String password) {
+        if(password.length() >= 8) {
+            this.password = password;
+            return "valid password";
+        }
+        return "invalid password";
+    }
+
+    public boolean isEnabled() {
+        return this.enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+
+    public String ableToLogin() {
+        if(this.isEnabled()) {
+            return "valid login";
+        }
+        return "invalid login";
+
+    }
+}
diff --git a/src/main/java/com/booleanuk/core/Admin.java b/src/main/java/com/booleanuk/core/Admin.java
new file mode 100644
index 0000000..1c0f7df
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/Admin.java
@@ -0,0 +1,7 @@
+package com.booleanuk.core;
+
+public class Admin extends Account{
+    public Admin(String email, String password) {
+        super(email, password);
+    }
+}
diff --git a/src/main/java/com/booleanuk/core/ClassDiagram.png b/src/main/java/com/booleanuk/core/ClassDiagram.png
new file mode 100644
index 0000000..e7a089f
Binary files /dev/null and b/src/main/java/com/booleanuk/core/ClassDiagram.png differ
diff --git a/src/main/java/com/booleanuk/core/TodoItem.java b/src/main/java/com/booleanuk/core/TodoItem.java
index 655d825..335038b 100644
--- a/src/main/java/com/booleanuk/core/TodoItem.java
+++ b/src/main/java/com/booleanuk/core/TodoItem.java
@@ -1,9 +1,11 @@
 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;
@@ -18,4 +20,21 @@ public void setStatus(String status) {
     public String getStatus() {
         return this.status;
     }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        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..3b8e4a3
--- /dev/null
+++ b/src/main/java/com/booleanuk/core/User.java
@@ -0,0 +1,7 @@
+package com.booleanuk.core;
+
+public class User extends Account{
+    public User(String email, String password) {
+        super(email, password);
+    }
+}
diff --git a/src/test/java/com/booleanuk/core/AccountTest.java b/src/test/java/com/booleanuk/core/AccountTest.java
new file mode 100644
index 0000000..8df96db
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/AccountTest.java
@@ -0,0 +1,23 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class AccountTest {
+
+    @Test
+    public void testAccount() {
+        Account account = new Account("email@email.email", "bestPassword");
+
+        Assertions.assertEquals("invalid password", account.setPassword("1"));
+        Assertions.assertEquals("invalid email", account.setEmail("1"));
+        Assertions.assertFalse(account.isEnabled());
+        Assertions.assertEquals("invalid login", account.ableToLogin());
+        account.setEnabled(true);
+        Assertions.assertTrue(account.isEnabled());
+        Assertions.assertEquals("valid login", account.ableToLogin());
+
+
+
+    }
+}
diff --git a/src/test/java/com/booleanuk/core/AdminTest.java b/src/test/java/com/booleanuk/core/AdminTest.java
new file mode 100644
index 0000000..5676966
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/AdminTest.java
@@ -0,0 +1,23 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class AdminTest {
+
+    @Test
+    public void testAdmin() {
+        Admin admin = new Admin("email@email.email", "bestPassword");
+
+
+        Assertions.assertEquals("invalid password", admin.setPassword("1"));
+        Assertions.assertEquals("invalid email", admin.setEmail("1"));
+        Assertions.assertFalse(admin.isEnabled());
+        Assertions.assertEquals("invalid login", admin.ableToLogin());
+        admin.setEnabled(true);
+        Assertions.assertTrue(admin.isEnabled());
+        Assertions.assertEquals("valid login", admin.ableToLogin());
+
+
+    }
+}
diff --git a/src/test/java/com/booleanuk/core/TodoItemTest.java b/src/test/java/com/booleanuk/core/TodoItemTest.java
index 095af82..fe4077c 100644
--- a/src/test/java/com/booleanuk/core/TodoItemTest.java
+++ b/src/test/java/com/booleanuk/core/TodoItemTest.java
@@ -5,4 +5,21 @@
 
 class TodoItemTest {
 
+    @Test
+    public void testAccessPrivateValues() {
+        TodoItem todoItem = new TodoItem("Title", "Detail", "Status");
+
+        Assertions.assertEquals("Status", todoItem.getStatus());
+        Assertions.assertEquals("Detail", todoItem.getDetail());
+        Assertions.assertEquals("Title", todoItem.getTitle());
+
+        todoItem.setStatus("Status2");
+        todoItem.setDetail("Detail2");
+        todoItem.setTitle("Title2");
+
+        Assertions.assertEquals("Status2", todoItem.getStatus());
+        Assertions.assertEquals("Detail2", todoItem.getDetail());
+        Assertions.assertEquals("Title2", todoItem.getTitle());
+    }
+
 }
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..266c585
--- /dev/null
+++ b/src/test/java/com/booleanuk/core/UserTest.java
@@ -0,0 +1,23 @@
+package com.booleanuk.core;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class UserTest {
+    @Test
+    public void testUser() {
+        User user = new User("email@email.email", "bestPassword");
+
+
+        Assertions.assertEquals("invalid password", user.setPassword("1"));
+        Assertions.assertEquals("invalid email", user.setEmail("1"));
+        Assertions.assertFalse(user.isEnabled());
+        Assertions.assertEquals("invalid login", user.ableToLogin());
+        user.setEnabled(true);
+        Assertions.assertTrue(user.isEnabled());
+        Assertions.assertEquals("valid login", user.ableToLogin());
+
+
+    }
+
+}