diff --git a/docker-compose.yml b/docker-compose.yml
index d8a6922..cd82b4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 # /opt/docker-compose.yml
+# edited via neovim
 ---
-version: '2'
 services:
 #Plex server stats page
   tautulli:
@@ -42,7 +42,8 @@ services:
       - /opt/appdata/sonarr:/config
       - /mnt/storage/tv:/tv
       - /downloads/:/downloads
-      - /downloads/complete/tv_import:/tv_import
+      - /download_portable/:/download_portable
+        #- /downloads/complete/tv_import:/tv_import
     ports:
       - 27021:8989
     networks:
@@ -76,6 +77,7 @@ services:
       - /downloads:/downloads
       - /mnt/storage/movies:/movies
       - /downloads/watch:/watch
+      - /download_portable/:/download_portable
     ports:
       - 7878:7878
     networks:
@@ -219,6 +221,7 @@ services:
     - /var/log:/var/log:ro
     - /opt/appdata/fail2ban/data:/data
     - /opt/appdata/shared:/shared
+    - /opt/appdata/traefik:/var/log/traefik
     restart: always  
 #Downloader, pull in content from torrents & hide traffic behind VPN  
   arch-deluge:
@@ -236,6 +239,7 @@ services:
     volumes:
       - /opt/appdata/arch-deluge:/config
       - /downloads:/downloads
+      - /download_portable/complete:/downloads/complete
       - /mnt/storage:/mnt/storage
       - /opt/appdata/shared:/shared
       - /opt/appdata/arch-deluge/data:/data
@@ -341,115 +345,8 @@ services:
       - PUID=${PUID}
       - PGID=${PGID}
       - TZ=${TZ}
-#Data Metrics: https://docs.docker.com/samples/library/influxdb/ 
-  influxdb:
-    image: influxdb:latest
-    container_name: influxdb
-    restart: always
-    ports:
-      - 8086:8086
-      - 8083:8083
-      - 8090:8090/udp
-    volumes:
-      - /opt/appdata/influxdb/lib:/var/lib/influxdb
-      - /opt/appdata/influxdb/:/etc/influxdb/
-      - /opt/appdata/shared:/shared
-    restart:
-      always
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
- #Server Metrics: https://github.com/grafana/grafana/tree/master/packaging/docker
-  grafana:
-    image: grafana/grafana:latest
-    container_name: grafana
-    restart: always
-    user: "104"
-    links:
-      - influxdb
-    ports:
-      - 3001:3000
-    networks:
-      - traefik_proxy1
-    labels:
-      - "traefik.enable=true"
-      - "traefik.backend=grafana"
-      - "traefik.frontend.rule=Host:grafana.${DOMAINNAME}"  #
-      - "traefik.port=3000"
-      - "traefik.docker.network=traefik_proxy1"
-      - "traefik.frontend.headers.SSLRedirect=true"
-      - "traefik.frontend.headers.STSSeconds=315360000"
-      - "traefik.frontend.headers.browserXSSFilter=true"
-      - "traefik.frontend.headers.contentTypeNosniff=true"
-      - "traefik.frontend.headers.forceSTSHeader=true"
-      - "traefik.frontend.headers.SSLHost=example.com"
-      - "traefik.frontend.headers.STSIncludeSubdomains=true"
-      - "traefik.frontend.headers.STSPreload=true"
-      - "traefik.frontend.headers.frameDeny=true"
-      - "docker.group=external"
-    volumes:
-      - /opt/appdata/grafana/var:/var/lib/grafana
-      - /opt/appdata/grafana:/etc/grafana
-      - /opt/appdata/shared:/shared
-    restart:
-      always
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-      - GF_INSTALL_PLUGINS=${GF_INSTALL_PLUGINS}
- #Server Metrics: feeds to influxdb 
-  telegraf:
-    image: telegraf:latest
-    container_name: telegraf
-    links:
-      - influxdb
-    volumes:
-      - /opt/appdata/telegraf:/var/lib/telegraf
-      - /opt/appdata/telegraf/:/etc/telegraf/
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart:
-      always
- #tdarr - convert / transcode video files 
- # TODO: upgrade to v2:
- # https://docs.tdarr.io/docs/installation/docker/run-compose
-  tdarr_aio:
-    image: haveagitgat/tdarr_aio
-    container_name: tdarr_aio
-    ports:
-      -  8265:8265
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    volumes:
-      - /opt/appdata/tdarr:/home/Tdarr/Documents/Tdarr
-      - /downloads/tdarrDB:/var/lib/mongodb
-      - /mnt/storage:/home/Tdarr/media
-      - /mnt/storage/movies:/home/Tdarr/media/movies
-      - /mnt/storage/tv:/home/Tdarr/media/tv
-      - /downloads/tdarrDB/cache:/home/Tdarr/cache
-      - /etc/localtime:/etc/localtime:ro
-    restart:
-      always
-  lidarr:
-    image: linuxserver/lidarr
-    container_name: lidarr
-    ports:
-      -  8686:8686
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    volumes:
-      - /opt/appdata/lidarr:/config
-      - /mnt/storage/music:/music
-      - /downloads:/downloads
-    restart:
-      always
   gitea:
-    image: gitea/gitea:1.13.0
+    image: gitea/gitea:latest
     container_name: gitea
     environment:
       - USER_UID=${PUID}
@@ -480,9 +377,94 @@ services:
     ports:
       - "3000:3000"
       - "222:22"
+  book-readarr:
+    image: lscr.io/linuxserver/readarr:develop
+    container_name: book-readarr
+    volumes:
+      - /opt/appdata/book-readarr:/config
+      - /downloads:/downloads
+      - /mnt/storage/books:/books
+      - /downloads/watch:/watch
+      - /download_portable/:/download_portable
+    ports:
+      - 8787:8787
+    networks:
+      - traefik_proxy1
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=book-readarr"
+      - "traefik.frontend.rule=Host:book-readarr.${DOMAINNAME}"  #
+      - "traefik.port=8787"
+      - "traefik.docker.network=traefik_proxy1"
+      - "traefik.frontend.headers.SSLRedirect=true"
+      - "traefik.frontend.headers.STSSeconds=315360000"
+      - "traefik.frontend.headers.browserXSSFilter=true"
+      - "traefik.frontend.headers.contentTypeNosniff=true"
+      - "traefik.frontend.headers.forceSTSHeader=true"
+      - "traefik.frontend.headers.SSLHost=example.com"
+      - "traefik.frontend.headers.STSIncludeSubdomains=true"
+      - "traefik.frontend.headers.STSPreload=true"
+      - "traefik.frontend.headers.frameDeny=true"
+      - "docker.group=external"
+    restart: always
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+  audio-readarr:
+    image: lscr.io/linuxserver/readarr:develop
+    container_name: audio-readarr
+    volumes:
+      - /opt/appdata/audio-readarr:/config
+      - /downloads:/downloads
+      - /mnt/storage/books:/books
+      - /downloads/watch:/watch
+      - /download_portable/:/download_portable
+    ports:
+      - 8888:8787
+    networks:
+      - traefik_proxy1
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=audio-readarr"
+      - "traefik.frontend.rule=Host:audio-readarr.${DOMAINNAME}"  #
+      - "traefik.port=8787"
+      - "traefik.docker.network=traefik_proxy1"
+      - "traefik.frontend.headers.SSLRedirect=true"
+      - "traefik.frontend.headers.STSSeconds=315360000"
+      - "traefik.frontend.headers.browserXSSFilter=true"
+      - "traefik.frontend.headers.contentTypeNosniff=true"
+      - "traefik.frontend.headers.forceSTSHeader=true"
+      - "traefik.frontend.headers.SSLHost=example.com"
+      - "traefik.frontend.headers.STSIncludeSubdomains=true"
+      - "traefik.frontend.headers.STSPreload=true"
+      - "traefik.frontend.headers.frameDeny=true"
+      - "docker.group=external"
+    restart: always
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+  calibre:
+    image: lscr.io/linuxserver/calibre:latest
+    container_name: calibre
+    volumes:
+      - /opt/appdata/calibre:/config
+      - /mnt/storage/books:/books
+    ports:
+      - 8090:8080
+      - 8191:8181
+      - 8091:8081
+    networks:
+      - traefik_proxy1
+    restart: always
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
 #Networks, Needed for Traefik    
 networks:
   traefik_proxy1:
-      external: true
+          #external: true
   default:
       driver: bridge