POTENTIAL FIXUP TO PR COMMENTS. (REBASE)

Tests are broken, but before I fix them, we need to lock down how this will work.