add umd national+subnational
wip: checkpoint