Got the state border in too. Fixes #21