Should be its own state
Should be its own state