wip: checkpoint with national+subnational forma+umd with tests