diff --git a/movement/filesystem.c b/movement/filesystem.c
index 9df0a8d..b5e3fca 100644
--- a/movement/filesystem.c
+++ b/movement/filesystem.c
@@ -127,6 +127,22 @@ bool filesystem_init(void) {
     return err == LFS_ERR_OK;
 }
 
+int _filesystem_format(void);
+int _filesystem_format(void) {
+    int err = lfs_unmount(&lfs);
+    if (err < 0) {
+        printf("Couldn't unmount - continuing to format, but you should reboot afterwards!\r\n");
+    }
+
+    err = lfs_format(&lfs, &cfg);
+    if (err < 0) return err;
+
+    err = lfs_mount(&lfs, &cfg);
+    if (err < 0) return err;
+    printf("Filesystem re-mounted with %ld bytes free.\r\n", filesystem_get_free_space());
+    return 0;
+}
+
 bool filesystem_file_exists(char *filename) {
     info.type = 0;
     lfs_stat(&lfs, filename, &info);
@@ -251,6 +267,15 @@ int filesystem_cmd_rm(int argc, char *argv[]) {
     return 0;
 }
 
+int filesystem_cmd_format(int argc, char *argv[]) {
+    (void) argc;
+    if(strcmp(argv[1], "YES") == 0) {
+        return _filesystem_format();
+    }
+    return 1;
+}
+
+
 int filesystem_cmd_echo(int argc, char *argv[]) {
     (void) argc;
 
@@ -279,4 +304,3 @@ int filesystem_cmd_echo(int argc, char *argv[]) {
 
     return 0;
 }
-
diff --git a/movement/filesystem.h b/movement/filesystem.h
index fa3d9d1..472f281 100644
--- a/movement/filesystem.h
+++ b/movement/filesystem.h
@@ -100,6 +100,7 @@ int filesystem_cmd_ls(int argc, char *argv[]);
 int filesystem_cmd_cat(int argc, char *argv[]);
 int filesystem_cmd_df(int argc, char *argv[]);
 int filesystem_cmd_rm(int argc, char *argv[]);
+int filesystem_cmd_format(int argc, char *argv[]);
 int filesystem_cmd_echo(int argc, char *argv[]);
 
 #endif // FILESYSTEM_H_
diff --git a/movement/shell_cmd_list.c b/movement/shell_cmd_list.c
index 0ea08a5..e2d700b 100644
--- a/movement/shell_cmd_list.c
+++ b/movement/shell_cmd_list.c
@@ -85,6 +85,13 @@ shell_command_t g_shell_commands[] = {
         .max_args = 1,
         .cb = filesystem_cmd_rm,
     },
+    {
+        .name = "format",
+        .help = "usage: format YES",
+        .min_args = 1,
+        .max_args = 1,
+        .cb = filesystem_cmd_format,
+    },
     {
         .name = "echo",
         .help = "usage: echo TEXT {>,>>} FILE",
@@ -109,7 +116,7 @@ static int help_cmd(int argc, char *argv[]) {
 
     printf("Command List:\r\n");
     for (size_t i = 0; i < g_num_shell_commands; i++) {
-        printf(" %s\t%s\r\n", 
+        printf(" %s\t%s\r\n",
                 g_shell_commands[i].name,
                 (g_shell_commands[i].help) ? g_shell_commands[i].help : ""
         );
@@ -156,4 +163,3 @@ static int stress_cmd(int argc, char *argv[]) {
 
     return 0;
 }
-