New Proposal Version

Using the new modular imports from the PR version