Groundwork for bumping direct makers to discourse

Also groundwork for persistence.