Finished switch statements

Also made North Dakota extend State, which I had accidentally forgotten
to do before