Next iteration of edits, plus some drafts for demo files