Then I won't block on it, although I'm still curious about what the radical refactor would look like