Writer: Initial changes. (Work-in-progress)