A slight refactor but still broken

I'll be testing out a config from Peter which uses org-mode which seems
pretty neat, so just wanted to save this away until I had given that a
try.