Preparing for Discourse 1.7