Refactor for initial release

Include Canada (national only)