I don't mind either solutions.  A Dwarven nation is long overdue,  for example.