First WIP commit, on migration path to org-mode