More initial updates from discussion.