diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 410d8952..777c4688 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -10,6 +10,7 @@ class HomeScreen extends StatelessWidget {
     final container = StateContainer.of(context);
     final appState = container.appState;
 
-    return JournalListingScreen(appState.notes);
+    return JournalListingScreen(noteFolder: appState.noteFolder);
+    // return FolderListingScreen();
   }
 }
diff --git a/lib/screens/journal_listing.dart b/lib/screens/journal_listing.dart
index 4648f418..992ce68a 100644
--- a/lib/screens/journal_listing.dart
+++ b/lib/screens/journal_listing.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gitjournal/note.dart';
+import 'package:gitjournal/note_folder.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/apis/git.dart';
 import 'package:gitjournal/screens/journal_editor.dart';
@@ -11,9 +12,10 @@ import 'package:gitjournal/widgets/journal_list.dart';
 import 'package:gitjournal/themes.dart';
 
 class JournalListingScreen extends StatelessWidget {
-  final List<Note> allNotes;
+  final NoteFolder noteFolder;
+  final bool recursive;
 
-  JournalListingScreen(this.allNotes);
+  JournalListingScreen({@required this.noteFolder, this.recursive = false});
 
   @override
   Widget build(BuildContext context) {
@@ -25,6 +27,8 @@ class JournalListingScreen extends StatelessWidget {
       child: Icon(Icons.add),
     );
 
+    var allNotes = recursive ? noteFolder.getAllNotes() : noteFolder.getNotes();
+
     Widget journalList = JournalList(
       notes: allNotes,
       noteSelectedFunction: (noteIndex) {