Clean up common imports
Implement Confidence and add tests
Update Statement type and add tests
Handle 'None' PackageIntents better