data and methods first draft
minor edits to code