diff --git a/stratosphere/fatal/source/fatal_repair.cpp b/stratosphere/fatal/source/fatal_repair.cpp
new file mode 100644
index 000000000..b9fdefef8
--- /dev/null
+++ b/stratosphere/fatal/source/fatal_repair.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include <switch.h>
+#include "fatal_types.hpp"
+#include "fatal_repair.hpp"
+#include "fatal_throw.hpp"
+
+void CheckRepairStatus() {
+    /* TODO */
+}
diff --git a/stratosphere/fatal/source/fatal_repair.hpp b/stratosphere/fatal/source/fatal_repair.hpp
new file mode 100644
index 000000000..a06d78c8f
--- /dev/null
+++ b/stratosphere/fatal/source/fatal_repair.hpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2018 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+#include <switch.h>
+#include <stratosphere.hpp>
+
+void CheckRepairStatus();
\ No newline at end of file
diff --git a/stratosphere/fatal/source/fatal_throw.cpp b/stratosphere/fatal/source/fatal_throw.cpp
new file mode 100644
index 000000000..9650acb3d
--- /dev/null
+++ b/stratosphere/fatal/source/fatal_throw.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include <switch.h>
+#include "fatal_throw.hpp"
+#include "fatal_event_manager.hpp"
+#include "fatal_task.hpp"
+#include "fatal_config.hpp"
+
+static bool g_thrown = false;
+
+static Result SetThrown() {
+    /* This should be fine, since fatal only has a single IPC thread. */
+    if (g_thrown) {
+        return FatalResult_AlreadyThrown;
+    }
+    
+    g_thrown = true;
+    return 0;
+}
+
+Result ThrowFatalForSelf(u32 error) {
+    u64 pid = 0;
+    FatalCpuContext ctx = {0};
+    
+    svcGetProcessId(&pid, CUR_PROCESS_HANDLE);
+    return ThrowFatalImpl(error, pid, FatalType_ErrorScreen, &ctx);
+}
+
+Result ThrowFatalImpl(u32 error, u64 pid, FatalType policy, FatalCpuContext *cpu_ctx) {
+    Result rc = 0;
+    FatalContext ctx;
+    ctx.error_code = error;
+    ctx.cpu_ctx = *cpu_ctx;
+    
+    /* Get config. */
+    const FatalConfig *config = GetFatalConfig();
+    
+    /* Get title id. On failure, it'll be zero. */
+    u64 title_id = 0;
+    pminfoGetTitleId(&title_id, pid);
+    
+    switch (policy) {
+        case FatalType_ErrorReport:
+            /* TODO: Don't write an error report. */
+        case FatalType_ErrorReportAndErrorScreen:
+        case FatalType_ErrorScreen:
+            {
+                /* Ensure we only throw once. */
+                if (R_FAILED((rc = SetThrown()))) {
+                    return rc;
+                }
+                
+                /* Signal that fatal is about to happen. */
+                GetEventManager()->SignalEvents();
+                
+                /* Create events. */
+                Event erpt_event;
+                Event battery_event;
+                if (R_FAILED(eventCreate(&erpt_event, false)) || R_FAILED(eventCreate(&battery_event, false))) {
+                    std::abort();
+                }
+                
+                /* Run tasks. */
+                if (config->transition_to_fatal) {
+                    RunFatalTasks(&ctx, title_id, policy == FatalType_ErrorReportAndErrorScreen, &erpt_event, &battery_event);
+                } else {
+                    /* If flag is not set, don't show the fatal screen. */
+                    return 0;
+                }
+                
+            }
+            break;
+        default:
+            /* N aborts here. Should we just return an error code? */
+            std::abort();
+    }
+    
+    return 0;
+}
diff --git a/stratosphere/fatal/source/fatal_throw.hpp b/stratosphere/fatal/source/fatal_throw.hpp
new file mode 100644
index 000000000..1723f7b63
--- /dev/null
+++ b/stratosphere/fatal/source/fatal_throw.hpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+#include <switch.h>
+#include <stratosphere.hpp>
+
+#include "fatal_types.hpp"
+
+Result ThrowFatalForSelf(u32 error);
+Result ThrowFatalImpl(u32 error, u64 pid, FatalType policy, FatalCpuContext *cpu_ctx);
diff --git a/stratosphere/fatal/source/fatal_user.cpp b/stratosphere/fatal/source/fatal_user.cpp
index f5405267c..98b081494 100644
--- a/stratosphere/fatal/source/fatal_user.cpp
+++ b/stratosphere/fatal/source/fatal_user.cpp
@@ -16,74 +16,9 @@
  
 #include <switch.h>
 #include "fatal_user.hpp"
+#include "fatal_throw.hpp"
 #include "fatal_event_manager.hpp"
 #include "fatal_task.hpp"
-#include "fatal_config.hpp"
-
-static bool g_thrown = false;
-
-static Result SetThrown() {
-    /* This should be fine, since fatal only has a single IPC thread. */
-    if (g_thrown) {
-        return FatalResult_AlreadyThrown;
-    }
-    
-    g_thrown = true;
-    return 0;
-}
-
-Result UserService::ThrowFatalImpl(u32 error, u64 pid, FatalType policy, FatalCpuContext *cpu_ctx) {
-    Result rc = 0;
-    FatalContext ctx;
-    ctx.error_code = error;
-    ctx.cpu_ctx = *cpu_ctx;
-    
-    /* Get config. */
-    const FatalConfig *config = GetFatalConfig();
-    
-    /* Get title id. On failure, it'll be zero. */
-    u64 title_id = 0;
-    pminfoGetTitleId(&title_id, pid);
-    
-    switch (policy) {
-        case FatalType_ErrorReport:
-            /* TODO: Don't write an error report. */
-        case FatalType_ErrorReportAndErrorScreen:
-        case FatalType_ErrorScreen:
-            {
-                /* Ensure we only throw once. */
-                if (R_FAILED((rc = SetThrown()))) {
-                    return rc;
-                }
-                
-                /* Signal that fatal is about to happen. */
-                GetEventManager()->SignalEvents();
-                
-                /* Create events. */
-                Event erpt_event;
-                Event battery_event;
-                if (R_FAILED(eventCreate(&erpt_event, false)) || R_FAILED(eventCreate(&battery_event, false))) {
-                    std::abort();
-                }
-                
-                /* Run tasks. */
-                if (config->transition_to_fatal) {
-                    RunFatalTasks(&ctx, title_id, policy == FatalType_ErrorReportAndErrorScreen, &erpt_event, &battery_event);
-                } else {
-                    /* If flag is not set, don't show the fatal screen. */
-                    return 0;
-                }
-                
-            }
-            break;
-        default:
-            /* N aborts here. Should we just return an error code? */
-            std::abort();
-    }
-    
-    return 0;
-}
-
 
 Result UserService::ThrowFatal(u32 error, PidDescriptor pid_desc) {
     FatalCpuContext ctx = {0};
diff --git a/stratosphere/fatal/source/fatal_user.hpp b/stratosphere/fatal/source/fatal_user.hpp
index ab46a4a9e..186a831d7 100644
--- a/stratosphere/fatal/source/fatal_user.hpp
+++ b/stratosphere/fatal/source/fatal_user.hpp
@@ -27,9 +27,7 @@ enum UserCmd {
 };
 
 class UserService final : public IServiceObject {
-    private:
-        Result ThrowFatalImpl(u32 error, u64 pid, FatalType policy, FatalCpuContext *context);
-    
+    private:    
         /* Actual commands. */
         Result ThrowFatal(u32 error, PidDescriptor pid_desc);
         Result ThrowFatalWithPolicy(u32 error, PidDescriptor pid_desc, FatalType policy);