Lots of changes.
Shift to org-mode