Finished adding first draft of comments