Broken WIP. It's worked before, but this is mid-refactor.