diff --git a/mediawiki/Dockerfile b/mediawiki/Dockerfile
index 1671c21..ddba6a8 100644
--- a/mediawiki/Dockerfile
+++ b/mediawiki/Dockerfile
@@ -1,59 +1,50 @@
 FROM mediawiki:1.42.1
 
 RUN apt update \
-    && apt install -y unzip wget clamav clamav-daemon
+    && apt install -y unzip wget clamav clamav-daemon make
+
+# Install extensions
+WORKDIR /var/www/html/extensions
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/MobileFrontend \
-    /var/www/html/extensions/MobileFrontend
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/MobileFrontend
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror \
-    /var/www/html/extensions/CodeMirror
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/Elastica \
-    /var/www/html/extensions/Elastica
-
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/Elastica
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch \
-    /var/www/html/extensions/CirrusSearch
-
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/AdvancedSearch \
-    /var/www/html/extensions/AdvancedSearch
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/AdvancedSearch
 
 RUN git clone --depth 1 \
     https://github.com/edwardspec/mediawiki-aws-s3.git \
-    /var/www/html/extensions/AWS
+    /AWS
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscordRCFeed \
-    /var/www/html/extensions/DiscordRCFeed
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscordRCFeed
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/DismissableSiteNotice \
-    /var/www/html/extensions/DismissableSiteNotice
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/DismissableSiteNotice
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/cldr \
-    /var/www/html/extensions/cldr
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/cldr
+RUN git clone --depth 1 \
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/CookieWarning
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/CookieWarning \
-    /var/www/html/extensions/CookieWarning
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/CreateUserPage
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/CreateUserPage \
-    /var/www/html/extensions/CreateUserPage
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/Disambiguator
 
 RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/Disambiguator \
-    /var/www/html/extensions/Disambiguator
+    https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups
 
-RUN git clone --depth 1 \
-    https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups \
-    /var/www/html/extensions/Popups
+# Install skins and tarballed extensions
+WORKDIR /var/www/html
 
 RUN wget https://github.com/StarCitizenTools/mediawiki-skins-Citizen/archive/main.zip \
     && unzip main.zip \
@@ -67,11 +58,11 @@ RUN wget https://github.com/StarCitizenWiki/mediawiki-extensions-EmbedVideo/arch
     && mv mediawiki-extensions-EmbedVideo-3.4.2/* /var/www/html/extensions/EmbedVideo \
     && rm v3.4.2.tar.gz
 
-COPY CheckUser.tar.gz .
+COPY *.tar.gz .
 
-RUN tar -xvf CheckUser.tar.gz \
-    && mv CheckUser /var/www/html/extensions/CheckUser \
-    && rm CheckUser.tar.gz
+RUN for file in *.tar.gz; do \
+        tar -xvf "$file" --directory /var/www/html/extensions/ && rm "$file"; \
+    done
 
 # Install composer (AWS S3 & CheckUser extensions)
 RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet \
diff --git a/mediawiki/SyntaxHighlight_GeSHi.tar.gz b/mediawiki/SyntaxHighlight_GeSHi.tar.gz
new file mode 100644
index 0000000..5e56616
Binary files /dev/null and b/mediawiki/SyntaxHighlight_GeSHi.tar.gz differ
diff --git a/mediawiki/docker-compose.dev.yml b/mediawiki/docker-compose.dev.yml
new file mode 100644
index 0000000..00d61c4
--- /dev/null
+++ b/mediawiki/docker-compose.dev.yml
@@ -0,0 +1,36 @@
+networks:
+  zenithwiki:
+    driver: bridge
+
+services:
+  mediawiki:
+    image: www.coastalcommits.com/zenith/mediawiki:latest
+    build: .
+    restart: always
+    ports:
+      - 8037:80
+    links:
+      - database
+    networks:
+      - zenithwiki
+    volumes:
+      - images:/var/www/html/images
+      - resources:/var/www/html/resources
+      - /var/lib/mediawiki/LocalSettings.php:/var/www/html/LocalSettings.php
+  database:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_DATABASE: zenith
+      MYSQL_USER: zenithwikiuser
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+    networks:
+      - zenithwiki
+    volumes:
+      - db:/var/lib/mysql
+
+volumes:
+  images:
+  resources:
+  db: