WIP: Data-driven overhaul #8

Draft
lrvick wants to merge 3 commits from data-driven into main

3 Commits