Currently stuck because this is high effort and low priority; I am only opening this diff so I don't lose this WIP code
Resolves #3880
Migrated from D7603 (view on Phabricator)
