Adds national or total. Closes #40