diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 061a29b..dd679c9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -30,7 +30,6 @@
 (require 'geiser-install)
 (require 'oni)
 (require 'uniquify)
-(require 'w3m-load)
 
 (autoload 'define-slime-contrib "slime")
 (autoload 'gtags-mode "gtags" nil t)
@@ -42,6 +41,8 @@
 (autoload 'server-running-p "server")
 (autoload 'slime-js-minor-mode "slime-js" nil t)
 (autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(autoload 'w3m-bookmark-view "w3m" nil t)
+(autoload 'w3m-goto-url "w3m" nil t)
 
 (load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
 
diff --git a/.emacs.d/snippets/python-mode/Makefile b/.emacs.d/snippets/python-mode/Makefile
new file mode 100644
index 0000000..192657b
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/Makefile
@@ -0,0 +1,4 @@
+DESTDIR:=$(DESTDIR)/python-mode
+objects=defm_empty form form_valid import_from permission_guard url
+
+include ../../../dotfiles.mk
diff --git a/.emacs.d/snippets/python-mode/defm_empty b/.emacs.d/snippets/python-mode/defm_empty
new file mode 100644
index 0000000..baa976e
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/defm_empty
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# name: Empty Defmethod
+# key: defm
+# --
+def ${1:name}(self, *args, **kwargs):
+    '''$2'''
+    return super(${3:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).$1(*args, **kwargs)
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode/form b/.emacs.d/snippets/python-mode/form
new file mode 100644
index 0000000..225d5e4
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/form
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: Model Form
+# key: form
+# --
+class ${1:Model}Form(forms.ModelForm):
+    '''Form for the $1 model.'''
+
+    class Meta:
+        model = $1
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode/form_valid b/.emacs.d/snippets/python-mode/form_valid
new file mode 100644
index 0000000..c5a7e58
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/form_valid
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: Record form
+# key: defm
+# --
+@record_activity(model=${1:`(progn (re-search-backward "^[ \t]*model = \\([a-zA-Z_].*\\)$") (match-string 1))`})
+def form_valid(self, form):
+    '''Make sure any changes to the $1 model get logged.'''
+    return super(${2:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).form_valid(form)
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode/import_from b/.emacs.d/snippets/python-mode/import_from
new file mode 100644
index 0000000..5c23b8e
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/import_from
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# name: from ... import ...
+# contributor: Tom Willemsen
+# key: from
+# --
+from ${1:module} import ${2:class_or_module}
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode/permission_guard b/.emacs.d/snippets/python-mode/permission_guard
new file mode 100644
index 0000000..ab53895
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/permission_guard
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: Permission guard
+# key: defm
+# --
+@method_decorator(permission_required('$1',
+                                      raise_exception=True))
+def dispatch(self, *args, **kwargs):
+    '''Make sure the user has the $1 permission.'''
+    return super(${3:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).dispatch(*args, **kwargs)
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode/url b/.emacs.d/snippets/python-mode/url
new file mode 100644
index 0000000..00ade72
--- /dev/null
+++ b/.emacs.d/snippets/python-mode/url
@@ -0,0 +1,5 @@
+# -*- mode: snippet -*-
+# name: url
+# key: url
+# --
+url(r'^$1', $2, name='$3'),
\ No newline at end of file