Nationals are now identified.
Fixing merge.
Adding persistence stuff.