partway through first re-read and edit