diff --git a/Timeline.org b/Timeline.org
index 617a2e7..61b4a03 100644
--- a/Timeline.org
+++ b/Timeline.org
@@ -1,6 +1,6 @@
 * Zion configuration
   
-** General
+** General [4/8] [50%]
 *** DONE NTP daemon
     CLOSED: [2019-10-17 Thu 23:20]
 *** DONE User account
@@ -12,17 +12,24 @@
 *** TODO Smartmontools
 *** DONE Zeroconf
     CLOSED: [2019-10-23 Wed 00:51]
-** Printing
-*** TODO Cups
-*** TODO SANE
-** Network
-*** TODO DynDNS [0/1] [0%]
-    - [ ] Ddclient
-*** TODO Firewall [0/2] [0%]
-    - [ ] General nftables config
+*** TODO Fish shell
+** Printing [2/2] [100%]
+*** DONE Cups
+    CLOSED: [2019-11-06 Wed 21:09]
+*** DONE SANE [1/1] [100%]
+    CLOSED: [2019-11-06 Wed 23:28]
+    - [X] nf_conntrack_sane
+** Network [1/3] [33%]
+*** DONE DynDNS [1/2] [50%]
+    CLOSED: [2019-11-06 Wed 23:00]
+    - [X] Ddclient
+    - [ ] Secrets outside the store
+*** TODO Firewall [1/2] [50%]
+    - [X] General config
     - [ ] VPN setup
-*** TODO Wireguard
-** LEMP stack
+*** TODO Wireguard [0/1] [0%]
+    - [ ] Encrypted DNS
+** LEMP stack [0/8] [0%]
 *** TODO Nginx
 *** TODO PHP [0/1] [0%]
     - [ ] Php-fpm
@@ -31,19 +38,21 @@
 *** TODO Certbot [0/2] [0%]
     - [ ] Obtain certs
     - [ ] Script to renew certs
-*** TODO Nextcloud [0/1] [0%]
-    - [ ] Tweak options
+*** TODO Syncthing [0/2] [0%]
+    - [ ] Relay server
+    - [ ] Discovery server
+*** TODO Radicale
 *** TODO Wallabag
 *** TODO Miniflux
 *** TODO Hugo [0/2] [0%]
     - [ ] Blog website
     - [ ] Ox-hugo
-** Software development
+** Software development [0/2] [0%]
 *** TODO Git [0/2] [0%]
     - [ ] Gitea
     - [ ] Import existing repositories
 *** TODO Drone
-** Backup
+** Backup [0/2] [0%]
 *** TODO Databases [0/4] [0%]
     - [ ] Regular dumps
     - [ ] Systemd timer (daily)
@@ -52,11 +61,11 @@
 *** TODO Machines [0/2] [0%]
     - [ ] Daily snapshot of monolith
     - [ ] Weekly snapshot of zion
-** Workflow
+** Workflow [0/1] [0%]
 *** TODO Automate nix files deployment [0/2] [0%]
     - [ ] Send local file to Zion
     - [ ] Rebuild
-** Communication
+** Communication [0/2] [0%]
 *** TODO Matrix
 *** TODO Mail [0/1] [0%]
-    - [ ] Check out[[https://gitlab.com/simple-nixos-mailserver/nixos-mailserver][ nixos-mailserver]] 
+    - [ ] Check out [[https://gitlab.com/simple-nixos-mailserver/nixos-mailserver][nixos-mailserver]] 
diff --git a/modules/printing.nix b/modules/printing.nix
new file mode 100644
index 0000000..d7fdb3d
--- /dev/null
+++ b/modules/printing.nix
@@ -0,0 +1,36 @@
+# CUPS and SANE configuration
+{ config, pkgs, lib, ... }:
+{
+
+  environment.systemPackages = with pkgs; [
+    cups
+    sane-backends
+  ];
+
+  # Enable CUPS with Zeroconf
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [ hplip_3_18_5 ];
+    browsing = true;
+    listenAddresses = [ "*:631" ];
+    defaultShared = true;
+  };
+
+  # Enable SANE
+  hardware.sane = {
+      enable = true;
+      extraBackends = with pkgs; [ hplip_3_18_5 ];
+  };
+
+  services.saned = {
+      enable = true;
+      extraConfig = ''
+      192.168.1.0/24
+      '';
+  };
+
+  users.users.scanner = {
+    extraGroups = [ "lp" ];
+  };
+
+}