diff --git a/include/fs.h b/include/fs.h
index 003eccf..4ee6278 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -22,8 +22,12 @@
 #include "fatfs/ff.h"
 
 
-#define FS_MAX_DRIVES  (FF_VOLUMES)
-#define FS_MAX_FILES   (5)
+#define FS_MAX_DRIVES   (FF_VOLUMES)
+#define FS_DRIVE_NAMES  FF_VOLUME_STRS
+
+#define FS_MAX_FILES    (5)
+
+#define FS_MAX_DIRS     (3)
 
 
 typedef enum
@@ -55,10 +59,10 @@
 s32 fWrite(s32 handle, const void *const buf, u32 size);
 s32 fSync(s32 handle);
 s32 fLseek(s32 handle, u32 offset);
-// fTell
-// fSize
-// fExpand
-// fMkdir
-// fRename
+u32 fTell(s32 handle);
+u32 fSize(s32 handle);
+s32 fExpand(s32 handle, u32 size);
+s32 fMkdir(const char *const path);
+s32 fRename(const char *const old, const char *const new);
 // fStat
 s32 fUnlink(const char *const path);
diff --git a/include/ipc_handler.h b/include/ipc_handler.h
index bf294cc..aa3f4d6 100644
--- a/include/ipc_handler.h
+++ b/include/ipc_handler.h
@@ -43,20 +43,25 @@
 	IPC_CMD9_FWRITE            = CMD_ID(5)  | CMD_IN_BUFS(1)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(1),
 	IPC_CMD9_FSYNC             = CMD_ID(6)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(1),
 	IPC_CMD9_FLSEEK            = CMD_ID(7)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(2),
-	IPC_CMD9_FOPEN_DIR         = CMD_ID(8)  | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), // Invalid on purpose. Will be decided later.
-	IPC_CMD9_FREAD_DIR         = CMD_ID(9)  | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_FCLOSE_DIR        = CMD_ID(10) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_FUNLINK           = CMD_ID(11) | CMD_IN_BUFS(1)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0),
-	IPC_CMD9_FGETFREE          = CMD_ID(12) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_READ_SECTORS      = CMD_ID(13) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_WRITE_SECTORS     = CMD_ID(14) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_MALLOC            = CMD_ID(15) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_FREE              = CMD_ID(16) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_LOAD_VERIFY_FIRM  = CMD_ID(17) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_FIRM_LAUNCH       = CMD_ID(18) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_PREPA_POWER       = CMD_ID(19) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_PANIC             = CMD_ID(20) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD9_EXCEPTION         = CMD_ID(21) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15)
+	IPC_CMD9_FTELL             = CMD_ID(8)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(1),
+	IPC_CMD9_FSIZE             = CMD_ID(9)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(1),
+	IPC_CMD9_FEXPAND           = CMD_ID(10) | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(2),
+	IPC_CMD9_FOPEN_DIR         = CMD_ID(11) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), // Invalid on purpose. Will be decided later.
+	IPC_CMD9_FREAD_DIR         = CMD_ID(12) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_FCLOSE_DIR        = CMD_ID(13) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_FMKDIR            = CMD_ID(14) | CMD_IN_BUFS(1)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0),
+	IPC_CMD9_FRENAME           = CMD_ID(15) | CMD_IN_BUFS(2)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0),
+	IPC_CMD9_FUNLINK           = CMD_ID(16) | CMD_IN_BUFS(1)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0),
+	IPC_CMD9_FGETFREE          = CMD_ID(17) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_READ_SECTORS      = CMD_ID(18) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_WRITE_SECTORS     = CMD_ID(19) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_MALLOC            = CMD_ID(20) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_FREE              = CMD_ID(21) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_LOAD_VERIFY_FIRM  = CMD_ID(22) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_FIRM_LAUNCH       = CMD_ID(23) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_PREPA_POWER       = CMD_ID(24) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_PANIC             = CMD_ID(25) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
+	IPC_CMD9_EXCEPTION         = CMD_ID(26) | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15)
 } IpcCmd9;
 
 typedef enum
diff --git a/source/arm11/fs.c b/source/arm11/fs.c
index 5df977a..d194ddb 100644
--- a/source/arm11/fs.c
+++ b/source/arm11/fs.c
@@ -87,6 +87,47 @@
 	return PXI_sendCmd(IPC_CMD9_FLSEEK, cmdBuf, 2);
 }
 
+u32 fTell(s32 handle)
+{
+	const u32 cmdBuf = handle;
+	return PXI_sendCmd(IPC_CMD9_FTELL, &cmdBuf, 1);
+}
+
+u32 fSize(s32 handle)
+{
+	const u32 cmdBuf = handle;
+	return PXI_sendCmd(IPC_CMD9_FSIZE, &cmdBuf, 1);
+}
+
+s32 fExpand(s32 handle, u32 size)
+{
+	u32 cmdBuf[2];
+	cmdBuf[0] = handle;
+	cmdBuf[1] = size;
+
+	return PXI_sendCmd(IPC_CMD9_FEXPAND, cmdBuf, 2);
+}
+
+s32 fMkdir(const char *const path)
+{
+	u32 cmdBuf[2];
+	cmdBuf[0] = (u32)path;
+	cmdBuf[1] = strlen(path) + 1;
+
+	return PXI_sendCmd(IPC_CMD9_FMKDIR, cmdBuf, 2);
+}
+
+s32 fRename(const char *const old, const char *const new)
+{
+	u32 cmdBuf[4];
+	cmdBuf[0] = (u32)old;
+	cmdBuf[1] = strlen(old) + 1;
+	cmdBuf[2] = (u32)new;
+	cmdBuf[3] = strlen(new) + 1;
+
+	return PXI_sendCmd(IPC_CMD9_FRENAME, cmdBuf, 4);
+}
+
 s32 fUnlink(const char *const path)
 {
 	u32 cmdBuf[2];
diff --git a/source/arm9/fs.c b/source/arm9/fs.c
index 80ee893..0485c3c 100644
--- a/source/arm9/fs.c
+++ b/source/arm9/fs.c
@@ -22,7 +22,7 @@
 
 
 static FATFS fsTable[FS_MAX_DRIVES] = {0};
-static const char *const fsPathTable[FS_MAX_DRIVES] = {FF_VOLUME_STRS};
+static const char *const fsPathTable[FS_MAX_DRIVES] = {FS_DRIVE_NAMES};
 static bool fsStatTable[FS_MAX_DRIVES] = {0};
 
 static FIL fTable[FS_MAX_FILES] = {0};
@@ -151,6 +151,41 @@
 	else return -res;
 }
 
+u32 fTell(s32 handle)
+{
+	if(!isHandleValid(handle)) return 0;
+	return f_tell(&fTable[handle]);
+}
+
+u32 fSize(s32 handle)
+{
+	if(!isHandleValid(handle)) return 0;
+	return f_size(&fTable[handle]);
+}
+
+s32 fExpand(s32 handle, u32 size)
+{
+	if(!isHandleValid(handle)) return -30;
+
+	FRESULT res = f_expand(&fTable[handle], size, 1);
+	if(res == FR_OK) return res;
+	else return -res;
+}
+
+s32 fMkdir(const char *const path)
+{
+	FRESULT res = f_mkdir(path);
+	if(res == FR_OK) return res;
+	else return -res;
+}
+
+s32 fRename(const char *const old, const char *const new)
+{
+	FRESULT res = f_rename(old, new);
+	if(res == FR_OK) return res;
+	else return -res;
+}
+
 s32 fUnlink(const char *const path)
 {
 	FRESULT res = f_unlink(path);
diff --git a/source/arm9/ipc_handler.c b/source/arm9/ipc_handler.c
index afc86a0..7c6be49 100644
--- a/source/arm9/ipc_handler.c
+++ b/source/arm9/ipc_handler.c
@@ -60,12 +60,27 @@
 		case IPC_CMD_ID_MASK(IPC_CMD9_FLSEEK):
 			result = fLseek(buf[0], buf[1]);
 			break;
+		case IPC_CMD_ID_MASK(IPC_CMD9_FTELL):
+			result = fTell(buf[0]);
+			break;
+		case IPC_CMD_ID_MASK(IPC_CMD9_FSIZE):
+			result = fSize(buf[0]);
+			break;
+		case IPC_CMD_ID_MASK(IPC_CMD9_FEXPAND):
+			result = fExpand(buf[0], buf[1]);
+			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FOPEN_DIR):
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FREAD_DIR):
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FCLOSE_DIR):
 			break;
+		case IPC_CMD_ID_MASK(IPC_CMD9_FMKDIR):
+			result = fMkdir((const char *const)buf[0]);
+			break;
+		case IPC_CMD_ID_MASK(IPC_CMD9_FRENAME):
+			result = fRename((const char *const)buf[0], (const char *const)buf[2]);
+			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FUNLINK):
 			result = fUnlink((const char *const)buf[0]);
 			break;