All states would have their boarders end at rivers or mountain ranges. This includes states that border other countries, we just conceed what we need to match a natural boundary. All waterways that are between states become federal waterways, overseen by the national parks department.

There will be chaos, and it will be glorious. No more states screwing the states that are downriver though, so that’s a win. .