diff --git a/Dockerfile b/Dockerfile
index 10cfb9c..2ba8420 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,11 @@ EXPOSE 8080
 
 RUN chmod +x /app/drmdtool
 RUN chmod +x /app/nre
+RUN mkdir -p /app/Watched
+
 
-ENV BASE_DIR=/app/Videos
 ENV FORMAT=mkv
-ENV TEMP_BASE_DIR=/app/tmp
+
 
 ENTRYPOINT ["/app/drmdtool"]
 
diff --git a/config.toml b/config.toml
index 4fcfb8c..217242f 100644
--- a/config.toml
+++ b/config.toml
@@ -1,7 +1,14 @@
+[General]
 BaseDir = "/app/Videos/"
-Format = "${FORMAT:-mkv}" 
+Format = "mkv"
 TempBaseDir = "/app/tmp/"
+EnableConsole = true
+
+[WatchFolder]
+Path = "/app/Watched"
+PollingInterval = 10
+UsePolling = false
+UseInotify = true
 
 [N_m3u8DLRE]
 Path = "/app/nre"
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 0b51b15..dbd1e7e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,16 @@ services:
       - "8080:8080"
     volumes:
       - /mnt/media:/app/Videos
+      - /home/joren/Documents/School/PREMA/labs/DRMD:/app/Watched
     environment:
-      - FORMAT=mp4
+      # When commented, defaults are taken from config.toml
+      - FORMAT=mkv
+      #- BASE_DIR=/path/to/base
+      #- TEMP_BASE_DIR=/path/to/temp
+      #- ENABLE_CONSOLE=false
+      #- WATCHED_FOLDER=/path/to/watched
+      - USE_POLLING=true
+      - USE_INOTIFY=false
+      #- POLLING_INTERVAL=3000 (In seconds)
     restart: unless-stopped
 
diff --git a/drmdtool b/drmdtool
index ca6db24..0829276 100755
Binary files a/drmdtool and b/drmdtool differ