Initial set of changes for discussion.