further foundational changes. committing for visibility