I'll try to reference  existing issues moving forward. When I'm done I'd like to go through & clearly mark things with `# @api stable` so we can tackle these bigger major-refactor issues.