Make DC a state but send fedgov to Puerto Rico.
No state...return the boundaries to the state from which it comes.