diff --git a/init.el b/init.el
index 056deb0aa..4c96dfb9b 100644
--- a/init.el
+++ b/init.el
@@ -13,7 +13,6 @@
 
 (server-mode t)
 (unless (server-running-p) (server-start))
-(when window-system (desktop-save-mode 1))
 
 ;; Global vars
 (defconst  my/dir           (file-name-directory load-file-name))
@@ -48,4 +47,5 @@
     mod-cpp             ; C++ gamedev
     mod-eclim           ; Integration into eclipse (for Java)
     mod-csharp          ; Emacs as a Csharp/Unity IDE
+    mod-collab          ; For collab programming
     ))
diff --git a/init/mod-collab.el b/init/mod-collab.el
new file mode 100644
index 000000000..5dc6366a1
--- /dev/null
+++ b/init/mod-collab.el
@@ -0,0 +1,11 @@
+(use-package floobits :ensure t
+  :commands (floobits-join-workspace
+             floobits-share-dir-private
+             floobits-share-dir-public
+             floobits-leave-workspace
+             floobits-summon
+             floobits-follow-mode-toggle
+             floobits-clear-highlights))
+
+;;
+(provide 'mod-collab)