WIP - More work toward #3892