diff --git a/src/com/twu/biblioteca/BibliotecaApp.java b/src/com/twu/biblioteca/BibliotecaApp.java
index 0ee082b..a6214c0 100755
--- a/src/com/twu/biblioteca/BibliotecaApp.java
+++ b/src/com/twu/biblioteca/BibliotecaApp.java
@@ -4,10 +4,10 @@ public class BibliotecaApp {
 
     public static void main(String[] args) {
         Biblioteca biblioteca = new Biblioteca();
+        Menu menu = new Menu();
+
         System.out.println(biblioteca.welcomeUser());
 
-        for(Book book : biblioteca.listBooks()) {
-            System.out.println(book.showDetails() + "\n");
-        }
+        System.out.println(menu.listOptions());
     }
 }
diff --git a/src/com/twu/biblioteca/Menu.java b/src/com/twu/biblioteca/Menu.java
new file mode 100644
index 0000000..5ca2da7
--- /dev/null
+++ b/src/com/twu/biblioteca/Menu.java
@@ -0,0 +1,10 @@
+package com.twu.biblioteca;
+
+/**
+ * Created by gdias on 7/31/15.
+ */
+public class Menu {
+    public String listOptions() {
+        return "1 - List books";
+    }
+}
diff --git a/test/com/twu/biblioteca/MenuTest.java b/test/com/twu/biblioteca/MenuTest.java
new file mode 100644
index 0000000..5d71e57
--- /dev/null
+++ b/test/com/twu/biblioteca/MenuTest.java
@@ -0,0 +1,15 @@
+package com.twu.biblioteca;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Created by gdias on 7/31/15.
+ */
+public class MenuTest {
+    @Test
+    public void listOptions_ShouldReturnTheMenuOptions() throws Exception {
+        assertEquals("1 - List books", new Menu().listOptions());
+    }
+}