diff --git a/sw/fsdir/verylargetextwithverylongname.txt b/sw/fsdir/verylargetextwithverylongname.txt
new file mode 100644
index 0000000..a5e31d9
--- /dev/null
+++ b/sw/fsdir/verylargetextwithverylongname.txt
@@ -0,0 +1,33 @@
+very large text file with a very long name
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ
+ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?~!@#$%^&*()_+`1234567890-=[]\{}|;':",./<>?
diff --git a/sw/kernel/filesystems/fat32.h b/sw/kernel/filesystems/fat32.h
index fdaf57e..2a02f8a 100644
--- a/sw/kernel/filesystems/fat32.h
+++ b/sw/kernel/filesystems/fat32.h
@@ -41,5 +41,6 @@ struct lfn_entry {
 
 int8_t fat32_get_cluster_by_name(char* name, struct fat32_directory_entry* dentry);
 int8_t fat32_read_cluster(uint32_t cluster, void* buf);
+uint32_t fat32_next_cluster(uint32_t cluster);
 
 #endif
diff --git a/sw/kernel/filesystems/fat32_c.c b/sw/kernel/filesystems/fat32_c.c
index 91f8b5e..438377a 100644
--- a/sw/kernel/filesystems/fat32_c.c
+++ b/sw/kernel/filesystems/fat32_c.c
@@ -12,10 +12,23 @@ int8_t fat32_read_cluster(uint32_t cluster, void* buf) {
     return error;
 }
 
+uint32_t fat32_next_cluster(uint32_t cluster) {
+    uint8_t error;
+    uint32_t addr = fat_start_sector;
+    uint32_t cluster_val;
+    SD_readSingleBlock(addr, sd_buf, &error);
+    cluster_val = ((uint32_t*)sd_buf)[cluster];
+    return cluster_val;
+}
+
 int8_t fat32_get_cluster_by_name(char* name, struct fat32_directory_entry* dentry) {
     struct fat32_directory_entry* local_entry;
     int i = 0;
 
+    uint32_t cluster;
+
+    cluster = fat32_next_cluster(root_cluster);
+
     cprintf("Sectors per cluster: %hhx\n", sectors_per_cluster);
 
     fat32_read_cluster(root_cluster, sd_buf);
diff --git a/sw/test_code/fs_test/main.c b/sw/test_code/fs_test/main.c
index 2067d4b..2245139 100644
--- a/sw/test_code/fs_test/main.c
+++ b/sw/test_code/fs_test/main.c
@@ -9,10 +9,11 @@ int main(void) {
     int i;
     uint32_t offset = 0;
     uint32_t cluster;
+    uint8_t cluster_count;
     fat32_init();
 
     /* This is what is going to be part of open */
-    fat32_get_cluster_by_name("TEST    TXT", &dentry);
+    fat32_get_cluster_by_name("VERYLA~1TXT", &dentry);
     cprintf("attr1: %x\n", dentry.attr1);
     cprintf("cluster: %x%x\n", dentry.cluster_high, dentry.cluster_low);
     cprintf("File Size: %lx\n", dentry.file_size);
@@ -20,10 +21,18 @@ int main(void) {
 
     /* This will become part of read */
     cluster = (dentry.cluster_high << 16) | dentry.cluster_low;
+    cluster++;
     fat32_read_cluster(cluster + offset/512, sd_buf);
 
-    for (i = 0; i < dentry.file_size; i++) {
-        cprintf("%c", sd_buf[i]);
+    cluster_count = (dentry.file_size/512)/sectors_per_cluster;
+    cprintf("Cluster count: %x\n", cluster_count);
+
+    while (cluster < 0xffffff0) {
+        for (i = 0; i < dentry.file_size && i < 512; i++) {
+            cprintf("%c", sd_buf[i]);
+        }
+        cluster = fat32_next_cluster(cluster);
+        fat32_read_cluster(cluster + offset/512, sd_buf);
     }
 
     return 0;