Still pretty broken but ostensibly the refactor is itself complete. But obviously there are bugs to fix.