Foundational changes. Committing for visibility.