diff --git a/src/main/java/com/booleanuk/core/TodoItem.java b/src/main/java/com/booleanuk/core/TodoItem.java
index 655d825..c8f6f5c 100644
--- a/src/main/java/com/booleanuk/core/TodoItem.java
+++ b/src/main/java/com/booleanuk/core/TodoItem.java
@@ -1,21 +1,38 @@
 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;
-        this.detail = detail;
-        this.status = status;
+    public void setStatusComplete() {
+        this.status = "Complete";
     }
-
-    public void setStatus(String status) {
-        this.status = status;
+    public void setStatusIncomplete() {
+        this.status = "Incomplete";
     }
 
     public String getStatus() {
         return this.status;
     }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public boolean setTitle(String title) {
+        if (title.isEmpty()) {
+            return false;
+        }
+        this.title = title;
+        return true;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
 }
diff --git a/src/test/java/com/booleanuk/core/TodoItemTest.java b/src/test/java/com/booleanuk/core/TodoItemTest.java
index 095af82..8dd36a8 100644
--- a/src/test/java/com/booleanuk/core/TodoItemTest.java
+++ b/src/test/java/com/booleanuk/core/TodoItemTest.java
@@ -5,4 +5,30 @@
 
 class TodoItemTest {
 
+    @Test
+    public void testStatusValidity() {
+        TodoItem todo = new TodoItem();
+        todo.setStatusComplete();
+        Assertions.assertEquals("Complete", todo.getStatus());
+        todo.setStatusIncomplete();
+        Assertions.assertEquals("Incomplete", todo.getStatus());
+
+    }
+
+    @Test
+    public void testTitleValidity() {
+        TodoItem todo = new TodoItem();
+        Assertions.assertFalse(todo.setTitle(""));
+        Assertions.assertTrue(todo.setTitle("title"));
+        todo.setTitle("Test");
+        Assertions.assertEquals("Test", todo.getTitle());
+    }
+
+    @Test
+    public void testDetailValidity() {
+        TodoItem todo = new TodoItem();
+        todo.setDetail("Detail");
+        Assertions.assertEquals("Detail", todo.getDetail());
+    }
+
 }