WIP - DO NOT MERGE

Builds on #2776