[WIP] Refactor 3.2 for features and wording

Don't approve yet. Still working on this.