diff --git a/console/src/test/kotlin/notes/multi/app/MessageUtilsTest.kt b/console/src/test/kotlin/notes/multi/app/MessageUtilsTest.kt
index 1c2621ad238dffb1b981dbcb0e7b76e36cb7a663..19f65f6ce03b5b77c3aa3b30843ca332d58e83a1 100644
--- a/console/src/test/kotlin/notes/multi/app/MessageUtilsTest.kt
+++ b/console/src/test/kotlin/notes/multi/app/MessageUtilsTest.kt
@@ -3,12 +3,39 @@
  */
 package notes.multi.app
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
-import org.junit.jupiter.api.Assertions.assertEquals
+import notes.multi.utilities.Note
+import notes.multi.utilities.Folder
+
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 class MessageUtilsTest {
     @Test fun testGetMessage() {
         assertEquals("Hello      World!", MessageUtils.getMessage())
     }
+    @Test fun checkModelClasses() {
+        var n = Note(
+            title = "NeverGonnaGiveYouUp",
+            text = StringBuffer(""),
+            author = "Rick Astley",
+            extension = "txt",
+            lastModified = LocalDateTime.now(),
+            location = "."
+        )
+
+
+        var fldr = Folder(
+            title = "Test Folder",
+            description = "This folder is a test",
+            author = "Jeff Avery",
+            dateCreated = LocalDate.now(),
+            lastModified = null,
+            notes = mutableListOf<Note>(n)
+        )
+
+        assertEquals(fldr.notes?.get(0) ?: null, n)
+    }
 }
diff --git a/utilities/src/main/kotlin/notes/multi/utilities/Folder.kt b/utilities/src/main/kotlin/notes/multi/utilities/Folder.kt
new file mode 100644
index 0000000000000000000000000000000000000000..c958edc1739ac36c587d171e3633b32101fd6d58
--- /dev/null
+++ b/utilities/src/main/kotlin/notes/multi/utilities/Folder.kt
@@ -0,0 +1,15 @@
+package notes.multi.utilities
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+class Folder(var title: String = "Untitled",
+             var description: String = "Empty",
+             val author: String = "?", // User class?
+             val dateCreated: LocalDate? = LocalDate.now(),
+             var lastModified: LocalDateTime? = LocalDateTime.now(),
+             var notes: MutableList<Note>? = null) {
+
+    // add/remove notes
+    // update last modified
+}
\ No newline at end of file
diff --git a/utilities/src/main/kotlin/notes/multi/utilities/Note.kt b/utilities/src/main/kotlin/notes/multi/utilities/Note.kt
new file mode 100644
index 0000000000000000000000000000000000000000..97db5a681071bddff91d560afc2f34d5bee812bc
--- /dev/null
+++ b/utilities/src/main/kotlin/notes/multi/utilities/Note.kt
@@ -0,0 +1,16 @@
+package notes.multi.utilities
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+
+class Note(var title: String = "Untitled",
+           var text: StringBuffer = StringBuffer(""),
+           val author: String = "?", // User class?
+           var extension: String= "?", // necessary?
+           val dateCreated: LocalDate? = LocalDate.now(),
+           var lastModified: LocalDateTime? = LocalDateTime.now(),
+           var location: String? = null) { // path to the created file?
+    // update last modified date
+    // images?
+}
\ No newline at end of file