Major refactoring of the island-command
Crude flat-land fix