diff --git a/build.sh b/build.sh
index 8f09339..888d388 100755
--- a/build.sh
+++ b/build.sh
@@ -2,23 +2,39 @@
 
 rm Nya.qmod
 
+echo "Installing Deps"
+qpm restore
+
 echo "Removing oldness"
 rm -rf build
+rm -rf logs
+rm -rf CMakeCache.txt
+rm -rf CMakeFiles
 
 echo "Bulding da dir"
 mkdir -p build
 cd build
 
+echo "Log da dir"
+mkdir -p ../logs
+
+set -e
+
 echo "cmaking it"
 cmake .. \
-  -DCMAKE_TOOLCHAIN_FILE=/home/dia/android/ndk/27.2.12479018+preview-0/build/cmake/android.toolchain.cmake \
+  -DCMAKE_TOOLCHAIN_FILE=$HOME/android/ndk/27.3.13750724/build/cmake/android.toolchain.cmake \
   -DANDROID_ABI=arm64-v8a \
   -DANDROID_PLATFORM=android-24 \
   -DCMAKE_BUILD_TYPE=Release \
-  -G Ninja
+  -G Ninja | tee ../logs/cmake_log.txt
 
 echo "Building funnies"
-ninja
+ninja | tee ../logs/ninja_log.txt
+
+echo "Generating mod.json"
+cd ..
+qpm qmod manifest
+cd build
 
 echo "Zipping bombing it"
 mkdir -p Nya
@@ -32,4 +48,6 @@ zip -r Nya.zip *
 
 mv Nya.zip ../../Nya.qmod
 
-echo "Done :3"
\ No newline at end of file
+rm -rf Nya
+
+echo "Done :3"
diff --git a/src/API.cpp b/src/API.cpp
index 8c10449..f9b5665 100644
--- a/src/API.cpp
+++ b/src/API.cpp
@@ -119,6 +119,8 @@ inline std::map<std::string, NyaAPI::SourceData> endpoint_data = {
             "FP-Public-naEjca70OhKMtq67WpzaN8Gs"
         }
     },
+    /*
+    // This one got shutdown, or at least their domain expired.
     {"waifu.pics",
         {
             "https://api.waifu.pics/",
@@ -162,6 +164,37 @@ inline std::map<std::string, NyaAPI::SourceData> endpoint_data = {
             "url",
         }
     },
+    */
+    /*
+    // Might come back to figure out why the 404 error is only happening in the mod and not in anything else
+    {"waifu.im",
+        {
+            "https://api.waifu.im/search?included_tags=",
+            DataMode::Json,
+            {
+                {"waifu", "waifu"},
+                {"maid", "maid"},
+                {"marin-kitagawa", "marin-kitagawa"},
+                {"mori-calliope", "mori-calliope"},
+                {"raiden-shogun", "raiden-shogun"},
+                {"oppai", "oppai"},
+                {"selfies", "selfies"},
+                {"uniform", "uniform"},
+                {"kamisato-ayaka", "kamisato-ayaka"},
+            },
+            {
+                {"ass", "ass"},
+                {"hentai", "hentai"},
+                {"milf", "milf"},
+                {"oral", "oral"},
+                {"paizuri", "paizuri"},
+                {"ecchi", "ecchi"},
+                {"ero", "ero"},
+            },
+            "images/0/url",
+        }
+    },
+    */
     {"Bocchi",
         {
             "https://boccher.pixelboom.dev/api/",
@@ -229,7 +262,7 @@ inline std::map<std::string, NyaAPI::SourceData> endpoint_data = {
             "link"
         }
     },
-    {"nekosia.cat",
+    {"Nekosia",
         {
             "https://api.nekosia.cat/api/v1/images/",
             DataMode::Json,
@@ -331,6 +364,42 @@ inline std::map<std::string, NyaAPI::SourceData> endpoint_data = {
             "results/0/url"
         }
     },
+    {"nekos.life",
+        {
+            "https://nekos.life/api/v2/img/",
+            DataMode::Json,
+            {
+                {"neko gif", "ngif"},
+                {"hug", "hug"},
+                {"gecg", "gecg"},
+                {"pat", "pat"},
+                {"cuddle", "cuddle"},
+                {"meow", "meow"},
+                {"gasm", "gasm"},
+                {"goose (Just geese)", "goose"},
+                {"bored", "bored"},
+                {"cry", "cry"},
+                {"cuddle", "cuddle"},
+                {"feed", "feed"},
+                {"slap", "slap"},
+                {"wallpaper", "wallpaper"},
+                {"neko", "neko"},
+                {"lizard", "lizard"},
+                {"woof", "woof"},
+                {"fox_girl", "fox_girl"},
+                {"8ball", "8ball"},
+                {"kiss", "kiss"},
+                {"avatar", "avatar"},
+                {"waifu", "waifu"},
+                {"smug", "smug"},
+            },
+            {
+                {"lewd", "lewd"},
+                {"spank", "spank"},
+            },
+            "url"
+        }
+    },
     {"Local Files",
         {
             "",