diff --git a/.DS_Store b/.DS_Store
index 5129328..4747cff 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 9bea433..43322df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 
 .DS_Store
+.DS_Store
diff --git a/apps/mcmyadmin.yml b/apps/mcmyadmin.yml
new file mode 100644
index 0000000..a178085
--- /dev/null
+++ b/apps/mcmyadmin.yml
@@ -0,0 +1,86 @@
+#!/bin/bash
+#
+# Title:      McMyadmin2
+# Author(s):  timekills
+# URL:        https://plexguide.com - http://github.plexguide.com
+# GNU:        General Public License v3.0
+################################################################################
+---
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    # CORE (MANDATORY) DO NOT CHANGE ###########################################
+
+    - name: 'Set Known Facts'
+      set_fact:
+        pgrole: 'mcmyadmin2'
+        intport: '8080'
+        extport: '8088'
+        image: 'linuxserver/mcmyadmin2'
+
+    - name: 'Including cron job'
+      include_tasks: '/opt/plexguide/containers/_core.yml'
+
+    # EXTRA FUNCTIONS REQUIRED BY THE ROLE #####################################
+
+    - name: 'Create scripts directory for {{pgrole}}'
+      file:
+        path: /opt/appdata/{{pgrole}}/scripts
+        state: directory
+        owner: 1000
+        group: 1000
+        mode: 0755
+
+    - name: 'Create plugins directory for {{pgrole}}'
+      file:
+        path: /opt/appdata/{{pgrole}}/plugins
+        state: directory
+        owner: 1000
+        group: 1000
+        mode: 0755
+
+    # LABELS #### KEEPS BOTTOM CLEAN ###########################################
+    - name: 'Adding Traefik'
+      set_fact:
+        pg_labels:
+          traefik.frontend.auth.forward.address: '{{gauth}}'
+          traefik.enable: 'true'
+          traefik.port: '{{intport}}'
+          traefik.frontend.rule: 'Host:mcmyadmin.{{domain.stdout}},{{tldset}}'
+
+    - name: 'Setting PG Volumes'
+      set_fact:
+        pg_volumes:
+          - '/opt/appdata/{{pgrole}}/mcmyadmin:/minecraft'
+          - '/opt/appdata/{{pgrole}}/Minecraft:/Minecraft'
+          - '{{path.stdout}}:{{path.stdout}}'
+          - '/mnt:/mnt'
+          - '/etc/localtime:/etc/localtime:ro'
+
+    - name: 'Setting PG ENV'
+      set_fact:
+        pg_env:
+          PUID: 1000
+          PGID: 1000
+
+    # MAIN SCRIPT ##############################################################
+
+    - name: 'Deploying {{pgrole}}'
+      docker_container:
+        name: '{{pgrole}}'
+        image: '{{image}}'
+        pull: yes
+        published_ports:
+          - '{{ports.stdout}}{{extport}}:{{intport}}'
+          - '25565:25565/tcp'
+          - '25566:25566/tcp'
+          - '25567:25567/tcp'
+        volumes: '{{pg_volumes}}'
+        env: '{{pg_env}}'
+        restart_policy: unless-stopped
+        networks:
+          - name: plexguide
+            aliases:
+              - '{{pgrole}}'
+        state: started
+        labels: '{{pg_labels}}'
diff --git a/apps/nzbthrottle.yml b/apps/templates/broken/nzbthrottle.yml
similarity index 90%
rename from apps/nzbthrottle.yml
rename to apps/templates/broken/nzbthrottle.yml
index e2b5042..f06e48f 100644
--- a/apps/nzbthrottle.yml
+++ b/apps/templates/broken/nzbthrottle.yml
@@ -21,21 +21,21 @@
     - name: 'Including cron job'
       include_tasks: '/opt/plexguide/containers/_core.yml'
 
-    - name: Checking {{pgrole}}'s json existance
+    - name: 'Checking {{pgrole}}'s json existance'
       stat:
         path: '/opt/plexguide/containers/templates/{{pgrole}}/config.json'
       register: jsoncheck
 
     - name: 'Copying file for {{pgrole}}'
       copy:
-        src: /opt/plexguide/containers/templates/{{pgrole}}.json
-        dest: /opt/appdata/{{pgrole}}/{{pgrole}}json
+        src: '/opt/plexguide/containers/templates/{{pgrole}}/config.json'
+        dest: '/opt/appdata/{{pgrole}}/{{pgrole}}/config.json'
         directory_mode: yes
         force: yes
         owner: 1000
         group: 1000
         mode: 0755
-      when: not nzbthrottle.stat.exists
+      when: not jsoncheck.stat.exists
 
     # LABELS ######################################################################
     - name: 'Adding Traefik'
diff --git a/templates/cleanup-radarr.sh b/templates/cleanup-radarr.sh
deleted file mode 100644
index b95d408..0000000
--- a/templates/cleanup-radarr.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [ -d "$radarr_moviefile_sourcefolder" ] && [ "$(basename $radarr_moviefile_sourcefolder)" = "deluge_extracted" ] ; then
-    /bin/rm -rf $radarr_moviefile_sourcefolder
-fi
diff --git a/templates/cleanup-sonarr.sh b/templates/cleanup-sonarr.sh
deleted file mode 100644
index f805109..0000000
--- a/templates/cleanup-sonarr.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [ -d "$sonarr_episodefile_sourcefolder" ] && [ "$(basename $sonarr_episodefile_sourcefolder)" = "deluge_extracted" ] ; then
-    /bin/rm -rf $sonarr_episodefile_sourcefolder
-fi