Major refactoring of the island-command