diff --git a/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp
index 0dedd6792..b4696d5bd 100644
--- a/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp
+++ b/libraries/libvapours/source/sdmmc/impl/sdmmc_port_mmc0.cpp
@@ -32,4 +32,12 @@ namespace ams::sdmmc::impl {
         return std::addressof(g_mmc0_host_controller);
     }
 
+    IDeviceAccessor *GetDeviceAccessorOfPortMmc0() {
+        return std::addressof(g_mmc0_device_accessor);
+    }
+
+    MmcDeviceAccessor *GetMmcDeviceAccessorOfPortMmc0() {
+        return std::addressof(g_mmc0_device_accessor);
+    }
+
 }
diff --git a/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp
index 3a19e5643..58866094a 100644
--- a/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp
+++ b/libraries/libvapours/source/sdmmc/impl/sdmmc_sd_host_standard_controller.cpp
@@ -355,7 +355,7 @@ namespace ams::sdmmc::impl {
                 R_TRY(this->CheckRemoved());
 
                 /* Check if command inhibit is no longer present. */
-                if (reg::HasValue(this->registers->present_state, SD_REG_BITS_ENUM(PRESENT_STATE_COMMAND_INHIBIT_CMD, NOT_READY))) {
+                if (reg::HasValue(this->registers->present_state, SD_REG_BITS_ENUM(PRESENT_STATE_COMMAND_INHIBIT_CMD, READY))) {
                     break;
                 }
 
@@ -375,7 +375,7 @@ namespace ams::sdmmc::impl {
                 R_TRY(this->CheckRemoved());
 
                 /* Check if command inhibit is no longer present. */
-                if (reg::HasValue(this->registers->present_state, SD_REG_BITS_ENUM(PRESENT_STATE_COMMAND_INHIBIT_DAT, NOT_READY))) {
+                if (reg::HasValue(this->registers->present_state, SD_REG_BITS_ENUM(PRESENT_STATE_COMMAND_INHIBIT_DAT, READY))) {
                     break;
                 }
 
diff --git a/libraries/libvapours/source/sdmmc/sdmmc_common.cpp b/libraries/libvapours/source/sdmmc/sdmmc_common.cpp
index b26561b28..edcff4b48 100644
--- a/libraries/libvapours/source/sdmmc/sdmmc_common.cpp
+++ b/libraries/libvapours/source/sdmmc/sdmmc_common.cpp
@@ -30,8 +30,8 @@ namespace ams::sdmmc {
             impl::IHostController *host_controller = nullptr;
             switch (port) {
                 case Port_Mmc0:    host_controller = impl::GetHostControllerOfPortMmc0();    break;
-                case Port_SdCard0: host_controller = impl::GetHostControllerOfPortSdCard0(); break;
-                case Port_GcAsic0: host_controller = impl::GetHostControllerOfPortGcAsic0(); break;
+                //TODO: case Port_SdCard0: host_controller = impl::GetHostControllerOfPortSdCard0(); break;
+                //TODO: case Port_GcAsic0: host_controller = impl::GetHostControllerOfPortGcAsic0(); break;
                 AMS_UNREACHABLE_DEFAULT_CASE();
             }
 
@@ -45,8 +45,8 @@ namespace ams::sdmmc {
             impl::IDeviceAccessor *device_accessor = nullptr;
             switch (port) {
                 case Port_Mmc0:    device_accessor = impl::GetDeviceAccessorOfPortMmc0();    break;
-                case Port_SdCard0: device_accessor = impl::GetDeviceAccessorOfPortSdCard0(); break;
-                case Port_GcAsic0: device_accessor = impl::GetDeviceAccessorOfPortGcAsic0(); break;
+                //TODO: case Port_SdCard0: device_accessor = impl::GetDeviceAccessorOfPortSdCard0(); break;
+                //TODO: case Port_GcAsic0: device_accessor = impl::GetDeviceAccessorOfPortGcAsic0(); break;
                 AMS_UNREACHABLE_DEFAULT_CASE();
             }
 
diff --git a/libraries/libvapours/source/sdmmc/sdmmc_mmc.cpp b/libraries/libvapours/source/sdmmc/sdmmc_mmc.cpp
new file mode 100644
index 000000000..e19183fec
--- /dev/null
+++ b/libraries/libvapours/source/sdmmc/sdmmc_mmc.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2018-2020 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 <vapours.hpp>
+#include "impl/sdmmc_mmc_device_accessor.hpp"
+#include "impl/sdmmc_port_mmc0.hpp"
+#include "impl/sdmmc_port_sd_card0.hpp"
+#include "impl/sdmmc_port_gc_asic0.hpp"
+
+namespace ams::sdmmc {
+
+    namespace {
+
+        impl::MmcDeviceAccessor *GetMmcDeviceAccessor(Port port) {
+            /* Get the accessor. */
+            impl::MmcDeviceAccessor *mmc_device_accessor = nullptr;
+            switch (port) {
+                case Port_Mmc0: mmc_device_accessor = impl::GetMmcDeviceAccessorOfPortMmc0();    break;
+                AMS_UNREACHABLE_DEFAULT_CASE();
+            }
+
+            /* Ensure it's valid */
+            AMS_ABORT_UNLESS(mmc_device_accessor != nullptr);
+            return mmc_device_accessor;
+        }
+
+    }
+
+    void SetMmcWorkBuffer(Port port, void *buffer, size_t buffer_size) {
+        return GetMmcDeviceAccessor(port)->SetMmcWorkBuffer(buffer, buffer_size);
+    }
+
+    void PutMmcToSleep(Port port) {
+        return GetMmcDeviceAccessor(port)->PutMmcToSleep();
+    }
+
+    void AwakenMmc(Port port) {
+        return GetMmcDeviceAccessor(port)->AwakenMmc();
+    }
+
+    Result SelectMmcPartition(Port port, MmcPartition mmc_partition) {
+        return GetMmcDeviceAccessor(port)->SelectMmcPartition(mmc_partition);
+    }
+
+    Result EraseMmc(Port port) {
+        return GetMmcDeviceAccessor(port)->EraseMmc();
+    }
+
+    Result GetMmcBootPartitionCapacity(u32 *out_num_sectors, Port port) {
+        return GetMmcDeviceAccessor(port)->GetMmcBootPartitionCapacity(out_num_sectors);
+    }
+
+    Result GetMmcExtendedCsd(void *out_buffer, size_t buffer_size, Port port) {
+        return GetMmcDeviceAccessor(port)->GetMmcExtendedCsd(out_buffer, buffer_size);
+    }
+
+}