This is The Feature of Theseus with how much I've had to rewrite huge chunks of this pull request now. 😮‍💨