diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index f79425033..000000000
--- a/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at poslovitch@bentobox.world. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index d1e879d67..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-name: Bug report
-about: Report a bug or a problem you're encountering with BentoBox.
-title: ''
-labels: 'Status: Pending, Type: Bug'
-assignees: ''
-
----
-
-### Description
-#### Describe the bug
-<!-- A clear and concise description of the problem you're encountering. -->
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please type below this line. -->
-
-#### Steps to reproduce the behavior
-<!-- Step-by-step instructions for us to reproduce the bug on our side. -->
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please type below this line. -->
-
-#### Screenshots and videos
-<!-- Videos and screenshots are helpful as they can provide better information about your problem. -->
-<!-- Please type below this line. -->
-
-#### Expected behavior
-<!-- Clear and concise description of what you actually expected to happen when you encountered this bug. -->
-<!-- Please type below this line. -->
-
-### Environment
-
-#### Server
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please replace the underscores with your answer. Do not remove the '*' characters. -->
- - OS: **________**
- - Java version: **________**
-
-#### Plugins
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please paste the `/plugins` output inside the code block below (remove the underscores). Do not provide an image. -->
-```
-_______
-```
-
-#### BentoBox setup
-
-##### BentoBox and Addons
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please paste the output of `/bentobox version` in the code block below (replace the underscores). Do not provide an image. -->
-```
-_______
-```
-
-##### Configuration
-<!-- /!\ Leaving this section blank will result in your ticket being closed without further explanation. -->
-<!-- Please replace the underscores with your answer. Do not remove the '*' characters. -->
- - Database: **________** <!-- Available options: YAML, JSON, MYSQL, MARIADB, MONGODB -->
-
-### Additional context
-<!-- Any additional information you'd like to provide us. -->
-<!-- Please type below this line. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 203d2c4d9..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea to improve BentoBox
-title: ''
-labels: 'Status: Pending, Type: Enhancement'
-assignees: ''
-
----
-
-### Description
-#### Is your feature request related to a problem?
-<!-- A clear and concise description of the problem you're encountering, if any. -->
-<!-- Please type below this line. -->
-
-#### Describe the solution you'd like us to implement.
-<!-- A clear and concise description of what you want us to do to resolve your problem. -->
-<!-- Please type below this line. -->
-
-#### Describe alternatives you've considered.
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-<!-- Please type below this line. -->
-
-### Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
-<!-- Please type below this line. -->
diff --git a/.github/ISSUE_TEMPLATE/placeholder_request.md b/.github/ISSUE_TEMPLATE/placeholder_request.md
deleted file mode 100644
index 724a030b4..000000000
--- a/.github/ISSUE_TEMPLATE/placeholder_request.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Placeholder request
-about: Suggest a placeholder to use via PlaceholderAPI
-title: 'Placeholder: '
-labels: 'Status: Pending, Type: Enhancement'
-assignees: ''
-
----
-
-**Description**
-<!-- A clear and concise description of the placeholder you want us to add. -->
-<!-- Please type below this line. -->
-
-**Placeholder**: `__________`
-<!-- Replace the underscores above with the actual placeholder. E.g: island_name -->
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 2339fbdaa..2099fc59a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,16 @@ addons:
             - develop
             - master
 jdk:
-    - oraclejdk8
+    - openjdk8
+    - openjdk11
+    
+matrix:
+  allow_failures:
+    - jdk: openjdk11
     
 script:
-    #- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B
+    #- sonar-scanner
+    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B
     #- echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
 cache:
     directories:
diff --git a/README.md b/README.md
index 9e6192c69..b8c6d63bd 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Do not submit PRs that only address code formatting because they will not be acc
 
 BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](https://codemc.org).
 
-### Maven dependency
+### Maven
 ```xml
 <repositories>
   <repository>
@@ -108,3 +108,14 @@ BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](htt
   </dependency>
 </dependencies>
 ```
+
+### Gradle
+```groovy
+repositories {
+  maven { url "https://repo.codemc.org/repository/maven-public/" }
+}
+
+dependencies {
+  compileOnly 'world.bentobox:bentobox:PUT-VERSION-HERE'
+}
+```
\ No newline at end of file
diff --git a/REFERENCES.md b/REFERENCES.md
deleted file mode 100644
index 06f0ddda1..000000000
--- a/REFERENCES.md
+++ /dev/null
@@ -1,300 +0,0 @@
-# Locale References
-
-This file contains a list of the locale references in the source code. See the commit date/time for the last update.
-
-## References
-
-/!\ Most command-related references are not listed at the moment.
-
-```
-commands.admin.setrange.range-updated
-commands.help.description
-commands.help.end
-commands.help.header
-commands.help.parameters
-commands.help.syntax
-commands.island.about.description
-commands.island.create.creating-island
-commands.island.create.unable-create-island
-commands.island.go.description
-commands.island.go.parameters
-commands.island.go.teleport
-commands.island.go.teleported
-commands.island.reset.must-remove-members
-commands.island.sethome.home-set
-commands.island.sethome.must-be-on-your-island
-commands.island.sethome.num-homes
-commands.island.setname.too-long
-commands.island.setname.too-short
-commands.island.team.demote.failure
-commands.island.team.demote.success
-commands.island.team.invite.accept.name-joined-your-island
-commands.island.team.invite.accept.you-joined-island
-commands.island.team.invite.already-on-team
-commands.island.team.invite.cannot-invite-self
-commands.island.team.invite.cooldown
-commands.island.team.invite.errors.invalid-invite
-commands.island.team.invite.errors.island-is-full
-commands.island.team.invite.errors.none-invited-you
-commands.island.team.invite.errors.you-already-are-in-team
-commands.island.team.invite.invitation-sent
-commands.island.team.invite.name-has-invited-you
-commands.island.team.invite.reject.name-rejected-your-invite
-commands.island.team.invite.reject.you-rejected-invite
-commands.island.team.invite.removing-invite
-commands.island.team.invite.to-accept-or-reject
-commands.island.team.invite.you-can-invite
-commands.island.team.invite.you-will-lose-your-island
-commands.island.team.kick.leader-kicked
-commands.island.team.kick.type-again
-commands.island.team.leave.left-your-island
-commands.island.team.leave.type-again
-commands.island.team.promote.failure
-commands.island.team.promote.success
-commands.island.team.setowner.errors.cant-transfer-to-yourself
-commands.island.team.setowner.errors.target-is-not-member
-commands.island.team.setowner.name-is-the-owner
-commands.island.team.setowner.you-are-the-owner
-commands.help.end
-commands.help.description
-commands.help.header
-commands.help.parameters
-commands.help.syntax
-general.confirm
-general.errors.already-have-island
-general.errors.command-cancelled
-general.errors.general
-general.errors.no-island
-general.errors.no-permission
-general.errors.no-team
-general.errors.not-in-team
-general.errors.not-owner
-general.errors.offline-player
-general.errors.player-has-island
-general.errors.player-has-no-island
-general.errors.unknown-command
-general.errors.unknown-player
-general.errors.unknown-player-name
-general.errors.use-in-game
-general.errors.warp-not-safe
-general.errors.wrong-world
-general.errors.you-must-wait
-general.errors.you-need
-general.previous-request-cancelled
-general.request-cancelled
-general.success
-general.tips.changing-obsidian-to-lava
-language.edited
-language.panel-title
-language.selected
-protection.command-is-banned
-protection.flags.ANIMAL_SPAWN.description
-protection.flags.ANIMAL_SPAWN.name
-protection.flags.ANVIL.description
-protection.flags.ANVIL.hint
-protection.flags.ANVIL.name
-protection.flags.ARMOR_STAND.description
-protection.flags.ARMOR_STAND.hint
-protection.flags.ARMOR_STAND.name
-protection.flags.BEACON.description
-protection.flags.BEACON.hint
-protection.flags.BEACON.name
-protection.flags.BED.description
-protection.flags.BED.hint
-protection.flags.BED.name
-protection.flags.BREAK_BLOCKS.description
-protection.flags.BREAK_BLOCKS.hint
-protection.flags.BREAK_BLOCKS.name
-protection.flags.BREEDING.description
-protection.flags.BREEDING.hint
-protection.flags.BREEDING.name
-protection.flags.BREWING.description
-protection.flags.BREWING.hint
-protection.flags.BREWING.name
-protection.flags.BUCKET.description
-protection.flags.BUCKET.hint
-protection.flags.BUCKET.name
-protection.flags.BUTTON.description
-protection.flags.BUTTON.hint
-protection.flags.BUTTON.name
-protection.flags.CHEST.description
-protection.flags.CHEST.hint
-protection.flags.CHEST.name
-protection.flags.CHEST_DAMAGE.description
-protection.flags.CHEST_DAMAGE.name
-protection.flags.CHORUS_FRUIT.description
-protection.flags.CHORUS_FRUIT.hint
-protection.flags.CHORUS_FRUIT.name
-protection.flags.CLEAN_SUPER_FLAT.description
-protection.flags.CLEAN_SUPER_FLAT.name
-protection.flags.COLLECT_LAVA.description
-protection.flags.COLLECT_LAVA.hint
-protection.flags.COLLECT_LAVA.name
-protection.flags.COLLECT_WATER.description
-protection.flags.COLLECT_WATER.hint
-protection.flags.COLLECT_WATER.name
-protection.flags.CRAFTING.description
-protection.flags.CRAFTING.hint
-protection.flags.CRAFTING.name
-protection.flags.CREEPER_DAMAGE.description
-protection.flags.CREEPER_DAMAGE.name
-protection.flags.CREEPER_GRIEFING.description
-protection.flags.CREEPER_GRIEFING.name
-protection.flags.CROP_TRAMPLE.description
-protection.flags.CROP_TRAMPLE.hint
-protection.flags.CROP_TRAMPLE.name
-protection.flags.DOOR.description
-protection.flags.DOOR.hint
-protection.flags.DOOR.name
-protection.flags.EGGS.description
-protection.flags.EGGS.hint
-protection.flags.EGGS.name
-protection.flags.ELYTRA.description
-protection.flags.ELYTRA.hint
-protection.flags.ELYTRA.name
-protection.flags.ENCHANTING.description
-protection.flags.ENCHANTING.hint
-protection.flags.ENCHANTING.name
-protection.flags.ENDERMAN_DEATH_DROP.description
-protection.flags.ENDERMAN_DEATH_DROP.name
-protection.flags.ENDERMAN_GRIEFING.description
-protection.flags.ENDERMAN_GRIEFING.name
-protection.flags.ENDER_PEARL.description
-protection.flags.ENDER_PEARL.hint
-protection.flags.ENDER_PEARL.name
-protection.flags.ENTER_EXIT_MESSAGES.description
-protection.flags.ENTER_EXIT_MESSAGES.island
-protection.flags.ENTER_EXIT_MESSAGES.name
-protection.flags.ENTER_EXIT_MESSAGES.now-entering
-protection.flags.ENTER_EXIT_MESSAGES.now-leaving
-protection.flags.FIRE.description
-protection.flags.FIRE.hint
-protection.flags.FIRE.name
-protection.flags.FIRE_EXTINGUISH.description
-protection.flags.FIRE_EXTINGUISH.hint
-protection.flags.FIRE_EXTINGUISH.name
-protection.flags.FIRE_SPREAD.description
-protection.flags.FIRE_SPREAD.hint
-protection.flags.FIRE_SPREAD.name
-protection.flags.FURNACE.description
-protection.flags.FURNACE.hint
-protection.flags.FURNACE.name
-protection.flags.GATE.description
-protection.flags.GATE.hint
-protection.flags.GATE.name
-protection.flags.GEO_LIMIT_MOBS.description
-protection.flags.GEO_LIMIT_MOBS.name
-protection.flags.HURT_ANIMALS.description
-protection.flags.HURT_ANIMALS.hint
-protection.flags.HURT_ANIMALS.name
-protection.flags.HURT_MONSTERS.description
-protection.flags.HURT_MONSTERS.hint
-protection.flags.HURT_MONSTERS.name
-protection.flags.HURT_VILLAGERS.description
-protection.flags.HURT_VILLAGERS.hint
-protection.flags.HURT_VILLAGERS.name
-protection.flags.ITEM_FRAME_DAMAGE.description
-protection.flags.ITEM_FRAME_DAMAGE.name
-protection.flags.INVINCIBLE_VISITORS.description
-protection.flags.INVINCIBLE_VISITORS.hint
-protection.flags.INVINCIBLE_VISITORS.name
-protection.flags.ISLAND_RESPAWN.description
-protection.flags.ISLAND_RESPAWN.name
-protection.flags.ITEM_DROP.description
-protection.flags.ITEM_DROP.hint
-protection.flags.ITEM_DROP.name
-protection.flags.ITEM_PICKUP.description
-protection.flags.ITEM_PICKUP.hint
-protection.flags.ITEM_PICKUP.name
-protection.flags.JUKEBOX.description
-protection.flags.JUKEBOX.hint
-protection.flags.JUKEBOX.name
-protection.flags.LEASH.description
-protection.flags.LEASH.hint
-protection.flags.LEASH.name
-protection.flags.LEVER.description
-protection.flags.LEVER.hint
-protection.flags.LEVER.name
-protection.flags.LOCK.description
-protection.flags.LOCK.name
-protection.flags.MILKING.description
-protection.flags.MILKING.hint
-protection.flags.MILKING.name
-protection.flags.MONSTER_SPAWN.description
-protection.flags.MONSTER_SPAWN.name
-protection.flags.MOUNT_INVENTORY.description
-protection.flags.MOUNT_INVENTORY.hint
-protection.flags.MOUNT_INVENTORY.name
-protection.flags.NOTE_BLOCK.description
-protection.flags.NOTE_BLOCK.hint
-protection.flags.NOTE_BLOCK.name
-protection.flags.OFFLINE_REDSTONE.description
-protection.flags.OFFLINE_REDSTONE.name
-protection.flags.PISTON_PUSH.description
-protection.flags.PISTON_PUSH.name
-protection.flags.PLACE_BLOCKS.description
-protection.flags.PLACE_BLOCKS.hint
-protection.flags.PLACE_BLOCKS.name
-protection.flags.PORTAL.description
-protection.flags.PORTAL.hint
-protection.flags.PORTAL.name
-protection.flags.PRESSURE_PLATE.description
-protection.flags.PRESSURE_PLATE.hint
-protection.flags.PRESSURE_PLATE.name
-protection.flags.PVP_END.description
-protection.flags.PVP_END.hint
-protection.flags.PVP_END.name
-protection.flags.PVP_NETHER.description
-protection.flags.PVP_NETHER.hint
-protection.flags.PVP_NETHER.name
-protection.flags.PVP_OVERWORLD.description
-protection.flags.PVP_OVERWORLD.hint
-protection.flags.PVP_OVERWORLD.name
-protection.flags.REDSTONE.description
-protection.flags.REDSTONE.hint
-protection.flags.REDSTONE.name
-protection.flags.RIDING.description
-protection.flags.RIDING.hint
-protection.flags.RIDING.name
-protection.flags.REMOVE_MOBS.description
-protection.flags.REMOVE_MOBS.name
-protection.flags.SHEARING.description
-protection.flags.SHEARING.hint
-protection.flags.SHEARING.name
-protection.flags.SPAWN_EGGS.description
-protection.flags.SPAWN_EGGS.hint
-protection.flags.SPAWN_EGGS.name
-protection.flags.TNT.description
-protection.flags.TNT.hint
-protection.flags.TNT.name
-protection.flags.TRADING.description
-protection.flags.TRADING.hint
-protection.flags.TRADING.name
-protection.flags.TRAPDOOR.description
-protection.flags.TRAPDOOR.hint
-protection.flags.TRAPDOOR.name
-protection.locked
-protection.panel.flag-item.allowed_rank
-protection.panel.flag-item.blocked_rank
-protection.panel.flag-item.description-layout
-protection.panel.flag-item.name-layout
-protection.panel.flag-item.menu-layout
-protection.panel.flag-item.minimal_rank
-protection.panel.flag-item.setting-active
-protection.panel.flag-item.setting-disabled
-protection.panel.flag-item.setting-layout
-protection.panel.PROTECTION.description
-protection.panel.PROTECTION.title
-protection.panel.SETTING.description
-protection.panel.SETTING.title
-protection.panel.WORLD_SETTING.description
-protection.panel.WORLD_SETTING.title
-protection.protected
-ranks.admin
-ranks.banned
-ranks.coop
-ranks.member
-ranks.mod
-ranks.owner
-ranks.visitor
-```
diff --git a/pom.xml b/pom.xml
index 7441468da..f4018ab31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,13 +66,13 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <!-- Non-minecraft related dependencies -->
-        <powermock.version>1.7.4</powermock.version>
+        <powermock.version>2.0.2</powermock.version>
         <mongodb.version>3.8.0</mongodb.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
         <bstats.version>1.5</bstats.version>
         <vault.version>1.7</vault.version>
-        <placeholderapi.version>2.10.1</placeholderapi.version>
+        <placeholderapi.version>2.10.3</placeholderapi.version>
         <mvdwplaceholderapi.version>2.5.1-SNAPSHOT</mvdwplaceholderapi.version>
         <githubapi.version>1.0</githubapi.version>
         <!-- Revision variable removes warning about dynamic version -->
@@ -80,7 +80,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.5.3</build.version>
+        <build.version>1.6.0</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
@@ -166,6 +166,10 @@
             <id>dynmap-repo</id>
             <url>http://repo.mikeprimm.com/</url>
         </repository>
+        <repository>
+            <id>worldedit-repo</id>
+            <url>http://maven.sk89q.com/repo/</url>
+        </repository>
     </repositories>
 
 	<dependencies>
@@ -176,12 +180,6 @@
 			<version>${spigot.version}</version>
 			<scope>provided</scope>
 		</dependency>
-        <!-- Some APIs from us :D -->
-        <dependency>
-            <groupId>world.bentobox</groupId>
-            <artifactId>GitHubAPI4Java</artifactId>
-            <version>${githubapi.version}</version>
-        </dependency>
 		<!-- Metrics -->
 		<dependency>
 			<groupId>org.bstats</groupId>
@@ -191,8 +189,8 @@
 		<!-- Mockito (Unit testing) -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<artifactId>mockito-core</artifactId>
+			<version>3.0.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -203,7 +201,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
+			<artifactId>powermock-api-mockito2</artifactId>
 			<version>${powermock.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -243,6 +241,18 @@
             <artifactId>dynmap-api</artifactId>
             <version>3.0-SNAPSHOT</version>
             <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-core</artifactId>
+            <version>7.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Shaded APIs -->
+        <dependency>
+            <groupId>com.github.TheBusyBiscuit</groupId>
+            <artifactId>GitHubWebAPI4Java</artifactId>
+            <version>d5f5e0bbd8</version>
         </dependency>
 		<!-- Static analysis -->
 		<!-- We are using Eclipse's annotations.
@@ -336,7 +346,7 @@
                             <shadedPattern>world.bentobox.bentobox.util.metrics</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>world.bentobox.githubapi4java</pattern>
+                            <pattern>io.github.TheBusyBiscuit.GitHubWebAPI4Java</pattern>
                             <shadedPattern>world.bentobox.bentobox.api.github</shadedPattern>
                         </relocation>
                     </relocations>
diff --git a/src/main/java/world/bentobox/bentobox/BStats.java b/src/main/java/world/bentobox/bentobox/BStats.java
index 6a6bcc664..2c5913d5d 100644
--- a/src/main/java/world/bentobox/bentobox/BStats.java
+++ b/src/main/java/world/bentobox/bentobox/BStats.java
@@ -4,7 +4,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.bstats.bukkit.Metrics;
+
+import org.bukkit.Bukkit;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.flags.Flag;
 
 /**
  * @author Poslovitch
@@ -33,11 +36,14 @@ public class BStats {
     }
 
     private void registerCustomMetrics() {
-        // Simple Pie Charts
+        // Pie Charts
         registerDefaultLanguageChart();
         registerDatabaseTypeChart();
         registerAddonsChart();
         registerGameModeAddonsChart();
+        registerHooksChart();
+        registerPlayersPerServerChart();
+        registerFlagsDisplayModeChart();
 
         // Single Line charts
         registerIslandsCountChart();
@@ -102,4 +108,53 @@ public class BStats {
             return values;
         }));
     }
+
+    /**
+     * Sends the enabled Hooks of this server.
+     * @since 1.6.0
+     */
+    private void registerHooksChart() {
+        metrics.addCustomChart(new Metrics.AdvancedPie("hooks", () -> {
+            Map<String, Integer> values = new HashMap<>();
+            plugin.getHooks().getHooks().forEach(hook -> values.put(hook.getPluginName(), 1));
+            return values;
+        }));
+    }
+
+    /**
+     * Sends the "category" this server is in depending on how many players it has.
+     * @since 1.6.0
+     */
+    private void registerPlayersPerServerChart() {
+        metrics.addCustomChart(new Metrics.SimplePie("playersPerServer", () -> {
+            int players = Bukkit.getOnlinePlayers().size();
+            if (players <= 10) return "0-10";
+            else if (players <= 30) return "11-30";
+            else if (players <= 50) return "31-50";
+            else if (players <= 100) return "51-100";
+            else if (players <= 200) return "101-200";
+            else return "201+";
+        }));
+    }
+
+    /**
+     * Sends the "flags display mode" of all the online players.
+     * @since 1.6.0
+     */
+    private void registerFlagsDisplayModeChart() {
+        metrics.addCustomChart(new Metrics.AdvancedPie("flagsDisplayMode", () -> {
+            Map<String, Integer> values = new HashMap<>();
+
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                Flag.Mode mode = plugin.getPlayers().getFlagsDisplayMode(player.getUniqueId());
+                if (values.containsKey(mode.name())) {
+                    values.put(mode.name(), values.get(mode.name()) + 1);
+                } else {
+                    values.put(mode.name(), 1);
+                }
+            });
+
+            return values;
+        }));
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
index 05eaaefc5..1fedff97b 100644
--- a/src/main/java/world/bentobox/bentobox/BentoBox.java
+++ b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -19,15 +19,15 @@ import world.bentobox.bentobox.api.user.Notifier;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.commands.BentoBoxCommand;
 import world.bentobox.bentobox.hooks.DynmapHook;
-import world.bentobox.bentobox.hooks.placeholders.MVdWPlaceholderAPIHook;
 import world.bentobox.bentobox.hooks.MultiverseCoreHook;
-import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
 import world.bentobox.bentobox.hooks.VaultHook;
+import world.bentobox.bentobox.hooks.WorldEditHook;
+import world.bentobox.bentobox.hooks.placeholders.MVdWPlaceholderAPIHook;
+import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
 import world.bentobox.bentobox.listeners.BannedVisitorCommands;
 import world.bentobox.bentobox.listeners.BlockEndDragon;
 import world.bentobox.bentobox.listeners.DeathListener;
 import world.bentobox.bentobox.listeners.JoinLeaveListener;
-import world.bentobox.bentobox.listeners.NetherTreesListener;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
 import world.bentobox.bentobox.listeners.PortalTeleportationListener;
 import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener;
@@ -52,6 +52,7 @@ import world.bentobox.bentobox.versions.ServerCompatibility;
  * @author tastybento, Poslovitch
  */
 public class BentoBox extends JavaPlugin {
+
     private static BentoBox instance;
 
     // Databases
@@ -85,6 +86,8 @@ public class BentoBox extends JavaPlugin {
     @Nullable
     private BStats metrics;
 
+    private Config<Settings> configObject;
+
     @Override
     public void onEnable(){
         if (!ServerCompatibility.getInstance().checkCompatibility().isCanLaunch()) {
@@ -200,6 +203,7 @@ public class BentoBox extends JavaPlugin {
 
             // Register additional hooks
             hooksManager.registerHook(new DynmapHook());
+            hooksManager.registerHook(new WorldEditHook());
 
             webManager = new WebManager(this);
 
@@ -229,8 +233,6 @@ public class BentoBox extends JavaPlugin {
         manager.registerEvents(new StandardSpawnProtectionListener(this), this);
         // Nether portals
         manager.registerEvents(new PortalTeleportationListener(this), this);
-        // Nether trees conversion
-        manager.registerEvents(new NetherTreesListener(this), this);
         // End dragon blocking
         manager.registerEvents(new BlockEndDragon(this), this);
         // Banned visitor commands
@@ -338,7 +340,8 @@ public class BentoBox extends JavaPlugin {
     public boolean loadSettings() {
         log("Loading Settings from config.yml...");
         // Load settings from config.yml. This will check if there are any issues with it too.
-        settings = new Config<>(this, Settings.class).loadConfigObject();
+        if (configObject == null) configObject = new Config<>(this, Settings.class);
+        settings = configObject.loadConfigObject();
         if (settings == null) {
             // Settings did not load correctly. Disable plugin.
             logError("Settings did not load correctly - disabling plugin - please check config.yml");
@@ -350,7 +353,7 @@ public class BentoBox extends JavaPlugin {
 
     @Override
     public void saveConfig() {
-        if (settings != null) new Config<>(this, Settings.class).saveConfigObject(settings);
+        if (settings != null) configObject.saveConfigObject(settings);
     }
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/Settings.java b/src/main/java/world/bentobox/bentobox/Settings.java
index b9d08c714..18114fb1f 100644
--- a/src/main/java/world/bentobox/bentobox/Settings.java
+++ b/src/main/java/world/bentobox/bentobox/Settings.java
@@ -1,16 +1,13 @@
 package world.bentobox.bentobox;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.ConfigObject;
 import world.bentobox.bentobox.api.configuration.StoreAt;
 import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType;
-import world.bentobox.bentobox.managers.RanksManager;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * All the plugin settings are here
@@ -38,10 +35,11 @@ public class Settings implements ConfigObject {
     private boolean useEconomy = true;
 
     // Database
-    @ConfigComment("JSON, MYSQL, MARIADB (10.2.3+), MONGODB, and YAML(deprecated).")
+    @ConfigComment("JSON, MYSQL, MARIADB (10.2.3+), MONGODB, SQLITE, POSTGRESQL and YAML(deprecated).")
     @ConfigComment("Transition database options are:")
-    @ConfigComment("  YAML2JSON, YAML2MARIADB, YAML2MYSQL")
-    @ConfigComment("  JSON2MARIADB, JSON2MYSQL, MYSQL2JSON")
+    @ConfigComment("  YAML2JSON, YAML2MARIADB, YAML2MYSQL, YAML2MONGODB, YAML2SQLITE")
+    @ConfigComment("  JSON2MARIADB, JSON2MYSQL, JSON2MONGODB, JSON2SQLITE, JSON2POSTGRESQL")
+    @ConfigComment("  MYSQL2JSON, MARIADB2JSON, MONGODB2JSON, SQLITE2JSON, POSTGRESQL2JSON")
     @ConfigComment("If you need others, please make a feature request.")
     @ConfigComment("Transition options enable migration from one database type to another. Use /bbox migrate.")
     @ConfigComment("YAML and JSON are file-based databases.")
@@ -78,10 +76,6 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "general.fakeplayers", experimental = true)
     private Set<String> fakePlayers = new HashSet<>();
 
-    @ConfigComment("Rank required to use a command. e.g., use the invite command. Default is owner rank is required.")
-    @ConfigEntry(path = "general.rank-command")
-    private Map<String, Integer> rankCommand = new HashMap<>();
-
     @ConfigEntry(path = "panel.close-on-click-outside")
     private boolean closePanelOnClickOutside = true;
 
@@ -134,6 +128,11 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "island.confirmation.time")
     private int confirmationTime = 10;
 
+    // Timeout for team kick and leave commands
+    @ConfigComment("Time in seconds that players have to stand still before teleport commands activate, e.g. island go.")
+    @ConfigEntry(path = "island.delay.time")
+    private int delayTime = 0;
+
     @ConfigComment("Ask the player to confirm the command he is using by typing it again.")
     @ConfigEntry(path = "island.confirmation.commands.kick")
     private boolean kickConfirmation = true;
@@ -150,6 +149,13 @@ public class Settings implements ConfigObject {
     @ConfigEntry(path = "island.name.max-length")
     private int nameMaxLength = 20;
 
+    @ConfigComment("Remove hostile mob on teleport box radius")
+    @ConfigComment("If hostile mobs are cleared on player teleport, then this sized box will be cleared")
+    @ConfigComment("around the player. e.g. 5 means a 10 x 10 x 10 box around the player")
+    @ConfigComment("Be careful not to make this too big. Does not cover standard nether or end teleports.")
+    @ConfigEntry(path = "island.clear-radius")
+    private int clearRadius = 5;
+
     @ConfigComment("Number of blocks to paste per tick when pasting blueprints")
     @ConfigComment("Smaller values will help reduce noticeable lag but will make pasting take longer")
     @ConfigEntry(path = "island.paste-speed")
@@ -190,10 +196,10 @@ public class Settings implements ConfigObject {
 
     @ConfigComment("Time in minutes between each connection to the GitHub API.")
     @ConfigComment("This allows for up-to-the-minute information gathering.")
-    @ConfigComment("However, as the GitHub API data does not get updated instantly, this value cannot be set less than 15 minutes.")
+    @ConfigComment("However, as the GitHub API data does not get updated instantly, this value cannot be set to less than 60 minutes.")
     @ConfigComment("Setting this to 0 will make BentoBox download data only at startup.")
     @ConfigEntry(path = "web.github.connection-interval", since = "1.5.0")
-    private int githubConnectionInterval = 60;
+    private int githubConnectionInterval = 120;
 
     @ConfigEntry(path = "web.updater.check-updates.bentobox", since = "1.3.0", hidden = true)
     private boolean checkBentoBoxUpdates = true;
@@ -292,22 +298,6 @@ public class Settings implements ConfigObject {
         this.fakePlayers = fakePlayers;
     }
 
-    public Map<String, Integer> getRankCommand() {
-        return rankCommand;
-    }
-
-    public int getRankCommand(String command) {
-        return rankCommand.getOrDefault(command, RanksManager.OWNER_RANK);
-    }
-
-    public void setRankCommand(String command, int rank) {
-        rankCommand.put(command, rank);
-    }
-
-    public void setRankCommand(Map<String, Integer> rankCommand) {
-        this.rankCommand = rankCommand;
-    }
-
     public boolean isClosePanelOnClickOutside() {
         return closePanelOnClickOutside;
     }
@@ -497,4 +487,33 @@ public class Settings implements ConfigObject {
     public void setLogGithubDownloadData(boolean logGithubDownloadData) {
         this.logGithubDownloadData = logGithubDownloadData;
     }
+
+    public int getDelayTime() {
+        return delayTime;
+    }
+
+    /**
+     * @param delayTime the delayTime to set
+     */
+    public void setDelayTime(int delayTime) {
+        this.delayTime = delayTime;
+    }
+
+    /**
+     * @return the clearRadius
+     */
+    public int getClearRadius() {
+        if (clearRadius < 0) clearRadius = 0;
+        return clearRadius;
+    }
+
+    /**
+     * @param clearRadius the clearRadius to set. Cannot be negative.
+     */
+    public void setClearRadius(int clearRadius) {
+        if (clearRadius < 0) clearRadius = 0;
+        this.clearRadius = clearRadius;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/Addon.java b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java
index 156c3ddef..83827c31e 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/Addon.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java
@@ -1,16 +1,5 @@
 package world.bentobox.bentobox.api.addons;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.event.Listener;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
-import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.managers.IslandsManager;
-import world.bentobox.bentobox.managers.PlayersManager;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +10,18 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Logger;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.event.Listener;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.PlayersManager;
+
 /**
  * Add-on class for BentoBox. Extend this to create an add-on. The operation
  * and methods are very similar to Bukkit's JavaPlugin.
@@ -385,7 +386,7 @@ public abstract class Addon {
 
     /**
      * Register request handler to answer requests from plugins.
-     * @param handler
+     * @param handler request handler
      */
     public void registerRequestHandler(AddonRequestHandler handler) {
         requestHandlers.put(handler.getLabel(), handler);
@@ -393,8 +394,8 @@ public abstract class Addon {
 
     /**
      * Send request to addon.
-     * @param label
-     * @param metaData
+     * @param label label
+     * @param metaData meta data
      * @return request response, null if no response.
      */
     public Object request(String label, Map<String, Object> metaData) {
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
index 66116bd2f..184675b6a 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
@@ -1,18 +1,5 @@
 package world.bentobox.bentobox.api.addons;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.InvalidDescriptionException;
-import org.bukkit.util.permissions.DefaultPermissions;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonFormatException;
-import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonInheritException;
-import world.bentobox.bentobox.managers.AddonsManager;
-
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
@@ -23,12 +10,27 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.plugin.InvalidDescriptionException;
+import org.bukkit.util.permissions.DefaultPermissions;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonFormatException;
+import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonInheritException;
+import world.bentobox.bentobox.managers.AddonsManager;
+
 /**
  * Loads addons and sets up permissions
  * @author Tastybento, ComminQ
  */
 public class AddonClassLoader extends URLClassLoader {
 
+    private static final String DEFAULT = ".default";
     private final Map<String, Class<?>> classes = new HashMap<>();
     private Addon addon;
     private AddonsManager loader;
@@ -70,7 +72,7 @@ public class AddonClassLoader extends URLClassLoader {
         if (data.isConfigurationSection("permissions")) {
             ConfigurationSection perms = data.getConfigurationSection("permissions");
             perms.getKeys(true).forEach(perm -> {
-                if (perms.contains(perm + ".default") && perms.contains(perm + ".description")) {
+                if (perms.contains(perm + DEFAULT) && perms.contains(perm + ".description")) {
                     registerPermission(perms, perm);
                 }
             });
@@ -78,7 +80,11 @@ public class AddonClassLoader extends URLClassLoader {
     }
 
     private void registerPermission(ConfigurationSection perms, String perm) {
-        PermissionDefault pd = PermissionDefault.getByName(perms.getString(perm + ".default"));
+        if (perms.getString(perm + DEFAULT) == null) {
+            Bukkit.getLogger().severe("Permission default is invalid : " + perms.getName());
+            return;
+        }
+        PermissionDefault pd = PermissionDefault.getByName(perms.getString(perm + DEFAULT));
         if (pd == null) {
             Bukkit.getLogger().severe("Permission default is invalid : " + perms.getName());
             return;
@@ -137,7 +143,6 @@ public class AddonClassLoader extends URLClassLoader {
                     result = super.findClass(name);
                 } catch (ClassNotFoundException | NoClassDefFoundError e) {
                     // Do nothing.
-                    result = null;
                 }
                 if (result != null) {
                     loader.setClass(name, result);
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java
index 929817b19..287082cf6 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java
@@ -1,12 +1,12 @@
 package world.bentobox.bentobox.api.addons;
 
-import org.bukkit.Material;
-import org.eclipse.jdt.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.Material;
+import org.eclipse.jdt.annotation.NonNull;
+
 /**
  * @author tastybento, Poslovitch
  */
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
index dc2d8c6e6..0474cb021 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
@@ -39,7 +39,8 @@ public abstract class GameModeAddon extends Addon {
 
     /**
      * Make the worlds for this GameMode in this method. BentoBox will call it
-     * after onLoad() and before onEnable().
+     * after onLoad() and before onEnable(). Do not register flags in this method.
+     * They ,ust be registered afterwards in onEnable()
      * {@link #islandWorld} must be created and assigned,
      * {@link #netherWorld} and {@link #endWorld} are optional and may be null.
      */
@@ -117,10 +118,10 @@ public abstract class GameModeAddon extends Addon {
      * Defines the world generator for this game mode
      * @param worldName - name of world that this applies to
      * @param id - id if any
-     * @return Chunk generator
+     * @return Chunk generator or null if one does not exist, e.g. the use own generator setting is true
      * @since 1.2.0
      */
-    @NonNull
+    @Nullable
     public abstract ChunkGenerator getDefaultWorldGenerator(String worldName, String id);
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java
index d08d7d900..8ac383913 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java
@@ -18,7 +18,7 @@ public class AddonRequestBuilder
 	/**
 	 * Define the addon you wish to request.
 	 *
-	 * @param addonName
+	 * @param addonName addon name
 	 */
 	public AddonRequestBuilder addon(String addonName) {
 		this.addonName = addonName;
@@ -28,7 +28,7 @@ public class AddonRequestBuilder
 	/**
 	 * Define label for addon request.
 	 *
-	 * @param requestLabel
+	 * @param requestLabel request label
 	 */
 	public AddonRequestBuilder label(String requestLabel) {
 		this.requestLabel = requestLabel;
@@ -38,8 +38,8 @@ public class AddonRequestBuilder
 	/**
 	 * Add meta data to addon request.
 	 *
-	 * @param key
-	 * @param value
+	 * @param key key
+	 * @param value value
 	 */
 	public AddonRequestBuilder addMetaData(String key, Object value) {
 		metaData.put(key, value);
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestHandler.java b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestHandler.java
index e4b517b4f..5e2d51506 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestHandler.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestHandler.java
@@ -24,7 +24,7 @@ public abstract class AddonRequestHandler
 	 * This is used only for Addons to respond to addon requests from plugins.
 	 * Example: request island level from Levels addon.
 	 *
-	 * @param metaData
+	 * @param metaData meta data
 	 * @return request response
 	 */
 	public abstract Object handle(Map<String, Object> metaData);
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
index bb19cfd1f..f976af7c9 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
@@ -238,8 +238,8 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
      * Does not traverse the tree of subcommands in args.
      * Event is not fired and it cannot be cancelled.
      * @param user - user calling this command
-     * @param label - label used
-     * @param args - list of args
+     * @param cmdLabel - label used
+     * @param cmdArgs - list of args
      * @return {@code true} if successful, {@code false} if not.
      * @since 1.5.3
      */
@@ -250,7 +250,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
             return false;
         }
         // Check perms, but only if this isn't the console
-        if (user.isPlayer() && !user.isOp() && !getPermission().isEmpty() && !user.hasPermission(getPermission())) {
+        if (user.isPlayer() && !user.isOp() && getPermission() != null && !getPermission().isEmpty() && !user.hasPermission(getPermission())) {
             user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, getPermission());
             return false;
         }
@@ -592,7 +592,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
         if (command.isOnlyPlayer() && !(sender instanceof Player)) {
             return options;
         }
-        if (!command.getPermission().isEmpty() && !sender.hasPermission(command.getPermission()) && !sender.isOp()) {
+        if (command.getPermission() != null && !command.getPermission().isEmpty() && !sender.hasPermission(command.getPermission()) && !sender.isOp()) {
             return options;
         }
         // Add any tab completion from the subcommand
@@ -624,7 +624,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
     @NonNull
     private List<String> getSubCommandLabels(@NonNull CommandSender sender, @NonNull CompositeCommand command) {
         return command.getSubCommands().values().stream()
-                .filter(cmd -> !cmd.isOnlyPlayer() || sender.isOp() || (sender instanceof Player && (cmd.getPermission().isEmpty() || sender.hasPermission(cmd.getPermission()))) )
+                .filter(cmd -> !cmd.isOnlyPlayer() || sender.isOp() || (sender instanceof Player && cmd.getPermission() != null && (cmd.getPermission().isEmpty() || sender.hasPermission(cmd.getPermission()))) )
                 .map(CompositeCommand::getLabel).collect(Collectors.toList());
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/ConfirmableCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/ConfirmableCommand.java
index 5f7ffcc49..69450633f 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/ConfirmableCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/ConfirmableCommand.java
@@ -91,6 +91,11 @@ public abstract class ConfirmableCommand extends CompositeCommand {
         askConfirmation(user, "", confirmed);
     }
 
+    /**
+     * Holds the data to run once the confirmation is given
+     * @author tastybento
+     *
+     */
     private class Confirmer {
         private final String topLabel;
         private final String label;
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommand.java
new file mode 100644
index 000000000..8b120e637
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommand.java
@@ -0,0 +1,155 @@
+package world.bentobox.bentobox.api.commands;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.scheduler.BukkitTask;
+
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * BentoBox Delayed Teleport Command
+ * Adds ability to require the player stays still for a period of time before a command is executed
+ * @author tastybento
+ */
+public abstract class DelayedTeleportCommand extends CompositeCommand implements Listener {
+
+    /**
+     * User monitor map
+     */
+    private static Map<UUID, DelayedCommand> toBeMonitored = new HashMap<>();
+
+    @EventHandler
+    public void onPlayerMove(PlayerMoveEvent e) {
+        UUID uuid = e.getPlayer().getUniqueId();
+        // Only check x,y,z
+        if (toBeMonitored.containsKey(uuid) && !e.getTo().toVector().equals(toBeMonitored.get(uuid).getLocation().toVector())) {
+            // Player moved
+            toBeMonitored.get(uuid).getTask().cancel();
+            toBeMonitored.remove(uuid);
+            // Player has another outstanding confirmation request that will now be cancelled
+            User.getInstance(e.getPlayer()).notify("commands.delay.moved-so-command-cancelled");
+        }
+    }
+
+    /**
+     * Top level command
+     * @param addon - addon creating the command
+     * @param label - string for this command
+     * @param aliases - aliases
+     */
+    public DelayedTeleportCommand(Addon addon, String label, String... aliases) {
+        super(addon, label, aliases);
+        Bukkit.getPluginManager().registerEvents(this, getPlugin());
+    }
+
+    /**
+     * Command to register a command from an addon under a parent command (that could be from another addon)
+     * @param addon - this command's addon
+     * @param parent - parent command
+     * @param aliases - aliases for this command
+     */
+    public DelayedTeleportCommand(Addon addon, CompositeCommand parent, String label, String... aliases ) {
+        super(addon, parent, label, aliases);
+        Bukkit.getPluginManager().registerEvents(this, getPlugin());
+    }
+
+
+    public DelayedTeleportCommand(CompositeCommand parent, String label, String... aliases) {
+        super(parent, label, aliases);
+        Bukkit.getPluginManager().registerEvents(this, getPlugin());
+    }
+
+    /**
+     * Tells user to stand still for a period of time before teleporting
+     * @param user User to tell
+     * @param message Optional message to send to the user to give them a bit more context. It must already be translated.
+     * @param confirmed Runnable to be executed if successfully delayed.
+     */
+    public void delayCommand(User user, String message, Runnable confirmed) {
+        if (getSettings().getDelayTime() < 1) {
+            Bukkit.getScheduler().runTask(getPlugin(), confirmed);
+            return;
+        }
+        // Check for pending delays
+        UUID uuid = user.getUniqueId();
+        if (toBeMonitored.containsKey(uuid)) {
+            // A double request - clear out the old one
+            toBeMonitored.get(uuid).getTask().cancel();
+            toBeMonitored.remove(uuid);
+            // Player has another outstanding confirmation request that will now be cancelled
+            user.sendMessage("commands.delay.previous-command-cancelled");
+        }
+        // Send user the context message if it is not empty
+        if (!message.trim().isEmpty()) {
+            user.sendRawMessage(message);
+        }
+        // Tell user that they need to stand still
+        user.sendMessage("commands.delay.stand-still", "[seconds]", String.valueOf(getSettings().getDelayTime()));
+        // Set up the run task
+        BukkitTask task = Bukkit.getScheduler().runTaskLater(getPlugin(), () -> {
+            Bukkit.getScheduler().runTask(getPlugin(), toBeMonitored.get(uuid).getRunnable());
+            toBeMonitored.remove(uuid);
+        }, getPlugin().getSettings().getDelayTime() * 20L);
+
+        // Add to the monitor
+        toBeMonitored.put(uuid, new DelayedCommand(confirmed, task, user.getLocation()));
+    }
+
+    /**
+     * Tells user to stand still for a period of time before teleporting
+     * @param user User to monitor.
+     * @param command Runnable to be executed if player does not move.
+     */
+    public void delayCommand(User user, Runnable command) {
+        delayCommand(user, "", command);
+    }
+
+    /**
+     * Holds the data to run once the confirmation is given
+     * @author tastybento
+     *
+     */
+    private class DelayedCommand {
+        private final Runnable runnable;
+        private final BukkitTask task;
+        private final Location location;
+
+        /**
+         * @param runnable - runnable to run when confirmed
+         * @param task - task ID to cancel when confirmed
+         * @param location - location
+         */
+        DelayedCommand(Runnable runnable, BukkitTask task, Location location) {
+            this.runnable = runnable;
+            this.task = task;
+            this.location = location;
+        }
+        /**
+         * @return the runnable
+         */
+        public Runnable getRunnable() {
+            return runnable;
+        }
+        /**
+         * @return the task
+         */
+        public BukkitTask getTask() {
+            return task;
+        }
+        /**
+         * @return the location
+         */
+        public Location getLocation() {
+            return location;
+        }
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java
index b18a7b29f..10979c484 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java
@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
+import org.bukkit.util.Vector;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -27,10 +29,10 @@ public class AdminDeleteCommand extends ConfirmableCommand {
 
     @Override
     public boolean canExecute(User user, String label, List<String> args) {
-		if (args.size() != 1) {
-			showHelp(this, user);
-			return false;
-		}
+        if (args.size() != 1) {
+            showHelp(this, user);
+            return false;
+        }
         // Get target
         UUID targetUUID = getPlayers().getUUID(args.get(0));
         if (targetUUID == null) {
@@ -65,10 +67,9 @@ public class AdminDeleteCommand extends ConfirmableCommand {
 
     private void deletePlayer(User user, UUID targetUUID) {
         // Delete player and island
-        user.sendMessage("commands.admin.delete.deleted-island", "[xyz]", Util.xyz(getIslands().getIsland(getWorld(), targetUUID).getCenter().toVector()));
-
         // Get the target's island
         Island oldIsland = getIslands().getIsland(getWorld(), targetUUID);
+        Vector vector = null;
         if (oldIsland != null) {
             // Check if player is online and on the island
             User target = User.getInstance(targetUUID);
@@ -86,10 +87,15 @@ public class AdminDeleteCommand extends ConfirmableCommand {
                     getPlugin().getVault().ifPresent(vault -> vault.withdraw(target, vault.getBalance(target)));
                 }
             }
-            getIslands().deleteIsland(oldIsland, true);
+            vector = oldIsland.getCenter().toVector();
+            getIslands().deleteIsland(oldIsland, true, targetUUID);
         }
         getPlayers().clearHomeLocations(getWorld(), targetUUID);
-        user.sendMessage("general.success");
+        if (vector == null) {
+            user.sendMessage("general.success");
+        } else {
+            user.sendMessage("commands.admin.delete.deleted-island", "[xyz]", Util.xyz(vector));
+        }
     }
 
     @Override
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java
index 4b3e11c23..f5c8970ff 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminEmptyTrashCommand.java
@@ -53,7 +53,7 @@ public class AdminEmptyTrashCommand extends ConfirmableCommand {
         } else {
             this.askConfirmation(user, () -> {
                 getIslands().deleteQuarantinedIslandByUser(getWorld(), targetUUID);
-                user.sendMessage("general.success");
+                user.sendMessage("commands.admin.emptytrash.success");
             });
             return true;
         }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java
index 89d55caf0..cd395783a 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java
@@ -82,7 +82,7 @@ public class AdminRegisterCommand extends ConfirmableCommand {
             Bukkit.getServer().getPluginManager().callEvent(event);
             return true;
         }).orElse(false)) {
-            // Island does not exist
+            // Island does not exist - this is a reservation
             user.sendMessage("commands.admin.register.no-island-here");
             this.askConfirmation(user, () -> {
                 // Make island here
@@ -92,13 +92,13 @@ public class AdminRegisterCommand extends ConfirmableCommand {
                     return;
                 }
                 getIslands().setOwner(user, targetUUID, i);
-                getWorld().getBlockAt(i.getCenter()).setType(Material.BEDROCK);
-                user.sendMessage("commands.admin.register.registered-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
-                user.sendMessage("general.success");
+                i.setReserved(true);
+                i.getCenter().getBlock().setType(Material.BEDROCK);
+                user.sendMessage("commands.admin.register.reserved-island", "[xyz]", Util.xyz(i.getCenter().toVector()));
                 IslandBaseEvent event = IslandEvent.builder()
                         .island(i)
                         .location(i.getCenter())
-                        .reason(IslandEvent.Reason.CREATED)
+                        .reason(IslandEvent.Reason.RESERVED)
                         .involvedPlayer(targetUUID)
                         .admin(true)
                         .build();
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommand.java
index a06e08716..37a0ad99f 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommand.java
@@ -29,7 +29,7 @@ public class AdminResetFlagsCommand extends ConfirmableCommand {
         // Everything's fine, we can set the island as spawn :)
         askConfirmation(user, () -> {
             getIslands().resetAllFlags(getWorld());
-            user.sendMessage("general.success");
+            user.sendMessage("commands.admin.resetflags.success");
         });
         return true;
     }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommand.java
index 0293bbc58..6ced5075d 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommand.java
@@ -6,6 +6,8 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
@@ -18,6 +20,10 @@ import world.bentobox.bentobox.managers.RanksManager;
  */
 public class AdminSetrankCommand extends CompositeCommand {
 
+    private int rankValue;
+    private @Nullable UUID targetUUID;
+    private RanksManager rm;
+
     public AdminSetrankCommand(CompositeCommand adminCommand) {
         super(adminCommand, "setrank");
     }
@@ -28,17 +34,18 @@ public class AdminSetrankCommand extends CompositeCommand {
         setOnlyPlayer(false);
         setParametersHelp("commands.admin.setrank.parameters");
         setDescription("commands.admin.setrank.description");
+        rm = getPlugin().getRanksManager();
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
         if (args.size() != 2) {
             // Show help
             showHelp(this, user);
             return false;
         }
         // Get target player
-        UUID targetUUID = getPlayers().getUUID(args.get(0));
+        targetUUID = getPlayers().getUUID(args.get(0));
         if (targetUUID == null) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
@@ -48,16 +55,23 @@ public class AdminSetrankCommand extends CompositeCommand {
             return false;
         }
         // Get rank
-        RanksManager rm = getPlugin().getRanksManager();
-        int rankValue = rm.getRanks().entrySet().stream()
+        rankValue = rm.getRanks().entrySet().stream()
                 .filter(r -> user.getTranslation(r.getKey()).equalsIgnoreCase(args.get(1))).findFirst()
                 .map(Map.Entry::getValue).orElse(-999);
         if (rankValue < RanksManager.BANNED_RANK) {
             user.sendMessage("commands.admin.setrank.unknown-rank");
             return false;
         }
-        User target = User.getInstance(targetUUID);
+        if (rankValue <= RanksManager.VISITOR_RANK) {
+            user.sendMessage("commands.admin.setrank.not-possible");
+            return false;
+        }
+        return true;
+    }
 
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        User target = User.getInstance(targetUUID);
         Island island = getPlugin().getIslands().getIsland(getWorld(), targetUUID);
         int currentRank = island.getRank(target);
         island.setRank(target, rankValue);
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommand.java
index c56010fc3..1b08f5f51 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommand.java
@@ -75,7 +75,6 @@ public class AdminSetspawnCommand extends ConfirmableCommand {
         }
         getIslands().setSpawn(i);
         i.setSpawnPoint(World.Environment.NORMAL, user.getLocation());
-        user.sendMessage("general.success");
-
+        user.sendMessage("commands.admin.setspawn.success");
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java
new file mode 100644
index 000000000..9c26e0c73
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java
@@ -0,0 +1,86 @@
+package world.bentobox.bentobox.api.commands.admin;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.panels.builders.TabbedPanelBuilder;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
+import world.bentobox.bentobox.panels.settings.WorldDefaultSettingsTab;
+
+/**
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class AdminSettingsCommand extends CompositeCommand {
+
+    private Island island;
+
+    public AdminSettingsCommand(CompositeCommand islandCommand) {
+        super(islandCommand, "settings", "flags", "options");
+    }
+
+    @Override
+    public void setup() {
+        setPermission("admin.settings");
+        setOnlyPlayer(true);
+        setParametersHelp("commands.admin.settings.parameters");
+        setDescription("commands.admin.settings.description");
+    }
+
+    @Override
+    public boolean canExecute(User user, String label, List<String> args) {
+        if (args.size() > 1) {
+            // Show help
+            showHelp(this, user);
+            return false;
+        }
+        if (args.isEmpty()) {
+            // World settings
+            return true;
+        }
+        // Get target player
+        @Nullable UUID targetUUID = getPlayers().getUUID(args.get(0));
+        if (targetUUID == null) {
+            user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
+            return false;
+        }
+        island = getIslands().getIsland(getWorld(), targetUUID);
+        if (island == null || !getPlugin().getIslands().hasIsland(getWorld(), targetUUID)) {
+            user.sendMessage("general.errors.player-has-no-island");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        if (args.isEmpty()) {
+            new TabbedPanelBuilder()
+            .user(user)
+            .world(getWorld())
+            .tab(1, new SettingsTab(getWorld(), user, Flag.Type.WORLD_SETTING))
+            .tab(2, new WorldDefaultSettingsTab(getWorld(), user))
+            .startingSlot(1)
+            .size(54)
+            .build().openPanel();
+            return true;
+        }
+        // Player settings
+        new TabbedPanelBuilder()
+        .user(user)
+        .world(getWorld())
+        .tab(1, new SettingsTab(getWorld(), user, island, Flag.Type.PROTECTION))
+        .tab(2, new SettingsTab(getWorld(), user, island, Flag.Type.SETTING))
+        .startingSlot(1)
+        .size(54)
+        .build().openPanel();
+        return true;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommand.java
index dadc9c2fd..233713dad 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommand.java
@@ -1,11 +1,11 @@
 package world.bentobox.bentobox.api.commands.admin;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.user.User;
 
-import java.util.List;
-
 /**
  * @since 1.5.0
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java
index be08232fb..ddffd9b58 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java
@@ -1,9 +1,11 @@
 package world.bentobox.bentobox.api.commands.admin;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.lang.math.NumberUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
@@ -14,6 +16,7 @@ import world.bentobox.bentobox.database.objects.Island;
 public class AdminSwitchtoCommand extends ConfirmableCommand {
 
     private UUID targetUUID;
+    private @NonNull List<Island> islands;
 
     /**
      * Switch player's island to the numbered one in trash
@@ -22,6 +25,7 @@ public class AdminSwitchtoCommand extends ConfirmableCommand {
      */
     public AdminSwitchtoCommand(CompositeCommand parent) {
         super(parent, "switchto");
+        islands = new ArrayList<>();
     }
 
     @Override
@@ -45,37 +49,35 @@ public class AdminSwitchtoCommand extends ConfirmableCommand {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
+        // Check island number
+        islands = getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID);
+        if (islands.isEmpty()) {
+            user.sendMessage("commands.admin.trash.no-islands-in-trash");
+            return false;
+        }
         return true;
     }
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        // Check island number
-        List<Island> islands = getIslands().getQuarantinedIslandByUser(getWorld(), targetUUID);
-        if (islands.isEmpty()) {
-            user.sendMessage("commands.admin.trash.no-islands-in-trash");
-            return false;
-        } else {
-            // Check number
-            if (NumberUtils.isDigits(args.get(1))) {
-                try {
-                    Integer n = Integer.valueOf(args.get(1));
-                    if (n < 1 || n > islands.size()) {
-                        user.sendMessage("commands.admin.switchto.out-of-range", TextVariables.NUMBER, String.valueOf(islands.size()), TextVariables.LABEL, getTopLabel());
-                        return false;
-                    }
-                    this.askConfirmation(user, () -> {
-                        if (getIslands().switchIsland(getWorld(), targetUUID, islands.get(n -1))) {
-                            user.sendMessage("general.success");
-                        } else {
-                            user.sendMessage("commands.admin.switchto.cannot-switch");
-                        }
-                    });
-                    return true;
-                } catch (Exception e) {
-                    showHelp(this, user);
+        if (NumberUtils.isDigits(args.get(1))) {
+            try {
+                Integer n = Integer.valueOf(args.get(1));
+                if (n < 1 || n > islands.size()) {
+                    user.sendMessage("commands.admin.switchto.out-of-range", TextVariables.NUMBER, String.valueOf(islands.size()), TextVariables.LABEL, getTopLabel());
                     return false;
                 }
+                this.askConfirmation(user, () -> {
+                    if (getIslands().switchIsland(getWorld(), targetUUID, islands.get(n -1))) {
+                        user.sendMessage("commands.admin.switchto.success");
+                    } else {
+                        user.sendMessage("commands.admin.switchto.cannot-switch");
+                    }
+                });
+                return true;
+            } catch (Exception e) {
+                showHelp(this, user);
+                return false;
             }
         }
         return true;
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java
index 96f2aca3c..60684e876 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java
@@ -60,7 +60,6 @@ public class AdminTeleportCommand extends CompositeCommand {
                 .entity(user.getPlayer())
                 .location(warpSpot)
                 .failureMessage(failureMessage)
-                .overrideGamemode(false)
                 .build();
                 return true;
             }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
index d8d065164..fcd55ae2e 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
@@ -63,7 +63,6 @@ public class AdminUnregisterCommand extends ConfirmableCommand {
     private void unregisterPlayer(User user, UUID targetUUID) {
         // Unregister island
         Island oldIsland = getIslands().getIsland(getWorld(), targetUUID);
-        user.sendMessage("commands.admin.unregister.unregistered-island", "[xyz]", Util.xyz(oldIsland.getCenter().toVector()));
         IslandBaseEvent event = IslandEvent.builder()
                 .island(oldIsland)
                 .location(oldIsland.getCenter())
@@ -77,7 +76,7 @@ public class AdminUnregisterCommand extends ConfirmableCommand {
             getIslands().removePlayer(getWorld(), m);
             getPlayers().clearHomeLocations(getWorld(), m);
         });
-        user.sendMessage("general.success");
+        user.sendMessage("commands.admin.unregister.unregistered-island", "[xyz]", Util.xyz(oldIsland.getCenter().toVector()));
     }
 
     @Override
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
index 19a9c2123..7bf510d8f 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
@@ -48,7 +48,7 @@ public class AdminWhyCommand extends ConfirmableCommand {
         }
         // Determine the debug mode and toggle if required
         boolean newValue = !target.getPlayer().getMetadata(getWorld().getName() + "_why_debug").stream()
-                .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false);
+                .filter(p -> getPlugin().equals(p.getOwningPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false);
         if (newValue) {
             user.sendMessage("commands.admin.why.turning-on", TextVariables.NAME, target.getName());
         } else {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCopyCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCopyCommand.java
index 74d8f861b..959db3dc1 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCopyCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCopyCommand.java
@@ -1,11 +1,11 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 
-import java.util.List;
-
 public class AdminBlueprintCopyCommand extends CompositeCommand {
 
     public AdminBlueprintCopyCommand(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintListCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintListCommand.java
index c9aed4db3..23a4ba677 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintListCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintListCommand.java
@@ -1,9 +1,5 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
-import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.managers.BlueprintsManager;
-
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.Arrays;
@@ -11,6 +7,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.managers.BlueprintsManager;
+
 public class AdminBlueprintListCommand extends CompositeCommand {
 
     public AdminBlueprintListCommand(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommand.java
index 1037f9343..aa9e476fd 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommand.java
@@ -1,14 +1,14 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.BlueprintClipboardManager;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 public class AdminBlueprintLoadCommand extends CompositeCommand {
 
     public AdminBlueprintLoadCommand(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintOriginCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintOriginCommand.java
index ae4834bd5..8c56cb93f 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintOriginCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintOriginCommand.java
@@ -1,14 +1,15 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.List;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 
-import java.util.List;
-
 public class AdminBlueprintOriginCommand extends CompositeCommand {
 
     public AdminBlueprintOriginCommand(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPasteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPasteCommand.java
index b21c58ce0..b10d6bbd8 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPasteCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPasteCommand.java
@@ -1,12 +1,12 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 import world.bentobox.bentobox.blueprints.BlueprintPaster;
 
-import java.util.List;
-
 public class AdminBlueprintPasteCommand extends CompositeCommand {
 
     public AdminBlueprintPasteCommand(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos1Command.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos1Command.java
index 34a05a769..eccc5143e 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos1Command.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos1Command.java
@@ -1,12 +1,12 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.List;
-
 public class AdminBlueprintPos1Command extends CompositeCommand {
 
     public AdminBlueprintPos1Command(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos2Command.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos2Command.java
index a46e3a2cc..3aa89d375 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos2Command.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintPos2Command.java
@@ -1,12 +1,12 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.List;
-
 public class AdminBlueprintPos2Command extends CompositeCommand {
 
     public AdminBlueprintPos2Command(AdminBlueprintCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java
index 7a7bf4031..bbb4c1462 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java
@@ -1,5 +1,9 @@
 package world.bentobox.bentobox.api.commands.admin.blueprints;
 
+import java.io.File;
+import java.util.List;
+import java.util.Locale;
+
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.user.User;
@@ -7,10 +11,6 @@ import world.bentobox.bentobox.blueprints.BlueprintClipboard;
 import world.bentobox.bentobox.managers.BlueprintClipboardManager;
 import world.bentobox.bentobox.managers.BlueprintsManager;
 
-import java.io.File;
-import java.util.List;
-import java.util.Locale;
-
 public class AdminBlueprintSaveCommand extends ConfirmableCommand {
 
     public AdminBlueprintSaveCommand(AdminBlueprintCommand parent) {
@@ -34,6 +34,11 @@ public class AdminBlueprintSaveCommand extends ConfirmableCommand {
         BlueprintClipboard clipboard = parent.getClipboards().computeIfAbsent(user.getUniqueId(), v -> new BlueprintClipboard());
         String fileName = args.get(0).toLowerCase(Locale.ENGLISH);
         if (clipboard.isFull()) {
+            // Check if blueprint had bedrock
+            if (clipboard.getBlueprint().getBedrock() == null) {
+                user.sendMessage("commands.admin.blueprint.bedrock-required");
+                return false;
+            }
             // Check if file exists
             File newFile = new File(parent.getBlueprintsFolder(), fileName + BlueprintsManager.BLUEPRINT_SUFFIX);
             if (newFile.exists()) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsResetCommand.java
index 7749153b9..4913fc55e 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsResetCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsResetCommand.java
@@ -1,13 +1,14 @@
 package world.bentobox.bentobox.api.commands.admin.deaths;
 
-import org.eclipse.jdt.annotation.NonNull;
-import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
-
 import java.util.List;
 import java.util.UUID;
 
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+
 /**
  * @author Poslovitch
  */
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsSetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsSetCommand.java
index 5a2e4cce9..041fbc4a3 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsSetCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsSetCommand.java
@@ -1,14 +1,15 @@
 package world.bentobox.bentobox.api.commands.admin.deaths;
 
-import org.apache.commons.lang.math.NumberUtils;
-import org.eclipse.jdt.annotation.NonNull;
-import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
-
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.lang.math.NumberUtils;
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+
 /**
  * @author Poslovitch
  */
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java
new file mode 100644
index 000000000..cf1bd6b92
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java
@@ -0,0 +1,157 @@
+package world.bentobox.bentobox.api.commands.admin.purge;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeletedEvent;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+
+public class AdminPurgeCommand extends CompositeCommand implements Listener {
+
+    private int count;
+    private boolean inPurge;
+    private boolean toBeConfirmed;
+    private Iterator<String> it;
+    private User user;
+    private Set<String> islands = new HashSet<>();
+
+    public AdminPurgeCommand(CompositeCommand parent) {
+        super(parent, "purge");
+        getAddon().registerListener(this);
+    }
+
+    @Override
+    public void setup() {
+        setPermission("admin.purge");
+        setOnlyPlayer(false);
+        setParametersHelp("commands.admin.purge.parameters");
+        setDescription("commands.admin.purge.description");
+        new AdminPurgeStopCommand(this);
+        new AdminPurgeUnownedCommand(this);
+        new AdminPurgeProtectCommand(this);
+    }
+
+    @Override
+    public boolean canExecute(User user, String label, List<String> args) {
+        if (inPurge) {
+            user.sendMessage("commands.admin.purge.purge-in-progress");
+            return false;
+        }
+        if (args.isEmpty()) {
+            // Show help
+            showHelp(this, user);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        if (args.get(0).equalsIgnoreCase("confirm") && toBeConfirmed && this.user.equals(user)) {
+            removeIslands();
+            return true;
+        }
+        // Clear tbc
+        toBeConfirmed = false;
+        islands.clear();
+        this.user = user;
+        try {
+            Integer days = Integer.parseInt(args.get(0));
+            if (days < 1) {
+                user.sendMessage("commands.admin.purge.days-one-or-more");
+                return false;
+            }
+            islands = getOldIslands(days);
+            user.sendMessage("commands.admin.purge.purgable-islands", TextVariables.NUMBER, String.valueOf(islands.size()));
+            if (!islands.isEmpty()) {
+                toBeConfirmed = true;
+                user.sendMessage("commands.admin.purge.confirm", TextVariables.LABEL, this.getTopLabel());
+                return false;
+            }
+        } catch(Exception e) {
+            user.sendMessage("commands.admin.purge.number-error");
+            return false;
+        }
+        return true;
+    }
+
+    void removeIslands() {
+        inPurge = true;
+        user.sendMessage("commands.admin.purge.see-console-for-status");
+        it = islands.iterator();
+        count = 0;
+        // Delete first island
+        deleteIsland();
+    }
+
+    private void deleteIsland() {
+        if (it.hasNext()) {
+            getIslands().getIslandById(it.next()).ifPresent(i -> {
+                getIslands().deleteIsland(i, true, null);
+                count++;
+                getPlugin().log(count + " islands purged");
+            });
+        } else {
+            user.sendMessage("commands.admin.purge.completed");
+            inPurge = false;
+        }
+
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    void onIslandDeleted(IslandDeletedEvent e) {
+        if (inPurge) {
+            deleteIsland();
+        }
+    }
+
+    Set<String> getOldIslands(int days) {
+        return getPlugin().getIslands().getIslands().stream()
+                .filter(i -> !i.getPurgeProtected())
+                .filter(i -> i.getWorld().equals(this.getWorld()))
+                .filter(i -> i.getOwner() != null)
+                .filter(i -> i.getMembers().size() == 1)
+                .filter(i -> (System.currentTimeMillis() - Bukkit.getOfflinePlayer(i.getOwner()).getLastPlayed()) > days * 1000 * 24 * 3600)
+                .map(Island::getUniqueId)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * @return the inPurge
+     */
+    boolean isInPurge() {
+        return inPurge;
+    }
+
+    /**
+     * Stop the purge
+     */
+    void stop() {
+        inPurge = false;
+    }
+
+    /**
+     * @param user the user to set
+     */
+    void setUser(User user) {
+        this.user = user;
+    }
+
+    /**
+     * @param islands the islands to set
+     */
+    void setIslands(Set<String> islands) {
+        this.islands = islands;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeProtectCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeProtectCommand.java
new file mode 100644
index 000000000..688b9a81d
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeProtectCommand.java
@@ -0,0 +1,53 @@
+package world.bentobox.bentobox.api.commands.admin.purge;
+
+import java.util.List;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+
+public class AdminPurgeProtectCommand extends CompositeCommand {
+
+    private Island island;
+
+    public AdminPurgeProtectCommand(CompositeCommand parent) {
+        super(parent, "protect");
+    }
+
+    @Override
+    public void setup() {
+        setPermission("admin.purge");
+        setOnlyPlayer(true);
+        setDescription("commands.admin.purge.protect.description");
+    }
+
+    @Override
+    public boolean canExecute(User user, String label, List<String> args) {
+        if (!args.isEmpty()) {
+            // Show help
+            showHelp(this, user);
+            return false;
+        }
+        // Get island where the player is
+        if (!getIslands().getIslandAt(user.getLocation()).map(i -> {
+            island = i;
+            return true;
+        }).orElse(false)) {
+            user.sendMessage("commands.admin.purge.protect.move-to-island");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        island.setPurgeProtected(!island.getPurgeProtected());
+        if (island.getPurgeProtected()) {
+            user.sendMessage("commands.admin.purge.protect.protecting");
+        } else {
+            user.sendMessage("commands.admin.purge.protect.unprotecting");
+        }
+        return true;
+
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeStopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeStopCommand.java
new file mode 100644
index 000000000..e8da54a9e
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeStopCommand.java
@@ -0,0 +1,38 @@
+package world.bentobox.bentobox.api.commands.admin.purge;
+
+import java.util.List;
+
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+
+public class AdminPurgeStopCommand extends CompositeCommand {
+
+    public AdminPurgeStopCommand(CompositeCommand parent) {
+        super(parent, "stop", "cancel");
+    }
+
+    @Override
+    public void setup() {
+        setPermission("admin.purge");
+        setOnlyPlayer(false);
+        setDescription("commands.admin.purge.stop.description");
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        if (!args.isEmpty()) {
+            // Show help
+            showHelp(this, user);
+            return false;
+        }
+        AdminPurgeCommand parentCommand = ((AdminPurgeCommand)getParent());
+        if (parentCommand.isInPurge()) {
+            user.sendMessage("commands.admin.purge.stop.stopping");
+            parentCommand.stop();
+            return true;
+        } else {
+            user.sendMessage("commands.admin.purge.stop.no-purge-in-progress");
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java
new file mode 100644
index 000000000..ec2cf3ae7
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java
@@ -0,0 +1,60 @@
+package world.bentobox.bentobox.api.commands.admin.purge;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import world.bentobox.bentobox.api.commands.ConfirmableCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+
+public class AdminPurgeUnownedCommand extends ConfirmableCommand {
+
+    public AdminPurgeUnownedCommand(AdminPurgeCommand parent) {
+        super(parent, "unowned");
+    }
+
+    @Override
+    public void setup() {
+        setPermission("admin.purge");
+        setOnlyPlayer(false);
+        setParametersHelp("commands.admin.purge.unowned.parameters");
+        setDescription("commands.admin.purge.unowned.description");
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        if (!args.isEmpty()) {
+            // Show help
+            showHelp(this, user);
+            return false;
+        }
+        AdminPurgeCommand parentCommand = ((AdminPurgeCommand)getParent());
+        if (parentCommand.isInPurge()) {
+            user.sendMessage("commands.admin.purge.purge-in-progress");
+            return false;
+        }
+        Set<String> unowned = getUnownedIslands();
+        user.sendMessage("commands.admin.purge.unowned.unowned-islands", TextVariables.NUMBER, String.valueOf(unowned.size()));
+        if (!unowned.isEmpty()) {
+            this.askConfirmation(user, () -> {
+                parentCommand.setUser(user);
+                parentCommand.setIslands(unowned);
+                parentCommand.removeIslands();
+            });
+        }
+        return true;
+    }
+
+    Set<String> getUnownedIslands() {
+        return getPlugin().getIslands().getIslands().stream()
+                .filter(i -> !i.getPurgeProtected())
+                .filter(i -> i.getWorld().equals(this.getWorld()))
+                .filter(i -> i.getOwner() == null)
+                .map(Island::getUniqueId)
+                .collect(Collectors.toSet());
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsResetCommand.java
index 67fdac122..5ce82eb09 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsResetCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsResetCommand.java
@@ -1,6 +1,9 @@
 package world.bentobox.bentobox.api.commands.admin.resets;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -24,7 +27,7 @@ public class AdminResetsResetCommand extends ConfirmableCommand {
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        if (args.isEmpty() || args.size() != 1) {
+        if (args.size() != 1) {
             showHelp(this, user);
             return false;
         }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
index 9ac9c456d..d70775827 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
@@ -1,6 +1,10 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
@@ -8,9 +12,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 public class AdminTeamAddCommand extends CompositeCommand {
 
     public AdminTeamAddCommand(CompositeCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java
index bde266c25..4172153e8 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java
@@ -1,6 +1,10 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
@@ -8,9 +12,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 public class AdminTeamDisbandCommand extends CompositeCommand {
 
     public AdminTeamDisbandCommand(CompositeCommand parent) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java
index c74f4a3ba..c489a1a81 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java
@@ -1,7 +1,11 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
@@ -9,9 +13,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 /**
  * Kicks the specified player from the island team.
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
index 00150da3d..007b56d68 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java
@@ -1,6 +1,10 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
@@ -8,9 +12,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 /**
  * Sets the owner of an island.
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java
index 86549e1fc..a19b574ad 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java
@@ -1,9 +1,16 @@
 package world.bentobox.bentobox.api.commands.island;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
@@ -12,13 +19,10 @@ import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 public class IslandBanCommand extends CompositeCommand {
 
+    private @Nullable User target;
+
     public IslandBanCommand(CompositeCommand islandCommand) {
         super(islandCommand, "ban");
     }
@@ -33,7 +37,7 @@ public class IslandBanCommand extends CompositeCommand {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
         if (args.size() != 1) {
             // Show help
             showHelp(this, user);
@@ -47,7 +51,7 @@ public class IslandBanCommand extends CompositeCommand {
         }
         // Check rank to use command
         Island island = getIslands().getIsland(getWorld(), user);
-        if (island.getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -73,12 +77,19 @@ public class IslandBanCommand extends CompositeCommand {
         if (getSettings().getBanCooldown() > 0 && checkCooldown(user, island.getUniqueId(), targetUUID.toString())) {
             return false;
         }
-        User target = User.getInstance(targetUUID);
+        target = User.getInstance(targetUUID);
         // Cannot ban ops
-        if (target.hasPermission(getAddon().getPermissionPrefix() + "admin.noban")) {
+        if (target.isOp() || (target.isOnline() && target.hasPermission(
+                getAddon()
+                .getPermissionPrefix() + "admin.noban"))) {
             user.sendMessage("commands.island.ban.cannot-ban");
             return false;
         }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
         // Finished error checking - start the banning
         return ban(user, target);
     }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommand.java
index 6da5161b1..464c8d0bb 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommand.java
@@ -11,6 +11,8 @@ import world.bentobox.bentobox.database.objects.Island;
 
 public class IslandBanlistCommand extends CompositeCommand {
 
+    private Island island;
+
     public IslandBanlistCommand(CompositeCommand islandCommand) {
         super(islandCommand, "banlist", "banned", "bans");
     }
@@ -23,18 +25,28 @@ public class IslandBanlistCommand extends CompositeCommand {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
         if (!args.isEmpty()) {
             // Show help
             showHelp(this, user);
             return false;
-        } 
-        // Player issuing the command must have an island       
-        if (!getIslands().hasIsland(getWorld(), user.getUniqueId())) {
-            user.sendMessage("general.errors.no-island");
-            return false; 
         }
-        Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
+        // Player issuing the command must have an island
+        if (!getIslands().hasIsland(getWorld(), user.getUniqueId()) && !getIslands().inTeam(getWorld(), user.getUniqueId())) {
+            user.sendMessage("general.errors.no-island");
+            return false;
+        }
+        // Check rank to use command
+        island = getIslands().getIsland(getWorld(), user.getUniqueId());
+        if (island.getRank(user) < island.getRankCommand("ban")) {
+            user.sendMessage("general.errors.no-permission");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
         // Show all the players banned on the island
         if (island.getBanned().isEmpty()) {
             user.sendMessage("commands.island.banlist.noone");
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java
index 1c1694d13..bda0c962f 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java
@@ -3,10 +3,13 @@ package world.bentobox.bentobox.api.commands.island;
 import java.io.IOException;
 import java.util.List;
 
+import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.BlueprintsManager;
 import world.bentobox.bentobox.managers.island.NewIsland;
 import world.bentobox.bentobox.panels.IslandCreationPanel;
@@ -36,8 +39,15 @@ public class IslandCreateCommand extends CompositeCommand {
 
     @Override
     public boolean canExecute(User user, String label, List<String> args) {
-        if (getIslands().hasIsland(getWorld(), user.getUniqueId())
-                || getIslands().inTeam(getWorld(), user.getUniqueId())) {
+        // Check if the island is reserved
+        @Nullable
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island != null) {
+            // Reserved islands can be made
+            if (island.isReserved()) {
+                return true;
+            }
+            // You cannot make an island
             user.sendMessage("general.errors.already-have-island");
             return false;
         }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java
index 0f5c0557b..44897de94 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java
@@ -1,7 +1,11 @@
 package world.bentobox.bentobox.api.commands.island;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Sound;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
@@ -9,9 +13,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 /**
  * @author tastybento
  * @since 1.4.0
@@ -19,7 +20,7 @@ import java.util.UUID;
 public class IslandExpelCommand extends CompositeCommand {
 
     private static final String CANNOT_EXPEL = "commands.island.expel.cannot-expel";
-    private static final String SUCCESS = "general.success";
+    private static final String SUCCESS = "commands.island.expel.success";
 
     private @Nullable User target;
 
@@ -50,7 +51,8 @@ public class IslandExpelCommand extends CompositeCommand {
             return false;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -110,13 +112,13 @@ public class IslandExpelCommand extends CompositeCommand {
         island.getWorld().playSound(target.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1F, 1F);
         if (getIslands().hasIsland(getWorld(), target)) {
             // Success
-            user.sendMessage(SUCCESS);
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
             // Teleport home
             getIslands().homeTeleport(getWorld(), target.getPlayer());
             return true;
         } else if (getIslands().getSpawn(getWorld()).isPresent()){
             // Success
-            user.sendMessage(SUCCESS);
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
             getIslands().spawnTeleport(getWorld(), target.getPlayer());
             return true;
         } else if (getIWM().getAddon(getWorld())
@@ -126,7 +128,7 @@ public class IslandExpelCommand extends CompositeCommand {
                 .orElse(false)
                 && target.performCommand(this.getTopLabel() + " create")) {
             getAddon().logWarning("Expel: " + target.getName() + " had no island, so one was created");
-            user.sendMessage(SUCCESS);
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
             return true;
         }
 
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java
index f8add9c36..3c1e2c191 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandGoCommand.java
@@ -1,18 +1,20 @@
 package world.bentobox.bentobox.api.commands.island;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.math.NumberUtils;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.commands.DelayedTeleportCommand;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 
 /**
  * @author tastybento
  */
-public class IslandGoCommand extends CompositeCommand {
+public class IslandGoCommand extends DelayedTeleportCommand {
 
     public IslandGoCommand(CompositeCommand islandCommand) {
         super(islandCommand, "go", "home", "h");
@@ -27,27 +29,38 @@ public class IslandGoCommand extends CompositeCommand {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
-        if (getIslands().getIsland(getWorld(), user.getUniqueId()) == null) {
+    public boolean canExecute(User user, String label, List<String> args) {
+        // Check if the island is reserved
+        Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
+        if (island == null) {
             user.sendMessage("general.errors.no-island");
             return false;
         }
+        if (island.isReserved()) {
+            // Send player to create an island
+            getParent().getSubCommand("create").ifPresent(createCmd -> createCmd.call(user, createCmd.getLabel(), Collections.emptyList()));
+            return false;
+        }
         if ((getIWM().inWorld(user.getWorld()) && Flags.PREVENT_TELEPORT_WHEN_FALLING.isSetForWorld(user.getWorld()))
-            && user.getPlayer().getFallDistance() > 0) {
-			// We're sending the "hint" to the player to tell them they cannot teleport while falling.
+                && user.getPlayer().getFallDistance() > 0) {
+            // We're sending the "hint" to the player to tell them they cannot teleport while falling.
             user.sendMessage(Flags.PREVENT_TELEPORT_WHEN_FALLING.getHintReference());
             return false;
         }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
         if (!args.isEmpty() && NumberUtils.isDigits(args.get(0))) {
             int homeValue = Integer.parseInt(args.get(0));
             int maxHomes = user.getPermissionValue(getPermissionPrefix() + "island.maxhomes", getIWM().getMaxHomes(getWorld()));
             if (homeValue > 1 && homeValue <= maxHomes) {
-                getIslands().homeTeleport(getWorld(), user.getPlayer(), homeValue);
-                user.sendMessage("commands.island.go.tip", TextVariables.LABEL, getTopLabel());
+                this.delayCommand(user, () -> getIslands().homeTeleport(getWorld(), user.getPlayer(), homeValue));
                 return true;
             }
         }
-        getIslands().homeTeleport(getWorld(), user.getPlayer());
+        this.delayCommand(user, () -> getIslands().homeTeleport(getWorld(), user.getPlayer()));
         return true;
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java
index 04a262f3a..046cc8651 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.util.List;
 
 import org.bukkit.entity.Player;
-
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java
index 69c1659e6..a99386bee 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSetnameCommand.java
@@ -60,7 +60,7 @@ public class IslandSetnameCommand extends CompositeCommand {
         }
 
         // Set the name
-        if (user.hasPermission(this.getPermissionPrefix() + ".island.name.format")) {
+        if (user.hasPermission(this.getPermissionPrefix() + "island.name.format")) {
             getIslands().getIsland(getWorld(), playerUUID).setName(ChatColor.translateAlternateColorCodes('&', name));
         } else {
             getIslands().getIsland(getWorld(), playerUUID).setName(name);
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java
index 994ea6fba..2a064e117 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandSettingsCommand.java
@@ -4,12 +4,14 @@ import java.util.List;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.panels.builders.TabbedPanelBuilder;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.panels.SettingsPanel;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
 import world.bentobox.bentobox.util.Util;
 
 /**
- * @author Poslovitch
+ * @author tastybento
  */
 public class IslandSettingsCommand extends CompositeCommand {
 
@@ -37,7 +39,15 @@ public class IslandSettingsCommand extends CompositeCommand {
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        SettingsPanel.openPanel(getPlugin(), user, Flag.Type.PROTECTION, getWorld(), 0);
+        Island island = getIslands().getIslandAt(user.getLocation()).orElse(getIslands().getIsland(user.getWorld(), user.getUniqueId()));
+        new TabbedPanelBuilder()
+        .user(user)
+        .world(getWorld())
+        .tab(1, new SettingsTab(getWorld(), user, island, Flag.Type.PROTECTION))
+        .tab(2, new SettingsTab(getWorld(), user, island, Flag.Type.SETTING))
+        .startingSlot(1)
+        .size(54)
+        .build().openPanel();
         return true;
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java
index 6e764dc2a..ca84e1b88 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java
@@ -1,5 +1,10 @@
 package world.bentobox.bentobox.api.commands.island;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
@@ -8,11 +13,6 @@ import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 public class IslandUnbanCommand extends CompositeCommand {
 
     public IslandUnbanCommand(CompositeCommand islandCommand) {
@@ -42,7 +42,8 @@ public class IslandUnbanCommand extends CompositeCommand {
             return false;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
index 3db356d8e..61bb99cb5 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
@@ -49,7 +49,7 @@ public class IslandTeamCoopCommand extends CompositeCommand {
         }
         // Check rank to use command
         Island island = getIslands().getIsland(getWorld(), user);
-        if (island.getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -81,7 +81,7 @@ public class IslandTeamCoopCommand extends CompositeCommand {
         Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             island.setRank(target, RanksManager.COOP_RANK);
-            user.sendMessage("general.success");
+            user.sendMessage("commands.island.team.coop.success", TextVariables.NAME, target.getName());
             target.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, user.getName());
             return true;
         } else {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
index a7e1058c8..f17237c46 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
@@ -89,7 +89,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
             getIslands().homeTeleport(getWorld(), user.getPlayer());
             // Delete the old island
             if (island != null) {
-                getIslands().deleteIsland(island, true);
+                getIslands().deleteIsland(island, true, user.getUniqueId());
             }
             // TODO Set the cooldown
             // Reset deaths
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
index 4e1b65831..d4dc084e5 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
@@ -17,6 +17,7 @@ import world.bentobox.bentobox.api.events.IslandBaseEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
 
 public class IslandTeamInviteCommand extends CompositeCommand {
@@ -36,19 +37,21 @@ public class IslandTeamInviteCommand extends CompositeCommand {
         setConfigurableRankCommand();
     }
 
+
     @Override
-    public boolean execute(User user, String label, List<String> args) {
-        UUID playerUUID = user.getUniqueId();
+    public boolean canExecute(User user, String label, List<String> args) {
         // Player issuing the command must have an island or be in a team
         if (!getIslands().inTeam(getWorld(), user.getUniqueId()) && !getIslands().hasIsland(getWorld(), user.getUniqueId())) {
             user.sendMessage("general.errors.no-island");
             return false;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
+        UUID playerUUID = user.getUniqueId();
         if (args.isEmpty() || args.size() > 1) {
             // Invite label with no name, i.e., /island invite - tells the player who has invited them so far
             if (inviteList.containsKey(playerUUID)) {
@@ -59,34 +62,41 @@ public class IslandTeamInviteCommand extends CompositeCommand {
             // Show help
             showHelp(this, user);
             return false;
-        } else  {
-            // Only online players can be invited
-            UUID invitedPlayerUUID = getPlayers().getUUID(args.get(0));
-            if (invitedPlayerUUID == null) {
-                user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
-                return false;
-            }
-            User invitedPlayer = User.getInstance(invitedPlayerUUID);
-            if (!invitedPlayer.isOnline()) {
-                user.sendMessage("general.errors.offline-player");
-                return false;
-            }
-            // Player cannot invite themselves
-            if (playerUUID.equals(invitedPlayerUUID)) {
-                user.sendMessage("commands.island.team.invite.errors.cannot-invite-self");
-                return false;
-            }
-            // Check cool down
-            if (getSettings().getInviteCooldown() > 0 && checkCooldown(user, getIslands().getIsland(getWorld(), user).getUniqueId(), invitedPlayerUUID.toString())) {
-                return false;
-            }
-            // Player cannot invite someone already on a team
-            if (getIslands().inTeam(getWorld(), invitedPlayerUUID)) {
-                user.sendMessage("commands.island.team.invite.errors.already-on-team");
-                return false;
-            }
-            return invite(user,invitedPlayer);
         }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        UUID playerUUID = user.getUniqueId();
+
+        // Only online players can be invited
+        UUID invitedPlayerUUID = getPlayers().getUUID(args.get(0));
+        if (invitedPlayerUUID == null) {
+            user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
+            return false;
+        }
+        User invitedPlayer = User.getInstance(invitedPlayerUUID);
+        if (!invitedPlayer.isOnline()) {
+            user.sendMessage("general.errors.offline-player");
+            return false;
+        }
+        // Player cannot invite themselves
+        if (playerUUID.equals(invitedPlayerUUID)) {
+            user.sendMessage("commands.island.team.invite.errors.cannot-invite-self");
+            return false;
+        }
+        // Check cool down
+        if (getSettings().getInviteCooldown() > 0 && checkCooldown(user, getIslands().getIsland(getWorld(), user).getUniqueId(), invitedPlayerUUID.toString())) {
+            return false;
+        }
+        // Player cannot invite someone already on a team
+        if (getIslands().inTeam(getWorld(), invitedPlayerUUID)) {
+            user.sendMessage("commands.island.team.invite.errors.already-on-team");
+            return false;
+        }
+        return invite(user,invitedPlayer);
+
     }
 
     private boolean invite(User user, User invitedPlayer) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
index f57d8dfc0..0a3d0e0bb 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
@@ -1,6 +1,10 @@
 package world.bentobox.bentobox.api.commands.island.team;
 
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
@@ -9,9 +13,6 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 
-import java.util.List;
-import java.util.UUID;
-
 
 public class IslandTeamKickCommand extends ConfirmableCommand {
 
@@ -38,6 +39,12 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
             user.sendMessage("general.errors.not-owner");
             return false;
         }
+        // Check rank to use command
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
+            user.sendMessage("general.errors.no-permission");
+            return false;
+        }
         // If args are not right, show help
         if (args.size() != 1) {
             showHelp(this, user);
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java
index 0266a74e9..4c5577aee 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java
@@ -94,7 +94,7 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand {
             // Notify how many resets are left
             showResets(user);
         }
-        user.sendMessage("general.success");
+        user.sendMessage("commands.island.team.leave.success");
         // Fire event
         IslandBaseEvent e = TeamEvent.builder()
                 .island(island)
@@ -103,5 +103,4 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand {
                 .build();
         Bukkit.getServer().getPluginManager().callEvent(e);
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java
index b65344d4f..39f92b300 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java
@@ -5,6 +5,7 @@ import java.util.List;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.RanksManager;
 
 public class IslandTeamPromoteCommand extends CompositeCommand {
@@ -24,6 +25,7 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
             setParametersHelp("commands.island.team.demote.parameters");
             setDescription("commands.island.team.demote.description");
         }
+        this.setConfigurableRankCommand();
     }
 
     @Override
@@ -33,7 +35,8 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
             return true;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -49,6 +52,11 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return true;
         }
+        // Check if the user is not trying to promote/ demote himself
+        if (target == user) {
+            user.sendMessage("commands.island.team.demote.errors.cant-demote-yourself");
+            return true;
+        }
         if (!inTeam(getWorld(), target) || !getOwner(getWorld(), user).equals(getOwner(getWorld(), target))) {
             user.sendMessage("general.errors.not-in-team");
             return true;
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
index 59f2a922d..670796624 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
@@ -45,7 +45,7 @@ public class IslandTeamTrustCommand extends CompositeCommand {
         }
         // Check rank to use command
         Island island = getIslands().getIsland(getWorld(), user);
-        if (island.getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -77,7 +77,7 @@ public class IslandTeamTrustCommand extends CompositeCommand {
         Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             island.setRank(target, RanksManager.TRUSTED_RANK);
-            user.sendMessage("general.success");
+            user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName());
             target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName());
             return true;
         } else {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java
index 08dd0a7dc..138bb3aa1 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java
@@ -48,7 +48,8 @@ public class IslandTeamUncoopCommand extends CompositeCommand {
             return false;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -81,7 +82,7 @@ public class IslandTeamUncoopCommand extends CompositeCommand {
         Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             island.removeMember(targetUUID);
-            user.sendMessage("general.success");
+            user.sendMessage("commands.island.team.uncoop.success", TextVariables.NAME, target.getName());
             target.sendMessage("commands.island.team.uncoop.you-are-no-longer-a-coop-member", TextVariables.NAME, user.getName());
             // Set cooldown
             if (getSettings().getCoopCooldown() > 0 && getParent() != null) {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java
index c4582e421..3c3dd7a6c 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommand.java
@@ -48,7 +48,8 @@ public class IslandTeamUntrustCommand extends CompositeCommand {
             return false;
         }
         // Check rank to use command
-        if (getIslands().getIsland(getWorld(), user).getRank(user) < getPlugin().getSettings().getRankCommand(getUsage())) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island.getRank(user) < island.getRankCommand(getUsage())) {
             user.sendMessage("general.errors.no-permission");
             return false;
         }
@@ -81,7 +82,7 @@ public class IslandTeamUntrustCommand extends CompositeCommand {
         Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             island.removeMember(targetUUID);
-            user.sendMessage("general.success");
+            user.sendMessage("commands.island.team.untrust.success", TextVariables.NAME, target.getName());
             target.sendMessage("commands.island.team.untrust.you-are-no-longer-trusted", TextVariables.NAME, user.getName());
             // Set cooldown
             if (getSettings().getTrustCooldown() > 0 && getParent() != null) {
diff --git a/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java b/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java
index 395cf093f..9ad5b2130 100644
--- a/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java
+++ b/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java
@@ -171,11 +171,6 @@ public interface WorldSettings extends ConfigObject {
      */
     boolean isNetherIslands();
 
-    /**
-     * @return the netherTrees
-     */
-    boolean isNetherTrees();
-
     /**
      * @return the onJoinResetEnderChest
      */
@@ -251,6 +246,12 @@ public interface WorldSettings extends ConfigObject {
      */
     boolean isDeathsCounted();
 
+    /**
+     * @return true if deaths in the world are reset when the player has a new island
+     * @since 1.6.0
+     */
+    boolean isDeathsResetOnNewIsland();
+
     /**
      * @return whether a player can set their home in the Nether or not.
      */
diff --git a/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java b/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java
index 08080bd50..75c07773c 100644
--- a/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java
+++ b/src/main/java/world/bentobox/bentobox/api/events/OfflineMessageEvent.java
@@ -13,8 +13,8 @@ public class OfflineMessageEvent extends BentoBoxEvent {
     private final String message;
 
     /**
-     * @param offlinePlayer
-     * @param message
+     * @param offlinePlayer - offline player
+     * @param message message to send offline player
      */
     public OfflineMessageEvent(UUID offlinePlayer, String message) {
         this.offlinePlayer = offlinePlayer;
diff --git a/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java
deleted file mode 100644
index a64097096..000000000
--- a/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package world.bentobox.bentobox.api.events;
-
-import org.bukkit.event.Event;
-
-/**
- * Provides the default methods expected when extending {@link Event}.
- * @deprecated As of 1.5.3, for removal. Use {@link BentoBoxEvent} instead.
- */
-@Deprecated
-public abstract class PremadeEvent extends BentoBoxEvent {
-
-    /**
-     * The default constructor is defined for cleaner code.
-     * This constructor assumes the PremadeEvent is synchronous.
-     */
-    public PremadeEvent() {
-        this(false);
-    }
-
-    /**
-     * This constructor is used to explicitly declare an PremadeEvent as synchronous or asynchronous.
-     * @param async - true indicates the event will fire asynchronously, false
-     *    by default from default constructor
-     * @since 1.5.2
-     */
-    public PremadeEvent(boolean async) {
-        super(async);
-    }
-
-}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagChangeEvent.java
new file mode 100644
index 000000000..0f481ad62
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagChangeEvent.java
@@ -0,0 +1,40 @@
+package world.bentobox.bentobox.api.events.flags;
+
+import world.bentobox.bentobox.api.events.BentoBoxEvent;
+import world.bentobox.bentobox.api.flags.Flag;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author Poslovitch
+ * @since 1.6.0
+ */
+public abstract class FlagChangeEvent extends BentoBoxEvent {
+
+    private final UUID player;
+    private final Flag editedFlag;
+
+    /**
+     * @param player - player changing the flag
+     * @param editedFlag - flag that has changed
+     */
+    public FlagChangeEvent(UUID player, Flag editedFlag) {
+        this.player = player;
+        this.editedFlag = editedFlag;
+    }
+
+    /**
+     * @return the player
+     */
+    public UUID getPlayer() {
+        return player;
+    }
+
+    /**
+     * @return the editedFlag
+     */
+    public Flag getEditedFlag() {
+        return editedFlag;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java
new file mode 100644
index 000000000..0bd2854a8
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java
@@ -0,0 +1,44 @@
+package world.bentobox.bentobox.api.events.flags;
+
+import java.util.UUID;
+
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.database.objects.Island;
+
+/**
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class FlagProtectionChangeEvent extends FlagChangeEvent {
+
+    private final Island island;
+    private final int setTo;
+
+    /**
+     * Event that fires when an island protection flag is changed
+     * @param island - island
+     * @param player - player changing the flag
+     * @param editedFlag - flag that has changed
+     * @param setTo - value it was set to
+     */
+    public FlagProtectionChangeEvent(Island island, UUID player, Flag editedFlag, int setTo) {
+        super(player, editedFlag);
+        this.island = island;
+        this.setTo = setTo;
+    }
+
+    /**
+     * @return the island
+     */
+    public Island getIsland() {
+        return island;
+    }
+
+    /**
+     * @return the setTo
+     */
+    public int getSetTo() {
+        return setTo;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java
new file mode 100644
index 000000000..9dd31410b
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java
@@ -0,0 +1,44 @@
+package world.bentobox.bentobox.api.events.flags;
+
+import java.util.UUID;
+
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.database.objects.Island;
+
+/**
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class FlagSettingChangeEvent extends FlagChangeEvent {
+
+    private final Island island;
+    private final boolean setTo;
+
+    /**
+     * Event that fires when an island setting flag is changed
+     * @param island - island
+     * @param player - player changing the flag
+     * @param editedFlag - flag that has changed
+     * @param setTo - value it was set to
+     */
+    public FlagSettingChangeEvent(Island island, UUID player, Flag editedFlag, boolean setTo) {
+        super(player, editedFlag);
+        this.island = island;
+        this.setTo = setTo;
+    }
+
+    /**
+     * @return the island
+     */
+    public Island getIsland() {
+        return island;
+    }
+
+    /**
+     * @return the setTo
+     */
+    public boolean isSetTo() {
+        return setTo;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java
new file mode 100644
index 000000000..497d9e4a8
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java
@@ -0,0 +1,45 @@
+package world.bentobox.bentobox.api.events.flags;
+
+import java.util.UUID;
+
+import org.bukkit.World;
+
+import world.bentobox.bentobox.api.flags.Flag;
+
+/**
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class FlagWorldSettingChangeEvent extends FlagChangeEvent {
+
+    private final World world;
+    private final boolean setTo;
+
+    /**
+     * Event that fires when a world setting is changed
+     * @param world - world
+     * @param player - player changing the flag
+     * @param editedFlag - flag that has changed
+     * @param setTo - value it was set to
+     */
+    public FlagWorldSettingChangeEvent(World world, UUID player, Flag editedFlag, boolean setTo) {
+        super(player, editedFlag);
+        this.world = world;
+        this.setTo = setTo;
+    }
+
+    /**
+     * @return the world
+     */
+    public World getWorld() {
+        return world;
+    }
+
+    /**
+     * @return the setTo
+     */
+    public boolean isSetTo() {
+        return setTo;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java
deleted file mode 100644
index 6522dbb2c..000000000
--- a/src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package world.bentobox.bentobox.api.events.island;
-
-import java.util.UUID;
-
-import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.database.objects.Island;
-
-/**
- * This event is fired when a player changes a flag on his island
- * <p>
- * Canceling this event will result in canceling the change.
- *
- * @author Poslovitch
- */
-public class FlagChangeEvent extends IslandBaseEvent {
-    private final UUID player;
-    private final Flag editedFlag;
-    private final boolean setTo;
-
-    /**
-     * @param island - island
-     * @param player - the player
-     * @param editedFlag - flag edited
-     * @param setTo - new value
-     */
-    public FlagChangeEvent(Island island, UUID player, Flag editedFlag, boolean setTo) {
-        super(island);
-        this.player = player;
-        this.editedFlag = editedFlag;
-        this.setTo = setTo;
-    }
-
-    /**
-     * @return the player
-     */
-    public UUID getPlayer() {
-        return player;
-    }
-
-    /**
-     * @return the edited flag
-     */
-    public Flag getFlag() {
-        return editedFlag;
-    }
-
-    /**
-     * @return enabled/disabled
-     */
-    public boolean getSetTo() {
-        return setTo;
-    }
-}
diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java
index 886119b3f..93c7a9875 100644
--- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java
+++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java
@@ -4,8 +4,10 @@ import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.database.objects.IslandDeletion;
 import world.bentobox.bentobox.lists.Flags;
@@ -122,7 +124,12 @@ public class IslandEvent extends IslandBaseEvent {
          * Player was expelled
          * @since 1.4.0
          */
-        EXPEL
+        EXPEL,
+        /**
+         * The island was reserved and now is being pasted.
+         * @since 1.6.0
+         */
+        RESERVED
     }
 
     public static IslandEventBuilder builder() {
@@ -177,9 +184,27 @@ public class IslandEvent extends IslandBaseEvent {
      *
      */
     public static class IslandCreateEvent extends IslandBaseEvent {
-        private IslandCreateEvent(Island island, UUID player, boolean admin, Location location) {
+        private @NonNull BlueprintBundle blueprintBundle;
+
+        private IslandCreateEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle) {
             // Final variables have to be declared in the constructor
             super(island, player, admin, location);
+            this.blueprintBundle = blueprintBundle;
+        }
+
+        /**
+         * @since 1.6.0
+         */
+        @NonNull
+        public BlueprintBundle getBlueprintBundle() {
+            return blueprintBundle;
+        }
+
+        /**
+         * @since 1.6.0
+         */
+        public void setBlueprintBundle(@NonNull BlueprintBundle blueprintBundle) {
+            this.blueprintBundle = blueprintBundle;
         }
     }
     /**
@@ -222,7 +247,10 @@ public class IslandEvent extends IslandBaseEvent {
         }
     }
     /**
-     * Fired when an island is deleted.
+     * Fired when island blocks are going to be deleted.
+     * If canceled, the island blocks will not be deleted. Note that by the time this is called
+     * the ownership of the island may have been removed. This event is just for detecting
+     * that the island blocks are going to be removed.
      *
      */
     public static class IslandDeletedEvent extends IslandBaseEvent {
@@ -304,9 +332,27 @@ public class IslandEvent extends IslandBaseEvent {
      * May be cancelled.
      */
     public static class IslandResetEvent extends IslandBaseEvent {
-        private IslandResetEvent(Island island, UUID player, boolean admin, Location location) {
+        private @NonNull BlueprintBundle blueprintBundle;
+
+        private IslandResetEvent(Island island, UUID player, boolean admin, Location location, @NonNull BlueprintBundle blueprintBundle) {
             // Final variables have to be declared in the constructor
             super(island, player, admin, location);
+            this.blueprintBundle = blueprintBundle;
+        }
+
+        /**
+         * @since 1.6.0
+         */
+        @NonNull
+        public BlueprintBundle getBlueprintBundle() {
+            return blueprintBundle;
+        }
+
+        /**
+         * @since 1.6.0
+         */
+        public void setBlueprintBundle(@NonNull BlueprintBundle blueprintBundle) {
+            this.blueprintBundle = blueprintBundle;
         }
     }
     /**
@@ -338,6 +384,7 @@ public class IslandEvent extends IslandBaseEvent {
         private boolean admin;
         private Location location;
         private IslandDeletion deletedIslandInfo;
+        private BlueprintBundle blueprintBundle;
 
         public IslandEventBuilder island(Island island) {
             this.island = island;
@@ -382,6 +429,15 @@ public class IslandEvent extends IslandBaseEvent {
             return this;
         }
 
+        /**
+         * @since 1.6.0
+         */
+        @NonNull
+        public IslandEventBuilder blueprintBundle(@NonNull BlueprintBundle blueprintBundle) {
+            this.blueprintBundle = blueprintBundle;
+            return this;
+        }
+
         public IslandBaseEvent build() {
             // Call the generic event for developers who just want one event and use the Reason enum
             Bukkit.getServer().getPluginManager().callEvent(new IslandEvent(island, player, admin, location, reason));
@@ -396,7 +452,7 @@ public class IslandEvent extends IslandBaseEvent {
                 Bukkit.getServer().getPluginManager().callEvent(ban);
                 return ban;
             case CREATE:
-                IslandCreateEvent create = new IslandCreateEvent(island, player, admin, location);
+                IslandCreateEvent create = new IslandCreateEvent(island, player, admin, location, blueprintBundle);
                 Bukkit.getServer().getPluginManager().callEvent(create);
                 return create;
             case CREATED:
@@ -428,7 +484,7 @@ public class IslandEvent extends IslandBaseEvent {
                 Bukkit.getServer().getPluginManager().callEvent(lock);
                 return lock;
             case RESET:
-                IslandResetEvent reset = new IslandResetEvent(island, player, admin, location);
+                IslandResetEvent reset = new IslandResetEvent(island, player, admin, location, blueprintBundle);
                 Bukkit.getServer().getPluginManager().callEvent(reset);
                 return reset;
             case RESETTED:
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java
index 32b9401b6..fc1329a99 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/Flag.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java
@@ -1,10 +1,16 @@
 package world.bentobox.bentobox.api.flags;
 
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
@@ -18,18 +24,11 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.bentobox.util.Util;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 
 public class Flag implements Comparable<Flag> {
 
     /**
-     * Defines the behavior and operation of the flag, as well as its category in the {@link world.bentobox.bentobox.panels.SettingsPanel}.
+     * Defines the behavior and operation of the flag.
      */
     public enum Type {
         /**
@@ -63,6 +62,61 @@ public class Flag implements Comparable<Flag> {
         }
     }
 
+    /**
+     * Defines the flag mode
+     * @author tastybento
+     * @since 1.6.0
+     */
+    public enum Mode {
+        /**
+         * Flag should be shown in the basic settings
+         */
+        BASIC,
+        /**
+         * Flag should be shown in the advanced settings
+         */
+        ADVANCED,
+        /**
+         * Flag should be shown in the expert settings
+         */
+        EXPERT,
+        /**
+         * Flag should be shown in the top row if applicable
+         */
+        TOP_ROW;
+
+        /**
+         * Get the next ranking mode above this one. If at the top, it cycles back to the bottom mode
+         * @return next ranking mode
+         */
+        public Mode getNext() {
+            switch(this) {
+                case ADVANCED:
+                    return EXPERT;
+                case BASIC:
+                    return ADVANCED;
+                default:
+                    return BASIC;
+            }
+        }
+
+        /**
+         * Get a list of ranks that are ranked greater than this rank
+         * @param rank - rank to compare
+         * @return true if ranked greater
+         */
+        public boolean isGreaterThan(Mode rank) {
+            switch(this) {
+                case EXPERT:
+                    return rank.equals(BASIC) || rank.equals(ADVANCED);
+                case ADVANCED:
+                    return rank.equals(BASIC);
+                default:
+                    return false;
+            }
+        }
+    }
+
     private static final String PROTECTION_FLAGS = "protection.flags.";
 
     private final String id;
@@ -70,12 +124,13 @@ public class Flag implements Comparable<Flag> {
     private final Listener listener;
     private final Type type;
     private boolean setting;
-    private Map<World, Boolean> defaultWorldSettings = new HashMap<>();
     private final int defaultRank;
     private final PanelItem.ClickHandler clickHandler;
     private final boolean subPanel;
     private Set<GameModeAddon> gameModes = new HashSet<>();
     private final Addon addon;
+    private final int cooldown;
+    private final Mode mode;
 
     private Flag(Builder builder) {
         this.id = builder.id;
@@ -89,7 +144,9 @@ public class Flag implements Comparable<Flag> {
         if (builder.gameModeAddon != null) {
             this.gameModes.add(builder.gameModeAddon);
         }
+        this.cooldown = builder.cooldown;
         this.addon = builder.addon;
+        this.mode = builder.mode;
     }
 
     public String getID() {
@@ -104,6 +161,13 @@ public class Flag implements Comparable<Flag> {
         return Optional.ofNullable(listener);
     }
 
+    /**
+     * @return the cooldown
+     */
+    public int getCooldown() {
+        return cooldown;
+    }
+
     /**
      * Check if a setting is set in this world
      * @param world - world
@@ -111,17 +175,17 @@ public class Flag implements Comparable<Flag> {
      * If world is not a game world, then the result will always be false!
      */
     public boolean isSetForWorld(World world) {
-        if (type.equals(Type.WORLD_SETTING)) {
-            WorldSettings ws = BentoBox.getInstance().getIWM().getWorldSettings(world);
-            if (ws != null) {
-                ws.getWorldFlags().putIfAbsent(getID(), setting);
-                return ws.getWorldFlags().get(getID());
+        WorldSettings ws = BentoBox.getInstance().getIWM().getWorldSettings(world);
+        if (ws == null) return false;
+        if (type.equals(Type.WORLD_SETTING) || type.equals(Type.PROTECTION)) {
+            if (!ws.getWorldFlags().containsKey(getID())) {
+                ws.getWorldFlags().put(getID(), setting);
+                // Save config file
+                BentoBox.getInstance().getIWM().getAddon(world).ifPresent(GameModeAddon::saveWorldSettings);
             }
-            return false;
-        } else {
-            // Setting
-            return defaultWorldSettings.getOrDefault(Util.getWorld(world), setting);
+            return ws.getWorldFlags().get(getID());
         }
+        return setting;
     }
 
     /**
@@ -130,13 +194,20 @@ public class Flag implements Comparable<Flag> {
      * @param setting - true or false
      */
     public void setSetting(World world, boolean setting) {
-        if (getType().equals(Type.WORLD_SETTING)) {
-            BentoBox.getInstance().getIWM().getWorldSettings(world).getWorldFlags().put(getID(), setting);
+        if (getType().equals(Type.WORLD_SETTING) || type.equals(Type.PROTECTION)) {
+            BentoBox.getInstance()
+            .getIWM()
+            .getWorldSettings(world)
+            .getWorldFlags()
+            .put(getID(), setting);
+            // Save config file
+            BentoBox.getInstance().getIWM().getAddon(world).ifPresent(GameModeAddon::saveWorldSettings);
         }
     }
 
     /**
-     * Set the status of this flag for locations outside of island spaces
+     * Set the original status of this flag for locations outside of island spaces.
+     * May be overriden by the the setting for this world.
      * @param defaultSetting - true means it is allowed. false means it is not allowed
      */
     public void setDefaultSetting(boolean defaultSetting) {
@@ -144,11 +215,19 @@ public class Flag implements Comparable<Flag> {
     }
 
     /**
-     * Set the status of this flag for locations outside of island spaces for a specific world
+     * Set the status of this flag for locations outside of island spaces for a specific world.
+     * World must exist and be registered before this method can be called.
      * @param defaultSetting - true means it is allowed. false means it is not allowed
      */
     public void setDefaultSetting(World world, boolean defaultSetting) {
-        this.defaultWorldSettings.put(world, defaultSetting);
+        WorldSettings ws = BentoBox.getInstance().getIWM().getWorldSettings(world);
+        if (ws == null ) {
+            BentoBox.getInstance().logError("Attempt to set default world setting for unregistered world. Register flags in onEnable.");
+            return;
+        }
+        ws.getWorldFlags().put(getID(), defaultSetting);
+        // Save config file
+        BentoBox.getInstance().getIWM().getAddon(world).ifPresent(GameModeAddon::saveWorldSettings);
     }
 
     /**
@@ -276,10 +355,12 @@ public class Flag implements Comparable<Flag> {
      * Converts a flag to a panel item. The content of the flag will change depending on who the user is and where they are.
      * @param plugin - plugin
      * @param user - user that will see this flag
+     * @param island - target island, if any
      * @param invisible - true if this flag is not visible to players
-     * @return - PanelItem for this flag or null if item is inivisible to user
+     * @return - PanelItem for this flag or null if item is invisible to user
      */
-    public PanelItem toPanelItem(BentoBox plugin, User user, boolean invisible) {
+    @Nullable
+    public PanelItem toPanelItem(BentoBox plugin, User user, @Nullable Island island, boolean invisible) {
         // Invisibility
         if (!user.isOp() && invisible) {
             return null;
@@ -294,7 +375,6 @@ public class Flag implements Comparable<Flag> {
             pib.description(user.getTranslation("protection.panel.flag-item.menu-layout", TextVariables.DESCRIPTION, user.getTranslation(getDescriptionReference())));
             return pib.build();
         }
-        Island island = plugin.getIslands().getIslandAt(user.getLocation()).orElse(plugin.getIslands().getIsland(user.getWorld(), user.getUniqueId()));
         switch(getType()) {
         case PROTECTION:
             return createProtectionFlag(plugin, user, island, pib).build();
@@ -321,6 +401,9 @@ public class Flag implements Comparable<Flag> {
                     : user.getTranslation("protection.panel.flag-item.setting-disabled");
             pib.description(user.getTranslation("protection.panel.flag-item.setting-layout", TextVariables.DESCRIPTION, user.getTranslation(getDescriptionReference())
                     , "[setting]", islandSetting));
+            if (this.cooldown > 0 && island.isCooldown(this)) {
+                pib.description(user.getTranslation("protection.panel.flag-item.setting-cooldown"));
+            }
         }
         return pib;
     }
@@ -344,6 +427,14 @@ public class Flag implements Comparable<Flag> {
     }
 
 
+    /**
+     * @return the mode
+     * @since 1.6.0
+     */
+    public Mode getMode() {
+        return mode;
+    }
+
     @Override
     public String toString() {
         return "Flag [id=" + id + "]";
@@ -383,6 +474,12 @@ public class Flag implements Comparable<Flag> {
         private GameModeAddon gameModeAddon;
         private Addon addon;
 
+        // Cooldown
+        private int cooldown;
+
+        // Mode
+        public Mode mode = Mode.EXPERT;
+
         /**
          * Builder for making flags
          * @param id - a unique id that MUST be the same as the enum of the flag
@@ -456,7 +553,7 @@ public class Flag implements Comparable<Flag> {
 
         /**
          * Make this flag specific to this gameMode
-         * @param gameModeAddon
+         * @param gameModeAddon game mode addon
          * @return Builder
          */
         public Builder setGameMode(GameModeAddon gameModeAddon) {
@@ -466,7 +563,7 @@ public class Flag implements Comparable<Flag> {
 
         /**
          * The addon registering this flag. Ensure this is set to enable the addon to be reloaded.
-         * @param addon
+         * @param addon addon
          * @return Builder
          * @since 1.5.0
          */
@@ -475,6 +572,29 @@ public class Flag implements Comparable<Flag> {
             return this;
         }
 
+        /**
+         * Set a cooldown for {@link Type#SETTING} flag. Only applicable for settings.
+         * @param cooldown in seconds
+         * @return Builder
+         * @since 1.6.0
+         */
+        public Builder cooldown(int cooldown) {
+            this.cooldown = cooldown;
+            return this;
+        }
+
+        /**
+         * Set the flag difficulty mode.
+         * Defaults to {@link Flag.Mode#EXPERT}.
+         * @param mode
+         * @return Builder
+         * @since 1.6.0
+         */
+        public Builder mode(Mode mode) {
+            this.mode = mode;
+            return this;
+        }
+
         /**
          * Build the flag
          * @return Flag
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java b/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
index fb25b0f36..a3d4be4ae 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
@@ -79,7 +79,7 @@ public abstract class FlagListener implements Listener {
      * @param flag - the flag that has been checked
      */
     public void noGo(@NonNull Event e, @NonNull Flag flag) {
-        noGo(e, flag, false);
+        noGo(e, flag, false, "protection.protected");
     }
 
     /**
@@ -87,14 +87,15 @@ public abstract class FlagListener implements Listener {
      * @param e - event
      * @param flag - the flag that has been checked
      * @param silent - if true, message is not sent
+     * @param string - translation reference
      */
-    public void noGo(@NonNull Event e, @NonNull Flag flag, boolean silent) {
+    public void noGo(@NonNull Event e, @NonNull Flag flag, boolean silent, String string) {
         if (e instanceof Cancellable) {
             ((Cancellable)e).setCancelled(true);
         }
         if (user != null) {
             if (!silent) {
-                user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation(flag.getHintReference()));
+                user.notify(string, TextVariables.DESCRIPTION, user.getTranslation(flag.getHintReference()));
             }
             user.updateInventory();
         }
@@ -153,8 +154,8 @@ public abstract class FlagListener implements Listener {
         // Protection flag
 
         // Ops or "bypass everywhere" moderators can do anything
-        if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypassprotect")
-                || user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass." + flag.getID() + ".everywhere")) {
+        if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypassprotect")
+                || user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypass." + flag.getID() + ".everywhere")) {
             if (user.isOp()) {
                 report(user, e, loc, flag,  Why.OP);
             } else {
@@ -170,7 +171,7 @@ public abstract class FlagListener implements Listener {
                 return true;
             }
             report(user, e, loc, flag,  Why.NOT_ALLOWED_IN_WORLD);
-            noGo(e, flag, silent);
+            noGo(e, flag, silent, "protection.world-protected");
             return false;
         }
 
@@ -182,12 +183,12 @@ public abstract class FlagListener implements Listener {
             if (island.get().isAllowed(user, flag)) {
                 report(user, e, loc, flag,  Why.RANK_ALLOWED);
                 return true;
-            } else if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass." + flag.getID() + ".island")) {
+            } else if (user.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypass." + flag.getID() + ".island")) {
                 report(user, e, loc, flag,  Why.BYPASS_ISLAND);
                 return true;
             }
             report(user, e, loc, flag,  Why.NOT_ALLOWED_ON_ISLAND);
-            noGo(e, flag, silent);
+            noGo(e, flag, silent, "protection.protected");
             return false;
         }
         // The player is in the world, but not on an island, so general world settings apply
@@ -196,7 +197,7 @@ public abstract class FlagListener implements Listener {
             return true;
         } else {
             report(user, e, loc, flag,  Why.NOT_ALLOWED_IN_WORLD);
-            noGo(e, flag, silent);
+            noGo(e, flag, silent, "protection.world-protected");
             return false;
         }
     }
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java
index 1a383993e..401e760de 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java
@@ -1,15 +1,20 @@
 package world.bentobox.bentobox.api.flags.clicklisteners;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.event.inventory.ClickType;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.events.flags.FlagProtectionChangeEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.Panel;
 import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.RanksManager;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -38,9 +43,9 @@ public class CycleClick implements PanelItem.ClickHandler {
 
     /**
      * Construct a cycle clicker with a min and max rank
-     * @param id
-     * @param minRank
-     * @param maxRank
+     * @param id flag id
+     * @param minRank minimum rank value
+     * @param maxRank maximum rank value
      */
     public CycleClick(String id, int minRank, int maxRank) {
         this.id = id;
@@ -50,16 +55,19 @@ public class CycleClick implements PanelItem.ClickHandler {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType click, int slot) {
+        // This click listener is used with TabbedPanel and SettingsTabs only
+        TabbedPanel tp = (TabbedPanel)panel;
+        SettingsTab st = (SettingsTab)tp.getActiveTab();
+        // Get the island for this tab
+        island = st.getIsland();
         this.user = user;
         changeOccurred = false;
-        // Get the world
-        if (!plugin.getIWM().inWorld(user.getLocation())) {
-            user.sendMessage("general.errors.wrong-world");
-            return true;
-        }
-        String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings." + id;
-        String allPerms = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings.*";
-        if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)) {
+        // Permission prefix
+        String prefix = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld()));
+        String reqPerm = prefix + "settings." + id;
+        String allPerms = prefix + "settings.*";
+        if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)
+                && !user.isOp() && !user.hasPermission(prefix + "admin.settings")) {
             user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
             return true;
@@ -67,15 +75,10 @@ public class CycleClick implements PanelItem.ClickHandler {
         // Left clicking increases the rank required
         // Right clicking decreases the rank required
         // Shift Left Click toggles player visibility
-        // Get the user's island
-        island = plugin.getIslands().getIslandAt(user.getLocation()).orElse(plugin.getIslands().getIsland(user.getWorld(), user.getUniqueId()));
-        if (island != null && (user.isOp() || user.getUniqueId().equals(island.getOwner()))) {
+        if (island != null && (user.isOp() || user.getUniqueId().equals(island.getOwner()) || user.hasPermission(prefix + "admin.settings"))) {
             changeOccurred = true;
             RanksManager rm = plugin.getRanksManager();
             plugin.getFlagsManager().getFlag(id).ifPresent(flag -> {
-
-                // Flag visibility
-                boolean invisible = false;
                 // Rank
                 int currentRank = island.getFlag(flag);
                 if (click.equals(ClickType.LEFT)) {
@@ -85,6 +88,8 @@ public class CycleClick implements PanelItem.ClickHandler {
                         island.setFlag(flag, rm.getRankUpValue(currentRank));
                     }
                     user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_OFF, 1F, 1F);
+                    // Fire event
+                    Bukkit.getPluginManager().callEvent(new FlagProtectionChangeEvent(island, user.getUniqueId(), flag, island.getFlag(flag)));
                 } else if (click.equals(ClickType.RIGHT)) {
                     if (currentRank <= minRank) {
                         island.setFlag(flag, maxRank);
@@ -92,9 +97,10 @@ public class CycleClick implements PanelItem.ClickHandler {
                         island.setFlag(flag, rm.getRankDownValue(currentRank));
                     }
                     user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_ON, 1F, 1F);
+                    // Fire event
+                    Bukkit.getPluginManager().callEvent(new FlagProtectionChangeEvent(island, user.getUniqueId(), flag, island.getFlag(flag)));
                 } else if (click.equals(ClickType.SHIFT_LEFT) && user.isOp()) {
                     if (!plugin.getIWM().getHiddenFlags(user.getWorld()).contains(flag.getID())) {
-                        invisible = true;
                         plugin.getIWM().getHiddenFlags(user.getWorld()).add(flag.getID());
                         user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_GLASS_BREAK, 1F, 1F);
                     } else {
@@ -104,8 +110,6 @@ public class CycleClick implements PanelItem.ClickHandler {
                     // Save changes
                     plugin.getIWM().getAddon(user.getWorld()).ifPresent(GameModeAddon::saveWorldSettings);
                 }
-                // Apply change to panel
-                panel.getInventory().setItem(slot, flag.toPanelItem(plugin, user, invisible).getItem());
             });
         } else {
             // Player is not the owner of the island.
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandLockClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandLockClick.java
index 1333401ed..cafbd16ad 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandLockClick.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandLockClick.java
@@ -10,16 +10,16 @@ import world.bentobox.bentobox.api.events.island.IslandEvent;
 public class IslandLockClick extends CycleClick {
 
     /**
-     * @param id
+     * @param id flag id
      */
     public IslandLockClick(String id) {
         super(id);
     }
 
     /**
-     * @param id
-     * @param minRank
-     * @param maxRank
+     * @param id flag id
+     * @param minRank minimum rank
+     * @param maxRank maximum rank
      */
     public IslandLockClick(String id, int minRank, int maxRank) {
         super(id, minRank, maxRank);
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java
index a403997c5..0dc10b64f 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java
@@ -1,14 +1,19 @@
 package world.bentobox.bentobox.api.flags.clicklisteners;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.event.inventory.ClickType;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.events.flags.FlagSettingChangeEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.Panel;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
 import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -30,27 +35,26 @@ public class IslandToggleClick implements ClickHandler {
 
     @Override
     public boolean onClick(Panel panel, User user, ClickType click, int slot) {
-        // Get the world
-        if (!plugin.getIWM().inWorld(user.getLocation())) {
-            user.sendMessage("general.errors.wrong-world");
-            return true;
-        }
-        String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".settings." + id;
-        if (!user.hasPermission(reqPerm)) {
+        // This click listener is used with TabbedPanel and SettingsTabs only
+        TabbedPanel tp = (TabbedPanel)panel;
+        SettingsTab st = (SettingsTab)tp.getActiveTab();
+
+        // Permission prefix
+        String prefix = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld()));
+        String reqPerm = prefix + "settings." + id;
+        String allPerms = prefix + "settings.*";
+        if (!user.hasPermission(reqPerm) && !user.hasPermission(allPerms)
+                && !user.isOp() && !user.hasPermission(prefix + "admin.settings")) {
             user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
             return true;
         }
-        // Get the user's island or where they are standing
-        Island island = plugin.getIslands().getIslandAt(user.getLocation()).orElse(plugin.getIslands().getIsland(user.getWorld(), user.getUniqueId()));
-        if (island != null && (user.isOp() || user.getUniqueId().equals(island.getOwner()))) {
+        // Get the island for this tab
+        Island island = st.getIsland();
+        if (island != null && (user.isOp() || user.getUniqueId().equals(island.getOwner()) || user.hasPermission(prefix + "admin.settings"))) {
             plugin.getFlagsManager().getFlag(id).ifPresent(flag -> {
-
-                // Visibility
-                boolean invisible = false;
                 if (click.equals(ClickType.SHIFT_LEFT) && user.isOp()) {
                     if (!plugin.getIWM().getHiddenFlags(user.getWorld()).contains(flag.getID())) {
-                        invisible = true;
                         plugin.getIWM().getHiddenFlags(user.getWorld()).add(flag.getID());
                         user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_GLASS_BREAK, 1F, 1F);
                     } else {
@@ -60,12 +64,20 @@ public class IslandToggleClick implements ClickHandler {
                     // Save changes
                     plugin.getIWM().getAddon(user.getWorld()).ifPresent(GameModeAddon::saveWorldSettings);
                 } else {
+                    // Check cooldown
+                    if (!user.isOp() && island.isCooldown(flag)) {
+                        user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 1F, 1F);
+                        user.notify("protection.panel.flag-item.setting-cooldown");
+                        return;
+                    }
                     // Toggle flag
                     island.toggleFlag(flag);
                     user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_ON, 1F, 1F);
+                    // Set cooldown
+                    island.setCooldown(flag);
+                    // Fire event
+                    Bukkit.getPluginManager().callEvent(new FlagSettingChangeEvent(island, user.getUniqueId(), flag, island.isAllowed(flag)));
                 }
-                // Apply change to panel
-                panel.getInventory().setItem(slot, flag.toPanelItem(plugin, user, invisible).getItem());
             });
         } else {
             // Player is not the owner of the island.
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java
index c8321cfc6..e33bbf623 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java
@@ -1,10 +1,12 @@
 package world.bentobox.bentobox.api.flags.clicklisteners;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.event.inventory.ClickType;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.events.flags.FlagWorldSettingChangeEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.panels.Panel;
 import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
@@ -18,8 +20,8 @@ import world.bentobox.bentobox.util.Util;
  */
 public class WorldToggleClick implements ClickHandler {
 
-    private BentoBox plugin = BentoBox.getInstance();
-    private String id;
+    private final BentoBox plugin = BentoBox.getInstance();
+    private final String id;
 
     /**
      * @param id - the flag ID that this click listener is associated with
@@ -35,7 +37,7 @@ public class WorldToggleClick implements ClickHandler {
             user.sendMessage("general.errors.wrong-world");
             return true;
         }
-        String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.world.settings." + id;
+        String reqPerm = plugin.getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.world.settings." + id;
         if (!user.hasPermission(reqPerm)) {
             user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
@@ -43,11 +45,8 @@ public class WorldToggleClick implements ClickHandler {
         }
         // Get flag
         plugin.getFlagsManager().getFlag(id).ifPresent(flag -> {
-            // Visibility
-            boolean invisible = false;
             if (click.equals(ClickType.SHIFT_LEFT) && user.isOp()) {
                 if (!plugin.getIWM().getHiddenFlags(user.getWorld()).contains(flag.getID())) {
-                    invisible = true;
                     plugin.getIWM().getHiddenFlags(user.getWorld()).add(flag.getID());
                     user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_GLASS_BREAK, 1F, 1F);
                 } else {
@@ -60,9 +59,9 @@ public class WorldToggleClick implements ClickHandler {
                 // Toggle flag
                 flag.setSetting(user.getWorld(), !flag.isSetForWorld(user.getWorld()));
                 user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_ON, 1F, 1F);
+                // Fire event
+                Bukkit.getPluginManager().callEvent(new FlagWorldSettingChangeEvent(user.getWorld(), user.getUniqueId(), flag, flag.isSetForWorld(user.getWorld())));
             }
-            // Apply change to panel
-            panel.getInventory().setItem(slot, flag.toPanelItem(plugin, user, invisible).getItem());
 
             // Save world settings
             plugin.getIWM().getAddon(Util.getWorld(user.getWorld())).ifPresent(GameModeAddon::saveWorldSettings);
diff --git a/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java b/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java
index a24b03cd7..0868ad12f 100644
--- a/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java
+++ b/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java
@@ -6,6 +6,7 @@ import java.util.Locale;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
+import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.util.ItemParser;
 
@@ -96,7 +97,7 @@ public class BentoBoxLocale {
      * Merges a language YAML file to this locale
      * @param toBeMerged the YamlConfiguration of the language file
      */
-    public void merge(YamlConfiguration toBeMerged) {
+    public void merge(@NonNull YamlConfiguration toBeMerged) {
         for (String key : toBeMerged.getKeys(true)) {
             if (!key.startsWith("meta") && !config.contains(key)) {
                 config.set(key, toBeMerged.get(key));
@@ -105,6 +106,17 @@ public class BentoBoxLocale {
         updateAuthors(toBeMerged);
     }
 
+    /**
+     * Sets a reference and its value in the locale.
+     * If the reference already exists, it will overwrite its value.
+     * @param reference the reference to add, not null.
+     * @param value the value to set, not null.
+     * @since 1.6.0
+     */
+    public void set(@NonNull String reference, @NonNull String value) {
+        config.set(reference, value);
+    }
+
     public boolean contains(String reference) {
         return config.contains(reference);
     }
diff --git a/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java b/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java
index 877ab2af7..3718dc9ae 100644
--- a/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java
+++ b/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java
@@ -17,4 +17,8 @@ public class TextVariables {
     public static final String SPAWN_HERE = "[spawn_here]";
     public static final String VERSION = "[version]";
     public static final String START_TEXT = "[start]";
+    /**
+     * @since 1.6.0
+     */
+    public static final String NEXT = "[next]";
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/Panel.java b/src/main/java/world/bentobox/bentobox/api/panels/Panel.java
index 54981da7a..55af3d493 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/Panel.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/Panel.java
@@ -11,49 +11,48 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
 import world.bentobox.bentobox.util.heads.HeadGetter;
 import world.bentobox.bentobox.util.heads.HeadRequester;
 
+/**
+ * A GUI panel that uses the Bukkit inventory API
+ * @author tastybento
+ *
+ */
 public class Panel implements HeadRequester, InventoryHolder {
 
     private Inventory inventory;
     private Map<Integer, PanelItem> items;
     private PanelListener listener;
     private User user;
-    private final String name;
+    private String name;
 
     public Panel(String name, Map<Integer, PanelItem> items, int size, User user, PanelListener listener) {
+        makePanel(name, items, size, user, listener);
+    }
+
+    public Panel() {}
+
+    protected void makePanel(String name, Map<Integer, PanelItem> items, int size, User user,
+            PanelListener listener) {
         this.name = name;
         this.items = items;
-        // If size is undefined (0) then use the number of items
-        if (size == 0) {
-            size = items.keySet().size();
-        }
+        size = fixSize(size);
         // Create panel
-        if (size > 0) {
-            // Make sure size is a multiple of 9 and is 54 max.
-            size = size + 8;
-            size -= (size % 9);
-            if (size > 54) size = 54;
-
-            inventory = Bukkit.createInventory(null, size, name);
-            // Fill the inventory and return
-            for (Map.Entry<Integer, PanelItem> en: items.entrySet()) {
-                //TODO allow multi-paging
-                if (en.getKey() < 54) {
-                    inventory.setItem(en.getKey(), en.getValue().getItem());
-                    // Get player head async
-                    if (en.getValue().isPlayerHead()) {
-                        HeadGetter.getHead(en.getValue(), this);
-                    }
+        inventory = Bukkit.createInventory(null, size, name);
+        // Fill the inventory and return
+        for (Map.Entry<Integer, PanelItem> en: items.entrySet()) {
+            if (en.getKey() < 54) {
+                inventory.setItem(en.getKey(), en.getValue().getItem());
+                // Get player head async
+                if (en.getValue().isPlayerHead()) {
+                    HeadGetter.getHead(en.getValue(), this);
                 }
             }
-        } else {
-            inventory = Bukkit.createInventory(null, 9, name);
         }
         this.listener = listener;
         // If the listener is defined, then run setup
@@ -64,6 +63,22 @@ public class Panel implements HeadRequester, InventoryHolder {
         if (user != null) this.open(user);
     }
 
+    private int fixSize(int size) {
+        // If size is undefined (0) then use the number of items
+        if (size == 0) {
+            size = items.keySet().size();
+        }
+        if (size > 0) {
+            // Make sure size is a multiple of 9 and is 54 max.
+            size = size + 8;
+            size -= (size % 9);
+            if (size > 54) size = 54;
+        } else {
+            return 9;
+        }
+        return size;
+    }
+
     @NonNull
     @Override
     public Inventory getInventory() {
@@ -145,7 +160,7 @@ public class Panel implements HeadRequester, InventoryHolder {
             ItemStack it = inventory.getItem(i);
             if (it != null && it.getType().equals(Material.PLAYER_HEAD)) {
                 ItemMeta meta = it.getItemMeta();
-                if (item.getName().equals(meta.getLocalizedName())) {
+                if (meta != null && item.getName().equals(meta.getLocalizedName())) {
                     inventory.setItem(i, item.getItem());
                     // If one is found, we are done
                     return;
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java
index 74f41fd5b..fa9d56ec9 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java
@@ -12,6 +12,11 @@ import org.bukkit.inventory.meta.ItemMeta;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 
+/**
+ * Represents an item in a {@link Panel}
+ * @author tastybento
+ *
+ */
 public class PanelItem {
 
     public static PanelItem empty() {
@@ -24,7 +29,7 @@ public class PanelItem {
     private String name;
     private boolean glow;
     private ItemMeta meta;
-    private boolean playerHead;
+    private final boolean playerHead;
     private boolean invisible;
 
     public PanelItem(PanelItemBuilder builtItem) {
@@ -104,6 +109,14 @@ public class PanelItem {
         return Optional.ofNullable(clickHandler);
     }
 
+    /**
+     * @param clickHandler the clickHandler to set
+     * @since 1.6.0
+     */
+    public void setClickHandler(ClickHandler clickHandler) {
+        this.clickHandler = clickHandler;
+    }
+
     public boolean isGlow() {
         return glow;
     }
@@ -142,8 +155,8 @@ public class PanelItem {
     public void setHead(ItemStack itemStack) {
         this.icon = itemStack;
         // Get the meta
+        meta = icon.getItemMeta();
         if (meta != null) {
-            meta = icon.getItemMeta();
             // Set flags to neaten up the view
             meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
             meta.addItemFlags(ItemFlag.HIDE_DESTROYS);
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java b/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java
index b55b9837f..631be556f 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java
@@ -5,6 +5,11 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 
 import world.bentobox.bentobox.api.user.User;
 
+/**
+ * This will be called if registered and if a player clicks on a panel
+ * @author tastybento
+ *
+ */
 public interface PanelListener {
 
     /**
@@ -16,4 +21,10 @@ public interface PanelListener {
 
     void onInventoryClick(User user, InventoryClickEvent event);
 
+    /**
+     * Called after a user has clicked on a panel item.
+     * Used to refresh the panel in its entirety
+     * @since 1.6.0
+     */
+    default void refreshPanel() {}
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/Tab.java b/src/main/java/world/bentobox/bentobox/api/panels/Tab.java
new file mode 100644
index 000000000..2a4c91743
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/panels/Tab.java
@@ -0,0 +1,44 @@
+package world.bentobox.bentobox.api.panels;
+
+import org.eclipse.jdt.annotation.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents a tab in a {@link TabbedPanel}. Contains {@link PanelItem}'s.
+ *
+ * @author tastybento
+ * @since 1.6.0
+ *
+ */
+public interface Tab {
+
+    // The icon that should be shown at the top of the tabbed panel
+    PanelItem getIcon();
+
+    /**
+     * @return the name of this tab
+     */
+    String getName();
+
+    /**
+     * Return the panel items for this tab
+     * @return a list of items in slot order
+     */
+    List<@Nullable PanelItem> getPanelItems();
+
+    /**
+     * @return the permission required to view this tab or empty if no permission required
+     */
+    String getPermission();
+
+    /**
+     * @return Map of icons to be shown in the tab row when the tab is active
+     * Make sure these do not overlap any tabs that are in the tab row
+     */
+    default Map<Integer, PanelItem> getTabIcons() {
+        return Collections.emptyMap();
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java b/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java
new file mode 100644
index 000000000..187b906ca
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/panels/TabbedPanel.java
@@ -0,0 +1,195 @@
+package world.bentobox.bentobox.api.panels;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
+import world.bentobox.bentobox.api.panels.builders.TabbedPanelBuilder;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Represents a panel with tabs. The top row of the panel is made up of up to 9 icons that are made of {@link world.bentobox.bentobox.api.panels.Tab}s.
+ * Only the active tab is shown. The panel will auto-refresh when a panel item is clicked, so panel item
+ * click listeners do not have to actively update the panel. Viewers of the panel who do not have permission
+ * to see a {@link world.bentobox.bentobox.api.panels.Tab} will not be shown it.
+ *
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class TabbedPanel extends Panel implements PanelListener {
+
+    private static final String PROTECTION_PANEL = "protection.panel.";
+    private final TabbedPanelBuilder tpb;
+    private @NonNull BentoBox plugin = BentoBox.getInstance();
+    private int activeTab;
+    private int activePage;
+    private boolean closed;
+
+    /**
+     * Construct the tabbed panel
+     * @param tpb - tabbed panel builder
+     */
+    public TabbedPanel(TabbedPanelBuilder tpb) {
+        this.tpb = tpb;
+    }
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.api.panels.PanelListener#refreshPanel()
+     */
+    @Override
+    public void refreshPanel() {
+        if (closed) return;
+        // Called when a player clicks on the panel
+        openPanel(activeTab, activePage);
+        // Reset the closed flag
+        closed = false;
+    }
+
+    /**
+     * Open the tabbed panel at the starting slot
+     */
+    public void openPanel() {
+        openPanel(tpb.getStartingSlot(), 0);
+    }
+
+    /**
+     * Open the tabbed panel
+     * @param activeTab - the tab to show referenced by the slot (0 through 8)
+     * @param page - the page of the tab to show (if multi paged)
+     */
+    public void openPanel(int activeTab, int page) {
+        if (!tpb.getTabs().containsKey(activeTab)) {
+            // Request to open a non-existent tab
+            throw new InvalidParameterException("Attempt to open a non-existent tab in a tabbed panel. Missing tab #" + activeTab);
+        }
+        if (page < 0) {
+            // Request to open a non-existent tab
+            throw new InvalidParameterException("Attempt to open a tab in a tabbed panel to a negative page! " + page);
+        }
+        this.activeTab = activeTab;
+        this.activePage = page;
+        // The items in the panel
+        TreeMap<Integer, PanelItem> items = new TreeMap<>();
+        // Get the tab
+        Tab tab = tpb.getTabs().get(activeTab);
+
+        // Set up the tabbed header
+        setupHeader(tab, items);
+
+        // Show the active tab
+        if (tpb.getTabs().containsKey(activeTab)) {
+            List<PanelItem> panelItems = tab.getPanelItems();
+            panelItems.stream().filter(Objects::nonNull).skip(page * 43L).limit(page * 43L + 43L).forEach(i -> items.put(items.lastKey() + 1, i));
+            // Add forward and backward icons
+            if (page > 0) {
+                // Previous page icon
+                items.put(items.lastKey() + 1, new PanelItemBuilder().icon(Material.ARROW).name(tpb.getUser().getTranslation(PROTECTION_PANEL + "previous")).clickHandler((panel, user1, clickType, slot1) -> {
+                    this.activePage--;
+                    this.refreshPanel();
+                    return true;
+                }).build());
+            }
+            if ((page + 1) * 45 < items.size()) {
+                // Next page icon
+                items.put(items.lastKey() + 1, new PanelItemBuilder().icon(Material.ARROW).name(tpb.getUser().getTranslation(PROTECTION_PANEL + "next")).clickHandler((panel, user1, clickType, slot1) -> {
+                    this.activePage++;
+                    this.refreshPanel();
+                    return true;
+                }).build());
+            }
+        } else {
+            throw new InvalidParameterException("Unknown tab slot number " + activeTab);
+        }
+        // Show it to the player
+        this.makePanel(tab.getName(), items, tpb.getSize(), tpb.getUser(), this);
+    }
+
+    /**
+     * Shows the top row of icons
+     * @param tab  - active tab
+     * @param items - panel builder
+     */
+    private void setupHeader(Tab tab, TreeMap<Integer, PanelItem> items) {
+        // Set up top
+        for (int i = 0; i < 9; i++) {
+            items.put(i, new PanelItemBuilder().icon(Material.LIGHT_BLUE_STAINED_GLASS_PANE).name("").build());
+        }
+        // Add icons
+        for (Entry<Integer, Tab> tabPanel : tpb.getTabs().entrySet()) {
+            // Add the icon to the top row
+            if (tabPanel.getValue().getPermission().isEmpty() || tpb.getUser().hasPermission(tabPanel.getValue().getPermission()) || tpb.getUser().isOp()) {
+                PanelItem activeIcon = tabPanel.getValue().getIcon();
+                // Set the glow of the active tab
+                activeIcon.setGlow(tabPanel.getValue().equals(tab));
+                items.put(tabPanel.getKey(), activeIcon);
+            }
+        }
+        // Add any subsidiary icons
+        tab.getTabIcons().forEach(items::put);
+
+    }
+
+    @Override
+    public void setup() {
+        // Not used
+    }
+
+    @Override
+    public void onInventoryClose(InventoryCloseEvent event) {
+        // This flag is set every time the inventory is closed or refreshed (closed and opened)
+        closed = true;
+    }
+
+    @Override
+    public void onInventoryClick(User user, InventoryClickEvent event) {
+        // Trap top row tab clicks
+        if (event.isLeftClick() && tpb.getTabs().containsKey(event.getRawSlot())
+                && (tpb.getTabs().get(event.getRawSlot()).getPermission().isEmpty()
+                        || tpb.getUser().hasPermission(tpb.getTabs().get(event.getRawSlot()).getPermission()) || tpb.getUser().isOp())) {
+            event.setCancelled(true);
+            this.openPanel(event.getRawSlot(), 0);
+            user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_OFF, 1F, 1F);
+            // Reset the closed flag
+            closed = false;
+        }
+    }
+
+    /**
+     * @return the active tab being shown to the user
+     */
+    public Tab getActiveTab() {
+        return tpb.getTabs().get(activeTab);
+    }
+
+    /**
+     * @return the activePage
+     */
+    public int getActivePage() {
+        return activePage;
+    }
+
+    /**
+     * @param activePage the activePage to set
+     */
+    public void setActivePage(int activePage) {
+        this.activePage = activePage;
+    }
+
+    /**
+     * @param activeTab the activeTab to set
+     */
+    public void setActiveTab(int activeTab) {
+        this.activeTab = activeTab;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
index bcc4791d6..f6ec09edf 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
@@ -1,8 +1,10 @@
 package world.bentobox.bentobox.api.panels.builders;
 
-import org.bukkit.ChatColor;
+import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.bukkit.ChatColor;
+
 import world.bentobox.bentobox.api.panels.Panel;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.PanelListener;
@@ -15,7 +17,7 @@ import world.bentobox.bentobox.api.user.User;
  */
 public class PanelBuilder {
     private String name;
-    private TreeMap<Integer, PanelItem> items = new TreeMap<>();
+    private final SortedMap<Integer, PanelItem> items = new TreeMap<>();
     private int size;
     private User user;
     private PanelListener listener;
@@ -108,4 +110,39 @@ public class PanelBuilder {
         // items.lastKey() is a slot position, so the panel size is this value + 1
         return new Panel(name, items, Math.max(size, items.isEmpty() ? size : items.lastKey() + 1), user, listener);
     }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the items
+     */
+    public SortedMap<Integer, PanelItem> getItems() {
+        return items;
+    }
+
+    /**
+     * @return the size
+     */
+    public int getSize() {
+        return size;
+    }
+
+    /**
+     * @return the user
+     */
+    public User getUser() {
+        return user;
+    }
+
+    /**
+     * @return the listener
+     */
+    public PanelListener getListener() {
+        return listener;
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java
index cb0eece06..7e42016b3 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java
@@ -1,17 +1,18 @@
 package world.bentobox.bentobox.api.panels.builders;
 
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
+
 public class PanelItemBuilder {
     private ItemStack icon = new ItemStack(Material.AIR);
     private @Nullable String name = "";
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/TabbedPanelBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/TabbedPanelBuilder.java
new file mode 100644
index 000000000..d67b4a5a6
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/TabbedPanelBuilder.java
@@ -0,0 +1,131 @@
+package world.bentobox.bentobox.api.panels.builders;
+
+import java.security.InvalidParameterException;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.bukkit.World;
+
+import world.bentobox.bentobox.api.panels.Tab;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Builds {@link TabbedPanel}'s
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class TabbedPanelBuilder {
+
+    private int size;
+    private final Map<Integer, Tab> tabs = new TreeMap<>();
+    private int startingSlot;
+    private World world;
+    private User user;
+
+    /**
+     * Forces panel to be a specific number of slots.
+     * @param size - size to be
+     * @return PanelBuilder - PanelBuilder
+     */
+    public TabbedPanelBuilder size(int size) {
+        this.size = size;
+        return this;
+    }
+
+    /**
+     * Sets the user who will get this panel. This will open it immediately when it is built
+     * @param user - the User
+     * @return PanelBuilder
+     */
+    public TabbedPanelBuilder user(User user) {
+        this.user = user;
+        return this;
+    }
+
+    /**
+     * @param world - world that applies to this tab
+     * @return TabbedPanelBuilder
+     */
+    public TabbedPanelBuilder world(World world) {
+        this.world = world;
+        return this;
+    }
+
+    /**
+     * Add a tab to the panel
+     * @param slot - slot of panel (0 to 9)
+     * @param tab - tab to show
+     * @return TabbedPanelBuilder
+     */
+    public TabbedPanelBuilder tab(int slot, Tab tab) {
+        if (slot < 0 || slot > 9) {
+            throw new InvalidParameterException("Slot must be between 0 and 9");
+        }
+        tabs.put(slot, tab);
+        return this;
+    }
+
+    /**
+     * The default tab to show
+     * @param slot - slot value between 0 and 9
+     * @return TabbedPanelBuilder
+     */
+    public TabbedPanelBuilder startingSlot(int slot) {
+        if (slot < 0 || slot > 9) {
+            throw new InvalidParameterException("Slot must be between 0 and 9");
+        }
+        startingSlot = slot;
+        return this;
+    }
+
+    /**
+     * Build the panel
+     * @return Panel
+     */
+    public TabbedPanel build() {
+        // Set starting slot
+        if (!tabs.isEmpty() && !tabs.containsKey(startingSlot)) {
+            startingSlot = ((TreeMap<Integer, Tab>)tabs).firstKey();
+        }
+        return new TabbedPanel(this);
+    }
+
+    /**
+     * @return the tabs
+     */
+    public Map<Integer, Tab> getTabs() {
+        return tabs;
+    }
+
+    /**
+     * @return the startingSlot
+     */
+    public int getStartingSlot() {
+        return startingSlot;
+    }
+
+    /**
+     * @return the world
+     */
+    public World getWorld() {
+        return world;
+    }
+
+    /**
+     * @return the size
+     */
+    public int getSize() {
+        return size;
+    }
+
+    /**
+     * @return the user
+     */
+    public User getUser() {
+        return user;
+    }
+
+
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java b/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
index 1a1fb5500..6eb2a6b38 100644
--- a/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
+++ b/src/main/java/world/bentobox/bentobox/api/placeholders/GameModePlaceholderReplacer.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.api.placeholders;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
index 2bd57b25b..99ac3b848 100644
--- a/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
+++ b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderReplacer.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.api.placeholders;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.user.User;
 
 @FunctionalInterface
diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java
index 4bf7fc886..b3332ea88 100644
--- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java
+++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java
@@ -1,15 +1,16 @@
 package world.bentobox.bentobox.api.placeholders.placeholderapi;
 
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.entity.Player;
-import org.eclipse.jdt.annotation.NonNull;
-import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer;
-import world.bentobox.bentobox.api.user.User;
-
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import org.bukkit.entity.Player;
+import org.eclipse.jdt.annotation.NonNull;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer;
+import world.bentobox.bentobox.api.user.User;
+
 /**
  * @author Poslovitch
  */
diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java
index 2f623f87f..ba0dc489f 100644
--- a/src/main/java/world/bentobox/bentobox/api/user/User.java
+++ b/src/main/java/world/bentobox/bentobox/api/user/User.java
@@ -1,5 +1,13 @@
 package world.bentobox.bentobox.api.user;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -16,18 +24,11 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.util.Vector;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.events.OfflineMessageEvent;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 /**
  * Combines {@link Player}, {@link OfflinePlayer} and {@link CommandSender} to provide convenience methods related to
  * localization and generic interactions.
@@ -245,7 +246,7 @@ public class User {
      */
     public boolean removePerm(String name) {
         for (PermissionAttachmentInfo p : player.getEffectivePermissions()) {
-            if (p.getPermission().equals(name)) {
+            if (p.getPermission().equals(name) && p.getAttachment() != null) {
                 player.removeAttachment(p.getAttachment());
                 break;
             }
@@ -290,6 +291,9 @@ public class User {
      * @return max value
      */
     public int getPermissionValue(String permissionPrefix, int defaultValue) {
+        // If requester is console, then return the default value
+        if (!isPlayer()) return defaultValue;
+        
         int value = defaultValue;
 
         // If there is a dot at the end of the permissionPrefix, remove it
@@ -421,7 +425,7 @@ public class User {
     }
 
     /**
-     * Sends a message to sender if message is not empty and if the same wasn't sent within the previous {@link Notifier#NOTIFICATION_DELAY} seconds.
+     * Sends a message to sender if message is not empty and if the same wasn't sent within the previous Notifier.NOTIFICATION_DELAY seconds.
      * @param reference - language file reference
      * @param variables - CharSequence target, replacement pairs
      *
@@ -435,7 +439,7 @@ public class User {
     }
 
     /**
-     * Sends a message to sender if message is not empty and if the same wasn't sent within the previous {@link Notifier#NOTIFICATION_DELAY} seconds.
+     * Sends a message to sender if message is not empty and if the same wasn't sent within the previous Notifier.NOTIFICATION_DELAY seconds.
      * @param world - the world the translation should come from
      * @param reference - language file reference
      * @param variables - CharSequence target, replacement pairs
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java b/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java
index 6f9d77b7a..9fe98787c 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/Blueprint.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.blueprints;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.bukkit.Material;
@@ -49,7 +50,8 @@ public class Blueprint {
      * @return the name
      */
     public String getName() {
-        return name;
+        // Force lower case
+        return name.toLowerCase(Locale.ENGLISH);
     }
     /**
      * @param name the name to set
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java
index e67daf4df..822a3cac9 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintClipboard.java
@@ -1,5 +1,15 @@
 package world.bentobox.bentobox.blueprints;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -24,6 +34,7 @@ import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
@@ -31,16 +42,6 @@ import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock;
 import world.bentobox.bentobox.blueprints.dataobjects.BlueprintCreatureSpawner;
 import world.bentobox.bentobox.blueprints.dataobjects.BlueprintEntity;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 /**
  * The clipboard provides the holding spot for an active blueprint that is being
  * manipulated by a user. It supports copying from the world and setting of coordinates
@@ -63,6 +64,7 @@ public class BlueprintClipboard {
     private Map<Vector, List<BlueprintEntity>> bpEntities = new LinkedHashMap<>();
     private Map<Vector, BlueprintBlock> bpAttachable = new LinkedHashMap<>();
     private Map<Vector, BlueprintBlock> bpBlocks = new LinkedHashMap<>();
+    private BentoBox plugin = BentoBox.getInstance();
 
     /**
      * Create a clipboard for blueprint
@@ -114,49 +116,49 @@ public class BlueprintClipboard {
         blueprint.setySize((int)toCopy.getHeight());
         blueprint.setzSize((int)toCopy.getWidthZ());
 
-        BentoBox plugin = BentoBox.getInstance();
-
-        final int speed = plugin.getSettings().getPasteSpeed();
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-            final List<Vector> vectorsToCopy = getVectors(toCopy);
-            copying = false;
-            copyTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
-                if (copying) {
-                    return;
-                }
-                copying = true;
-                vectorsToCopy.stream().skip(index).limit(speed).forEach(v -> {
-                    List<LivingEntity> ents = world.getLivingEntities().stream()
-                            .filter(Objects::nonNull)
-                            .filter(e -> !(e instanceof Player))
-                            .filter(e -> new Vector(Math.rint(e.getLocation().getX()),
-                                    Math.rint(e.getLocation().getY()),
-                                    Math.rint(e.getLocation().getZ())).equals(v))
-                            .collect(Collectors.toList());
-                    if (copyBlock(v.toLocation(world), origin, copyAir, ents)) {
-                        count++;
-                    }
-                });
-                index += speed;
-                int percent = (int)(index * 100 / (double)vectorsToCopy.size());
-                if (percent != lastPercentage && percent % 10 == 0) {
-                    user.sendMessage("commands.admin.blueprint.copied-percent", TextVariables.NUMBER, String.valueOf(percent));
-                    lastPercentage = percent;
-                }
-                if (index > vectorsToCopy.size()) {
-                    copyTask.cancel();
-                    blueprint.setAttached(bpAttachable);
-                    blueprint.setBlocks(bpBlocks);
-                    blueprint.setEntities(bpEntities);
-                    user.sendMessage("general.success");
-                    user.sendMessage("commands.admin.blueprint.copied-blocks", TextVariables.NUMBER, String.valueOf(count));
-                }
-                copying = false;
-            }, 0L, 1L);
-        });
+        int speed = plugin.getSettings().getPasteSpeed();
+        List<Vector> vectorsToCopy = getVectors(toCopy);
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> copyAsync(world, user, vectorsToCopy, speed, copyAir));
         return true;
     }
 
+    private void copyAsync(World world, User user, List<Vector> vectorsToCopy, int speed, boolean copyAir) {
+        copying = false;
+        copyTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
+            if (copying) {
+                return;
+            }
+            copying = true;
+            vectorsToCopy.stream().skip(index).limit(speed).forEach(v -> {
+                List<LivingEntity> ents = world.getLivingEntities().stream()
+                        .filter(Objects::nonNull)
+                        .filter(e -> !(e instanceof Player))
+                        .filter(e -> new Vector(Math.rint(e.getLocation().getX()),
+                                Math.rint(e.getLocation().getY()),
+                                Math.rint(e.getLocation().getZ())).equals(v))
+                        .collect(Collectors.toList());
+                if (copyBlock(v.toLocation(world), origin, copyAir, ents)) {
+                    count++;
+                }
+            });
+            index += speed;
+            int percent = (int)(index * 100 / (double)vectorsToCopy.size());
+            if (percent != lastPercentage && percent % 10 == 0) {
+                user.sendMessage("commands.admin.blueprint.copied-percent", TextVariables.NUMBER, String.valueOf(percent));
+                lastPercentage = percent;
+            }
+            if (index > vectorsToCopy.size()) {
+                copyTask.cancel();
+                blueprint.setAttached(bpAttachable);
+                blueprint.setBlocks(bpBlocks);
+                blueprint.setEntities(bpEntities);
+                user.sendMessage("general.success");
+                user.sendMessage("commands.admin.blueprint.copied-blocks", TextVariables.NUMBER, String.valueOf(count));
+            }
+            copying = false;
+        }, 0L, 1L);
+    }
+
     /**
      * Get all the x,y,z coords that must be copied
      * @param b - bounding box
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
index bd3fda6ef..63143c5e8 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
@@ -1,16 +1,7 @@
 package world.bentobox.bentobox.blueprints;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import com.google.common.collect.ImmutableMap;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -18,12 +9,7 @@ import org.bukkit.block.CreatureSpawner;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Sign;
 import org.bukkit.block.data.type.WallSign;
-import org.bukkit.entity.AbstractHorse;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.ChestedHorse;
-import org.bukkit.entity.Horse;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Tameable;
+import org.bukkit.entity.*;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.material.Colorable;
@@ -31,9 +17,6 @@ import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-
-import com.google.common.collect.ImmutableMap;
-
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
@@ -43,6 +26,12 @@ import world.bentobox.bentobox.blueprints.dataobjects.BlueprintEntity;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * This class pastes the clipboard it is given
  * @author tastybento
@@ -67,8 +56,6 @@ public class BlueprintPaster {
     private Location pos1;
     // The maximum block position (x,y,z)
     private Location pos2;
-    // Speed of pasting
-    private int pasteSpeed;
     private PasteState pasteState;
     private BukkitTask pastingTask;
     private BlueprintClipboard clipboard;
@@ -115,16 +102,16 @@ public class BlueprintPaster {
      */
     private void paste(@NonNull World world, @Nullable Island island, @NonNull Location loc, @NonNull Blueprint blueprint, @Nullable Runnable task) {
         // Iterators for the various maps to paste
-        Map<Vector, BlueprintBlock> blocks = blueprint.getBlocks() == null ? new HashMap<>() : blueprint.getBlocks();
-        Map<Vector, BlueprintBlock> attached = blueprint.getAttached() == null ? new HashMap<>() : blueprint.getAttached();
-        Map<Vector, List<BlueprintEntity>> entities = blueprint.getEntities() == null ? new HashMap<>() : blueprint.getEntities();
+        Map<Vector, BlueprintBlock> blocks = blueprint.getBlocks() == null ? Collections.emptyMap() : blueprint.getBlocks();
+        Map<Vector, BlueprintBlock> attached = blueprint.getAttached() == null ? Collections.emptyMap() : blueprint.getAttached();
+        Map<Vector, List<BlueprintEntity>> entities = blueprint.getEntities() == null ? Collections.emptyMap() : blueprint.getEntities();
         Iterator<Entry<Vector, BlueprintBlock>> it = blocks.entrySet().iterator();
         Iterator<Entry<Vector, BlueprintBlock>> it2 = attached.entrySet().iterator();
         Iterator<Entry<Vector, List<BlueprintEntity>>> it3 = entities.entrySet().iterator();
 
         // Initial state & speed
         pasteState = PasteState.BLOCKS;
-        pasteSpeed = plugin.getSettings().getPasteSpeed();
+        final int pasteSpeed = plugin.getSettings().getPasteSpeed();
 
         pastingTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
             int count = 0;
@@ -132,28 +119,23 @@ public class BlueprintPaster {
                 pasteBlock(world, island, loc, it.next());
                 count++;
             }
-            while (it2 != null && pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && it2.hasNext()) {
+            while (pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && it2.hasNext()) {
                 pasteBlock(world, island, loc, it2.next());
                 count++;
             }
-            while (it3 != null && pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && it3.hasNext()) {
+            while (pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && it3.hasNext()) {
                 pasteEntity(world, loc, it3.next());
                 count++;
             }
             // STATE SHIFT
             if (pasteState.equals(PasteState.BLOCKS) && !it.hasNext()) {
-                // Blocks done.
-                if (it2 == null && it3 == null) {
-                    // No attachments or entities
-                    pasteState = PasteState.DONE;
-                } else {
-                    // Next paste attachments, otherwise skip to entities
-                    pasteState = it2 != null ? PasteState.ATTACHMENTS : PasteState.ENTITIES;
-                }
+                // Blocks done
+                // Next paste attachments
+                pasteState = PasteState.ATTACHMENTS;
             }
             if (pasteState.equals(PasteState.ATTACHMENTS) && !it2.hasNext()) {
-                // Attachments done. Next paste entities, otherwise done
-                pasteState = it3 != null ? PasteState.ENTITIES : PasteState.DONE;
+                // Attachments done. Next paste entities
+                pasteState = PasteState.ENTITIES;
             }
             if (pasteState.equals(PasteState.ENTITIES) && !it3.hasNext()) {
                 pasteState = PasteState.DONE;
@@ -183,22 +165,11 @@ public class BlueprintPaster {
         BlueprintBlock bpBlock = entry.getValue();
         Block block = pasteTo.getBlock();
         // Set the block data - default is AIR
-        BlockData bd = Bukkit.createBlockData(Material.AIR);
+        BlockData bd;
         try {
             bd = Bukkit.createBlockData(bpBlock.getBlockData());
         } catch (Exception e) {
-            // This may happen if the block type is no longer supported by the server
-            plugin.logWarning("Blueprint references materials not supported on this server version.");
-            plugin.logWarning("Load blueprint manually, check and save to fix for this server version.");
-            plugin.logWarning("World: " + world.getName() + " Failed block data: " + bpBlock.getBlockData());
-            // Try to fix
-            for (Entry<String, String> en : BLOCK_CONVERSION.entrySet()) {
-                if (bpBlock.getBlockData().startsWith(MINECRAFT + en.getKey())) {
-                    bd = Bukkit.createBlockData(
-                            bpBlock.getBlockData().replace(MINECRAFT + en.getKey(), MINECRAFT + en.getValue()));
-                    break;
-                }
-            }
+            bd = convertBlockData(world, bpBlock);
         }
         block.setBlockData(bd, false);
         setBlockState(island, block, bpBlock);
@@ -206,6 +177,29 @@ public class BlueprintPaster {
         updatePos(world, entry.getKey());
     }
 
+    /**
+     * Tries to convert the BlockData to a newer version, and logs a warning if it fails to do so.
+     * @return the converted BlockData or a default AIR BlockData.
+     * @since 1.6.0
+     */
+    private BlockData convertBlockData(World world, BlueprintBlock block) {
+        BlockData blockData = Bukkit.createBlockData(Material.AIR);
+        try {
+            for (Entry<String, String> en : BLOCK_CONVERSION.entrySet()) {
+                if (block.getBlockData().startsWith(MINECRAFT + en.getKey())) {
+                    blockData = Bukkit.createBlockData(block.getBlockData().replace(MINECRAFT + en.getKey(), MINECRAFT + en.getValue()));
+                    break;
+                }
+            }
+        } catch (IllegalArgumentException e) {
+            // This may happen if the block type is no longer supported by the server
+            plugin.logWarning("Blueprint references materials not supported on this server version.");
+            plugin.logWarning("Load blueprint manually, check and save to fix for this server version.");
+            plugin.logWarning("World: " + world.getName() + "; Failed block data: " + block.getBlockData());
+        }
+        return blockData;
+    }
+
     private void pasteEntity(World world, Location location, Entry<Vector, List<BlueprintEntity>> entry) {
         int x = location.getBlockX() + entry.getKey().getBlockX();
         int y = location.getBlockY() + entry.getKey().getBlockY();
@@ -324,7 +318,7 @@ public class BlueprintPaster {
     }
 
     private void writeSign(final Island island, final Block block, final List<String> lines) {
-        BlockFace bf = null;
+        BlockFace bf;
         if (block.getType().name().contains("WALL_SIGN")) {
             WallSign wallSign = (WallSign)block.getBlockData();
             bf = wallSign.getFacing();
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java
index c9897e438..1a69cd089 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java
@@ -19,8 +19,8 @@ public class DescriptionSuccessPrompt extends MessagePrompt {
     private BlueprintBundle bb;
 
     /**
-     * @param addon
-     * @param bb
+     * @param addon game mode addon
+     * @param bb blueprint bundle
      */
     public DescriptionSuccessPrompt(GameModeAddon addon, BlueprintBundle bb) {
         this.addon = addon;
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/dataobjects/BlueprintBundle.java b/src/main/java/world/bentobox/bentobox/blueprints/dataobjects/BlueprintBundle.java
index 90120a22e..19384d3fd 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/dataobjects/BlueprintBundle.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/dataobjects/BlueprintBundle.java
@@ -3,6 +3,7 @@ package world.bentobox.bentobox.blueprints.dataobjects;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.bukkit.Material;
@@ -68,7 +69,7 @@ public class BlueprintBundle implements DataObject {
      */
     @Override
     public String getUniqueId() {
-        return uniqueId;
+        return uniqueId.toLowerCase(Locale.ENGLISH);
     }
     /**
      * @param uniqueId the uniqueId to set
@@ -155,7 +156,7 @@ public class BlueprintBundle implements DataObject {
     /**
      * Adds a line to the description
      *
-     * @param string
+     * @param string description
      */
     public void setDescription(String string) {
         if (description == null)
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java
new file mode 100644
index 000000000..2cc438013
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java
@@ -0,0 +1,136 @@
+package world.bentobox.bentobox.blueprints.worldedit;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.blueprints.Blueprint;
+import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory;
+
+/**
+ * @since 1.6.0
+ * @author CustomEntity
+ */
+public class BlueprintClipboardFormat implements ClipboardFormat {
+
+    public BlueprintClipboardFormat() {
+        ClipboardFormats.registerClipboardFormat(this);
+    }
+
+    @Override
+    public String getName() {
+        return "Blueprint";
+    }
+
+    @Override
+    public Set<String> getAliases() {
+        return Sets.newHashSet("Bp");
+    }
+
+    @Override
+    public ClipboardReader getReader(InputStream inputStream) throws IOException {
+        return new BlueprintClipboardReader(inputStream);
+    }
+
+    @Override
+    public ClipboardWriter getWriter(OutputStream outputStream) throws IOException {
+        return new BlueprintClipboardWriter(outputStream);
+    }
+
+    @Override
+    public boolean isFormat(File file) {
+        try {
+            Gson gson = getGson();
+
+            unzip(file.getAbsolutePath());
+
+            File unzippedFile = new File(file.getParentFile(), file.getName());
+
+            return gsonCheck(gson, unzippedFile);
+
+        } catch (IOException e) {
+            BentoBox.getInstance().logStacktrace(e);
+        }
+        return false;
+    }
+
+    private boolean gsonCheck(Gson gson, File unzippedFile) {
+        try (FileReader fr = new FileReader(unzippedFile)) {
+            gson.fromJson(fr, Blueprint.class);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public String getPrimaryFileExtension() {
+        return "blueprint";
+    }
+
+    @Override
+    public Set<String> getFileExtensions() {
+        return ImmutableSet.of("blu", "blueprint");
+    }
+
+    private Gson getGson() {
+        GsonBuilder builder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().enableComplexMapKeySerialization();
+        // Disable <>'s escaping etc.
+        builder.disableHtmlEscaping();
+        // Register adapter factory
+        builder.registerTypeAdapterFactory(new BentoboxTypeAdapterFactory(BentoBox.getInstance()));
+        return builder.create();
+    }
+
+    private void unzip(final String zipFilePath) throws IOException {
+        Path path = Paths.get(zipFilePath);
+        if (!(path.toFile().exists())) {
+            throw new IOException("No file exists!");
+        }
+        try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(zipFilePath))) {
+            ZipEntry entry = zipInputStream.getNextEntry();
+            while (entry != null) {
+                Path filePath = Paths.get(path.getParent().toString(), entry.getName());
+                if (!entry.isDirectory()) {
+                    unzipFiles(zipInputStream, filePath);
+                } else {
+                    Files.createDirectories(filePath);
+                }
+
+                zipInputStream.closeEntry();
+                entry = zipInputStream.getNextEntry();
+            }
+        }
+    }
+
+    private void unzipFiles(final ZipInputStream zipInputStream, final Path unzipFilePath) throws IOException {
+        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(unzipFilePath.toAbsolutePath().toString()))) {
+            byte[] bytesIn = new byte[1024];
+            int read;
+            while ((read = zipInputStream.read(bytesIn)) != -1) {
+                bos.write(bytesIn, 0, read);
+            }
+        }
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java
new file mode 100644
index 000000000..705f838ea
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java
@@ -0,0 +1,34 @@
+package world.bentobox.bentobox.blueprints.worldedit;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+
+/**
+ * @since 1.6.0
+ * @author CustomEntity
+ */
+public class BlueprintClipboardReader implements ClipboardReader {
+
+    private InputStream inputStream;
+
+    public BlueprintClipboardReader(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public Clipboard read() throws IOException {
+        return null; //TODO
+    }
+
+    @Override
+    public void close() throws IOException {
+
+    }
+
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java
new file mode 100644
index 000000000..8d9074ad9
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java
@@ -0,0 +1,33 @@
+package world.bentobox.bentobox.blueprints.worldedit;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+
+/**
+ * @since 1.6.0
+ * @author CustomEntity
+ */
+public class BlueprintClipboardWriter implements ClipboardWriter {
+
+    private OutputStream outputStream;
+
+    public BlueprintClipboardWriter(OutputStream outputStream) {
+        this.outputStream = outputStream;
+    }
+    @Override
+    public void write(Clipboard clipboard) throws IOException {
+        // TODO
+    }
+
+    @Override
+    public void close() throws IOException {
+
+    }
+
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java
new file mode 100644
index 000000000..6a1708006
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java
@@ -0,0 +1,42 @@
+package world.bentobox.bentobox.blueprints.worldedit;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+
+import world.bentobox.bentobox.BentoBox;
+
+/**
+ * @since 1.6.0
+ * @author CustomEntity
+ */
+public class BlueprintSchematicConverter {
+
+    private File blueprintFile;
+
+    public BlueprintSchematicConverter(File blueprintFile) {
+        if(!BentoBox.getInstance().getHooks().getHook("WorldEdit").isPresent()) {
+            BentoBox.getInstance().logError("WorldEdit must be installed to use that class !");
+            return;
+        }
+        this.blueprintFile = blueprintFile;
+    }
+
+    public Clipboard convertBlueprintToSchematic() {
+        Clipboard clipboard = null;
+        try {
+            clipboard = ClipboardFormats.findByFile(blueprintFile).getReader(new FileInputStream(blueprintFile)).read();
+        } catch (IOException e) {
+            BentoBox.getInstance().logWarning("Error while trying to convert blueprint format to schematic format.");
+            BentoBox.getInstance().logStacktrace(e);
+        }
+        return clipboard;
+    }
+
+    public File getBlueprintFile() {
+        return blueprintFile;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxCatalogCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxCatalogCommand.java
index e3b9932f2..f5da6a737 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxCatalogCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxCatalogCommand.java
@@ -1,11 +1,11 @@
 package world.bentobox.bentobox.commands;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.panels.CatalogPanel;
 
-import java.util.List;
-
 /**
  * Displays the Addons Catalog.
  *
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxCommand.java
index 7710e6cae..a36278524 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxCommand.java
@@ -1,10 +1,10 @@
 package world.bentobox.bentobox.commands;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 
-import java.util.List;
-
 public class BentoBoxCommand extends CompositeCommand {
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxLocaleCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxLocaleCommand.java
index ce8382c63..9c16ad804 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxLocaleCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxLocaleCommand.java
@@ -1,11 +1,11 @@
 package world.bentobox.bentobox.commands;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.user.User;
 
-import java.util.List;
-
 /**
  * Performs localization analysis.
  *
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxManageCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxManageCommand.java
index 7d1dc7d22..f0c1d6ea3 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxManageCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxManageCommand.java
@@ -1,11 +1,11 @@
 package world.bentobox.bentobox.commands;
 
+import java.util.List;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.panels.ManagementPanel;
 
-import java.util.List;
-
 /**
  * Displays the Management panel.
  *
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxReloadCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxReloadCommand.java
index 973d6a7ac..5feab0508 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxReloadCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxReloadCommand.java
@@ -4,8 +4,11 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
+import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
 
@@ -50,6 +53,9 @@ public class BentoBoxReloadCommand extends ConfirmableCommand {
                 // Reload locales
                 getPlugin().getLocalesManager().reloadLanguages();
                 user.sendMessage("commands.bentobox.reload.locales-reloaded");
+
+                // Fire ready event
+                Bukkit.getServer().getPluginManager().callEvent(new BentoBoxReadyEvent());
             });
         } else {
             showHelp(this, user);
diff --git a/src/main/java/world/bentobox/bentobox/commands/BentoBoxVersionCommand.java b/src/main/java/world/bentobox/bentobox/commands/BentoBoxVersionCommand.java
index 902e2d1c9..f68689b33 100644
--- a/src/main/java/world/bentobox/bentobox/commands/BentoBoxVersionCommand.java
+++ b/src/main/java/world/bentobox/bentobox/commands/BentoBoxVersionCommand.java
@@ -1,17 +1,18 @@
 package world.bentobox.bentobox.commands;
 
-import org.bukkit.Bukkit;
-import world.bentobox.bentobox.api.addons.GameModeAddon;
-import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.versions.ServerCompatibility;
-
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.bukkit.Bukkit;
+
+import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.versions.ServerCompatibility;
+
 /**
  * Displays information about Gamemodes, Addons and versioning.
  *
@@ -45,6 +46,7 @@ public class BentoBoxVersionCommand extends CompositeCommand {
                 TextVariables.NAME, serverSoftware != null ? serverSoftware.toString() : user.getTranslation("general.invalid"),
                         TextVariables.VERSION, serverVersion != null ? serverVersion.toString() : user.getTranslation("general.invalid"));
         user.sendMessage("commands.bentobox.version.plugin-version", TextVariables.VERSION, getPlugin().getDescription().getVersion());
+        user.sendMessage("commands.bentobox.version.database", "[database]", getSettings().getDatabaseType().toString());
         user.sendMessage("commands.bentobox.version.loaded-game-worlds");
 
         getIWM().getOverWorldNames().entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey))
@@ -62,16 +64,16 @@ public class BentoBoxVersionCommand extends CompositeCommand {
                    &c = dimension does not exist
                 */
                 // Get the nether color
-                if (addon.getNetherWorld() == null || !getIWM().isNetherGenerate(addon.getNetherWorld())) {
+                if (addon.getNetherWorld() == null || !getIWM().isNetherGenerate(addon.getOverWorld())) {
                     netherColor = GAMEWORLD_COLOR_NOT_EXIST;
-                } else if (!getIWM().isNetherIslands(addon.getNetherWorld())) {
+                } else if (!getIWM().isNetherIslands(addon.getOverWorld())) {
                     netherColor = GAMEWORLD_COLOR_EXISTS_NO_ISLANDS;
                 }
 
                 // Get the nether color
-                if (addon.getEndWorld() == null || !getIWM().isEndGenerate(addon.getEndWorld())) {
+                if (addon.getEndWorld() == null || !getIWM().isEndGenerate(addon.getOverWorld())) {
                     endColor = GAMEWORLD_COLOR_NOT_EXIST;
-                } else if (!getIWM().isEndIslands(addon.getEndWorld())) {
+                } else if (!getIWM().isEndIslands(addon.getOverWorld())) {
                     endColor = GAMEWORLD_COLOR_EXISTS_NO_ISLANDS;
                 }
             }
diff --git a/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java
index 1e575bb00..a33e62c2c 100644
--- a/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java
@@ -3,7 +3,11 @@ package world.bentobox.bentobox.database;
 import java.beans.IntrospectionException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
+import org.bukkit.Bukkit;
+import org.bukkit.scheduler.BukkitTask;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -19,6 +23,21 @@ import world.bentobox.bentobox.api.addons.Addon;
  */
 public abstract class AbstractDatabaseHandler<T> {
 
+    /**
+     * FIFO queue for saves or deletions. Note that the assumption here is that most database objects will be held
+     * in memory because loading is not handled with this queue. That means that it is theoretically
+     * possible to load something before it has been saved. So, in general, load your objects and then
+     * save them async only when you do not need the data again immediately.
+     */
+    protected Queue<Runnable> processQueue;
+
+    /**
+     * Async save task that runs repeatedly
+     */
+    private BukkitTask asyncSaveTask;
+
+    protected boolean shutdown;
+
     /**
      * Name of the folder where databases using files will live
      */
@@ -75,6 +94,33 @@ public abstract class AbstractDatabaseHandler<T> {
         this.plugin = plugin;
         this.databaseConnector = databaseConnector;
         this.dataObject = type;
+
+        // Run async queue
+        processQueue = new ConcurrentLinkedQueue<>();
+        if (plugin.isEnabled()) {
+            asyncSaveTask = Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                // Loop continuously
+                while (!shutdown || !processQueue.isEmpty()) {
+                    // This catches any databases that are not explicitly closed
+                    if (!plugin.isEnabled()) {
+                        shutdown = true;
+                    }
+                    while (!processQueue.isEmpty()) {
+                        processQueue.poll().run();
+                    }
+                    // Clear the queue and then sleep
+                    try {
+                        Thread.sleep(25);
+                    } catch (InterruptedException e) {
+                        plugin.logError("Thread sleep error " + e.getMessage());
+                        Thread.currentThread().interrupt();
+                    }
+                }
+                // Cancel
+                asyncSaveTask.cancel();
+                databaseConnector.closeConnection(dataObject);
+            });
+        }
     }
 
     protected AbstractDatabaseHandler() {}
diff --git a/src/main/java/world/bentobox/bentobox/database/Database.java b/src/main/java/world/bentobox/bentobox/database/Database.java
index cbfae24fe..4fafa11d2 100644
--- a/src/main/java/world/bentobox/bentobox/database/Database.java
+++ b/src/main/java/world/bentobox/bentobox/database/Database.java
@@ -21,6 +21,7 @@ public class Database<T> {
 
     private AbstractDatabaseHandler<T> handler;
     private Logger logger;
+    private static DatabaseSetup databaseSetup = DatabaseSetup.getDatabase();
 
     /**
      * Construct a database
@@ -29,7 +30,7 @@ public class Database<T> {
      */
     public Database(BentoBox plugin, Class<T> type)  {
         this.logger = plugin.getLogger();
-        handler = DatabaseSetup.getDatabase().getHandler(type);
+        handler = databaseSetup.getHandler(type);
     }
 
     /**
@@ -39,7 +40,7 @@ public class Database<T> {
      */
     public Database(Addon addon, Class<T> type)  {
         this.logger = addon.getLogger();
-        handler = DatabaseSetup.getDatabase().getHandler(type);
+        handler = databaseSetup.getHandler(type);
     }
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/database/DatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/DatabaseConnector.java
index c4b962ac0..ab57ac1d2 100644
--- a/src/main/java/world/bentobox/bentobox/database/DatabaseConnector.java
+++ b/src/main/java/world/bentobox/bentobox/database/DatabaseConnector.java
@@ -1,45 +1,54 @@
 package world.bentobox.bentobox.database;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 /**
- *
  * Creates a connection to a database.
- *
  */
 public interface DatabaseConnector {
 
     /**
      * Establishes a new connection to the database
      *
+     * @param type of class
      * @return A new connection to the database using the settings provided
      */
-     Object createConnection();
-     
-     /**
+    Object createConnection(Class<?> type);
+
+    /**
      * Close the database connection
+     * @param type of class being closed
      */
-    void closeConnection();
-    
+    void closeConnection(Class<?> type);
+
     /**
      * Returns the connection url
      *
      * @return the connector's URL
      */
-     String getConnectionUrl();
+    String getConnectionUrl();
 
     /**
      * Looks through the database (or files) and returns a known unique key
+     *
      * @param tableName - name of the table
      * @return a unique key for this record
      */
-     String getUniqueId(String tableName);
+    @NonNull
+    String getUniqueId(String tableName);
 
     /**
      * Check if a key exists in the database in this table or not
+     *
      * @param tableName - name of the table
-     * @param key - key to check
+     * @param key       - key to check
      * @return true if it exists
      */
-     boolean uniqueIdExists(String tableName, String key);
+    boolean uniqueIdExists(String tableName, String key);
+
+
+
+
 
 }
 
diff --git a/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java b/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java
index 350853ef9..e24e0b817 100644
--- a/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java
+++ b/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java
@@ -1,20 +1,31 @@
 package world.bentobox.bentobox.database;
 
+import java.util.Arrays;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.database.json.JSONDatabase;
-import world.bentobox.bentobox.database.mariadb.MariaDBDatabase;
 import world.bentobox.bentobox.database.mongodb.MongoDBDatabase;
-import world.bentobox.bentobox.database.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.sql.mariadb.MariaDBDatabase;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.sql.postgresql.PostgreSQLDatabase;
+import world.bentobox.bentobox.database.sql.sqlite.SQLiteDatabase;
 import world.bentobox.bentobox.database.transition.Json2MariaDBDatabase;
+import world.bentobox.bentobox.database.transition.Json2MongoDBDatabase;
 import world.bentobox.bentobox.database.transition.Json2MySQLDatabase;
+import world.bentobox.bentobox.database.transition.Json2PostgreSQLDatabase;
+import world.bentobox.bentobox.database.transition.Json2SQLiteDatabase;
+import world.bentobox.bentobox.database.transition.MariaDB2JsonDatabase;
+import world.bentobox.bentobox.database.transition.MongoDB2JsonDatabase;
 import world.bentobox.bentobox.database.transition.MySQL2JsonDatabase;
+import world.bentobox.bentobox.database.transition.PostgreSQL2JsonDatabase;
+import world.bentobox.bentobox.database.transition.SQLite2JsonDatabase;
 import world.bentobox.bentobox.database.transition.Yaml2JsonDatabase;
 import world.bentobox.bentobox.database.transition.Yaml2MariaDBDatabase;
+import world.bentobox.bentobox.database.transition.Yaml2MongoDBDatabase;
 import world.bentobox.bentobox.database.transition.Yaml2MySQLDatabase;
+import world.bentobox.bentobox.database.transition.Yaml2SQLiteDatabase;
 import world.bentobox.bentobox.database.yaml.YamlDatabase;
 
-import java.util.Arrays;
-
 /**
  * @author Poslovitch, tastybento
  */
@@ -23,7 +34,7 @@ public interface DatabaseSetup {
     /**
      * Gets the type of database being used.
      * Currently supported options are YAML, JSON, MYSQL, MARIADB and MONGODB.
-     * Default is YAML.
+     * Default is JSON.
      * @return Database type
      */
     static DatabaseSetup getDatabase() {
@@ -57,6 +68,18 @@ public interface DatabaseSetup {
          */
         YAML2MARIADB(new Yaml2MariaDBDatabase()),
 
+        /**
+         * Transition database, from YAML to MongoDB
+         * @since 1.6.0
+         */
+        YAML2MONGODB(new Yaml2MongoDBDatabase()),
+
+        /**
+         * Transition database, from YAML to SQLite
+         * @since 1.6.0
+         */
+        YAML2SQLITE(new Yaml2SQLiteDatabase()),
+
         JSON(new JSONDatabase()),
         /**
          * Transition database, from JSON to MySQL
@@ -69,7 +92,26 @@ public interface DatabaseSetup {
          */
         JSON2MARIADB(new Json2MariaDBDatabase()),
 
+        /**
+         * Transition database, from JSON to MongoDB
+         * @since 1.6.0
+         */
+        JSON2MONGODB(new Json2MongoDBDatabase()),
+
+        /**
+         * Transition database, from JSON to SQLite
+         * @since 1.6.0
+         */
+        JSON2SQLITE(new Json2SQLiteDatabase()),
+
+        /**
+         * Transition database, from JSON to PostgreSQL
+         * @since 1.6.0
+         */
+        JSON2POSTGRESQL(new Json2PostgreSQLDatabase()),
+
         MYSQL(new MySQLDatabase()),
+
         /**
          * Transition database, from MySQL to JSON
          * @since 1.5.0
@@ -80,7 +122,41 @@ public interface DatabaseSetup {
          */
         MARIADB(new MariaDBDatabase()),
 
-        MONGODB(new MongoDBDatabase());
+        /**
+         * Transition database, from MariaDB to JSON
+         * @since 1.6.0
+         */
+        MARIADB2JSON(new MariaDB2JsonDatabase()),
+
+        MONGODB(new MongoDBDatabase()),
+
+        /**
+         * Transition database, from MongoDB to JSON
+         * @since 1.6.0
+         */
+        MONGODB2JSON(new MongoDB2JsonDatabase()),
+
+        /**
+         * @since 1.6.0
+         */
+        SQLITE(new SQLiteDatabase()),
+
+        /**
+         * Transition database, from SQLite to JSON
+         * @since 1.6.0
+         */
+        SQLITE2JSON(new SQLite2JsonDatabase()),
+
+        /**
+         * @since 1.6.0
+         */
+        POSTGRESQL(new PostgreSQLDatabase()),
+
+        /**
+         * Transition database, from PostgreSQL to JSON
+         * @since 1.6.0
+         */
+        POSTGRESQL2JSON(new PostgreSQL2JsonDatabase());
 
         DatabaseSetup database;
 
diff --git a/src/main/java/world/bentobox/bentobox/database/json/AbstractJSONDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/json/AbstractJSONDatabaseHandler.java
index e7909f753..20e312c68 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/AbstractJSONDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/AbstractJSONDatabaseHandler.java
@@ -22,7 +22,7 @@ public abstract class AbstractJSONDatabaseHandler<T> extends AbstractDatabaseHan
     /**
      * Constructor
      *
-     * @param plugin
+     * @param plugin            BentoBox plugin
      * @param type              The type of the objects that should be created and filled with
      *                          values from the database or inserted into the database
      * @param databaseConnector Contains the settings to create a connection to the database
@@ -41,6 +41,7 @@ public abstract class AbstractJSONDatabaseHandler<T> extends AbstractDatabaseHan
         builder.disableHtmlEscaping();
 
         gson = builder.create();
+
     }
 
     protected Gson getGson() {
diff --git a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java
index f8488c7e1..56c57f1ee 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java
@@ -35,7 +35,7 @@ public class BentoboxTypeAdapterFactory implements TypeAdapterFactory {
     BentoBox plugin;
 
     /**
-     * @param plugin
+     * @param plugin plugin
      */
     public BentoboxTypeAdapterFactory(BentoBox plugin) {
         this.plugin = plugin;
diff --git a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabase.java b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabase.java
index c3406afb9..b2b2ce108 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabase.java
@@ -6,8 +6,13 @@ import world.bentobox.bentobox.database.DatabaseSetup;
 
 public class JSONDatabase implements DatabaseSetup {
 
+    private JSONDatabaseConnector connector = new JSONDatabaseConnector(BentoBox.getInstance());
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.DatabaseSetup#getHandler(java.lang.Class)
+     */
     @Override
     public <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass) {
-        return new JSONDatabaseHandler<>(BentoBox.getInstance(), dataObjectClass, new JSONDatabaseConnector(BentoBox.getInstance()));
+        return new JSONDatabaseHandler<>(BentoBox.getInstance(), dataObjectClass, connector);
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseConnector.java
index ac23b45eb..fab8aa33e 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseConnector.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseConnector.java
@@ -3,6 +3,8 @@ package world.bentobox.bentobox.database.json;
 import java.io.File;
 import java.util.UUID;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.database.DatabaseConnector;
 
@@ -18,6 +20,7 @@ public class JSONDatabaseConnector implements DatabaseConnector {
     }
 
     @Override
+    @NonNull
     public String getUniqueId(String tableName) {
         UUID uuid = UUID.randomUUID();
         File file = new File(dataFolder, tableName + File.separator + uuid.toString() + JSON);
@@ -35,18 +38,20 @@ public class JSONDatabaseConnector implements DatabaseConnector {
         return file.exists();
     }
 
-    @Override
-    public Object createConnection() {
-        return null; // Not used
-    }
-
     @Override
     public String getConnectionUrl() {
         return null; // Not used
     }
 
     @Override
-    public void closeConnection() {
+    public Object createConnection(Class<?> type) {
+        // Not used
+        return null;
+    }
+
+    @Override
+    public void closeConnection(Class<?> type) {
         // Not used
     }
+
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseHandler.java
index ca62478fd..9ec4dfc73 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/JSONDatabaseHandler.java
@@ -16,6 +16,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.database.DatabaseConnector;
 import world.bentobox.bentobox.database.objects.DataObject;
@@ -27,7 +29,7 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     /**
      * Constructor
      *
-     * @param plugin
+     * @param plugin            BentoBox plugin
      * @param type              The type of the objects that should be created and filled with
      *                          values from the database or inserted into the database
      * @param databaseConnector Contains the settings to create a connection to the database
@@ -57,11 +59,9 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
             try (FileReader reader = new FileReader(file)){
                 T object = getGson().fromJson(reader, dataObject);
                 if (object == null) {
-                    reader.close();
                     throw new IOException("JSON file created a null object: " + file.getPath());
                 }
                 list.add(object);
-                reader.close();
             } catch (FileNotFoundException e) {
                 plugin.logError("Could not load file '" + file.getName() + "': File not found.");
 
@@ -73,7 +73,7 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     }
 
     @Override
-    public T loadObject(String uniqueId) {
+    public T loadObject(@NonNull String uniqueId) {
         // Objects are loaded from a folder named after the simple name of the class being stored
         String path = DATABASE_FOLDER_NAME + File.separator + dataObject.getSimpleName();
 
@@ -119,7 +119,16 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
         }
 
         String toStore = getGson().toJson(instance);
+        if (plugin.isEnabled()) {
+            // Async
+            processQueue.add(() -> store(toStore, file, tableFolder, fileName));
+        } else {
+            // Sync
+            store(toStore, file, tableFolder, fileName);
+        }
+    }
 
+    private void store(String toStore, File file, File tableFolder, String fileName) {
         try (FileWriter fileWriter = new FileWriter(file)) {
             File tmpFile = new File(tableFolder, fileName + ".bak");
             if (file.exists()) {
@@ -129,12 +138,23 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
             fileWriter.write(toStore);
             Files.deleteIfExists(tmpFile.toPath());
         } catch (IOException e) {
-            plugin.logError("Could not save json file: " + path + " " + fileName + " " + e.getMessage());
+            plugin.logError("Could not save JSON file: " + tableFolder.getName() + " " + fileName + " " + e.getMessage());
         }
     }
 
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.AbstractDatabaseHandler#deleteID(java.lang.String)
+     */
     @Override
     public void deleteID(String uniqueId) {
+        if (plugin.isEnabled()) {
+            processQueue.add(() -> delete(uniqueId));
+        } else {
+            delete(uniqueId);
+        }
+    }
+
+    private void delete(String uniqueId) {
         // The filename of the JSON file is the value of uniqueId field plus .json. Sometimes the .json is already appended.
         if (!uniqueId.endsWith(JSON)) {
             uniqueId = uniqueId + JSON;
@@ -148,27 +168,28 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
             try {
                 Files.deleteIfExists(file.toPath());
             } catch (IOException e) {
-                plugin.logError("Could not delete json database object! " + file.getName() + " - " + e.getMessage());
+                plugin.logError("Could not delete JSON database object! " + file.getName() + " - " + e.getMessage());
             }
         }
     }
 
     @Override
-    public void deleteObject(T instance) throws IllegalAccessException, InvocationTargetException, IntrospectionException {
+    public void deleteObject(T instance) {
         // Null check
         if (instance == null) {
-            plugin.logError("JSON database request to delete a null. ");
+            plugin.logError("JSON database request to delete a null.");
             return;
         }
         if (!(instance instanceof DataObject)) {
             plugin.logError("This class is not a DataObject: " + instance.getClass().getName());
             return;
         }
-
-        // Obtain the value of uniqueId within the instance (which must be a DataObject)
-        PropertyDescriptor propertyDescriptor = new PropertyDescriptor("uniqueId", dataObject);
-        Method method = propertyDescriptor.getReadMethod();
-        deleteID((String) method.invoke(instance));
+        try {
+            Method getUniqueId = dataObject.getMethod("getUniqueId");
+            deleteID((String) getUniqueId.invoke(instance));
+        } catch (Exception e) {
+            plugin.logError("Could not delete object " + instance.getClass().getName() + " " + e.getMessage());
+        }
     }
 
     @Override
@@ -179,6 +200,6 @@ public class JSONDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     @Override
     public void close() {
-        // Not used
+        shutdown = true;
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/json/adapters/BukkitObjectTypeAdapter.java b/src/main/java/world/bentobox/bentobox/database/json/adapters/BukkitObjectTypeAdapter.java
index eeb040b4b..7abade9f2 100644
--- a/src/main/java/world/bentobox/bentobox/database/json/adapters/BukkitObjectTypeAdapter.java
+++ b/src/main/java/world/bentobox/bentobox/database/json/adapters/BukkitObjectTypeAdapter.java
@@ -1,18 +1,19 @@
 package world.bentobox.bentobox.database.json.adapters;
 
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+import static org.bukkit.configuration.serialization.ConfigurationSerialization.SERIALIZED_TYPE_KEY;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.bukkit.configuration.serialization.ConfigurationSerialization.SERIALIZED_TYPE_KEY;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.configuration.serialization.ConfigurationSerialization;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 
 /**
  * Handles {@link ConfigurationSerializable} types
diff --git a/src/main/java/world/bentobox/bentobox/database/json/package-info.java b/src/main/java/world/bentobox/bentobox/database/json/package-info.java
new file mode 100644
index 000000000..99f56dc98
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/json/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Contains JSON database managers.
+ */
+package world.bentobox.bentobox.database.json;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabase.java
deleted file mode 100644
index 889f4906a..000000000
--- a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabase.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package world.bentobox.bentobox.database.mariadb;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.database.AbstractDatabaseHandler;
-import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
-import world.bentobox.bentobox.database.DatabaseSetup;
-
-/**
- * @author barpec12
- * @since 1.1
- */
-public class MariaDBDatabase implements DatabaseSetup {
-
-    /* (non-Javadoc)
-     * @see world.bentobox.bentobox.database.BSBDbSetup#getHandler(java.lang.Class)
-     */
-    @Override
-    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
-        BentoBox plugin = BentoBox.getInstance();
-        return new MariaDBDatabaseHandler<>(plugin, type, new MariaDBDatabaseConnector(new DatabaseConnectionSettingsImpl(
-                plugin.getSettings().getDatabaseHost(),
-                plugin.getSettings().getDatabasePort(),
-                plugin.getSettings().getDatabaseName(),
-                plugin.getSettings().getDatabaseUsername(),
-                plugin.getSettings().getDatabasePassword()
-                )));
-    }
-
-}
diff --git a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseConnector.java
deleted file mode 100644
index cbcdc8570..000000000
--- a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseConnector.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package world.bentobox.bentobox.database.mariadb;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.bukkit.Bukkit;
-
-import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
-import world.bentobox.bentobox.database.DatabaseConnector;
-
-/**
- * @author barpec12
- * @since 1.1
- */
-public class MariaDBDatabaseConnector implements DatabaseConnector {
-
-    private String connectionUrl;
-    private DatabaseConnectionSettingsImpl dbSettings;
-    private Connection connection = null;
-
-    /**
-     * Class for MariaDB database connections using the settings provided
-     * @param dbSettings - database settings
-     */
-    MariaDBDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings) {
-        this.dbSettings = dbSettings;
-        connectionUrl = "jdbc:mysql://" + dbSettings.getHost() + ":" + dbSettings.getPort() + "/" + dbSettings.getDatabaseName()
-        + "?autoReconnect=true&useSSL=false&allowMultiQueries=true";
-    }
-
-    @Override
-    public Connection createConnection() {
-        try {
-            connection = DriverManager.getConnection(connectionUrl, dbSettings.getUsername(), dbSettings.getPassword());
-        } catch (SQLException e) {
-            Bukkit.getLogger().severe("Could not connect to the database! " + e.getMessage());
-        }
-        return connection;
-    }
-
-    @Override
-    public String getConnectionUrl() {
-        return connectionUrl;
-    }
-
-    @Override
-    public String getUniqueId(String tableName) {
-        // Not used
-        return "";
-    }
-
-    @Override
-    public boolean uniqueIdExists(String tableName, String key) {
-        // Not used
-        return false;
-    }
-
-    @Override
-    public void closeConnection() {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                Bukkit.getLogger().severe("Could not close MariaDB database connection");
-            }
-        }
-    }
-}
diff --git a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandler.java
deleted file mode 100644
index 87a1169ba..000000000
--- a/src/main/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandler.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package world.bentobox.bentobox.database.mariadb;
-
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitTask;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.database.DatabaseConnector;
-import world.bentobox.bentobox.database.json.AbstractJSONDatabaseHandler;
-import world.bentobox.bentobox.database.objects.DataObject;
-
-/**
- *
- * Class that inserts a <T> into the corresponding database-table.
- *
- * @author tastybento, barpec12
- *
- * @param <T>
- */
-public class MariaDBDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
-
-    private static final String COULD_NOT_LOAD_OBJECTS = "Could not load objects ";
-    private static final String COULD_NOT_LOAD_OBJECT = "Could not load object ";
-
-    /**
-     * Connection to the database
-     */
-    private Connection connection;
-
-    /**
-     * FIFO queue for saves or deletions. Note that the assumption here is that most database objects will be held
-     * in memory because loading is not handled with this queue. That means that it is theoretically
-     * possible to load something before it has been saved. So, in general, load your objects and then
-     * save them async only when you do not need the data again immediately.
-     */
-    private Queue<Runnable> processQueue;
-
-    /**
-     * Async save task that runs repeatedly
-     */
-    private BukkitTask asyncSaveTask;
-
-
-    /**
-     * Handles the connection to the database and creation of the initial database schema (tables) for
-     * the class that will be stored.
-     * @param plugin - plugin object
-     * @param type - the type of class to be stored in the database. Must inherit DataObject
-     * @param dbConnecter - authentication details for the database
-     */
-    MariaDBDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector dbConnecter) {
-        super(plugin, type, dbConnecter);
-        connection = (Connection)dbConnecter.createConnection();
-        if (connection == null) {
-            plugin.logError("Are the settings in config.yml correct?");
-            Bukkit.getPluginManager().disablePlugin(plugin);
-            return;
-        }
-        // Check if the table exists in the database and if not, create it
-        createSchema();
-        processQueue = new ConcurrentLinkedQueue<>();
-        if (plugin.isEnabled()) {
-            asyncSaveTask = Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                // Loop continuously
-                while (plugin.isEnabled() || !processQueue.isEmpty()) {
-                    while (!processQueue.isEmpty()) {
-                        processQueue.poll().run();
-                    }
-                    // Clear the queue and then sleep
-                    try {
-                        Thread.sleep(25);
-                    } catch (InterruptedException e) {
-                        plugin.logError("Thread sleep error " + e.getMessage());
-                        Thread.currentThread().interrupt();
-                    }
-                }
-                // Cancel
-                asyncSaveTask.cancel();
-            });
-        }
-    }
-
-    /**
-     * Creates the table in the database if it doesn't exist already
-     */
-    private void createSchema() {
-        String sql = "CREATE TABLE IF NOT EXISTS `" +
-                dataObject.getCanonicalName() +
-                "` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))";
-        // Prepare and execute the database statements
-        try (PreparedStatement pstmt = connection.prepareStatement(sql)) {
-            pstmt.executeUpdate();
-        } catch (SQLException e) {
-            plugin.logError("Problem trying to create schema for data object " + dataObject.getCanonicalName() + " " + e.getMessage());
-        }
-    }
-
-    @Override
-    public List<T> loadObjects() {
-        try (Statement preparedStatement = connection.createStatement()) {
-            return loadIt(preparedStatement);
-        } catch (SQLException e) {
-            plugin.logError(COULD_NOT_LOAD_OBJECTS + e.getMessage());
-        }
-        return Collections.emptyList();
-    }
-
-    private List<T> loadIt(Statement preparedStatement) {
-        List<T> list = new ArrayList<>();
-
-        String sb = "SELECT `json` FROM `" +
-                dataObject.getCanonicalName() +
-                "`";
-        try (ResultSet resultSet = preparedStatement.executeQuery(sb)) {
-            // Load all the results
-            Gson gson = getGson();
-            while (resultSet.next()) {
-                String json = resultSet.getString("json");
-                if (json != null) {
-                    try {
-                        T gsonResult = gson.fromJson(json, dataObject);
-                        if (gsonResult != null) {
-                            list.add(gsonResult);
-                        }
-                    } catch (JsonSyntaxException ex) {
-                        plugin.logError(COULD_NOT_LOAD_OBJECT + ex.getMessage());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            plugin.logError(COULD_NOT_LOAD_OBJECTS + e.getMessage());
-        }
-        return list;
-    }
-
-    @Override
-    public T loadObject(String uniqueId) {
-        String sb = "SELECT `json` FROM `" + dataObject.getCanonicalName() + "` WHERE uniqueId = ? LIMIT 1";
-        try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
-            // UniqueId needs to be placed in quotes
-            preparedStatement.setString(1, "\"" + uniqueId + "\"");
-            try (ResultSet resultSet = preparedStatement.executeQuery()) {
-                if (resultSet.next()) {
-                    // If there is a result, we only want/need the first one
-                    Gson gson = getGson();
-                    return gson.fromJson(resultSet.getString("json"), dataObject);
-                }
-            } catch (Exception e) {
-                plugin.logError(COULD_NOT_LOAD_OBJECT + uniqueId + " " + e.getMessage());
-            }
-        } catch (SQLException e) {
-            plugin.logError(COULD_NOT_LOAD_OBJECT + uniqueId + " " + e.getMessage());
-        }
-        return null;
-    }
-
-    @Override
-    public void saveObject(T instance) {
-        // Null check
-        if (instance == null) {
-            plugin.logError("MySQL database request to store a null. ");
-            return;
-        }
-        if (!(instance instanceof DataObject)) {
-            plugin.logError("This class is not a DataObject: " + instance.getClass().getName());
-            return;
-        }
-        String sb = "INSERT INTO " +
-                "`" +
-                dataObject.getCanonicalName() +
-                "` (json) VALUES (?) ON DUPLICATE KEY UPDATE json = ?";
-
-        Gson gson = getGson();
-        String toStore = gson.toJson(instance);
-        if (plugin.isEnabled()) {
-            // Async
-            processQueue.add(() -> store(instance, toStore, sb));
-        } else {
-            // Sync
-            store(instance, toStore, sb);
-        }
-    }
-
-    private void store(T instance, String toStore, String sb) {
-        try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
-            preparedStatement.setString(1, toStore);
-            preparedStatement.setString(2, toStore);
-            preparedStatement.execute();
-        } catch (SQLException e) {
-            plugin.logError("Could not save object " + instance.getClass().getName() + " " + e.getMessage());
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see world.bentobox.bentobox.database.AbstractDatabaseHandler#deleteID(java.lang.String)
-     */
-    @Override
-    public void deleteID(String uniqueId) {
-        if (plugin.isEnabled()) {
-            processQueue.add(() -> delete(uniqueId));
-        } else {
-            delete(uniqueId);
-        }
-    }
-
-    private void delete(String uniqueId) {
-        String sb = "DELETE FROM `" +
-                dataObject.getCanonicalName() +
-                "` WHERE uniqueId = ?";
-        try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
-            // UniqueId needs to be placed in quotes
-            preparedStatement.setString(1, "\"" + uniqueId + "\"");
-            preparedStatement.execute();
-        } catch (Exception e) {
-            plugin.logError("Could not delete object " + dataObject.getCanonicalName() + " " + uniqueId + " " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void deleteObject(T instance) {
-        // Null check
-        if (instance == null) {
-            plugin.logError("MariaDB database request to delete a null.");
-            return;
-        }
-        if (!(instance instanceof DataObject)) {
-            plugin.logError("This class is not a DataObject: " + instance.getClass().getName());
-            return;
-        }
-        try {
-            Method getUniqueId = dataObject.getMethod("getUniqueId");
-            deleteID((String) getUniqueId.invoke(instance));
-        } catch (Exception e) {
-            plugin.logError("Could not delete object " + instance.getClass().getName() + " " + e.getMessage());
-        }
-    }
-
-    @Override
-    public boolean objectExists(String uniqueId) {
-        // Create the query to see if this key exists
-        String query = "SELECT IF ( EXISTS( SELECT * FROM `" +
-                dataObject.getCanonicalName() +
-                "` WHERE `uniqueId` = ?), 1, 0)";
-
-        try (PreparedStatement preparedStatement = connection.prepareStatement(query)) {
-            // UniqueId needs to be placed in quotes
-            preparedStatement.setString(1, "\"" + uniqueId + "\"");
-            try (ResultSet resultSet = preparedStatement.executeQuery()) {
-                if (resultSet.next()) {
-                    return resultSet.getBoolean(1);
-                }
-            }
-        } catch (SQLException e) {
-            plugin.logError("Could not check if key exists in database! " + uniqueId + " " + e.getMessage());
-        }
-        return false;
-    }
-
-    @Override
-    public void close() {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                plugin.logError("Could not close database for some reason");
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
index 016a5e4aa..95d838e4c 100644
--- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
@@ -9,6 +9,11 @@ import world.bentobox.bentobox.database.DatabaseSetup;
 
 public class MongoDBDatabase implements DatabaseSetup {
 
+    private MongoDBDatabaseConnector connector;
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.DatabaseSetup#getHandler(java.lang.Class)
+     */
     @Override
     public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
         BentoBox plugin = BentoBox.getInstance();
@@ -19,13 +24,16 @@ public class MongoDBDatabase implements DatabaseSetup {
             Bukkit.getServer().getPluginManager().disablePlugin(plugin);
             return null;
         }
-        return new MongoDBDatabaseHandler<>(plugin, type, new MongoDBDatabaseConnector(new DatabaseConnectionSettingsImpl(
-                plugin.getSettings().getDatabaseHost(),
-                plugin.getSettings().getDatabasePort(),
-                plugin.getSettings().getDatabaseName(),
-                plugin.getSettings().getDatabaseUsername(),
-                plugin.getSettings().getDatabasePassword()
-                )));
+        if (connector == null) {
+            connector = new MongoDBDatabaseConnector(new DatabaseConnectionSettingsImpl(
+                    plugin.getSettings().getDatabaseHost(),
+                    plugin.getSettings().getDatabasePort(),
+                    plugin.getSettings().getDatabaseName(),
+                    plugin.getSettings().getDatabaseUsername(),
+                    plugin.getSettings().getDatabasePassword()
+                    ));
+        }
+        return new MongoDBDatabaseHandler<>(plugin, type, connector);
     }
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java
index 8bdb0a415..1f890985d 100644
--- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java
+++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java
@@ -1,5 +1,11 @@
 package world.bentobox.bentobox.database.mongodb;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.eclipse.jdt.annotation.NonNull;
+
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoCredential;
@@ -13,6 +19,7 @@ public class MongoDBDatabaseConnector implements DatabaseConnector {
 
     private MongoClient client;
     private DatabaseConnectionSettingsImpl dbSettings;
+    private Set<Class<?>> types = new HashSet<>();
 
     /**
      * Class for MySQL database connections using the settings provided
@@ -20,15 +27,19 @@ public class MongoDBDatabaseConnector implements DatabaseConnector {
      */
     MongoDBDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings) {
         this.dbSettings = dbSettings;
-        MongoCredential credential = MongoCredential.createCredential(dbSettings.getUsername(),
-                dbSettings.getDatabaseName(),
-                dbSettings.getPassword().toCharArray());
-        MongoClientOptions options = MongoClientOptions.builder().sslEnabled(false).build();
-        client = new MongoClient(new ServerAddress(dbSettings.getHost(), dbSettings.getPort()), credential,options);
     }
 
     @Override
-    public MongoDatabase createConnection() {
+    public MongoDatabase createConnection(Class<?> type) {
+        types.add(type);
+        // Only get one client
+        if (client == null) {
+            MongoCredential credential = MongoCredential.createCredential(dbSettings.getUsername(),
+                    dbSettings.getDatabaseName(),
+                    dbSettings.getPassword().toCharArray());
+            MongoClientOptions options = MongoClientOptions.builder().sslEnabled(false).build();
+            client = new MongoClient(new ServerAddress(dbSettings.getHost(), dbSettings.getPort()), credential,options);
+        }
         return client.getDatabase(dbSettings.getDatabaseName());
     }
 
@@ -38,6 +49,7 @@ public class MongoDBDatabaseConnector implements DatabaseConnector {
     }
 
     @Override
+    @NonNull
     public String getUniqueId(String tableName) {
         // Not used
         return "";
@@ -50,8 +62,12 @@ public class MongoDBDatabaseConnector implements DatabaseConnector {
     }
 
     @Override
-    public void closeConnection() {
-        client.close();
+    public void closeConnection(Class<?> type) {
+        types.remove(type);
+        if (types.isEmpty() && client != null) {
+            client.close();
+            Bukkit.getLogger().info("Closed database connection");
+        }
     }
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java
index f619f2a14..c3b0174b6 100644
--- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java
@@ -49,7 +49,7 @@ public class MongoDBDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
         this.dbConnecter = dbConnecter;
 
         // Connection to the database
-        MongoDatabase database = (MongoDatabase) dbConnecter.createConnection();
+        MongoDatabase database = (MongoDatabase) dbConnecter.createConnection(dataObject);
         if (database == null) {
             plugin.logError("Are the settings in config.yml correct?");
             Bukkit.getPluginManager().disablePlugin(plugin);
@@ -146,9 +146,6 @@ public class MongoDBDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     @Override
     public void close() {
-        dbConnecter.closeConnection();
-
+        dbConnecter.closeConnection(dataObject);
     }
-
-
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/package-info.java b/src/main/java/world/bentobox/bentobox/database/mongodb/package-info.java
new file mode 100644
index 000000000..e146d2366
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/mongodb/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Contains MongoDB database managers.
+ */
+package world.bentobox.bentobox.database.mongodb;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
deleted file mode 100644
index f7bdf68ca..000000000
--- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package world.bentobox.bentobox.database.mysql;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.database.AbstractDatabaseHandler;
-import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
-import world.bentobox.bentobox.database.DatabaseSetup;
-
-public class MySQLDatabase implements DatabaseSetup {
-
-
-    /* (non-Javadoc)
-     * @see world.bentobox.bentobox.database.BSBDbSetup#getHandler(java.lang.Class)
-     */
-    @Override
-    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
-        BentoBox plugin = BentoBox.getInstance();
-        return new MySQLDatabaseHandler<>(plugin, type, new MySQLDatabaseConnector(new DatabaseConnectionSettingsImpl(
-                plugin.getSettings().getDatabaseHost(),
-                plugin.getSettings().getDatabasePort(),
-                plugin.getSettings().getDatabaseName(),
-                plugin.getSettings().getDatabaseUsername(),
-                plugin.getSettings().getDatabasePassword()
-                )));
-    }
-
-}
diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java
deleted file mode 100644
index 7d9819df4..000000000
--- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package world.bentobox.bentobox.database.mysql;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.bukkit.Bukkit;
-
-import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
-import world.bentobox.bentobox.database.DatabaseConnector;
-
-public class MySQLDatabaseConnector implements DatabaseConnector {
-
-    private String connectionUrl;
-    private DatabaseConnectionSettingsImpl dbSettings;
-    private Connection connection = null;
-
-    /**
-     * Class for MySQL database connections using the settings provided
-     * @param dbSettings - database settings
-     */
-    MySQLDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings) {
-        this.dbSettings = dbSettings;
-        connectionUrl = "jdbc:mysql://" + dbSettings.getHost() + ":" + dbSettings.getPort() + "/" + dbSettings.getDatabaseName()
-        + "?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8";
-    }
-
-    @Override
-    public Connection createConnection() {
-        try {
-            connection = DriverManager.getConnection(connectionUrl, dbSettings.getUsername(), dbSettings.getPassword());
-        } catch (SQLException e) {
-            Bukkit.getLogger().severe("Could not connect to the database! " + e.getMessage());
-        }
-        return connection;
-    }
-
-    @Override
-    public String getConnectionUrl() {
-        return connectionUrl;
-    }
-
-    @Override
-    public String getUniqueId(String tableName) {
-        // Not used
-        return "";
-    }
-
-    @Override
-    public boolean uniqueIdExists(String tableName, String key) {
-        // Not used
-        return false;
-    }
-
-    @Override
-    public void closeConnection() {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                Bukkit.getLogger().severe("Could not close MySQL database connection");
-            }
-        }
-    }
-}
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Island.java b/src/main/java/world/bentobox/bentobox/database/objects/Island.java
index d19903f39..f5a290a42 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/Island.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/Island.java
@@ -1,33 +1,5 @@
 package world.bentobox.bentobox.database.objects;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.gson.annotations.Expose;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.World.Environment;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BoundingBox;
-import org.bukkit.util.Vector;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.configuration.WorldSettings;
-import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.logs.LogEntry;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.database.objects.adapters.Adapter;
-import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
-import world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter;
-import world.bentobox.bentobox.lists.Flags;
-import world.bentobox.bentobox.managers.IslandWorldManager;
-import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.bentobox.util.Pair;
-import world.bentobox.bentobox.util.Util;
-
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -40,6 +12,38 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.World.Environment;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.Vector;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
+import com.google.gson.annotations.Expose;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.adapters.Adapter;
+import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
+import world.bentobox.bentobox.database.objects.adapters.FlagSerializer3;
+import world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter;
+import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.RanksManager;
+import world.bentobox.bentobox.util.Pair;
+import world.bentobox.bentobox.util.Util;
+
 /**
  * Stores all the info about an island
  * Managed by IslandsManager
@@ -144,6 +148,31 @@ public class Island implements DataObject {
     @Expose
     private boolean doNotLoad;
 
+    /**
+     * Used to store flag cooldowns for this island
+     */
+    @Adapter(FlagSerializer3.class)
+    @Expose
+    private Map<Flag, Long> cooldowns = new HashMap<>();
+
+    /**
+     * Commands and the rank required to use them for this island
+     */
+    @Expose
+    private Map<String, Integer> commandRanks;
+
+    /**
+     * If true then this space is reserved for the owner and when they teleport there they will be asked to make an island
+     * @since 1.6.0
+     */
+    @Expose
+    @Nullable
+    private Boolean reserved = null;
+
+    /*
+     * *************************** Constructors ******************************
+     */
+
     public Island() {}
 
     public Island(@NonNull Location location, UUID owner, int protectionRange) {
@@ -183,8 +212,15 @@ public class Island implements DataObject {
         this.uniqueId = island.uniqueId;
         this.updatedDate = island.updatedDate;
         this.world = island.world;
+        this.cooldowns = island.cooldowns;
+        this.commandRanks = island.commandRanks;
+        this.reserved = island.reserved;
     }
 
+    /*
+     * *************************** Methods ******************************
+     */
+
     /**
      * Adds a team member. If player is on banned list, they will be removed from it.
      * @param playerUUID - the player's UUID
@@ -557,9 +593,33 @@ public class Island implements DataObject {
      * @see #getVisitors()
      */
     public boolean hasVisitors() {
-        return !getVisitors().isEmpty();
+        return Bukkit.getOnlinePlayers().stream().anyMatch(player -> onIsland(player.getLocation()) && getRank(User.getInstance(player)) == RanksManager.VISITOR_RANK);
     }
-
+    
+    /**
+     * Returns a list of players that are physically inside the island's protection range
+     * @return list of players
+     * @since 1.6.0
+     */
+    @NonNull
+    public List<Player> getPlayersOnIsland() {
+        return Bukkit.getOnlinePlayers().stream()
+                .filter(player -> onIsland(player.getLocation()))
+                .collect(Collectors.toList());
+    }
+    
+    /**
+     * Returns whether this Island has players inside its protection range.
+     * Note this is equivalent to {@code !island.getPlayersOnIsland().isEmpty()}.
+     * @return {@code true} if there are players inside this Island's protection range, {@code false} otherwise.
+     *
+     * @since 1.6.0
+     * @see #getPlayersOnIsland()
+     */
+    public boolean hasPlayersOnIsland() {
+        return Bukkit.getOnlinePlayers().stream().anyMatch(player -> onIsland(player.getLocation()));
+    }
+                        
     /**
      * Check if the flag is allowed or not
      * For flags that are for the island in general and not related to rank.
@@ -884,6 +944,9 @@ public class Island implements DataObject {
             user.sendMessage("commands.admin.info.banned-players");
             banned.forEach(u -> user.sendMessage("commands.admin.info.banned-format", TextVariables.NAME, plugin.getPlayers().getName(u)));
         }
+        if (purgeProtected) {
+            user.sendMessage("commands.admin.info.purge-protected");
+        }
         return true;
     }
 
@@ -1047,6 +1110,95 @@ public class Island implements DataObject {
                 !getCenter().toVector().toLocation(iwm.getEndWorld(getWorld())).getBlock().getType().equals(Material.AIR);
     }
 
+
+    /**
+     * Checks if a flag is on cooldown. Only stored in memory so a server restart will reset the cooldown.
+     * @param flag - flag
+     * @return true if on cooldown, false if not
+     * @since 1.6.0
+     */
+    public boolean isCooldown(Flag flag) {
+        if (cooldowns.containsKey(flag) && cooldowns.get(flag) > System.currentTimeMillis()) {
+            return true;
+        }
+        cooldowns.remove(flag);
+        return false;
+    }
+
+    /**
+     * Sets a cooldown for this flag on this island.
+     * @param flag - Flag to cooldown
+     */
+    public void setCooldown(Flag flag) {
+        cooldowns.put(flag, flag.getCooldown() * 1000 + System.currentTimeMillis());
+    }
+
+    /**
+     * @return the cooldowns
+     */
+    public Map<Flag, Long> getCooldowns() {
+        return cooldowns;
+    }
+
+    /**
+     * @param cooldowns the cooldowns to set
+     */
+    public void setCooldowns(Map<Flag, Long> cooldowns) {
+        this.cooldowns = cooldowns;
+    }
+
+    /**
+     * @return the commandRanks
+     */
+    public Map<String, Integer> getCommandRanks() {
+        return commandRanks;
+    }
+
+    /**
+     * @param commandRanks the commandRanks to set
+     */
+    public void setCommandRanks(Map<String, Integer> commandRanks) {
+        this.commandRanks = commandRanks;
+    }
+
+    /**
+     * Get the rank required to run command on this island.
+     * The command must have been registered with a rank.
+     * @param command - the string given by {@link CompositeCommand#getUsage()}
+     * @return Rank value required, or if command is not set {@link RanksManager#OWNER_RANK}
+     */
+    public int getRankCommand(String command) {
+        return commandRanks == null ? RanksManager.OWNER_RANK : commandRanks.getOrDefault(command, RanksManager.OWNER_RANK);
+    }
+
+    /**
+     *
+     * @param command - the string given by {@link CompositeCommand#getUsage()}
+     * @param rank value as used by {@link RanksManager}
+     */
+    public void setRankCommand(String command, int rank) {
+        if (this.commandRanks == null) this.commandRanks = new HashMap<>();
+        this.commandRanks.put(command, rank);
+    }
+
+    /**
+     * Returns whether this Island is currently reserved or not.
+     * If {@code true}, this means no blocks, except a bedrock one at the center of the island, exist.
+     * @return {@code true} if this Island is reserved, {@code false} otherwise.
+     * @since 1.6.0
+     */
+    public boolean isReserved() {
+        return reserved != null && reserved;
+    }
+
+    /**
+     * @param reserved the reserved to set
+     * @since 1.6.0
+     */
+    public void setReserved(boolean reserved) {
+        this.reserved = reserved;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
@@ -1059,4 +1211,5 @@ public class Island implements DataObject {
                 + ", purgeProtected=" + purgeProtected + ", flags=" + flags + ", history=" + history
                 + ", levelHandicap=" + levelHandicap + ", spawnPoint=" + spawnPoint + ", doNotLoad=" + doNotLoad + "]";
     }
+
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/IslandDeletion.java b/src/main/java/world/bentobox/bentobox/database/objects/IslandDeletion.java
index 3b2070aa2..a6fea1eda 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/IslandDeletion.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/IslandDeletion.java
@@ -233,5 +233,15 @@ public class IslandDeletion implements DataObject {
         this.box = box;
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "IslandDeletion [uniqueId=" + uniqueId + ", location=" + location + ", minXChunk=" + minXChunk
+                + ", maxXChunk=" + maxXChunk + ", minZChunk=" + minZChunk + ", maxZChunk=" + maxZChunk + ", minX="
+                + minX + ", minZ=" + minZ + ", maxX=" + maxX + ", maxZ=" + maxZ + ", box=" + box + "]";
+    }
+
 }
 
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Players.java b/src/main/java/world/bentobox/bentobox/database/objects/Players.java
index 2a5b64f78..f20c6342e 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/Players.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/Players.java
@@ -14,7 +14,9 @@ import org.bukkit.entity.Player;
 
 import com.google.gson.annotations.Expose;
 
+import org.eclipse.jdt.annotation.Nullable;
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -43,6 +45,12 @@ public class Players implements DataObject {
     @Expose
     private Set<String> pendingKicks = new HashSet<>();
 
+    /**
+     * Stores the display mode of the Settings Panel.
+     * @since 1.6.0
+     */
+    @Expose
+    private Flag.Mode flagsDisplayMode = Flag.Mode.BASIC;
 
     /**
      * This is required for database storage
@@ -71,6 +79,7 @@ public class Players implements DataObject {
      * @param world - world to check
      * @return Location - home location in world
      */
+    @Nullable
     public Location getHomeLocation(World world) {
         return getHomeLocation(world, 1); // Default
     }
@@ -81,6 +90,7 @@ public class Players implements DataObject {
      * @param number - a number
      * @return Location of this home or null if not available
      */
+    @Nullable
     public Location getHomeLocation(World world, int number) {
         // Remove any lost worlds/locations
         homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null);
@@ -234,7 +244,7 @@ public class Players implements DataObject {
      * @param deaths the deaths to set
      */
     public void setDeaths(World world, int deaths) {
-        this.deaths.put(world.getName(), deaths > getPlugin().getIWM().getDeathsMax(world) ? getPlugin().getIWM().getDeathsMax(world) : deaths);
+        this.deaths.put(world.getName(), Math.min(deaths, getPlugin().getIWM().getDeathsMax(world)));
     }
 
     /**
@@ -281,33 +291,51 @@ public class Players implements DataObject {
         this.deaths = deaths;
     }
 
-
     /**
-     * This method returns the pendingKicks value.
+     * Returns the pendingKicks value.
      * @return the value of pendingKicks.
+     * @since 1.3.0
      */
     public Set<String> getPendingKicks()
     {
         return pendingKicks;
     }
 
-
     /**
-     * This method sets the pendingKicks value.
+     * Sets the pendingKicks value.
      * @param pendingKicks the pendingKicks new value.
+     * @since 1.3.0
      */
     public void setPendingKicks(Set<String> pendingKicks)
     {
         this.pendingKicks = pendingKicks;
     }
 
-
     /**
-     * This method adds given world in pendingKicks world set.
+     * Adds given world in pendingKicks world set.
      * @param world World that must be added to pendingKicks set.
+     * @since 1.3.0
      */
     public void addToPendingKick(World world)
     {
         this.pendingKicks.add(Util.getWorld(world).getName());
     }
+
+    /**
+     * Returns the display mode for the Flags in the Settings Panel.
+     * @return the display mode for the Flags in the Settings Panel.
+     * @since 1.6.0
+     */
+    public Flag.Mode getFlagsDisplayMode() {
+        return flagsDisplayMode;
+    }
+
+    /**
+     * Sets the display mode for the Flags in the Settings Panel.
+     * @param flagsDisplayMode the display mode for the Flags in the Settings Panel.
+     * @since 1.6.0
+     */
+    public void setFlagsDisplayMode(Flag.Mode flagsDisplayMode) {
+        this.flagsDisplayMode = flagsDisplayMode;
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer3.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer3.java
new file mode 100644
index 000000000..7ef181eeb
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer3.java
@@ -0,0 +1,57 @@
+package world.bentobox.bentobox.database.objects.adapters;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.bukkit.configuration.MemorySection;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.flags.Flag;
+
+/**
+ * Serializes the {@link world.bentobox.bentobox.database.objects.Island#getFlags() getFlags()} and
+ * {@link world.bentobox.bentobox.database.objects.Island#setFlags(Map)} () setFlags()}
+ * in {@link world.bentobox.bentobox.database.objects.Island}
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class FlagSerializer3 implements AdapterInterface<Map<Flag, Long>, Map<String, Long>> {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Map<Flag, Long> deserialize(Object object) {
+        Map<Flag, Long> result = new HashMap<>();
+        if (object == null) {
+            return result;
+        }
+        // For YAML
+        if (object instanceof MemorySection) {
+            MemorySection section = (MemorySection) object;
+            for (String key : section.getKeys(false)) {
+                BentoBox.getInstance().getFlagsManager().getFlag(key).ifPresent(flag -> result.put(flag, section.getLong(key)));
+            }
+        } else {
+            for (Entry<String, Long> en : ((Map<String, Long>)object).entrySet()) {
+                BentoBox.getInstance().getFlagsManager().getFlag(en.getKey()).ifPresent(flag -> result.put(flag, en.getValue()));
+            }
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Map<String, Long> serialize(Object object) {
+        Map<String, Long> result = new HashMap<>();
+        if (object == null) {
+            return result;
+        }
+        Map<Flag, Long> flags = (Map<Flag, Long>)object;
+        for (Entry<Flag, Long> en: flags.entrySet()) {
+            if (en != null && en.getKey() != null) {
+                result.put(en.getKey().getID(), en.getValue());
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/SQLConfiguration.java b/src/main/java/world/bentobox/bentobox/database/sql/SQLConfiguration.java
new file mode 100644
index 000000000..b27b0afb4
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/SQLConfiguration.java
@@ -0,0 +1,97 @@
+package world.bentobox.bentobox.database.sql;
+
+/**
+ * Contains the SQL strings for the database.
+ * The default strings are for MySQL, so only the deltas need to be supplied.
+ * @author tastybento
+ *
+ */
+public class SQLConfiguration {
+    private String loadObjectSQL;
+    private String saveObjectSQL;
+    private String deleteObjectSQL;
+    private String objectExistsSQL;
+    private String schemaSQL;
+    private String loadObjectsSQL;
+
+    /**
+     * @param canonicalName - canonical name of the class being stored.
+     */
+    public SQLConfiguration(String canonicalName) {
+        schemaSQL = "CREATE TABLE IF NOT EXISTS `" + canonicalName +
+                "` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )";
+        loadObjectsSQL = "SELECT `json` FROM `" + canonicalName + "`";
+        loadObjectSQL = "SELECT `json` FROM `" + canonicalName + "` WHERE uniqueId = ? LIMIT 1";
+        saveObjectSQL = "INSERT INTO `" + canonicalName + "` (json) VALUES (?) ON DUPLICATE KEY UPDATE json = ?";
+        deleteObjectSQL = "DELETE FROM `" + canonicalName + "` WHERE uniqueId = ?";
+        objectExistsSQL = "SELECT IF ( EXISTS( SELECT * FROM `" + canonicalName + "` WHERE `uniqueId` = ?), 1, 0)";
+    }
+
+    public SQLConfiguration loadObject(String string) {
+        this.loadObjectSQL = string;
+        return this;
+    }
+
+    public SQLConfiguration saveObject(String string) {
+        this.saveObjectSQL = string;
+        return this;
+    }
+
+    public SQLConfiguration deleteObject(String string) {
+        this.deleteObjectSQL = string;
+        return this;
+    }
+
+    public SQLConfiguration objectExists(String string) {
+        this.objectExistsSQL = string;
+        return this;
+    }
+
+    public SQLConfiguration schema(String string) {
+        this.schemaSQL = string;
+        return this;
+    }
+
+    public SQLConfiguration loadObjects(String string) {
+        this.loadObjectsSQL = string;
+        return this;
+    }
+
+    /**
+     * @return the loadObjectSQL
+     */
+    public String getLoadObjectSQL() {
+        return loadObjectSQL;
+    }
+    /**
+     * @return the saveObjectSQL
+     */
+    public String getSaveObjectSQL() {
+        return saveObjectSQL;
+    }
+    /**
+     * @return the deleteObjectSQL
+     */
+    public String getDeleteObjectSQL() {
+        return deleteObjectSQL;
+    }
+    /**
+     * @return the objectExistsSQL
+     */
+    public String getObjectExistsSQL() {
+        return objectExistsSQL;
+    }
+    /**
+     * @return the schemaSQL
+     */
+    public String getSchemaSQL() {
+        return schemaSQL;
+    }
+    /**
+     * @return the loadItSQL
+     */
+    public String getLoadObjectsSQL() {
+        return loadObjectsSQL;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseConnector.java
new file mode 100644
index 000000000..5b0949238
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseConnector.java
@@ -0,0 +1,72 @@
+package world.bentobox.bentobox.database.sql;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.DatabaseConnector;
+
+public abstract class SQLDatabaseConnector implements DatabaseConnector {
+
+    protected String connectionUrl;
+    private DatabaseConnectionSettingsImpl dbSettings;
+    protected static Connection connection = null;
+    protected static Set<Class<?>> types = new HashSet<>();
+
+    public SQLDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings, String connectionUrl) {
+        this.dbSettings = dbSettings;
+        this.connectionUrl = connectionUrl;
+    }
+
+    @Override
+    public String getConnectionUrl() {
+        return connectionUrl;
+    }
+
+    @Override
+    @NonNull
+    public String getUniqueId(String tableName) {
+        // Not used
+        return "";
+    }
+
+    @Override
+    public boolean uniqueIdExists(String tableName, String key) {
+        // Not used
+        return false;
+    }
+
+    @Override
+    public void closeConnection(Class<?> type) {
+        types.remove(type);
+        if (types.isEmpty() && connection != null) {
+            try {
+                connection.close();
+                Bukkit.getLogger().info("Closed database connection");
+            } catch (SQLException e) {
+                Bukkit.getLogger().severe("Could not close database connection");
+            }
+        }
+    }
+
+    @Override
+    public Object createConnection(Class<?> type) {
+        types.add(type);
+        // Only make one connection to the database
+        if (connection == null) {
+            try {
+                connection = DriverManager.getConnection(connectionUrl, dbSettings.getUsername(), dbSettings.getPassword());
+            } catch (SQLException e) {
+                Bukkit.getLogger().severe("Could not connect to the database! " + e.getMessage());
+            }
+        }
+        return connection;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseHandler.java
similarity index 63%
rename from src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java
rename to src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseHandler.java
index 55033a0cf..180cba593 100644
--- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/sql/SQLDatabaseHandler.java
@@ -1,4 +1,4 @@
-package world.bentobox.bentobox.database.mysql;
+package world.bentobox.bentobox.database.sql;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -9,11 +9,9 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitTask;
+import org.eclipse.jdt.annotation.NonNull;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -25,13 +23,14 @@ import world.bentobox.bentobox.database.objects.DataObject;
 
 /**
  *
+ * Abstract class that covers SQL style databases
  * Class that inserts a <T> into the corresponding database-table.
  *
  * @author tastybento
  *
  * @param <T>
  */
-public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
+public class SQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     private static final String COULD_NOT_LOAD_OBJECTS = "Could not load objects ";
     private static final String COULD_NOT_LOAD_OBJECT = "Could not load object ";
@@ -42,18 +41,9 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     private Connection connection;
 
     /**
-     * FIFO queue for saves or deletions. Note that the assumption here is that most database objects will be held
-     * in memory because loading is not handled with this queue. That means that it is theoretically
-     * possible to load something before it has been saved. So, in general, load your objects and then
-     * save them async only when you do not need the data again immediately.
+     * SQL configuration
      */
-    private Queue<Runnable> processQueue;
-
-    /**
-     * Async save task that runs repeatedly
-     */
-    private BukkitTask asyncSaveTask;
-
+    private SQLConfiguration sqlConfig;
 
     /**
      * Handles the connection to the database and creation of the initial database schema (tables) for
@@ -61,48 +51,37 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
      * @param plugin - plugin object
      * @param type - the type of class to be stored in the database. Must inherit DataObject
      * @param dbConnecter - authentication details for the database
+     * @param sqlConfiguration - SQL configuration
      */
-    MySQLDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector dbConnecter) {
+    protected SQLDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector dbConnecter, SQLConfiguration sqlConfiguration) {
         super(plugin, type, dbConnecter);
-        connection = (Connection)dbConnecter.createConnection();
-        if (connection == null) {
-            plugin.logError("Are the settings in config.yml correct?");
-            Bukkit.getPluginManager().disablePlugin(plugin);
-            return;
-        }
-        // Check if the table exists in the database and if not, create it
-        createSchema();
-        processQueue = new ConcurrentLinkedQueue<>();
-        if (plugin.isEnabled()) {
-            asyncSaveTask = Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                // Loop continuously
-                while (plugin.isEnabled() || !processQueue.isEmpty()) {
-                    while (!processQueue.isEmpty()) {
-                        processQueue.poll().run();
-                    }
-                    // Clear the queue and then sleep
-                    try {
-                        Thread.sleep(25);
-                    } catch (InterruptedException e) {
-                        plugin.logError("Thread sleep error " + e.getMessage());
-                        Thread.currentThread().interrupt();
-                    }
-                }
-                // Cancel
-                asyncSaveTask.cancel();
-            });
+        this.sqlConfig = sqlConfiguration;
+        if (setConnection((Connection)databaseConnector.createConnection(type))) {
+            // Check if the table exists in the database and if not, create it
+            createSchema();
         }
     }
 
+    /**
+     * @return the sqlConfig
+     */
+    public SQLConfiguration getSqlConfig() {
+        return sqlConfig;
+    }
+
+    /**
+     * @param sqlConfig the sqlConfig to set
+     */
+    public void setSqlConfig(SQLConfiguration sqlConfig) {
+        this.sqlConfig = sqlConfig;
+    }
+
     /**
      * Creates the table in the database if it doesn't exist already
      */
-    private void createSchema() {
-        String sql = "CREATE TABLE IF NOT EXISTS `" +
-                dataObject.getCanonicalName() +
-                "` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )";
+    protected void createSchema() {
         // Prepare and execute the database statements
-        try (PreparedStatement pstmt = connection.prepareStatement(sql)) {
+        try (PreparedStatement pstmt = connection.prepareStatement(sqlConfig.getSchemaSQL())) {
             pstmt.executeUpdate();
         } catch (SQLException e) {
             plugin.logError("Problem trying to create schema for data object " + dataObject.getCanonicalName() + " " + e.getMessage());
@@ -121,11 +100,7 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     private List<T> loadIt(Statement preparedStatement) {
         List<T> list = new ArrayList<>();
-
-        String sb = "SELECT `json` FROM `" +
-                dataObject.getCanonicalName() +
-                "`";
-        try (ResultSet resultSet = preparedStatement.executeQuery(sb)) {
+        try (ResultSet resultSet = preparedStatement.executeQuery(sqlConfig.getLoadObjectsSQL())) {
             // Load all the results
             Gson gson = getGson();
             while (resultSet.next()) {
@@ -149,9 +124,8 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     }
 
     @Override
-    public T loadObject(String uniqueId) {
-        String sb = "SELECT `json` FROM `" + dataObject.getCanonicalName() + "` WHERE uniqueId = ? LIMIT 1";
-        try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
+    public T loadObject(@NonNull String uniqueId) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sqlConfig.getLoadObjectSQL())) {
             // UniqueId needs to be placed in quotes
             preparedStatement.setString(1, "\"" + uniqueId + "\"");
             try (ResultSet resultSet = preparedStatement.executeQuery()) {
@@ -173,30 +147,19 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     public void saveObject(T instance) {
         // Null check
         if (instance == null) {
-            plugin.logError("MySQL database request to store a null. ");
+            plugin.logError("SQL database request to store a null. ");
             return;
         }
         if (!(instance instanceof DataObject)) {
             plugin.logError("This class is not a DataObject: " + instance.getClass().getName());
             return;
         }
-        String sb = "INSERT INTO " +
-                "`" +
-                dataObject.getCanonicalName() +
-                "` (json) VALUES (?) ON DUPLICATE KEY UPDATE json = ?";
-
-        Gson gson = getGson();
-        String toStore = gson.toJson(instance);
-        if (plugin.isEnabled()) {
-            // Async
-            processQueue.add(() -> store(instance, toStore, sb));
-        } else {
-            // Sync
-            store(instance, toStore, sb);
-        }
+        // Async
+        processQueue.add(() -> store(instance, sqlConfig.getSaveObjectSQL()));
     }
 
-    private void store(T instance, String toStore, String sb) {
+    private void store(T instance, String sb) {
+        String toStore = getGson().toJson(instance);
         try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
             preparedStatement.setString(1, toStore);
             preparedStatement.setString(2, toStore);
@@ -211,18 +174,11 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
      */
     @Override
     public void deleteID(String uniqueId) {
-        if (plugin.isEnabled()) {
-            processQueue.add(() -> delete(uniqueId));
-        } else {
-            delete(uniqueId);
-        }
+        processQueue.add(() -> delete(uniqueId));
     }
 
     private void delete(String uniqueId) {
-        String sb = "DELETE FROM `" +
-                dataObject.getCanonicalName() +
-                "` WHERE uniqueId = ?";
-        try (PreparedStatement preparedStatement = connection.prepareStatement(sb)) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sqlConfig.getDeleteObjectSQL())) {
             // UniqueId needs to be placed in quotes
             preparedStatement.setString(1, "\"" + uniqueId + "\"");
             preparedStatement.execute();
@@ -235,7 +191,7 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
     public void deleteObject(T instance) {
         // Null check
         if (instance == null) {
-            plugin.logError("MySQL database request to delete a null.");
+            plugin.logError("SQL database request to delete a null.");
             return;
         }
         if (!(instance instanceof DataObject)) {
@@ -252,12 +208,8 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     @Override
     public boolean objectExists(String uniqueId) {
-        // Create the query to see if this key exists
-        String query = "SELECT IF ( EXISTS( SELECT * FROM `" +
-                dataObject.getCanonicalName() +
-                "` WHERE `uniqueId` = ?), 1, 0)";
-
-        try (PreparedStatement preparedStatement = connection.prepareStatement(query)) {
+        // Query to see if this key exists
+        try (PreparedStatement preparedStatement = connection.prepareStatement(sqlConfig.getObjectExistsSQL())) {
             // UniqueId needs to be placed in quotes
             preparedStatement.setString(1, "\"" + uniqueId + "\"");
             try (ResultSet resultSet = preparedStatement.executeQuery()) {
@@ -273,13 +225,27 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
 
     @Override
     public void close() {
-        if (connection != null) {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                plugin.logError("Could not close database for some reason");
-            }
-        }
+        shutdown = true;
     }
 
+    /**
+     * @return the connection
+     */
+    public Connection getConnection() {
+        return connection;
+    }
+
+    /**
+     * @param connection the connection to set
+     * @return true if connection is not null
+     */
+    public boolean setConnection(Connection connection) {
+        if (connection == null) {
+            plugin.logError("Are the settings in config.yml correct?");
+            Bukkit.getPluginManager().disablePlugin(plugin);
+            return false;
+        }
+        this.connection = connection;
+        return true;
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabase.java
new file mode 100644
index 000000000..f56121d38
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabase.java
@@ -0,0 +1,33 @@
+package world.bentobox.bentobox.database.sql.mariadb;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.DatabaseSetup;
+
+/**
+ * @author barpec12
+ * @since 1.1
+ */
+public class MariaDBDatabase implements DatabaseSetup {
+    private MariaDBDatabaseConnector connector;
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.DatabaseSetup#getHandler(java.lang.Class)
+     */
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        BentoBox plugin = BentoBox.getInstance();
+        if (connector == null) {
+            connector = new MariaDBDatabaseConnector(new DatabaseConnectionSettingsImpl(
+                    plugin.getSettings().getDatabaseHost(),
+                    plugin.getSettings().getDatabasePort(),
+                    plugin.getSettings().getDatabaseName(),
+                    plugin.getSettings().getDatabaseUsername(),
+                    plugin.getSettings().getDatabasePassword()
+                    ));
+        }
+        return new MariaDBDatabaseHandler<>(plugin, type, connector);
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseConnector.java
new file mode 100644
index 000000000..9c4872ceb
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseConnector.java
@@ -0,0 +1,21 @@
+package world.bentobox.bentobox.database.sql.mariadb;
+
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.sql.SQLDatabaseConnector;
+
+/**
+ * @author barpec12
+ * @since 1.1
+ */
+public class MariaDBDatabaseConnector extends SQLDatabaseConnector {
+
+    /**
+     * Class for MariaDB database connections using the settings provided
+     * @param dbSettings - database settings
+     */
+    MariaDBDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings) {
+        super(dbSettings, "jdbc:mysql://" + dbSettings.getHost() + ":" + dbSettings.getPort() + "/" + dbSettings.getDatabaseName()
+        + "?autoReconnect=true&useSSL=false&allowMultiQueries=true");
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseHandler.java
new file mode 100644
index 000000000..63896b5bc
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/MariaDBDatabaseHandler.java
@@ -0,0 +1,30 @@
+package world.bentobox.bentobox.database.sql.mariadb;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.DatabaseConnector;
+import world.bentobox.bentobox.database.sql.SQLDatabaseHandler;
+import world.bentobox.bentobox.database.sql.SQLConfiguration;
+
+/**
+ *
+ * Class that inserts a <T> into the corresponding database-table.
+ *
+ * @author tastybento, barpec12
+ *
+ * @param <T>
+ */
+public class MariaDBDatabaseHandler<T> extends SQLDatabaseHandler<T> {
+
+    /**
+     * Handles the connection to the database and creation of the initial database schema (tables) for
+     * the class that will be stored.
+     * @param plugin - plugin object
+     * @param type - the type of class to be stored in the database. Must inherit DataObject
+     * @param databaseConnector - authentication details for the database
+     */
+    MariaDBDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector databaseConnector) {
+        super(plugin, type, databaseConnector, new SQLConfiguration(type.getCanonicalName())
+                .schema("CREATE TABLE IF NOT EXISTS `" + type.getCanonicalName() +
+                        "` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))"));
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mariadb/package-info.java b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/package-info.java
new file mode 100644
index 000000000..2b3c61872
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mariadb/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Contains MariaDB (MySQL fork) database managers.
+ * @since 1.1
+ * @author barpec12
+ */
+package world.bentobox.bentobox.database.sql.mariadb;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabase.java
new file mode 100644
index 000000000..44c277fb3
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabase.java
@@ -0,0 +1,30 @@
+package world.bentobox.bentobox.database.sql.mysql;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.DatabaseSetup;
+
+public class MySQLDatabase implements DatabaseSetup {
+
+    private MySQLDatabaseConnector connector;
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.DatabaseSetup#getHandler(java.lang.Class)
+     */
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        BentoBox plugin = BentoBox.getInstance();
+        if (connector == null) {
+            connector = new MySQLDatabaseConnector(new DatabaseConnectionSettingsImpl(
+                    plugin.getSettings().getDatabaseHost(),
+                    plugin.getSettings().getDatabasePort(),
+                    plugin.getSettings().getDatabaseName(),
+                    plugin.getSettings().getDatabaseUsername(),
+                    plugin.getSettings().getDatabasePassword()
+                    ));
+        }
+        return new MySQLDatabaseHandler<>(plugin, type, connector);
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnector.java
new file mode 100644
index 000000000..63c7b1ef8
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnector.java
@@ -0,0 +1,16 @@
+package world.bentobox.bentobox.database.sql.mysql;
+
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.sql.SQLDatabaseConnector;
+
+public class MySQLDatabaseConnector extends SQLDatabaseConnector {
+
+    /**
+     * Class for MySQL database connections using the settings provided
+     * @param dbSettings - database settings
+     */
+    MySQLDatabaseConnector(DatabaseConnectionSettingsImpl dbSettings) {
+        super(dbSettings, "jdbc:mysql://" + dbSettings.getHost() + ":" + dbSettings.getPort() + "/" + dbSettings.getDatabaseName()
+        + "?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8");
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandler.java
new file mode 100644
index 000000000..06e1717e4
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandler.java
@@ -0,0 +1,28 @@
+package world.bentobox.bentobox.database.sql.mysql;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.DatabaseConnector;
+import world.bentobox.bentobox.database.sql.SQLDatabaseHandler;
+import world.bentobox.bentobox.database.sql.SQLConfiguration;
+
+/**
+ *
+ * Class that inserts a <T> into the corresponding database-table.
+ *
+ * @author tastybento
+ *
+ * @param <T>
+ */
+public class MySQLDatabaseHandler<T> extends SQLDatabaseHandler<T> {
+
+    /**
+     * Handles the connection to the database and creation of the initial database schema (tables) for
+     * the class that will be stored.
+     * @param plugin - plugin object
+     * @param type - the type of class to be stored in the database. Must inherit DataObject
+     * @param dbConnecter - authentication details for the database
+     */
+    MySQLDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector dbConnecter) {
+        super(plugin, type, dbConnecter, new SQLConfiguration(type.getCanonicalName()));
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/mysql/package-info.java b/src/main/java/world/bentobox/bentobox/database/sql/mysql/package-info.java
new file mode 100644
index 000000000..257f8fa41
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/mysql/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Contains MySQL database managers.
+ */
+package world.bentobox.bentobox.database.sql.mysql;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabase.java
new file mode 100644
index 000000000..0881408a6
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabase.java
@@ -0,0 +1,30 @@
+package world.bentobox.bentobox.database.sql.postgresql;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.DatabaseSetup;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch
+ */
+public class PostgreSQLDatabase implements DatabaseSetup {
+
+    PostgreSQLDatabaseConnector connector;
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass) {
+        BentoBox plugin = BentoBox.getInstance();
+        if (connector == null) {
+            connector = new PostgreSQLDatabaseConnector(new DatabaseConnectionSettingsImpl(
+                    plugin.getSettings().getDatabaseHost(),
+                    plugin.getSettings().getDatabasePort(),
+                    plugin.getSettings().getDatabaseName(),
+                    plugin.getSettings().getDatabaseUsername(),
+                    plugin.getSettings().getDatabasePassword()
+                    ));
+        }
+        return new PostgreSQLDatabaseHandler<>(plugin, dataObjectClass, connector);
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseConnector.java
new file mode 100644
index 000000000..2a777f432
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseConnector.java
@@ -0,0 +1,22 @@
+package world.bentobox.bentobox.database.sql.postgresql;
+
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.sql.SQLDatabaseConnector;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch
+ */
+public class PostgreSQLDatabaseConnector extends SQLDatabaseConnector {
+
+    /**
+     * Class for PostgreSQL database connections using the settings provided
+     * @param dbSettings - database settings
+     */
+    PostgreSQLDatabaseConnector(@NonNull DatabaseConnectionSettingsImpl dbSettings) {
+        super(dbSettings, "jdbc:postgresql://" + dbSettings.getHost() + ":" + dbSettings.getPort() + "/" + dbSettings.getDatabaseName()
+        + "?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8");
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseHandler.java
new file mode 100644
index 000000000..5304c7305
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/PostgreSQLDatabaseHandler.java
@@ -0,0 +1,29 @@
+package world.bentobox.bentobox.database.sql.postgresql;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.DatabaseConnector;
+import world.bentobox.bentobox.database.sql.SQLDatabaseHandler;
+import world.bentobox.bentobox.database.sql.SQLConfiguration;
+
+/**
+ *
+ * @param <T>
+ *
+ * @since 1.6.0
+ * @author tastybento, Poslovitch
+ */
+public class PostgreSQLDatabaseHandler<T> extends SQLDatabaseHandler<T> {
+
+    /**
+     * Constructor
+     *
+     * @param plugin            BentoBox plugin
+     * @param type              The type of the objects that should be created and filled with
+     *                          values from the database or inserted into the database
+     * @param databaseConnector Contains the settings to create a connection to the database
+     */
+    PostgreSQLDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector databaseConnector) {
+        super(plugin, type, databaseConnector, new SQLConfiguration(type.getCanonicalName()));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/postgresql/package-info.java b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/package-info.java
new file mode 100644
index 000000000..6b02db641
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/postgresql/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Contains PostgreSQL database managers.
+ * @since 1.6.0
+ */
+package world.bentobox.bentobox.database.sql.postgresql;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabase.java b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabase.java
new file mode 100644
index 000000000..ff599734b
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabase.java
@@ -0,0 +1,19 @@
+package world.bentobox.bentobox.database.sql.sqlite;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch
+ */
+public class SQLiteDatabase implements DatabaseSetup {
+
+    private SQLiteDatabaseConnector connector = new SQLiteDatabaseConnector(BentoBox.getInstance());
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass) {
+        return new SQLiteDatabaseHandler<>(BentoBox.getInstance(), dataObjectClass, connector);
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseConnector.java
new file mode 100644
index 000000000..57f637663
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseConnector.java
@@ -0,0 +1,48 @@
+package world.bentobox.bentobox.database.sql.sqlite;
+
+import java.io.File;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import org.bukkit.Bukkit;
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.sql.SQLDatabaseConnector;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch
+ */
+public class SQLiteDatabaseConnector extends SQLDatabaseConnector {
+
+    private static final String DATABASE_FOLDER_NAME = "database";
+
+    SQLiteDatabaseConnector(@NonNull BentoBox plugin) {
+        super(null, ""); // Not used by SQLite
+        File dataFolder = new File(plugin.getDataFolder(), DATABASE_FOLDER_NAME);
+        if (!dataFolder.exists() && !dataFolder.mkdirs()) {
+            BentoBox.getInstance().logError("Could not create database folder!");
+            return;
+        }
+        connectionUrl = "jdbc:sqlite:" + dataFolder.getAbsolutePath() + File.separator + "database.db";
+    }
+
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.sql.SQLDatabaseConnector#createConnection(java.lang.Class)
+     */
+    @Override
+    public Object createConnection(Class<?> type) {
+        types.add(type);
+        // Only make one connection at a time
+        if (connection == null) {
+            try {
+                connection = DriverManager.getConnection(connectionUrl);
+            } catch (SQLException e) {
+                Bukkit.getLogger().severe("Could not connect to the database! " + e.getMessage());
+            }
+        }
+        return connection;
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseHandler.java
new file mode 100644
index 000000000..024bdda03
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/SQLiteDatabaseHandler.java
@@ -0,0 +1,76 @@
+package world.bentobox.bentobox.database.sql.sqlite;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import com.google.gson.Gson;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.database.DatabaseConnector;
+import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.sql.SQLDatabaseHandler;
+import world.bentobox.bentobox.database.sql.SQLConfiguration;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch, tastybento
+ */
+public class SQLiteDatabaseHandler<T> extends SQLDatabaseHandler<T> {
+
+    /**
+     * Constructor
+     *
+     * @param plugin            BentoBox plugin
+     * @param type              The type of the objects that should be created and filled with
+     *                          values from the database or inserted into the database
+     * @param databaseConnector Contains the settings to create a connection to the database
+     */
+    protected SQLiteDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector databaseConnector) {
+        super(plugin, type, databaseConnector, new SQLConfiguration(type.getCanonicalName())
+                .schema("CREATE TABLE IF NOT EXISTS `" + type.getCanonicalName() + "` (json JSON, uniqueId VARCHAR(255) NOT NULL PRIMARY KEY)")
+                .saveObject("INSERT INTO `" + type.getCanonicalName()
+                + "` (json, uniqueId) VALUES (?, ?) ON CONFLICT(uniqueId) DO UPDATE SET json = ?")
+                .objectExists("SELECT EXISTS (SELECT 1 FROM `" + type.getCanonicalName() + "` WHERE `uniqueId` = ?)"));
+    }
+
+    @Override
+    public void saveObject(T instance) {
+        // Null check
+        if (instance == null) {
+            plugin.logError("MySQL database request to store a null. ");
+            return;
+        }
+        if (!(instance instanceof DataObject)) {
+            plugin.logError("This class is not a DataObject: " + instance.getClass().getName());
+            return;
+        }
+        processQueue.add(() -> {
+            Gson gson = getGson();
+            String toStore = gson.toJson(instance);
+            try (PreparedStatement preparedStatement = getConnection().prepareStatement(getSqlConfig().getSaveObjectSQL())) {
+                preparedStatement.setString(1, toStore);
+                preparedStatement.setString(2, ((DataObject)instance).getUniqueId());
+                preparedStatement.setString(3, toStore);
+                preparedStatement.execute();
+            } catch (SQLException e) {
+                plugin.logError("Could not save object " + instance.getClass().getName() + " " + e.getMessage());
+            }
+        });
+    }
+
+    @Override
+    public void deleteID(String uniqueId) {
+        processQueue.add(() -> {
+            try (PreparedStatement preparedStatement = getConnection().prepareStatement(getSqlConfig().getDeleteObjectSQL())) {
+                // UniqueId must *not* be placed in quotes
+                preparedStatement.setString(1, uniqueId);
+                int result = preparedStatement.executeUpdate();
+                if (result != 1) {
+                    throw new SQLException("Delete did not affect any rows!");
+                }
+            } catch (Exception e) {
+                plugin.logError("Could not delete object " + dataObject.getCanonicalName() + " " + uniqueId + " " + e.getMessage());
+            }
+        });
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/sql/sqlite/package-info.java b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/package-info.java
new file mode 100644
index 000000000..97972c842
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/sql/sqlite/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Contains SQLite database managers.
+ * @since 1.6.0
+ */
+package world.bentobox.bentobox.database.sql.sqlite;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Json2MariaDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Json2MariaDBDatabase.java
index 811705e2a..1bd14eb51 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/Json2MariaDBDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Json2MariaDBDatabase.java
@@ -3,7 +3,7 @@ package world.bentobox.bentobox.database.transition;
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
 import world.bentobox.bentobox.database.json.JSONDatabase;
-import world.bentobox.bentobox.database.mariadb.MariaDBDatabase;
+import world.bentobox.bentobox.database.sql.mariadb.MariaDBDatabase;
 
 /**
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Json2MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Json2MongoDBDatabase.java
new file mode 100644
index 000000000..26b11a50f
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Json2MongoDBDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.mongodb.MongoDBDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class Json2MongoDBDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new JSONDatabase().getHandler(type), new MongoDBDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Json2MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Json2MySQLDatabase.java
index f16804286..a32e4cd35 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/Json2MySQLDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Json2MySQLDatabase.java
@@ -3,7 +3,7 @@ package world.bentobox.bentobox.database.transition;
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
 import world.bentobox.bentobox.database.json.JSONDatabase;
-import world.bentobox.bentobox.database.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabase;
 
 /**
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Json2PostgreSQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Json2PostgreSQLDatabase.java
new file mode 100644
index 000000000..6ae571365
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Json2PostgreSQLDatabase.java
@@ -0,0 +1,17 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.sql.postgresql.PostgreSQLDatabase;
+
+/**
+ * @author Poslovitch
+ * @since 1.6.0
+ */
+public class Json2PostgreSQLDatabase implements DatabaseSetup {
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass) {
+        return new TransitionDatabaseHandler<>(dataObjectClass, new JSONDatabase().getHandler(dataObjectClass), new PostgreSQLDatabase().getHandler(dataObjectClass));
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Json2SQLiteDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Json2SQLiteDatabase.java
new file mode 100644
index 000000000..e7859f9c8
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Json2SQLiteDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.sql.sqlite.SQLiteDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class Json2SQLiteDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new JSONDatabase().getHandler(type), new SQLiteDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/MariaDB2JsonDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/MariaDB2JsonDatabase.java
new file mode 100644
index 000000000..c31e3bcb6
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/MariaDB2JsonDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.sql.mariadb.MariaDBDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class MariaDB2JsonDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new MariaDBDatabase().getHandler(type), new JSONDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/MongoDB2JsonDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/MongoDB2JsonDatabase.java
new file mode 100644
index 000000000..7e4dec2f1
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/MongoDB2JsonDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.mongodb.MongoDBDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class MongoDB2JsonDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new MongoDBDatabase().getHandler(type), new JSONDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/MySQL2JsonDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/MySQL2JsonDatabase.java
index 021c2a960..5e0efb841 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/MySQL2JsonDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/MySQL2JsonDatabase.java
@@ -3,7 +3,7 @@ package world.bentobox.bentobox.database.transition;
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
 import world.bentobox.bentobox.database.json.JSONDatabase;
-import world.bentobox.bentobox.database.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabase;
 
 /**
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/PostgreSQL2JsonDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/PostgreSQL2JsonDatabase.java
new file mode 100644
index 000000000..8c32670af
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/PostgreSQL2JsonDatabase.java
@@ -0,0 +1,17 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.sql.postgresql.PostgreSQLDatabase;
+
+/**
+ * @author Poslovitch
+ * @since 1.6.0
+ */
+public class PostgreSQL2JsonDatabase implements DatabaseSetup {
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> dataObjectClass) {
+        return new TransitionDatabaseHandler<>(dataObjectClass, new PostgreSQLDatabase().getHandler(dataObjectClass), new JSONDatabase().getHandler(dataObjectClass));
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/SQLite2JsonDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/SQLite2JsonDatabase.java
new file mode 100644
index 000000000..346443dba
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/SQLite2JsonDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.json.JSONDatabase;
+import world.bentobox.bentobox.database.sql.sqlite.SQLiteDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class SQLite2JsonDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new SQLiteDatabase().getHandler(type), new JSONDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java
index 0b0cb4f2e..fde8e188b 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/TransitionDatabaseHandler.java
@@ -1,12 +1,13 @@
 package world.bentobox.bentobox.database.transition;
 
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.database.AbstractDatabaseHandler;
-
 import java.beans.IntrospectionException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+
 /**
  * Class that transitions from one database type to another
  *
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MariaDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MariaDBDatabase.java
index ee0af5d59..4551504e1 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MariaDBDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MariaDBDatabase.java
@@ -2,7 +2,7 @@ package world.bentobox.bentobox.database.transition;
 
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
-import world.bentobox.bentobox.database.mariadb.MariaDBDatabase;
+import world.bentobox.bentobox.database.sql.mariadb.MariaDBDatabase;
 import world.bentobox.bentobox.database.yaml.YamlDatabase;
 
 /**
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MongoDBDatabase.java
new file mode 100644
index 000000000..49f76a579
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MongoDBDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.mongodb.MongoDBDatabase;
+import world.bentobox.bentobox.database.yaml.YamlDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class Yaml2MongoDBDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new YamlDatabase().getHandler(type), new MongoDBDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MySQLDatabase.java
index 920b3fd24..8eb2dac50 100644
--- a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MySQLDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2MySQLDatabase.java
@@ -2,7 +2,7 @@ package world.bentobox.bentobox.database.transition;
 
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
-import world.bentobox.bentobox.database.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabase;
 import world.bentobox.bentobox.database.yaml.YamlDatabase;
 
 /**
diff --git a/src/main/java/world/bentobox/bentobox/database/transition/Yaml2SQLiteDatabase.java b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2SQLiteDatabase.java
new file mode 100644
index 000000000..c844d9ade
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/transition/Yaml2SQLiteDatabase.java
@@ -0,0 +1,20 @@
+package world.bentobox.bentobox.database.transition;
+
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.DatabaseSetup;
+import world.bentobox.bentobox.database.sql.sqlite.SQLiteDatabase;
+import world.bentobox.bentobox.database.yaml.YamlDatabase;
+
+
+/**
+ * @author BONNe
+ * @since 1.6.0
+ */
+public class Yaml2SQLiteDatabase implements DatabaseSetup {
+
+    @Override
+    public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
+        return new TransitionDatabaseHandler<>(type, new YamlDatabase().getHandler(type), new SQLiteDatabase().getHandler(type));
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java
index 1fa61f799..597a24384 100644
--- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java
@@ -6,6 +6,8 @@ import world.bentobox.bentobox.database.DatabaseSetup;
 
 public class YamlDatabase implements DatabaseSetup {
 
+    private YamlDatabaseConnector connector = new YamlDatabaseConnector(BentoBox.getInstance());
+
     /**
      * Get the config
      * @param <T> - Class type
@@ -13,12 +15,15 @@ public class YamlDatabase implements DatabaseSetup {
      * @return - the config handler
      */
     public <T> AbstractDatabaseHandler<T> getConfig(Class<T> type) {
-        return new ConfigHandler<>(BentoBox.getInstance(), type, new YamlDatabaseConnector(BentoBox.getInstance()));
+        return new ConfigHandler<>(BentoBox.getInstance(), type, connector);
     }
 
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.database.DatabaseSetup#getHandler(java.lang.Class)
+     */
     @Override
     public <T> AbstractDatabaseHandler<T> getHandler(Class<T> type) {
-        return new YamlDatabaseHandler<>(BentoBox.getInstance(), type, new YamlDatabaseConnector(BentoBox.getInstance()));
+        return new YamlDatabaseHandler<>(BentoBox.getInstance(), type, connector);
     }
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java
index 8f4266282..cc2f3b735 100644
--- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java
@@ -13,7 +13,6 @@ import java.io.PrintWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +23,7 @@ import java.util.UUID;
 
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.eclipse.jdt.annotation.NonNull;
 
 import com.google.common.base.Charsets;
 
@@ -43,11 +43,6 @@ public class YamlDatabaseConnector implements DatabaseConnector {
         dataFolder = new File(plugin.getDataFolder(), DATABASE_FOLDER_NAME);
     }
 
-    @Override
-    public Connection createConnection() {
-        return null; // Not used
-    }
-
     @Override
     public String getConnectionUrl() {
         return null; // Not used
@@ -191,6 +186,7 @@ public class YamlDatabaseConnector implements DatabaseConnector {
     }
 
     @Override
+    @NonNull
     public String getUniqueId(String tableName) {
         UUID uuid = UUID.randomUUID();
         File file = new File(dataFolder, tableName + File.separator + uuid.toString() + YML);
@@ -209,8 +205,16 @@ public class YamlDatabaseConnector implements DatabaseConnector {
     }
 
     @Override
-    public void closeConnection() {
+    public Object createConnection(Class<?> type) {
         // Not used
+        return null;
+    }
+
+
+    @Override
+    public void closeConnection(Class<?> type) {
+        // not used
+
     }
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
index de6cb259b..652f3fc3c 100644
--- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
@@ -20,17 +20,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.configuration.MemorySection;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.scheduler.BukkitTask;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -59,26 +56,11 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
 
     private static final String YML = ".yml";
 
-    /**
-     * FIFO queue for saves. Note that the assumption here is that most database objects will be held
-     * in memory because loading is not handled with this queue. That means that it is theoretically
-     * possible to load something before it has been saved. So, in general, load your objects and then
-     * save them async only when you do not need the data again immediately.
-     */
-    private Queue<Runnable> processQueue;
-
-    /**
-     * Async save task that runs repeatedly
-     */
-    private BukkitTask asyncSaveTask;
-
     /**
      * Flag to indicate if this is a config or a pure object database (difference is in comments and annotations)
      */
     protected boolean configFlag;
 
-
-
     /**
      * Constructor
      * @param plugin - plugin
@@ -87,26 +69,6 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
      */
     YamlDatabaseHandler(BentoBox plugin, Class<T> type, DatabaseConnector databaseConnector) {
         super(plugin, type, databaseConnector);
-        processQueue = new ConcurrentLinkedQueue<>();
-        if (plugin.isEnabled()) {
-            asyncSaveTask = Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                // Loop continuously
-                while (plugin.isEnabled() || !processQueue.isEmpty()) {
-                    while (!processQueue.isEmpty()) {
-                        processQueue.poll().run();
-                    }
-                    // Clear the queue and then sleep
-                    try {
-                        Thread.sleep(25);
-                    } catch (InterruptedException e) {
-                        plugin.logError("Thread sleep error " + e.getMessage());
-                        Thread.currentThread().interrupt();
-                    }
-                }
-                // Cancel
-                asyncSaveTask.cancel();
-            });
-        }
     }
 
     /* (non-Javadoc)
@@ -176,9 +138,9 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
      * @param config - YAML config file
      *
      * @return <T> filled with values
-     * @throws SecurityException
-     * @throws NoSuchMethodException
-     * @throws IllegalArgumentException
+     * @throws SecurityException security exception
+     * @throws NoSuchMethodException no such method
+     * @throws IllegalArgumentException illegal argument
      */
     private T createObject(YamlConfiguration config) throws InstantiationException, IllegalAccessException, IntrospectionException, InvocationTargetException, ClassNotFoundException, NoSuchMethodException {
         // Create a new instance of the dataObject of type T (which can be any class)
@@ -191,7 +153,8 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 continue;
             }
             // Get the getter and setters for this field using the JavaBeans system
-            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(field.getName(), dataObject);
+            //noinspection RedundantCast
+            PropertyDescriptor propertyDescriptor = new PropertyDescriptor((String)field.getName(), dataObject);
             // Get the write method
             Method method = propertyDescriptor.getWriteMethod();
             /*
@@ -382,7 +345,8 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 continue;
             }
             // Get the property descriptor for this field
-            PropertyDescriptor propertyDescriptor = new PropertyDescriptor(field.getName(), dataObject);
+            //noinspection RedundantCast
+            PropertyDescriptor propertyDescriptor = new PropertyDescriptor((String)field.getName(), dataObject);
             // Get the read method
             Method method = propertyDescriptor.getReadMethod();
             // Invoke the read method to get the value. We have no idea what type of value it is.
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/package-info.java b/src/main/java/world/bentobox/bentobox/database/yaml/package-info.java
new file mode 100644
index 000000000..5faaac3f0
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Contains YAML database and configuration files managers.
+ */
+package world.bentobox.bentobox.database.yaml;
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java b/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java
index d82fa93b1..9583dac37 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/DynmapHook.java
@@ -1,18 +1,19 @@
 package world.bentobox.bentobox.hooks;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.bukkit.Material;
 import org.dynmap.DynmapAPI;
 import org.dynmap.markers.MarkerAPI;
 import org.dynmap.markers.MarkerSet;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.hooks.Hook;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author Poslovitch
  * @since 1.5.0
diff --git a/src/main/java/world/bentobox/bentobox/hooks/MultiverseCoreHook.java b/src/main/java/world/bentobox/bentobox/hooks/MultiverseCoreHook.java
index d4d239b0f..c93d2a76f 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/MultiverseCoreHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/MultiverseCoreHook.java
@@ -3,6 +3,7 @@ package world.bentobox.bentobox.hooks;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.hooks.Hook;
 
diff --git a/src/main/java/world/bentobox/bentobox/hooks/VaultHook.java b/src/main/java/world/bentobox/bentobox/hooks/VaultHook.java
index 9f17ffb76..5d568edf9 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/VaultHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/VaultHook.java
@@ -1,10 +1,11 @@
 package world.bentobox.bentobox.hooks;
 
-import net.milkbowl.vault.economy.Economy;
-import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.plugin.RegisteredServiceProvider;
+
+import net.milkbowl.vault.economy.Economy;
+import net.milkbowl.vault.economy.EconomyResponse;
 import world.bentobox.bentobox.api.hooks.Hook;
 import world.bentobox.bentobox.api.user.User;
 
@@ -27,7 +28,7 @@ public class VaultHook extends Hook {
             return false;
         }
         economy = rsp.getProvider();
-        return economy != null;
+        return true;
     }
 
     @Override
diff --git a/src/main/java/world/bentobox/bentobox/hooks/WorldEditHook.java b/src/main/java/world/bentobox/bentobox/hooks/WorldEditHook.java
new file mode 100644
index 000000000..a77579dbc
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/hooks/WorldEditHook.java
@@ -0,0 +1,41 @@
+package world.bentobox.bentobox.hooks;
+
+import org.bukkit.Material;
+import org.eclipse.jdt.annotation.Nullable;
+
+import com.sk89q.worldedit.WorldEdit;
+
+import world.bentobox.bentobox.api.hooks.Hook;
+import world.bentobox.bentobox.blueprints.worldedit.BlueprintClipboardFormat;
+
+/**
+ * @since 1.6.0
+ * @author Poslovitch
+ */
+public class WorldEditHook extends Hook {
+
+    public WorldEditHook() {
+        super("WorldEdit", Material.WOODEN_AXE);
+    }
+
+    @Override
+    public boolean hook() {
+
+        WorldEdit instance;
+        try {
+            instance = WorldEdit.getInstance();
+            new BlueprintClipboardFormat();
+        } catch (Exception e) {
+            return false;
+        }
+
+        return instance != null;
+
+    }
+
+    @Override
+    @Nullable
+    public String getFailureCause() {
+        return null; // The process shouldn't fail
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/hooks/placeholders/MVdWPlaceholderAPIHook.java b/src/main/java/world/bentobox/bentobox/hooks/placeholders/MVdWPlaceholderAPIHook.java
index 3339b4f70..9d4f1b203 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/placeholders/MVdWPlaceholderAPIHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/placeholders/MVdWPlaceholderAPIHook.java
@@ -1,8 +1,9 @@
 package world.bentobox.bentobox.hooks.placeholders;
 
-import be.maximvdw.placeholderapi.PlaceholderAPI;
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.NonNull;
+
+import be.maximvdw.placeholderapi.PlaceholderAPI;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer;
diff --git a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java
index 4cd5557ef..6f9dddebf 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderHook.java
@@ -3,6 +3,7 @@ package world.bentobox.bentobox.hooks.placeholders;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.hooks.Hook;
 import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer;
diff --git a/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
index 3f3c67a70..380264da7 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
@@ -3,6 +3,7 @@ package world.bentobox.bentobox.listeners;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World.Environment;
+import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -30,11 +31,13 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
-        Location location = event.getPlayer().getLocation();
+        testLocation(event.getPlayer().getLocation());
+    }
 
+    private void testLocation(Location location) {
         if (!plugin.getIWM().isIslandEnd(location.getWorld())
-            || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(location.getWorld())
-            || location.getWorld().getBlockAt(0, 255, 0).getType().equals(Material.END_PORTAL)) {
+                || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(location.getWorld())
+                || location.getWorld().getBlockAt(0, 255, 0).getType().equals(Material.END_PORTAL)) {
             return;
         }
 
@@ -49,16 +52,7 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerJoinWorld(PlayerJoinEvent event) {
-        Location location = event.getPlayer().getLocation();
-
-        if (!plugin.getIWM().isIslandEnd(location.getWorld())
-            || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(location.getWorld())
-            || location.getWorld().getBlockAt(0, 255, 0).getType().equals(Material.END_PORTAL)) {
-            return;
-        }
-
-        // Setting a End Portal at the top will trick dragon legacy check.
-        location.getWorld().getBlockAt(0, 255, 0).setType(Material.END_PORTAL, false);
+        testLocation(event.getPlayer().getLocation());
     }
 
     /**
@@ -68,18 +62,18 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEndBlockPlace(BlockPlaceEvent e) {
-        if (e.getBlock().getY() != 255
-                || e.getBlock().getX() != 0
-                || e.getBlock().getZ() != 0
-                || !e.getBlock().getType().equals(Material.END_PORTAL)
-                || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
-                || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
-                || !plugin.getIWM().inWorld(e.getBlock().getWorld())
-                || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
-                || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {
-            return;
-        }
-        e.setCancelled(true);
+        e.setCancelled(testBlock(e.getBlock()));
+    }
+
+    private boolean testBlock(Block block) {
+        return block.getY() == 255
+                && block.getX() == 0
+                && block.getZ() == 0
+                && block.getWorld().getEnvironment().equals(Environment.THE_END)
+                && Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(block.getWorld())
+                && plugin.getIWM().inWorld(block.getWorld())
+                && plugin.getIWM().isEndGenerate(block.getWorld())
+                && plugin.getIWM().isEndIslands(block.getWorld());
     }
 
     /**
@@ -89,17 +83,6 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEndBlockBreak(BlockBreakEvent e) {
-        if (e.getBlock().getY() != 255
-                || e.getBlock().getX() != 0
-                || e.getBlock().getZ() != 0
-                || !e.getBlock().getType().equals(Material.END_PORTAL)
-                || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
-                || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
-                || !plugin.getIWM().inWorld(e.getBlock().getWorld())
-                || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
-                || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {
-            return;
-        }
-        e.setCancelled(true);
+        e.setCancelled(testBlock(e.getBlock()));
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
index d35187c4b..122b887fb 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
@@ -1,9 +1,5 @@
 package world.bentobox.bentobox.listeners;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
@@ -14,8 +10,8 @@ import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.eclipse.jdt.annotation.NonNull;
-
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
@@ -25,6 +21,10 @@ import world.bentobox.bentobox.managers.PlayersManager;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
 public class JoinLeaveListener implements Listener {
 
     private BentoBox plugin;
@@ -70,8 +70,8 @@ public class JoinLeaveListener implements Listener {
             }
 
             // If mobs have to be removed when a player joins, then wipe all the mobs on his island.
-            if (plugin.getIWM().inWorld(user.getLocation()) && Flags.REMOVE_MOBS.isSetForWorld(user.getWorld())) {
-                plugin.getIslands().clearArea(user.getLocation());
+            if (plugin.getIslands().locationIsOnIsland(event.getPlayer(), user.getLocation()) && Flags.REMOVE_MOBS.isSetForWorld(user.getWorld())) {
+                Bukkit.getScheduler().runTask(plugin, () -> plugin.getIslands().clearArea(user.getLocation()));
             }
 
             // Clear inventory if required
@@ -141,6 +141,7 @@ public class JoinLeaveListener implements Listener {
 
                 if (!candidates.isEmpty() && !plugin.getSettings().isAutoOwnershipTransferIgnoreRanks()) {
                     // Ranks are not ignored, our candidates can only have the highest rank
+                    // TODO Complete this section
                 }
             }
         });
@@ -153,7 +154,7 @@ public class JoinLeaveListener implements Listener {
             Island island = plugin.getIslands().getIsland(world, user);
             if (island != null) {
                 // Check if new owner has a different range permission than the island size
-                int range = user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld()).get().getPermissionPrefix() + "island.range", island.getProtectionRange());
+                int range = user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld()).map(GameModeAddon::getPermissionPrefix).orElse("") + "island.range", island.getProtectionRange());
 
                 // Range can go up or down
                 if (range != island.getProtectionRange()) {
diff --git a/src/main/java/world/bentobox/bentobox/listeners/NetherTreesListener.java b/src/main/java/world/bentobox/bentobox/listeners/NetherTreesListener.java
deleted file mode 100644
index 1ad629cb9..000000000
--- a/src/main/java/world/bentobox/bentobox/listeners/NetherTreesListener.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package world.bentobox.bentobox.listeners;
-
-import org.bukkit.Material;
-import org.bukkit.Tag;
-import org.bukkit.World;
-import org.bukkit.block.BlockState;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.world.StructureGrowEvent;
-import org.eclipse.jdt.annotation.NonNull;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.configuration.WorldSettings;
-
-/**
- * Handles conversion of trees in the Nether if {@link WorldSettings#isNetherTrees()} is {@code true}.
- *
- * @author tastybento
- */
-public class NetherTreesListener implements Listener {
-
-    private BentoBox plugin;
-
-    public NetherTreesListener(@NonNull BentoBox plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Converts trees to gravel and glowstone.
-     *
-     * @param e event
-     */
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-    public void onTreeGrow(StructureGrowEvent e) {
-        // Don't do anything if we're not in the right place.
-        if (!plugin.getIWM().isNetherTrees(e.getWorld()) || !e.getWorld().getEnvironment().equals(World.Environment.NETHER)) {
-            return;
-        }
-
-        // Modify everything!
-        for (BlockState b : e.getBlocks()) {
-            if (Tag.LOGS.isTagged(b.getType())) {
-                b.setType(Material.GRAVEL);
-            } else if (Tag.LEAVES.isTagged(b.getType())) {
-                b.setType(Material.GLOWSTONE);
-            }
-        }
-    }
-}
diff --git a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java
index de5540c4c..15d33ebe1 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java
@@ -54,9 +54,12 @@ public class PanelListenerManager implements Listener {
                     // Execute the handler's onClick method and optionally cancel the event if the handler returns true
                     event.setCancelled(handler.onClick(panel, user, event.getClick(), event.getSlot())));
                 }
-                // If there is a listener, then run it.
-                panel.getListener().ifPresent(l -> l.onInventoryClick(user, event));
-
+                // If there is a listener, then run it and refresh the panel
+                panel.getListener().ifPresent(l -> {
+                    l.onInventoryClick(user, event);
+                    // Refresh
+                    l.refreshPanel();
+                });
             } else {
                 // Wrong name - delete this panel
                 openPanels.remove(user.getUniqueId());
diff --git a/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java b/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
index c22a4f057..bb1606107 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
@@ -15,10 +15,10 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.util.Util;
-import world.bentobox.bentobox.util.teleport.SafeSpotTeleport;
 import world.bentobox.bentobox.blueprints.BlueprintPaster;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.util.Util;
+import world.bentobox.bentobox.util.teleport.SafeSpotTeleport;
 
 /**
  * Handles teleportation via the Nether/End portals to the Nether and End dimensions of the worlds added by the GameModeAddons.
@@ -102,7 +102,7 @@ public class PortalTeleportationListener implements Listener {
         Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.THE_END)).orElse(e.getFrom().toVector().toLocation(endWorld));
         e.setCancelled(true);
         // Check if there is a missing end island
-        if (plugin.getIWM().isEndGenerate(overWorld)
+        if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isEndGenerate(overWorld)
                 && plugin.getIWM().isEndIslands(overWorld)
                 && plugin.getIWM().getEndWorld(overWorld) != null
                 && !optionalIsland.map(Island::hasEndIsland).orElse(true)) {
@@ -171,7 +171,7 @@ public class PortalTeleportationListener implements Listener {
         Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.NETHER)).orElse(e.getFrom().toVector().toLocation(nether));
         e.setCancelled(true);
         // Check if there is an island there or not
-        if (plugin.getIWM().isNetherGenerate(overWorld)
+        if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isNetherGenerate(overWorld)
                 && plugin.getIWM().isNetherIslands(overWorld)
                 && plugin.getIWM().getNetherWorld(overWorld) != null
                 && !optionalIsland.map(Island::hasNetherIsland).orElse(true)) {
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java
index c1ea275bf..2e8d5a602 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandCycleClick.java
@@ -36,26 +36,26 @@ public class CommandCycleClick implements ClickHandler {
         Island island = plugin.getIslands().getIsland(user.getWorld(), user.getUniqueId());
         if (island != null && island.getOwner().equals(user.getUniqueId())) {
             RanksManager rm = plugin.getRanksManager();
-            int currentRank = plugin.getSettings().getRankCommand(command);
+            int currentRank = island.getRankCommand(command);
             if (click.equals(ClickType.LEFT)) {
                 if (currentRank == RanksManager.OWNER_RANK) {
-                    plugin.getSettings().setRankCommand(command, RanksManager.MEMBER_RANK);
+                    island.setRankCommand(command, RanksManager.MEMBER_RANK);
                 } else {
-                    plugin.getSettings().setRankCommand(command, rm.getRankUpValue(currentRank));
+                    island.setRankCommand(command, rm.getRankUpValue(currentRank));
                 }
                 user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_ON, 1F, 1F);
             } else if (click.equals(ClickType.RIGHT)) {
                 if (currentRank == RanksManager.MEMBER_RANK) {
-                    plugin.getSettings().setRankCommand(command, RanksManager.OWNER_RANK);
+                    island.setRankCommand(command, RanksManager.OWNER_RANK);
                 } else {
-                    plugin.getSettings().setRankCommand(command, rm.getRankDownValue(currentRank));
+                    island.setRankCommand(command, rm.getRankDownValue(currentRank));
                 }
                 user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_ON, 1F, 1F);
             }
             // Apply change to panel
             panel.getInventory().setItem(slot, commandRankClickListener.getPanelItem(command, user).getItem());
-            // Save config
-            plugin.saveConfig();
+            // Save island
+            plugin.getIslands().save(island);
 
         } else {
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java
index afc2ef093..b41081071 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java
@@ -18,6 +18,7 @@ import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
@@ -41,13 +42,21 @@ public class CommandRankClickListener implements ClickHandler {
             return true;
         }
         IslandWorldManager iwm = plugin.getIWM();
-        String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.COMMAND_RANKS";
+        String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.COMMAND_RANKS";
         if (!user.hasPermission(reqPerm)) {
             user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
             return true;
         }
 
+        // Get the user's island
+        Island island = plugin.getIslands().getIsland(user.getWorld(), user.getUniqueId());
+        if (island == null || !island.getOwner().equals(user.getUniqueId())) {
+            user.sendMessage("general.errors.not-owner");
+            user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
+            return true;
+        }
+
         String panelName = user.getTranslation("protection.flags.COMMAND_RANKS.name");
         if (panel.getName().equals(panelName)) {
             // This is a click on the panel
@@ -81,6 +90,7 @@ public class CommandRankClickListener implements ClickHandler {
      * @return panel item for this command
      */
     public PanelItem getPanelItem(String c, User user) {
+        Island island = plugin.getIslands().getIsland(user.getWorld(), user);
         PanelItemBuilder pib = new PanelItemBuilder();
         pib.name(c);
         pib.clickHandler(new CommandCycleClick(this, c));
@@ -89,11 +99,11 @@ public class CommandRankClickListener implements ClickHandler {
         String d = user.getTranslation("protection.panel.flag-item.description-layout", TextVariables.DESCRIPTION, "");
         pib.description(d);
         plugin.getRanksManager().getRanks().forEach((reference, score) -> {
-            if (score >= RanksManager.MEMBER_RANK && score < plugin.getSettings().getRankCommand(c)) {
+            if (score >= RanksManager.MEMBER_RANK && score < island.getRankCommand(c)) {
                 pib.description(user.getTranslation("protection.panel.flag-item.blocked-rank") + user.getTranslation(reference));
-            } else if (score <= RanksManager.OWNER_RANK && score > plugin.getSettings().getRankCommand(c)) {
+            } else if (score <= RanksManager.OWNER_RANK && score > island.getRankCommand(c)) {
                 pib.description(user.getTranslation("protection.panel.flag-item.allowed-rank") + user.getTranslation(reference));
-            } else if (score == plugin.getSettings().getRankCommand(c)) {
+            } else if (score == island.getRankCommand(c)) {
                 pib.description(user.getTranslation("protection.panel.flag-item.minimal-rank") + user.getTranslation(reference));
             }
         });
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java
index 06990028d..81727db45 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoLimitClickListener.java
@@ -45,7 +45,7 @@ public class GeoLimitClickListener implements ClickHandler {
             return true;
         }
         IslandWorldManager iwm = BentoBox.getInstance().getIWM();
-        String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.GEO_LIMIT_MOBS";
+        String reqPerm = iwm.getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.GEO_LIMIT_MOBS";
         if (!user.hasPermission(reqPerm)) {
             user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
index 1fca838d5..ce1075b18 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
@@ -29,19 +29,22 @@ import world.bentobox.bentobox.lists.Flags;
  */
 public class BlockInteractionListener extends FlagListener {
 
+    private static final String FURNACE = "FURNACE";
+    private static final String CRAFTING = "CRAFTING";
+
     /**
      * These cover materials in another server version.
      * This avoids run time errors due to unknown enum values, at the expense of a string comparison
      */
     private final Map<String, String> stringFlags = ImmutableMap.<String, String>builder()
-            .put("CAMPFIRE", "FURNACE")
-            .put("CARTOGRAPHY_TABLE", "CRAFTING")
-            .put("GRINDSTONE", "CRAFTING")
+            .put("CAMPFIRE", FURNACE)
+            .put("CARTOGRAPHY_TABLE", CRAFTING)
+            .put("GRINDSTONE", CRAFTING)
             .put("LECTERN", "BREAK_BLOCKS")
-            .put("LOOM", "CRAFTING")
-            .put("STONECUTTER", "CRAFTING")
-            .put("SMOKER", "FURNACE")
-            .put("BLAST_FURNACE", "FURNACE")
+            .put("LOOM", CRAFTING)
+            .put("STONECUTTER", CRAFTING)
+            .put("SMOKER", FURNACE)
+            .put("BLAST_FURNACE", FURNACE)
             .put("COMPOSTER", "CONTAINER")
             .build();
 
@@ -153,6 +156,8 @@ public class BlockInteractionListener extends FlagListener {
         }
         switch (type) {
         case ANVIL:
+        case CHIPPED_ANVIL:
+        case DAMAGED_ANVIL:
             checkIsland(e, player, loc, Flags.ANVIL);
             break;
         case BEACON:
@@ -287,7 +292,7 @@ public class BlockInteractionListener extends FlagListener {
         default:
             if (stringFlags.containsKey(type.name())) {
                 Optional<Flag> f = BentoBox.getInstance().getFlagsManager().getFlag(stringFlags.get(type.name()));
-                if (f.isPresent()) checkIsland(e, player, loc, f.get());
+                f.ifPresent(flag -> checkIsland(e, player, loc, flag));
             }
         }
     }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
index 4928047e7..20409e0eb 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
@@ -114,7 +114,7 @@ public class BreakBlocksListener extends FlagListener {
             Projectile p = (Projectile) e.getDamager();
             if (p.getShooter() instanceof Player && !checkIsland(e, (Player)p.getShooter(), e.getEntity().getLocation(), Flags.BREAK_BLOCKS)) {
                 e.getEntity().setFireTicks(0);
-                e.getDamager().remove();
+                p.setFireTicks(0);
             }
         }
     }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java
index 1b0776371..8f49dc2b6 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreedingListener.java
@@ -1,5 +1,8 @@
 package world.bentobox.bentobox.listeners.flags.protection;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.bukkit.Material;
 import org.bukkit.entity.Animals;
 import org.bukkit.event.EventHandler;
@@ -7,12 +10,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Handles breeding protection
  * Note - animal protection is done elsewhere.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java
index df782b38d..a4822f399 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BucketListener.java
@@ -9,6 +9,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/DyeListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/DyeListener.java
index e5706e378..80325ffaf 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/DyeListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/DyeListener.java
@@ -6,6 +6,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.versions.ServerCompatibility;
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListener.java
new file mode 100644
index 000000000..18ab3ee3b
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/ElytraListener.java
@@ -0,0 +1,44 @@
+package world.bentobox.bentobox.listeners.flags.protection;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityToggleGlideEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+
+import world.bentobox.bentobox.api.flags.FlagListener;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.lists.Flags;
+
+public class ElytraListener extends FlagListener {
+
+
+    /**
+     * Handle visitors using elytra
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onGlide(EntityToggleGlideEvent e) {
+        if (e.getEntity() instanceof Player) {
+            Player player = (Player) e.getEntity();
+            checkIsland(e, player, player.getLocation(), Flags.ELYTRA);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void wearingElytra(PlayerTeleportEvent e) {
+        if (!getIWM().inWorld(e.getTo())) {
+            return;
+        }
+        User user = User.getInstance(e.getPlayer());
+        // Check user's inventory
+        if (user.getInventory().all(Material.ELYTRA).isEmpty()) {
+            return;
+        }
+        if (getIslands().getProtectedIslandAt(e.getTo()).filter(i-> !i.isAllowed(user, Flags.ELYTRA)).isPresent()) {
+            user.notify("protection.flags.ELYTRA.hint");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java
index 883efe8ed..582dd1d75 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java
@@ -12,6 +12,7 @@ import org.bukkit.event.block.BlockIgniteEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.BlockIterator;
+
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java
index fef4e6ef1..e35caff3f 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListener.java
@@ -1,5 +1,7 @@
 package world.bentobox.bentobox.listeners.flags.protection;
 
+import java.util.HashMap;
+
 import org.bukkit.Material;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
@@ -18,12 +20,12 @@ import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.potion.PotionEffect;
+
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.util.Util;
-
-import java.util.HashMap;
+import world.bentobox.bentobox.versions.ServerCompatibility;
 
 
 /**
@@ -83,8 +85,8 @@ public class HurtingListener extends FlagListener {
         }
 
         if ((Util.isPassiveEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_ANIMALS))
-            || (Util.isHostileEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_MONSTERS))
-            || (e.getCaught() instanceof Villager && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_VILLAGERS))) {
+                || (Util.isHostileEntity(e.getCaught()) && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_MONSTERS))
+                || (e.getCaught() instanceof Villager && checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), Flags.HURT_VILLAGERS))) {
             e.getHook().remove();
         }
 
@@ -153,6 +155,12 @@ public class HurtingListener extends FlagListener {
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
     public void onLingeringPotionSplash(final LingeringPotionSplashEvent e) {
+        // TODO Switch this to 1.13 when we move to 1.14 officially
+        if (!ServerCompatibility.getInstance().isVersion(ServerCompatibility.ServerVersion.V1_14, ServerCompatibility.ServerVersion.V1_14_1)) {
+            // We're disabling this check for non-1.14 servers.
+            return;
+        }
+
         // Try to get the shooter
         Projectile projectile = e.getEntity();
         if (projectile.getShooter() instanceof Player) {
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListener.java
index a814d9e2e..2cd31f7a2 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListener.java
@@ -7,6 +7,7 @@ import org.bukkit.block.Dropper;
 import org.bukkit.block.Furnace;
 import org.bukkit.block.Hopper;
 import org.bukkit.entity.Animals;
+import org.bukkit.entity.NPC;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.minecart.HopperMinecart;
 import org.bukkit.event.EventHandler;
@@ -57,6 +58,9 @@ public class InventoryListener extends FlagListener {
         else if (inventoryHolder instanceof Beacon) {
             checkIsland(e, player, e.getInventory().getLocation(), Flags.BEACON);
         }
+        else if (inventoryHolder instanceof NPC) {
+            checkIsland(e, player, e.getInventory().getLocation(), Flags.TRADING);
+        }
         else if (!(inventoryHolder instanceof Player)) {
             // All other containers
             checkIsland(e, player, e.getInventory().getLocation(), Flags.CONTAINER);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java
index 3b3e2f864..c07366d56 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LeashListener.java
@@ -6,6 +6,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerLeashEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.player.PlayerUnleashEntityEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java
index 876da8a74..9fe668bd6 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java
@@ -1,7 +1,6 @@
 package world.bentobox.bentobox.listeners.flags.protection;
 
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -60,7 +59,7 @@ public class LockAndBanListener extends FlagListener {
         }
         if (!checkAndNotify(e.getPlayer(), e.getTo()).equals(CheckResult.OPEN)) {
             e.setCancelled(true);
-            e.getFrom().getWorld().playSound(e.getFrom(), Sound.BLOCK_ANVIL_HIT, 1F, 1F);
+            e.getPlayer().playSound(e.getFrom(), Sound.BLOCK_ANVIL_HIT, 1F, 1F);
             e.getPlayer().setVelocity(new Vector(0,0,0));
             e.getPlayer().setGliding(false);
         }
@@ -83,7 +82,7 @@ public class LockAndBanListener extends FlagListener {
             if (!checkAndNotify(p, e.getTo()).equals(CheckResult.OPEN)) {
                 p.leaveVehicle();
                 p.teleport(e.getFrom());
-                e.getFrom().getWorld().playSound(e.getFrom(), Sound.BLOCK_ANVIL_HIT, 1F, 1F);
+                e.getVehicle().getWorld().playSound(e.getFrom(), Sound.BLOCK_ANVIL_HIT, 1F, 1F);
                 eject(p);
             }
         });
@@ -112,10 +111,10 @@ public class LockAndBanListener extends FlagListener {
         return getIslands().getProtectedIslandAt(loc)
                 .map(is -> {
                     if (is.isBanned(player.getUniqueId())) {
-                        return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypassban") ? CheckResult.OPEN : CheckResult.BANNED;
+                        return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypassban") ? CheckResult.OPEN : CheckResult.BANNED;
                     }
                     if (!is.isAllowed(User.getInstance(player), Flags.LOCK)) {
-                        return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypasslock") ? CheckResult.OPEN : CheckResult.LOCKED;
+                        return player.hasPermission(getIWM().getPermissionPrefix(loc.getWorld()) + "mod.bypasslock") ? CheckResult.OPEN : CheckResult.LOCKED;
                     }
                     return CheckResult.OPEN;
                 }).orElse(CheckResult.OPEN);
@@ -147,7 +146,6 @@ public class LockAndBanListener extends FlagListener {
      * @param player - player
      */
     private void eject(Player player) {
-        player.setGameMode(GameMode.SPECTATOR);
         // Teleport player to their home
         if (getIslands().hasIsland(player.getWorld(), player.getUniqueId())) {
             getIslands().homeTeleport(player.getWorld(), player);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListener.java
index e44683b11..cf90e5295 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PhysicalInteractionListener.java
@@ -7,6 +7,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java
index 7055bf84e..fe7c406a2 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java
@@ -10,6 +10,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java
index 9d69241a7..4c7b23d95 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java
@@ -1,5 +1,8 @@
 package world.bentobox.bentobox.listeners.flags.protection;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -10,12 +13,10 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Protects islands from visitors blowing things up
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TeleportationListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TeleportationListener.java
index 6224a9c8b..e09520340 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TeleportationListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TeleportationListener.java
@@ -4,6 +4,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/DecayListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/DecayListener.java
index f801e3355..0932ebd4e 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/DecayListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/DecayListener.java
@@ -1,14 +1,15 @@
 package world.bentobox.bentobox.listeners.flags.settings;
 
+import java.util.Optional;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.LeavesDecayEvent;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 
-import java.util.Optional;
-
 /**
  * Handles {@link world.bentobox.bentobox.lists.Flags#LEAF_DECAY}.
  * @author Poslovitch
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java
index dcf0f4462..e1b1c8ebf 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java
@@ -1,17 +1,18 @@
 package world.bentobox.bentobox.listeners.flags.settings;
 
+import java.util.Optional;
+
 import org.bukkit.entity.PufferFish;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.util.Util;
 
-import java.util.Optional;
-
 
 /**
  * Handles natural mob spawning.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java
index d68de7255..a62fb0c5e 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java
@@ -1,5 +1,8 @@
 package world.bentobox.bentobox.listeners.flags.settings;
 
+import java.util.HashMap;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -16,14 +19,12 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.LingeringPotionSplashEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.player.PlayerFishEvent;
+
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.lists.Flags;
 
-import java.util.HashMap;
-import java.util.UUID;
-
 /**
  * Handles PVP
  * @author tastybento
@@ -41,7 +42,7 @@ public class PVPListener extends FlagListener {
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onEntityDamage(EntityDamageByEntityEvent e) {
-        if (e.getEntity() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getLocation())) {
+        if (e.getEntity() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
             // Allow self damage
             if (e.getEntity().equals(e.getDamager())) {
                 return;
@@ -120,7 +121,7 @@ public class PVPListener extends FlagListener {
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
     public void onSplashPotionSplash(final PotionSplashEvent e) {
-        if (e.getEntity().getShooter() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getLocation())) {
+        if (e.getEntity().getShooter() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
             User user = User.getInstance((Player)e.getEntity().getShooter());
             // Run through affected entities and cancel the splash if any are a protected player
             e.setCancelled(e.getAffectedEntities().stream().anyMatch(le -> blockPVP(user, le, e, getFlag(e.getEntity().getWorld()))));
@@ -163,7 +164,7 @@ public class PVPListener extends FlagListener {
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
     public void onLingeringPotionSplash(final LingeringPotionSplashEvent e) {
         // Try to get the shooter
-        if (e.getEntity().getShooter() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getLocation())) {
+        if (e.getEntity().getShooter() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
             // Store it and remove it when the effect is gone (Entity ID, UUID of throwing player)
             thrownPotions.put(e.getAreaEffectCloud().getEntityId(), ((Player)e.getEntity().getShooter()).getUniqueId());
             Bukkit.getScheduler().runTaskLater(getPlugin(), () -> thrownPotions.remove(e.getAreaEffectCloud().getEntityId()), e.getAreaEffectCloud().getDuration());
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java
index 42e6b0334..1e42bf7f9 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListener.java
@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
+import java.security.SecureRandom;
 import java.util.LinkedList;
 import java.util.Queue;
 
@@ -10,6 +11,8 @@ import org.bukkit.World.Environment;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.ChunkGenerator.ChunkData;
 import org.bukkit.scheduler.BukkitTask;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
@@ -18,6 +21,7 @@ import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.util.MyBiomeGrid;
 import world.bentobox.bentobox.util.Pair;
 
 /**
@@ -27,6 +31,8 @@ import world.bentobox.bentobox.util.Pair;
  */
 public class CleanSuperFlatListener extends FlagListener {
 
+    private BentoBox plugin = BentoBox.getInstance();
+
     /**
      * Stores pairs of X,Z coordinates of chunks that need to be regenerated.
      * @since 1.1
@@ -54,32 +60,67 @@ public class CleanSuperFlatListener extends FlagListener {
         ready = true;
     }
 
-    @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onChunkLoad(ChunkLoadEvent e) {
-        if (!ready) {
+
+        World world = e.getWorld();
+        if (noClean(world, e)) {
             return;
         }
-        BentoBox plugin = BentoBox.getInstance();
-        World world = e.getWorld();
-        if (!e.getChunk().getBlock(0, 0, 0).getType().equals(Material.BEDROCK)
-                || !Flags.CLEAN_SUPER_FLAT.isSetForWorld(world)
-                || (world.getEnvironment().equals(Environment.NETHER) && (!plugin.getIWM().isNetherGenerate(world) || !plugin.getIWM().isNetherIslands(world)))
-                || (world.getEnvironment().equals(Environment.THE_END) && (!plugin.getIWM().isEndGenerate(world) || !plugin.getIWM().isEndIslands(world)))) {
+        MyBiomeGrid grid = new MyBiomeGrid(world.getEnvironment());
+        ChunkGenerator cg = plugin.getAddonsManager().getDefaultWorldGenerator(world.getName(), "");
+        if (cg == null) {
+            Flags.CLEAN_SUPER_FLAT.setSetting(world, false);
+            getPlugin().logWarning("Clean super flat is not available for " + world.getName());
             return;
         }
         // Add to queue
         chunkQueue.add(new Pair<>(e.getChunk().getX(), e.getChunk().getZ()));
-        if (task == null) {
-            task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
-                if (!chunkQueue.isEmpty()) {
-                    Pair<Integer, Integer> chunkXZ = chunkQueue.poll();
-                    world.regenerateChunk(chunkXZ.x, chunkXZ.z); // NOSONAR - the deprecation doesn't cause any issues to us
-                    if (plugin.getSettings().isLogCleanSuperFlatChunks()) {
-                        plugin.log(chunkQueue.size() + " Regenerating superflat chunk " + world.getName() + " " + chunkXZ.x + ", " + chunkXZ.z);
-                    }
-                }
-            }, 0L, 1L);
+        if (task == null || task.isCancelled()) {
+            task = Bukkit.getScheduler().runTaskTimer(plugin, () -> cleanChunk(e, world, cg, grid), 0L, 1L);
         }
     }
+
+    private void cleanChunk(ChunkLoadEvent e, World world, ChunkGenerator cg, MyBiomeGrid grid) {
+        SecureRandom random = new SecureRandom();
+        if (!chunkQueue.isEmpty()) {
+            Pair<Integer, Integer> chunkXZ = chunkQueue.poll();
+            ChunkData cd = cg.generateChunkData(world, random, e.getChunk().getX(), e.getChunk().getZ(), grid);
+            for (int x = 0; x < 16; x++) {
+                for (int z = 0; z < 16; z++) {
+                    for (int y = 0; y < world.getMaxHeight(); y++) {
+                        e.getChunk().getBlock(x, y, z).setBlockData(cd.getBlockData(x, y, z), false);
+                    }
+                }
+            }
+            // Run populators
+            cg.getDefaultPopulators(world).forEach(pop -> pop.populate(world, random, e.getChunk()));
+            if (plugin.getSettings().isLogCleanSuperFlatChunks()) {
+                plugin.log(chunkQueue.size() + " Regenerating superflat chunk " + world.getName() + " " + chunkXZ.x + ", " + chunkXZ.z);
+            }
+        } else {
+            task.cancel();
+        }
+    }
+
+    /**
+     * Check if chunk should be cleaned or not
+     * @param world - world
+     * @param e chunk load event
+     * @return true if the chunk should not be cleaned
+     */
+    private boolean noClean(World world, ChunkLoadEvent e) {
+        if (!ready) {
+            return true;
+        }
+        return !getIWM().inWorld(world) || !Flags.CLEAN_SUPER_FLAT.isSetForWorld(world) ||
+                (!(e.getChunk().getBlock(0, 0, 0).getType().equals(Material.BEDROCK)
+                        && e.getChunk().getBlock(0, 1, 0).getType().equals(Material.DIRT)
+                        && e.getChunk().getBlock(0, 2, 0).getType().equals(Material.DIRT)
+                        && e.getChunk().getBlock(0, 3, 0).getType().equals(Material.GRASS_BLOCK))
+                        || (world.getEnvironment().equals(Environment.NETHER) && (!plugin.getIWM().isNetherGenerate(world)
+                                || !plugin.getIWM().isNetherIslands(world)))
+                        || (world.getEnvironment().equals(Environment.THE_END) && (!plugin.getIWM().isEndGenerate(world)
+                                || !plugin.getIWM().isEndIslands(world))));
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListener.java
index bc6bcf194..c44574f53 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListener.java
@@ -35,9 +35,9 @@ public class EnderChestListener extends FlagListener {
 
     private boolean checkEnderChest(Player player, Material type) {
         if (type.equals(Material.ENDER_CHEST)
-                && getIWM().inWorld(player.getLocation())
+                && getIWM().inWorld(player.getWorld())
                 && !player.isOp()
-                && !player.hasPermission(getPlugin().getIWM().getPermissionPrefix(player.getWorld()) + ".craft.enderchest")
+                && !player.hasPermission(getPlugin().getIWM().getPermissionPrefix(player.getWorld()) + "craft.enderchest")
                 && !Flags.ENDER_CHEST.isSetForWorld(player.getWorld())) {
             // Not allowed
             User user = User.getInstance(player);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListener.java
index 950d7336d..e1959f9ef 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListener.java
@@ -8,8 +8,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.util.Vector;
-
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.flags.FlagListener;
 import world.bentobox.bentobox.api.localization.TextVariables;
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java
index 811abb2fe..51139952a 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListener.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.stream.Collectors;
 
-import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.World;
@@ -41,7 +40,7 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
             user.sendMessage("general.errors.wrong-world");
             return true;
         }
-        String reqPerm = getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + ".admin.settings.INVINCIBLE_VISITORS";
+        String reqPerm = getIWM().getPermissionPrefix(Util.getWorld(user.getWorld())) + "admin.settings.INVINCIBLE_VISITORS";
         if (!user.hasPermission(reqPerm)) {
             user.sendMessage("general.errors.no-permission", "[permission]", reqPerm);
             user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
@@ -103,7 +102,7 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
     public void onVisitorGetDamage(EntityDamageEvent e) {
         World world = e.getEntity().getWorld();
         if (!(e.getEntity() instanceof Player)
-                || !getIWM().inWorld(e.getEntity().getLocation())
+                || !getIWM().inWorld(world)
                 || !getIWM().getIvSettings(world).contains(e.getCause().name())
                 || getIslands().userIsOnIsland(world, User.getInstance(e.getEntity()))) {
             return;
@@ -114,9 +113,12 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
         // Handle the void - teleport player back to island in a safe spot
         if(e.getCause().equals(DamageCause.VOID)) {
             if (getIslands().getIslandAt(p.getLocation()).isPresent()) {
-                // Will be set back after the teleport
-                p.setGameMode(GameMode.SPECTATOR);
-                getIslands().getIslandAt(p.getLocation()).ifPresent(i -> new SafeSpotTeleport.Builder(getPlugin()).entity(p).island(i).build());
+                getIslands().getIslandAt(p.getLocation()).ifPresent(island ->
+                // Teleport
+                new SafeSpotTeleport.Builder(getPlugin())
+                .entity(p)
+                .location(island.getCenter().toVector().toLocation(p.getWorld()))
+                .build());
             } else if (getIslands().hasIsland(p.getWorld(), p.getUniqueId())) {
                 // No island in this location - if the player has an island try to teleport them back
                 getIslands().homeTeleport(p.getWorld(), p);
@@ -126,5 +128,7 @@ public class InvincibleVisitorsListener extends FlagListener implements ClickHan
             }
         }
     }
+
+
 }
 
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java
index 21dd15359..66be11e5c 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java
@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -18,7 +19,7 @@ public class RemoveMobsListener extends FlagListener {
     public void onUserTeleport(PlayerTeleportEvent e) {
         // Only process if flag is active
         if (getIslands().locationIsOnIsland(e.getPlayer(), e.getTo()) && Flags.REMOVE_MOBS.isSetForWorld(e.getTo().getWorld())) {
-            getIslands().clearArea(e.getTo());
+            Bukkit.getScheduler().runTask(getPlugin(), () -> getIslands().clearArea(e.getTo()));
         }
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListener.java
index 7c526957f..f26954442 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListener.java
@@ -29,6 +29,8 @@ public class TreesGrowingOutsideRangeListener extends FlagListener {
         }
 
         // Now, run through all the blocks that will be generated and if there is no protected island at their location, turn them into AIR.
-        e.getBlocks().stream().filter(blockState -> !getIslands().getProtectedIslandAt(blockState.getLocation()).isPresent()).forEach(blockState -> blockState.setType(Material.AIR));
+        e.getBlocks().stream()
+        .filter(blockState -> !getIslands().getProtectedIslandAt(blockState.getLocation()).isPresent())
+        .forEach(blockState -> blockState.setType(Material.AIR));
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListener.java
new file mode 100644
index 000000000..17fc995a3
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListener.java
@@ -0,0 +1,41 @@
+package world.bentobox.bentobox.listeners.flags.worldsettings;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import world.bentobox.bentobox.api.flags.FlagListener;
+import world.bentobox.bentobox.lists.Flags;
+
+/**
+ * Protects islands from withers blowing things up
+ * @author tastybento
+ * @since 1.6.0
+ */
+public class WitherListener extends FlagListener {
+
+    /**
+     * Prevents Wither explosion from breaking blocks
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onExplosion(final EntityExplodeEvent e) {
+        // Remove  blocks from the explosion list if required
+        if((e.getEntityType().equals(EntityType.WITHER_SKULL) || e.getEntityType().equals(EntityType.WITHER))
+                && !Flags.WITHER_DAMAGE.isSetForWorld(e.getLocation().getWorld())) {
+            e.blockList().clear();
+        }
+    }
+
+    /**
+     * Withers change blocks to air after they are hit (don't know why)
+     * This prevents this when the wither has been spawned
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onWitherChangeBlocks(final EntityChangeBlockEvent e) {
+        e.setCancelled(e.getEntityType().equals(EntityType.WITHER) && !Flags.WITHER_DAMAGE.isSetForWorld(e.getBlock().getWorld()));
+    }
+}
diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java
index 3fd8a06fb..f5f28a2f0 100644
--- a/src/main/java/world/bentobox/bentobox/lists/Flags.java
+++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java
@@ -18,6 +18,7 @@ import world.bentobox.bentobox.listeners.flags.protection.BreedingListener;
 import world.bentobox.bentobox.listeners.flags.protection.BucketListener;
 import world.bentobox.bentobox.listeners.flags.protection.DyeListener;
 import world.bentobox.bentobox.listeners.flags.protection.EggListener;
+import world.bentobox.bentobox.listeners.flags.protection.ElytraListener;
 import world.bentobox.bentobox.listeners.flags.protection.EntityInteractListener;
 import world.bentobox.bentobox.listeners.flags.protection.ExperiencePickupListener;
 import world.bentobox.bentobox.listeners.flags.protection.FireListener;
@@ -55,6 +56,7 @@ import world.bentobox.bentobox.listeners.flags.worldsettings.OfflineRedstoneList
 import world.bentobox.bentobox.listeners.flags.worldsettings.PistonPushListener;
 import world.bentobox.bentobox.listeners.flags.worldsettings.RemoveMobsListener;
 import world.bentobox.bentobox.listeners.flags.worldsettings.TreesGrowingOutsideRangeListener;
+import world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener;
 import world.bentobox.bentobox.managers.RanksManager;
 
 /**
@@ -71,12 +73,12 @@ public final class Flags {
      * Prevents players from breaking blocks on one's island.
      * @see BreakBlocksListener
      */
-    public static final Flag BREAK_BLOCKS = new Flag.Builder("BREAK_BLOCKS", Material.STONE).listener(new BreakBlocksListener()).build();
+    public static final Flag BREAK_BLOCKS = new Flag.Builder("BREAK_BLOCKS", Material.STONE_PICKAXE).listener(new BreakBlocksListener()).mode(Flag.Mode.BASIC).build();
     /**
      * Prevents players from placing blocks on one's island.
      * @see PlaceBlocksListener
      */
-    public static final Flag PLACE_BLOCKS = new Flag.Builder("PLACE_BLOCKS", Material.GRASS).listener(new PlaceBlocksListener()).build();
+    public static final Flag PLACE_BLOCKS = new Flag.Builder("PLACE_BLOCKS", Material.OAK_PLANKS).listener(new PlaceBlocksListener()).mode(Flag.Mode.BASIC).build();
 
     /**
      * Prevents players from generating Frosted Ice on one's island using "Frost Walker" enchanted boots.
@@ -85,27 +87,27 @@ public final class Flags {
     public static final Flag FROST_WALKER = new Flag.Builder("FROST_WALKER", Material.ICE).build();
 
     // Block interactions - all use BlockInteractionListener()
-    public static final Flag ANVIL = new Flag.Builder("ANVIL", Material.ANVIL).listener(new BlockInteractionListener()).build();
+    public static final Flag ANVIL = new Flag.Builder("ANVIL", Material.ANVIL).listener(new BlockInteractionListener()).mode(Flag.Mode.BASIC).build();
     public static final Flag BEACON = new Flag.Builder("BEACON", Material.BEACON).build();
     public static final Flag BED = new Flag.Builder("BED", Material.RED_BED).build();
-    public static final Flag BREWING = new Flag.Builder("BREWING", Material.BREWING_STAND).build();
-    public static final Flag CONTAINER = new Flag.Builder("CONTAINER", Material.CHEST).build();
-    public static final Flag DISPENSER = new Flag.Builder("DISPENSER", Material.DISPENSER).build();
-    public static final Flag DROPPER = new Flag.Builder("DROPPER", Material.DROPPER).build();
-    public static final Flag HOPPER = new Flag.Builder("HOPPER", Material.HOPPER).build();
-    public static final Flag DOOR = new Flag.Builder("DOOR", Material.OAK_DOOR).defaultSetting(true).build();
-    public static final Flag TRAPDOOR = new Flag.Builder("TRAPDOOR", Material.OAK_TRAPDOOR).defaultSetting(true).build();
+    public static final Flag BREWING = new Flag.Builder("BREWING", Material.BREWING_STAND).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag CONTAINER = new Flag.Builder("CONTAINER", Material.CHEST).mode(Flag.Mode.BASIC).build();
+    public static final Flag DISPENSER = new Flag.Builder("DISPENSER", Material.DISPENSER).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag DROPPER = new Flag.Builder("DROPPER", Material.DROPPER).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag HOPPER = new Flag.Builder("HOPPER", Material.HOPPER).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag DOOR = new Flag.Builder("DOOR", Material.OAK_DOOR).defaultSetting(true).mode(Flag.Mode.BASIC).build();
+    public static final Flag TRAPDOOR = new Flag.Builder("TRAPDOOR", Material.OAK_TRAPDOOR).defaultSetting(true).mode(Flag.Mode.BASIC).build();
     public static final Flag CRAFTING = new Flag.Builder("CRAFTING", Material.CRAFTING_TABLE).defaultSetting(true).build();
-    public static final Flag ENCHANTING = new Flag.Builder("ENCHANTING", Material.ENCHANTING_TABLE).defaultSetting(true).build();
-    public static final Flag FURNACE = new Flag.Builder("FURNACE", Material.FURNACE).build();
-    public static final Flag GATE = new Flag.Builder("GATE", Material.OAK_FENCE_GATE).defaultSetting(true).build();
+    public static final Flag ENCHANTING = new Flag.Builder("ENCHANTING", Material.ENCHANTING_TABLE).defaultSetting(true).mode(Flag.Mode.BASIC).build();
+    public static final Flag FURNACE = new Flag.Builder("FURNACE", Material.FURNACE).mode(Flag.Mode.BASIC).build();
+    public static final Flag GATE = new Flag.Builder("GATE", Material.OAK_FENCE_GATE).mode(Flag.Mode.BASIC).defaultSetting(true).build();
     public static final Flag NOTE_BLOCK = new Flag.Builder("NOTE_BLOCK", Material.NOTE_BLOCK).build();
     public static final Flag JUKEBOX = new Flag.Builder("JUKEBOX", Material.JUKEBOX).build();
-    public static final Flag LEVER = new Flag.Builder("LEVER", Material.LEVER).build();
-    public static final Flag BUTTON = new Flag.Builder("BUTTON", Material.OAK_BUTTON).build();
-    public static final Flag REDSTONE = new Flag.Builder("REDSTONE", Material.REDSTONE).build();
+    public static final Flag LEVER = new Flag.Builder("LEVER", Material.LEVER).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag BUTTON = new Flag.Builder("BUTTON", Material.OAK_BUTTON).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag REDSTONE = new Flag.Builder("REDSTONE", Material.REDSTONE).mode(Flag.Mode.ADVANCED).build();
     public static final Flag SPAWN_EGGS = new Flag.Builder("SPAWN_EGGS", Material.COW_SPAWN_EGG).build();
-    public static final Flag ITEM_FRAME = new Flag.Builder("ITEM_FRAME", Material.ITEM_FRAME).build();
+    public static final Flag ITEM_FRAME = new Flag.Builder("ITEM_FRAME", Material.ITEM_FRAME).mode(Flag.Mode.ADVANCED).build();
     /**
      * Prevents players from interacting with the Dragon Egg.
      * @since 1.3.1
@@ -115,7 +117,7 @@ public final class Flags {
     public static final Flag DRAGON_EGG = new Flag.Builder("DRAGON_EGG", Material.DRAGON_EGG).build();
 
     // Entity interactions
-    public static final Flag ARMOR_STAND = new Flag.Builder("ARMOR_STAND", Material.ARMOR_STAND).listener(new EntityInteractListener()).build();
+    public static final Flag ARMOR_STAND = new Flag.Builder("ARMOR_STAND", Material.ARMOR_STAND).listener(new EntityInteractListener()).mode(Flag.Mode.ADVANCED).build();
     public static final Flag RIDING = new Flag.Builder("RIDING", Material.GOLDEN_HORSE_ARMOR).build();
     /**
      * Prevents players from issuing any kind of interactions with Minecarts (entering, placing and opening if chest).
@@ -123,25 +125,25 @@ public final class Flags {
      * @see EntityInteractListener
      * @see PlaceBlocksListener
      */
-    public static final Flag MINECART = new Flag.Builder("MINECART", Material.MINECART).build();
+    public static final Flag MINECART = new Flag.Builder("MINECART", Material.MINECART).mode(Flag.Mode.ADVANCED).build();
     /**
      * Prevents players from issuing any kind of interactions with Boats (entering, placing).
      * @since 1.3.0
      * @see EntityInteractListener
      * @see PlaceBlocksListener
      */
-    public static final Flag BOAT = new Flag.Builder("BOAT", Material.OAK_BOAT).build();
-    public static final Flag TRADING = new Flag.Builder("TRADING", Material.EMERALD).defaultSetting(true).build();
-    public static final Flag NAME_TAG = new Flag.Builder("NAME_TAG", Material.NAME_TAG).build();
+    public static final Flag BOAT = new Flag.Builder("BOAT", Material.OAK_BOAT).mode(Flag.Mode.BASIC).build();
+    public static final Flag TRADING = new Flag.Builder("TRADING", Material.EMERALD).defaultSetting(true).mode(Flag.Mode.BASIC).build();
+    public static final Flag NAME_TAG = new Flag.Builder("NAME_TAG", Material.NAME_TAG).mode(Flag.Mode.ADVANCED).build();
 
     // Breeding
-    public static final Flag BREEDING = new Flag.Builder("BREEDING", Material.CARROT).listener(new BreedingListener()).build();
+    public static final Flag BREEDING = new Flag.Builder("BREEDING", Material.CARROT).listener(new BreedingListener()).mode(Flag.Mode.ADVANCED).build();
 
     // Buckets. All bucket use is covered by one listener
-    public static final Flag BUCKET = new Flag.Builder("BUCKET", Material.BUCKET).listener(new BucketListener()).build();
+    public static final Flag BUCKET = new Flag.Builder("BUCKET", Material.BUCKET).listener(new BucketListener()).mode(Flag.Mode.BASIC).build();
     public static final Flag COLLECT_LAVA = new Flag.Builder("COLLECT_LAVA", Material.LAVA_BUCKET).build();
-    public static final Flag COLLECT_WATER = new Flag.Builder("COLLECT_WATER", Material.WATER_BUCKET).build();
-    public static final Flag MILKING = new Flag.Builder("MILKING", Material.MILK_BUCKET).build();
+    public static final Flag COLLECT_WATER = new Flag.Builder("COLLECT_WATER", Material.WATER_BUCKET).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag MILKING = new Flag.Builder("MILKING", Material.MILK_BUCKET).mode(Flag.Mode.ADVANCED).build();
     public static final Flag FISH_SCOOPING = new Flag.Builder("FISH_SCOOPING", Material.TROPICAL_FISH_BUCKET).build();
 
     // Chorus Fruit and Enderpearls
@@ -150,7 +152,7 @@ public final class Flags {
 
     // Physical interactions
     public static final Flag CROP_TRAMPLE = new Flag.Builder("CROP_TRAMPLE", Material.WHEAT).listener(new PhysicalInteractionListener()).build();
-    public static final Flag PRESSURE_PLATE = new Flag.Builder("PRESSURE_PLATE", Material.STONE_PRESSURE_PLATE).build();
+    public static final Flag PRESSURE_PLATE = new Flag.Builder("PRESSURE_PLATE", Material.STONE_PRESSURE_PLATE).mode(Flag.Mode.ADVANCED).build();
     public static final Flag TURTLE_EGGS = new Flag.Builder("TURTLE_EGGS", Material.TURTLE_EGG).build();
 
     // Throwing things
@@ -188,7 +190,7 @@ public final class Flags {
      *
      * @see FireListener
      */
-    public static final Flag FLINT_AND_STEEL = new Flag.Builder("FLINT_AND_STEEL", Material.FLINT_AND_STEEL).listener(new FireListener()).build();
+    public static final Flag FLINT_AND_STEEL = new Flag.Builder("FLINT_AND_STEEL", Material.FLINT_AND_STEEL).listener(new FireListener()).mode(Flag.Mode.ADVANCED).build();
 
     /**
      * Prevents players from priming TNT.
@@ -205,12 +207,12 @@ public final class Flags {
     public static final Flag FIRE_EXTINGUISH = new Flag.Builder("FIRE_EXTINGUISH", Material.POTION).build();
 
     // Inventories
-    public static final Flag MOUNT_INVENTORY = new Flag.Builder("MOUNT_INVENTORY", Material.IRON_HORSE_ARMOR).listener(new InventoryListener()).build();
+    public static final Flag MOUNT_INVENTORY = new Flag.Builder("MOUNT_INVENTORY", Material.IRON_HORSE_ARMOR).listener(new InventoryListener()).mode(Flag.Mode.ADVANCED).build();
 
     // Hurting things
-    public static final Flag HURT_ANIMALS = new Flag.Builder("HURT_ANIMALS", Material.STONE_SWORD).listener(new HurtingListener()).build();
-    public static final Flag HURT_MONSTERS = new Flag.Builder("HURT_MONSTERS", Material.WOODEN_SWORD).build();
-    public static final Flag HURT_VILLAGERS = new Flag.Builder("HURT_VILLAGERS", Material.GOLDEN_SWORD).build();
+    public static final Flag HURT_ANIMALS = new Flag.Builder("HURT_ANIMALS", Material.STONE_SWORD).listener(new HurtingListener()).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag HURT_MONSTERS = new Flag.Builder("HURT_MONSTERS", Material.WOODEN_SWORD).mode(Flag.Mode.BASIC).build();
+    public static final Flag HURT_VILLAGERS = new Flag.Builder("HURT_VILLAGERS", Material.GOLDEN_SWORD).mode(Flag.Mode.ADVANCED).build();
 
     // Leashes
     public static final Flag LEASH = new Flag.Builder("LEASH", Material.LEAD).listener(new LeashListener()).build();
@@ -228,14 +230,34 @@ public final class Flags {
     public static final Flag END_PORTAL = new Flag.Builder("END_PORTAL", Material.END_PORTAL_FRAME).build();
 
     // Shearing
-    public static final Flag SHEARING = new Flag.Builder("SHEARING", Material.SHEARS).listener(new ShearingListener()).build();
+    public static final Flag SHEARING = new Flag.Builder("SHEARING", Material.SHEARS).listener(new ShearingListener()).mode(Flag.Mode.ADVANCED).build();
 
     // Item pickup or drop
-    public static final Flag ITEM_DROP = new Flag.Builder("ITEM_DROP", Material.BEETROOT_SOUP).defaultSetting(true).listener(new ItemDropPickUpListener()).build();
-    public static final Flag ITEM_PICKUP = new Flag.Builder("ITEM_PICKUP", Material.BEETROOT_SEEDS).build();
+    public static final Flag ITEM_DROP = new Flag.Builder("ITEM_DROP", Material.DIAMOND).defaultSetting(true).listener(new ItemDropPickUpListener()).mode(Flag.Mode.BASIC).build();
+    public static final Flag ITEM_PICKUP = new Flag.Builder("ITEM_PICKUP", Material.SUGAR_CANE).mode(Flag.Mode.BASIC).build();
 
     // Experience
-    public static final Flag EXPERIENCE_PICKUP = new Flag.Builder("EXPERIENCE_PICKUP", Material.EXPERIENCE_BOTTLE).listener(new ExperiencePickupListener()).build();
+    public static final Flag EXPERIENCE_PICKUP = new Flag.Builder("EXPERIENCE_PICKUP", Material.EXPERIENCE_BOTTLE).listener(new ExperiencePickupListener()).mode(Flag.Mode.ADVANCED).build();
+
+    // Command ranks
+    public static final Flag COMMAND_RANKS = new Flag.Builder("COMMAND_RANKS", Material.PLAYER_HEAD)
+            .clickHandler(new CommandRankClickListener()).usePanel(true).build();
+
+    /**
+     * Protects against visitors dying stuff, like sheep or signs
+     *
+     * @since 1.5.0
+     * @see DyeListener
+     */
+    public static final Flag DYE = new Flag.Builder("DYE", Material.LIGHT_BLUE_DYE).listener(new DyeListener()).mode(Flag.Mode.ADVANCED).build();
+
+    /**
+     * Protects against visitors using elytra. By default, it is allowed.
+     *
+     * @since 1.6.0
+     */
+    public static final Flag ELYTRA = new Flag.Builder("ELYTRA",  Material.ELYTRA).defaultRank(RanksManager.VISITOR_RANK).listener(new ElytraListener()).mode(Flag.Mode.ADVANCED).build();
+
 
     // TNT
     /**
@@ -248,18 +270,18 @@ public final class Flags {
     public static final Flag LOCK = new Flag.Builder("LOCK", Material.TRIPWIRE_HOOK).defaultSetting(true)
             .defaultRank(RanksManager.VISITOR_RANK).listener(new LockAndBanListener())
             .clickHandler(new CycleClick("LOCK", RanksManager.VISITOR_RANK, RanksManager.MEMBER_RANK))
-            .build();
+            .mode(Flag.Mode.TOP_ROW).build();
 
     /*
      * Settings flags (not protection flags)
      */
     // PVP
     public static final Flag PVP_OVERWORLD = new Flag.Builder("PVP_OVERWORLD", Material.ARROW).type(Type.SETTING)
-            .defaultRank(DISABLED).listener(new PVPListener()).build();
+            .defaultRank(DISABLED).listener(new PVPListener()).cooldown(60).mode(Flag.Mode.BASIC).build();
     public static final Flag PVP_NETHER = new Flag.Builder("PVP_NETHER", Material.IRON_AXE).type(Type.SETTING)
-            .defaultRank(DISABLED).build();
+            .defaultRank(DISABLED).cooldown(60).mode(Flag.Mode.BASIC).build();
     public static final Flag PVP_END = new Flag.Builder("PVP_END", Material.END_CRYSTAL).type(Type.SETTING)
-            .defaultRank(DISABLED).build();
+            .defaultRank(DISABLED).cooldown(60).mode(Flag.Mode.BASIC).build();
 
     // Fire
     /**
@@ -267,18 +289,21 @@ public final class Flags {
      * @since 1.3.0
      * @see FireListener
      */
-    public static final Flag FIRE_BURNING = new Flag.Builder("FIRE_BURNING", Material.CHARCOAL).defaultSetting(true).type(Type.SETTING).build();
+    public static final Flag FIRE_BURNING = new Flag.Builder("FIRE_BURNING", Material.CHARCOAL).defaultSetting(true).type(Type.SETTING)
+            .mode(Flag.Mode.ADVANCED).build();
     /**
      * Prevents fire from being ignited by non-players.
      * @since 1.3.0
      * @see FireListener
      */
-    public static final Flag FIRE_IGNITE = new Flag.Builder("FIRE_IGNITE", Material.FLINT_AND_STEEL).defaultSetting(true).type(Type.SETTING).build();
+    public static final Flag FIRE_IGNITE = new Flag.Builder("FIRE_IGNITE", Material.FLINT_AND_STEEL).defaultSetting(true)
+            .mode(Flag.Mode.ADVANCED).type(Type.SETTING).build();
     /**
      * Prevents fire from spreading to other blocks.
      * @see FireListener
      */
-    public static final Flag FIRE_SPREAD = new Flag.Builder("FIRE_SPREAD", Material.FIREWORK_STAR).defaultSetting(true).type(Type.SETTING).build();
+    public static final Flag FIRE_SPREAD = new Flag.Builder("FIRE_SPREAD", Material.FIREWORK_STAR).defaultSetting(true).type(Type.SETTING)
+            .mode(Flag.Mode.ADVANCED).build();
 
     // Others
     public static final Flag ANIMAL_SPAWN = new Flag.Builder("ANIMAL_SPAWN", Material.APPLE).defaultSetting(true).type(Type.SETTING)
@@ -297,7 +322,8 @@ public final class Flags {
      * @since 1.5.0
      * @see TNTListener
      */
-    public static final Flag TNT_DAMAGE = new Flag.Builder("TNT_DAMAGE", Material.TNT).type(Type.SETTING).build();
+    public static final Flag TNT_DAMAGE = new Flag.Builder("TNT_DAMAGE", Material.TNT).type(Type.SETTING)
+            .mode(Flag.Mode.ADVANCED).build();
 
     /*
      * World Settings - they apply to every island in the game worlds.
@@ -364,9 +390,6 @@ public final class Flags {
      */
     public static final Flag CREEPER_GRIEFING = new Flag.Builder("CREEPER_GRIEFING", Material.CREEPER_HEAD).type(Type.WORLD_SETTING).build();
 
-    public static final Flag COMMAND_RANKS = new Flag.Builder("COMMAND_RANKS", Material.PLAYER_HEAD).type(Type.WORLD_SETTING)
-            .clickHandler(new CommandRankClickListener()).usePanel(true).build();
-
     public static final Flag COARSE_DIRT_TILLING = new Flag.Builder("COARSE_DIRT_TILLING", Material.COARSE_DIRT).type(Type.WORLD_SETTING).defaultSetting(true).listener(new CoarseDirtTillingListener()).build();
 
     public static final Flag PREVENT_TELEPORT_WHEN_FALLING = new Flag.Builder("PREVENT_TELEPORT_WHEN_FALLING", Material.FEATHER).type(Type.WORLD_SETTING).build();
@@ -412,12 +435,10 @@ public final class Flags {
     public static final Flag NATURAL_SPAWNING_OUTSIDE_RANGE = new Flag.Builder("NATURAL_SPAWNING_OUTSIDE_RANGE", Material.ZOMBIE_SPAWN_EGG).type(Type.WORLD_SETTING).listener(new NaturalSpawningOutsideRangeListener()).defaultSetting(true).build();
 
     /**
-     * Protects against visitors dying stuff, like sheep or signs
-     *
-     * @since 1.5.0
-     * @see DyeListener
+     * Toggles wither explosion damage
+     * @since 1.6.0
      */
-    public static final Flag DYE = new Flag.Builder("DYE", Material.LIGHT_BLUE_DYE).type(Type.PROTECTION).listener(new DyeListener()).build();
+    public static final Flag WITHER_DAMAGE = new Flag.Builder("WITHER_DAMAGE", Material.WITHER_SKELETON_SKULL).listener(new WitherListener()).type(Type.WORLD_SETTING).build();
 
     /**
      * Provides a list of all the Flag instances contained in this class using reflection.
diff --git a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
index f910f99e9..6615691e6 100644
--- a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
+++ b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
@@ -1,15 +1,15 @@
 package world.bentobox.bentobox.lists;
 
-import world.bentobox.bentobox.api.placeholders.GameModePlaceholderReplacer;
-import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.bentobox.util.Util;
-
 import java.text.DateFormat;
 import java.time.Instant;
 import java.util.Date;
 import java.util.Optional;
 
+import world.bentobox.bentobox.api.placeholders.GameModePlaceholderReplacer;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
+import world.bentobox.bentobox.util.Util;
+
 public enum GameModePlaceholder {
 
     /* World-related */
@@ -42,11 +42,6 @@ public enum GameModePlaceholder {
     ISLAND_PROTECTION_RANGE_DIAMETER("island_protection_range_diameter", (addon, user, island) -> island == null ? "" : String.valueOf(2 * island.getProtectionRange())),
     ISLAND_OWNER("island_owner", (addon, user, island) -> island == null ? "" : addon.getPlayers().getName(island.getOwner())),
     ISLAND_CREATION_DATE("island_creation_date", (addon, user, island) -> island == null ? "" : DateFormat.getInstance().format(Date.from(Instant.ofEpochMilli(island.getCreatedDate())))),
-    /**
-     * @deprecated As of 1.5.2, for removal; use {@link #ISLAND_CENTER} instead.
-     */
-    @Deprecated
-    ISLAND_SPAWNPOINT("island_spawnpoint", (addon, user, island) -> island == null ? "" : Util.xyz(island.getCenter().toVector())),
     ISLAND_NAME("island_name", (addon, user, island) -> {
         if (island == null || island.getName() == null) {
             return "";
diff --git a/src/main/java/world/bentobox/bentobox/managers/BlueprintClipboardManager.java b/src/main/java/world/bentobox/bentobox/managers/BlueprintClipboardManager.java
index 650bce0a5..7464496da 100644
--- a/src/main/java/world/bentobox/bentobox/managers/BlueprintClipboardManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/BlueprintClipboardManager.java
@@ -14,6 +14,9 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import org.bukkit.Material;
+import org.bukkit.util.Vector;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -21,6 +24,7 @@ import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.blueprints.Blueprint;
 import world.bentobox.bentobox.blueprints.BlueprintClipboard;
+import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock;
 import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory;
 
 /**
@@ -84,7 +88,7 @@ public class BlueprintClipboardManager {
      * Loads a blueprint
      * @param fileName - the filename without the suffix
      * @return the blueprint
-     * @throws IOException
+     * @throws IOException exception if there's an issue loading or unzipping
      */
     public Blueprint loadBlueprint(String fileName) throws IOException {
         File zipFile = new File(blueprintFolder, fileName + BlueprintsManager.BLUEPRINT_SUFFIX);
@@ -101,8 +105,17 @@ public class BlueprintClipboardManager {
         Blueprint bp;
         try (FileReader fr = new FileReader(file)) {
             bp = gson.fromJson(fr, Blueprint.class);
+        } catch (Exception e) {
+            plugin.logError("Blueprint has JSON error: " + zipFile.getName());
+            throw new IOException("Blueprint has JSON error: " + zipFile.getName());
         }
         Files.delete(file.toPath());
+        // Bedrock check and set
+        if (bp.getBedrock() == null) {
+            bp.setBedrock(new Vector(bp.getxSize() / 2, bp.getySize() / 2, bp.getzSize() / 2));
+            bp.getBlocks().put(bp.getBedrock(), new BlueprintBlock(Material.BEDROCK.createBlockData().getAsString()));
+            plugin.logWarning("Blueprint " + fileName + " had no bedrock block in it so one was added automatically in the center. You should check it.");
+        }
         return bp;
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java b/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
index 71136e6e3..af010e896 100644
--- a/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
@@ -14,9 +14,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -44,8 +46,9 @@ import world.bentobox.bentobox.util.Util;
 
 /**
  * Handles Blueprints
- * @since 1.5.0
+ *
  * @author Poslovitch, tastybento
+ * @since 1.5.0
  */
 public class BlueprintsManager {
 
@@ -54,6 +57,7 @@ public class BlueprintsManager {
     public static final String DEFAULT_BUNDLE_NAME = "default";
 
     public static final @NonNull String FOLDER_NAME = "blueprints";
+    private static final String FOR = "' for ";
 
     /**
      * Map of blueprint bundles to game mode addon.
@@ -78,9 +82,10 @@ public class BlueprintsManager {
 
     public BlueprintsManager(@NonNull BentoBox plugin) {
         this.plugin = plugin;
-        this.blueprintBundles = new HashMap<>();
-        this.blueprints = new HashMap<>();
-        @SuppressWarnings({ "rawtypes", "unchecked" })
+        // Must use ConcurrentHashMap because the maps are loaded async and they need to be thread safe
+        this.blueprintBundles = new ConcurrentHashMap<>();
+        this.blueprints = new ConcurrentHashMap<>();
+        @SuppressWarnings({"rawtypes", "unchecked"})
         GsonBuilder builder = new GsonBuilder()
         .excludeFieldsWithoutExposeAnnotation()
         .enableComplexMapKeySerialization()
@@ -100,6 +105,7 @@ public class BlueprintsManager {
     /**
      * Extracts the blueprints and bundles provided by this {@link GameModeAddon} in its .jar file.
      * This will do nothing if the blueprints folder already exists for this GameModeAddon.
+     *
      * @param addon the {@link GameModeAddon} to extract the blueprints from.
      */
     public void extractDefaultBlueprints(@NonNull GameModeAddon addon) {
@@ -126,6 +132,7 @@ public class BlueprintsManager {
 
     /**
      * Get the blueprint bundles of this addon.
+     *
      * @param addon the {@link GameModeAddon} to get the blueprint bundles.
      */
     public Map<String, BlueprintBundle> getBlueprintBundles(@NonNull GameModeAddon addon) {
@@ -137,6 +144,7 @@ public class BlueprintsManager {
 
     /**
      * Returns a {@link File} instance of the blueprints folder of this {@link GameModeAddon}.
+     *
      * @param addon the {@link GameModeAddon}
      * @return a {@link File} instance of the blueprints folder of this GameModeAddon.
      */
@@ -147,20 +155,24 @@ public class BlueprintsManager {
 
     /**
      * Loads the blueprint bundles of this addon from its blueprints folder.
+     *
      * @param addon the {@link GameModeAddon} to load the blueprints of.
      */
     public void loadBlueprintBundles(@NonNull GameModeAddon addon) {
-        blueprintBundles.put(addon, new ArrayList<>());
-
-        // See if there are any schems that need converting
-        new SchemToBlueprint(plugin).convertSchems(addon);
-
-        if (!loadBundles(addon)) {
-            makeDefaults(addon);
-            loadBundles(addon);
-        }
-        // Load blueprints
-        loadBlueprints(addon);
+        Bukkit
+        .getScheduler()
+        .runTaskAsynchronously(
+                plugin, () -> {
+                    blueprintBundles.put(addon, new ArrayList<>());
+                    // See if there are any schems that need converting
+                    new SchemToBlueprint(plugin).convertSchems(addon);
+                    if (!loadBundles(addon)) {
+                        makeDefaults(addon);
+                        loadBundles(addon);
+                    }
+                    // Load blueprints
+                    loadBlueprints(addon);
+                });
     }
 
     private boolean loadBundles(@NonNull GameModeAddon addon) {
@@ -170,17 +182,20 @@ public class BlueprintsManager {
             bpf.mkdirs();
         }
         boolean loaded = false;
-        File[] bundles = bpf.listFiles((dir, name) ->  name.toLowerCase(Locale.ENGLISH).endsWith(BLUEPRINT_BUNDLE_SUFFIX));
+        File[] bundles = bpf.listFiles((dir, name) -> name.toLowerCase(Locale.ENGLISH).endsWith(BLUEPRINT_BUNDLE_SUFFIX));
         if (bundles == null || bundles.length == 0) {
-            makeDefaults(addon);
-            return loadBundles(addon);
+            return false;
         }
-        for (File file: bundles) {
+        for (File file : bundles) {
             try {
                 BlueprintBundle bb = gson.fromJson(new FileReader(file), BlueprintBundle.class);
-                blueprintBundles.get(addon).add(bb);
-                plugin.log("Loaded Blueprint Bundle '" + bb.getUniqueId() + "' for " + addon.getDescription().getName());
-                loaded = true;
+                if (bb != null) {
+                    blueprintBundles
+                    .get(addon)
+                    .add(bb);
+                    plugin.log("Loaded Blueprint Bundle '" + bb.getUniqueId() + FOR + addon.getDescription().getName());
+                    loaded = true;
+                }
             } catch (Exception e) {
                 plugin.logError("Could not load blueprint bundle " + file.getName() + " " + e.getMessage());
                 plugin.logStacktrace(e);
@@ -202,16 +217,17 @@ public class BlueprintsManager {
         Blueprint defaultBp = new Blueprint();
         defaultBp.setName("bedrock");
         defaultBp.setDescription(Collections.singletonList(ChatColor.AQUA + "A bedrock block"));
-        defaultBp.setBedrock(new Vector(0,0,0));
+        defaultBp.setBedrock(new Vector(0, 0, 0));
         Map<Vector, BlueprintBlock> map = new HashMap<>();
-        map.put(new Vector(0,0,0), new BlueprintBlock("minecraft:bedrock"));
+        map.put(new Vector(0, 0, 0), new BlueprintBlock("minecraft:bedrock"));
         defaultBp.setBlocks(map);
         return defaultBp;
     }
 
     /**
      * This should never be needed and is just a boot strap
-     * @param addon
+     *
+     * @param addon addon
      */
     private void makeDefaults(@NonNull GameModeAddon addon) {
         plugin.logError("No blueprint bundles found! Creating a default one.");
@@ -231,6 +247,7 @@ public class BlueprintsManager {
 
     /**
      * Loads all the blueprints of this addon from its blueprints folder.
+     *
      * @param addon the {@link GameModeAddon} to load the blueprints of.
      */
     public void loadBlueprints(@NonNull GameModeAddon addon) {
@@ -240,12 +257,12 @@ public class BlueprintsManager {
             plugin.logError("There is no blueprint folder for addon " + addon.getDescription().getName());
             bpf.mkdirs();
         }
-        File[] bps = bpf.listFiles((dir, name) ->  name.toLowerCase(Locale.ENGLISH).endsWith(BLUEPRINT_SUFFIX));
+        File[] bps = bpf.listFiles((dir, name) -> name.toLowerCase(Locale.ENGLISH).endsWith(BLUEPRINT_SUFFIX));
         if (bps == null || bps.length == 0) {
             plugin.logError("No blueprints found for " + addon.getDescription().getName());
             return;
         }
-        for (File file: bps) {
+        for (File file : bps) {
             String fileName = file.getName().substring(0, file.getName().length() - BLUEPRINT_SUFFIX.length());
             try {
                 Blueprint bp = new BlueprintClipboardManager(plugin, bpf).loadBlueprint(fileName);
@@ -253,7 +270,7 @@ public class BlueprintsManager {
                     bp.setName(fileName);
                 }
                 blueprints.get(addon).add(bp);
-                plugin.log("Loaded blueprint '" + bp.getName() + "' for " + addon.getDescription().getName());
+                plugin.log("Loaded blueprint '" + bp.getName() + FOR + addon.getDescription().getName());
             } catch (Exception e) {
                 plugin.logError("Could not load blueprint " + fileName + " " + e.getMessage());
                 plugin.logStacktrace(e);
@@ -264,20 +281,22 @@ public class BlueprintsManager {
     /**
      * Adds a blueprint to addon's list of blueprints. If the list already contains a blueprint with the same name
      * it is replaced.
+     *
      * @param addon - the {@link GameModeAddon}
-     * @param bp - blueprint
+     * @param bp    - blueprint
      */
     public void addBlueprint(@NonNull GameModeAddon addon, @NonNull Blueprint bp) {
         blueprints.putIfAbsent(addon, new ArrayList<>());
         blueprints.get(addon).removeIf(b -> b.getName().equals(bp.getName()));
         blueprints.get(addon).add(bp);
-        plugin.log("Added blueprint '" + bp.getName() + "' for " + addon.getDescription().getName());
+        plugin.log("Added blueprint '" + bp.getName() + FOR + addon.getDescription().getName());
     }
 
     /**
      * Saves a blueprint into addon's blueprint folder
+     *
      * @param addon - the {@link GameModeAddon}
-     * @param bp - blueprint to save
+     * @param bp    - blueprint to save
      */
     public boolean saveBlueprint(@NonNull GameModeAddon addon, @NonNull Blueprint bp) {
         return new BlueprintClipboardManager(plugin, getBlueprintsFolder(addon)).saveBlueprint(bp);
@@ -285,33 +304,37 @@ public class BlueprintsManager {
 
     /**
      * Save blueprint bundle for game mode
+     *
      * @param addon - gamemode addon
-     * @param bb blueprint bundle to save
+     * @param bb    blueprint bundle to save
      */
     public void saveBlueprintBundle(GameModeAddon addon, BlueprintBundle bb) {
-        File bpf = getBlueprintsFolder(addon);
-        if (!bpf.exists()) {
-            bpf.mkdirs();
-        }
-        File fileName = new File(bpf, bb.getUniqueId() + BLUEPRINT_BUNDLE_SUFFIX);
-        String toStore = gson.toJson(bb, BlueprintBundle.class);
-        try (FileWriter fileWriter = new FileWriter(fileName)) {
-            fileWriter.write(toStore);
-        } catch (IOException e) {
-            plugin.logError("Could not save blueprint bundle file: " + e.getMessage());
-        }
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            File bpf = getBlueprintsFolder(addon);
+            if (!bpf.exists()) {
+                bpf.mkdirs();
+            }
+            File fileName = new File(bpf, bb.getUniqueId() + BLUEPRINT_BUNDLE_SUFFIX);
+            String toStore = gson.toJson(bb, BlueprintBundle.class);
+            try (FileWriter fileWriter = new FileWriter(fileName)) {
+                fileWriter.write(toStore);
+            } catch (IOException e) {
+                plugin.logError("Could not save blueprint bundle file: " + e.getMessage());
+            }
+        });
     }
 
     /**
      * Saves all the blueprint bundles
      */
     public void saveBlueprintBundles() {
-        blueprintBundles.forEach((k,v) -> v.forEach(m -> saveBlueprintBundle(k, m)));
+        blueprintBundles.forEach((k, v) -> v.forEach(m -> saveBlueprintBundle(k, m)));
     }
 
     /**
      * Get blueprints for this game mode
-     * @param addon - game mdoe addon
+     *
+     * @param addon - game mode addon
      * @return Map of name and blueprint or empty map
      */
     public Map<String, Blueprint> getBlueprints(GameModeAddon addon) {
@@ -323,9 +346,10 @@ public class BlueprintsManager {
 
     /**
      * Paste the islands to world
-     * @param addon - GameModeAddon
+     *
+     * @param addon  - GameModeAddon
      * @param island - island
-     * @param name - bundle name
+     * @param name   - bundle name
      */
     public void paste(GameModeAddon addon, Island island, String name) {
         paste(addon, island, name, null);
@@ -333,10 +357,11 @@ public class BlueprintsManager {
 
     /**
      * Paste islands to the world and run task afterwards
-     * @param addon - the game mode addon
+     *
+     * @param addon  - the game mode addon
      * @param island - the island
-     * @param name - name of bundle to paste
-     * @param task - task to run after pasting is completed
+     * @param name   - name of bundle to paste
+     * @param task   - task to run after pasting is completed
      * @return true if okay, false is there is a problem
      */
     public boolean paste(GameModeAddon addon, Island island, String name, Runnable task) {
@@ -388,8 +413,9 @@ public class BlueprintsManager {
 
     /**
      * Validate if the bundle name is valid or not
+     *
      * @param addon - game mode addon
-     * @param name - bundle name
+     * @param name  - bundle name
      * @return bundle name or null if it's invalid
      */
     public @Nullable String validate(GameModeAddon addon, String name) {
@@ -404,8 +430,9 @@ public class BlueprintsManager {
 
     /**
      * Adds a blueprint bundle. If a bundle with the same uniqueId exists, it will be replaced
+     *
      * @param addon - the game mode addon
-     * @param bb - the blueprint bundle
+     * @param bb    - the blueprint bundle
      */
     public void addBlueprintBundle(GameModeAddon addon, BlueprintBundle bb) {
         if (blueprintBundles.containsKey(addon)) {
@@ -417,16 +444,17 @@ public class BlueprintsManager {
 
     /**
      * Checks if a player has permission to see or use this blueprint bundle.
+     *
      * @param addon - addon making the request
-     * @param user - user making the request
-     * @param name - name of the blueprint bundle
+     * @param user  - user making the request
+     * @param name  - name of the blueprint bundle
      * @return <tt>true</tt> if allowed, <tt>false</tt> if not or bundle does not exist
      */
     public boolean checkPerm(@NonNull Addon addon, @NonNull User user, @NonNull String name) {
         // Permission
         String permission = addon.getPermissionPrefix() + "island.create." + name;
         // Get Blueprint bundle
-        BlueprintBundle bb = getBlueprintBundles((GameModeAddon)addon).get(name.toLowerCase(Locale.ENGLISH));
+        BlueprintBundle bb = getBlueprintBundles((GameModeAddon) addon).get(name.toLowerCase(Locale.ENGLISH));
         if (bb == null || (bb.isRequirePermission() && !name.equals(DEFAULT_BUNDLE_NAME) && !user.hasPermission(permission))) {
             user.sendMessage("general.errors.no-permission", TextVariables.PERMISSION, permission);
             return false;
@@ -436,8 +464,9 @@ public class BlueprintsManager {
 
     /**
      * Removes a blueprint bundle
+     *
      * @param addon - Game Mode Addon
-     * @param bb - Blueprint Bundle to delete
+     * @param bb    - Blueprint Bundle to delete
      */
     public void deleteBlueprintBundle(@NonNull GameModeAddon addon, BlueprintBundle bb) {
         if (blueprintBundles.containsKey(addon)) {
@@ -454,9 +483,10 @@ public class BlueprintsManager {
 
     /**
      * Rename a blueprint
+     *
      * @param addon - Game Mode Addon
-     * @param bp - blueprint
-     * @param name - new name
+     * @param bp    - blueprint
+     * @param name  - new name
      */
     public void renameBlueprint(GameModeAddon addon, Blueprint bp, String name) {
         if (bp.getName().equalsIgnoreCase(name)) {
diff --git a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
index e3d3c1107..73e9297a9 100644
--- a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
@@ -50,6 +50,7 @@ public class CommandsManager {
         try {
             @SuppressWarnings("unchecked")
             Map<String, Command> knownCommands = (Map<String, Command>) commandMap.getClass().getMethod("getKnownCommands").invoke(commandMap);
+            //noinspection SuspiciousMethodCalls
             knownCommands.values().removeIf(commands.values()::contains);
             // Not sure if this is needed, but it clears out all references
             commands.values().forEach(c -> c.unregister(commandMap));
diff --git a/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java
index 3fc166122..8a70c8f13 100644
--- a/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java
@@ -1,21 +1,22 @@
 package world.bentobox.bentobox.managers;
 
-import org.bukkit.Bukkit;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.lists.Flags;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.bukkit.Bukkit;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.lists.Flags;
+
 /**
  * @author Poslovitch
  * @author tastybento
diff --git a/src/main/java/world/bentobox/bentobox/managers/GameModePlaceholderManager.java b/src/main/java/world/bentobox/bentobox/managers/GameModePlaceholderManager.java
index 234bd27c7..3bab214d4 100644
--- a/src/main/java/world/bentobox/bentobox/managers/GameModePlaceholderManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/GameModePlaceholderManager.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.managers;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer;
diff --git a/src/main/java/world/bentobox/bentobox/managers/HooksManager.java b/src/main/java/world/bentobox/bentobox/managers/HooksManager.java
index 3cbae6303..67e456481 100644
--- a/src/main/java/world/bentobox/bentobox/managers/HooksManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/HooksManager.java
@@ -1,13 +1,14 @@
 package world.bentobox.bentobox.managers;
 
-import org.eclipse.jdt.annotation.NonNull;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.hooks.Hook;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import org.eclipse.jdt.annotation.NonNull;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.hooks.Hook;
+
 /**
  * @author Poslovitch
  */
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandDeletionManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandDeletionManager.java
index de762fafc..86903a4ec 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandDeletionManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandDeletionManager.java
@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.managers;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -40,20 +41,28 @@ public class IslandDeletionManager implements Listener {
 
     /**
      * When BentoBox is fully loaded, load the islands that still need to be deleted and kick them off
-     * @param e
+     * @param e BentoBox Ready event
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBentoBoxReady(BentoBoxReadyEvent e) {
         // Load list of islands that were mid deletion and delete them
         List<IslandDeletion> toBeDeleted = handler.loadObjects();
+        List<IslandDeletion> toBeRemoved = new ArrayList<>();
         if (!toBeDeleted.isEmpty()) {
             plugin.log("There are " + toBeDeleted.size() + " islands pending deletion.");
             toBeDeleted.forEach(di -> {
-                plugin.log("Resuming deletion of island at " + di.getLocation().getWorld().getName() + " " + Util.xyz(di.getLocation().toVector()));
-                inDeletion.add(di.getLocation());
-                new DeleteIslandChunks(plugin, di);
+                if (di.getLocation() == null || di.getLocation().getWorld() == null) {
+                    plugin.logError("Island queued for deletion refers to a non-existant game world. Skipping...");
+                    toBeRemoved.add(di);
+                } else {
+                    plugin.log("Resuming deletion of island at " + di.getLocation().getWorld().getName() + " " + Util.xyz(di.getLocation().toVector()));
+                    inDeletion.add(di.getLocation());
+                    new DeleteIslandChunks(plugin, di);
+                }
             });
         }
+        // Remove the islands from the database so they don't come back
+        toBeRemoved.forEach(handler::deleteObject);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
index fdea04604..c06bc219e 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
@@ -63,7 +63,7 @@ public class IslandWorldManager {
      * @param world the World to register
      */
     private void registerToMultiverse(@NonNull World world) {
-        if (!isUseOwnGenerator(world) && plugin.getHooks() != null) {
+        if (plugin.getHooks() != null) {
             plugin.getHooks().getHook("Multiverse-Core").ifPresent(hook -> {
                 if (Bukkit.isPrimaryThread()) {
                     ((MultiverseCoreHook) hook).registerWorld(world);
@@ -165,7 +165,7 @@ public class IslandWorldManager {
                 registerToMultiverse(gameMode.getNetherWorld());
             }
         }
-        if (settings.isEndGenerate() && settings.isEndIslands()) {
+        if (settings.isEndGenerate()) {
             if (!Bukkit.getAllowEnd()) {
                 // Warn the users that players might not be able to teleport to these worlds later on
                 plugin.logWarning("'settings.allow-end' is set to 'false' in the bukkit.yml file!");
@@ -416,16 +416,6 @@ public class IslandWorldManager {
         return null;
     }
 
-    /**
-     * Check if nether trees should be created in the nether or not
-     *
-     * @param world - world
-     * @return true or false
-     */
-    public boolean isNetherTrees(@Nullable World world) {
-        return world != null && (gameModes.containsKey(world) && gameModes.get(world).getWorldSettings().isNetherTrees());
-    }
-
     /**
      * Whether the End Dragon can spawn or not in this world
      *
@@ -493,14 +483,13 @@ public class IslandWorldManager {
     }
 
     /**
-     * Get the permission prefix for this world. No trailing dot included.
+     * Get the permission prefix for this world. Trailing dot included.
      *
-     * @param world
-     *            - world
+     * @param world - world
      * @return permission prefix for this world
      */
     public String getPermissionPrefix(@NonNull World world) {
-        return gameModes.get(world).getWorldSettings().getPermissionPrefix();
+        return gameModes.get(world).getWorldSettings().getPermissionPrefix() + ".";
 
     }
 
@@ -700,10 +689,26 @@ public class IslandWorldManager {
         gameModes.get(world).getWorldSettings().setResetEpoch(System.currentTimeMillis());
     }
 
+    /**
+     * Check if the death count should be reset when joining a team in this world
+     * @param world - world
+     * @return true or false
+     */
     public boolean isTeamJoinDeathReset(@NonNull World world) {
         return gameModes.get(world).getWorldSettings().isTeamJoinDeathReset();
     }
 
+    /**
+     * Check if deaths in the world are reset when the player starts a new island.
+     * This includes a totally new island and also a new island from a reset.
+     * @param world - world
+     * @return true or false
+     * @since 1.6.0
+     */
+    public boolean isDeathsResetOnNewIsland(@NonNull World world) {
+        return gameModes.get(world).getWorldSettings().isDeathsResetOnNewIsland();
+    }
+
     /**
      * Get the maximum number of deaths allowed in this world
      * @param world - world
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
index 9c6a6d636..098505df0 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -14,7 +14,6 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.TreeSpecies;
@@ -111,6 +110,14 @@ public class IslandsManager {
         deletedIslands = new ArrayList<>();
     }
 
+    /**
+     * Used only for testing. Sets the database to a mock database.
+     * @param handler - handler
+     */
+    public void setHandler(Database<Island> handler) {
+        this.handler = handler;
+    }
+
     /**
      * This is a generic scan that can work in the overworld or the nether
      * @param l - location around which to scan
@@ -276,10 +283,11 @@ public class IslandsManager {
      * Deletes island.
      * @param island island to delete, not null
      * @param removeBlocks whether the island blocks should be removed or not
+     * @param involvedPlayer - player related to the island deletion, if any
      */
-    public void deleteIsland(@NonNull Island island, boolean removeBlocks) {
+    public void deleteIsland(@NonNull Island island, boolean removeBlocks, UUID involvedPlayer) {
         // Fire event
-        IslandBaseEvent event = IslandEvent.builder().island(island).reason(Reason.DELETE).build();
+        IslandBaseEvent event = IslandEvent.builder().island(island).involvedPlayer(involvedPlayer).reason(Reason.DELETE).build();
         if (event.isCancelled()) {
             return;
         }
@@ -544,7 +552,7 @@ public class IslandsManager {
     }
 
     /**
-     * Checks if a player has an island in the world
+     * Checks if a player has an island in the world and owns it
      * @param world - world to check
      * @param user - the user
      * @return true if player has island and owns it
@@ -645,12 +653,6 @@ public class IslandsManager {
         } else {
             user.sendMessage("commands.island.go.teleported", TextVariables.NUMBER, String.valueOf(number));
         }
-        // Exit spectator mode if in it - running this too quickly after teleporting can result in the player dropping a block
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            if (player.getGameMode().equals(GameMode.SPECTATOR)) {
-                player.setGameMode(plugin.getIWM().getDefaultGameMode(world));
-            }
-        }, 4L);
         // If this is a new island, then run commands and do resets
         if (newIsland) {
             // TODO add command running
@@ -693,7 +695,11 @@ public class IslandsManager {
                     player.leaveVehicle();
                     // Remove the boat so they don't lie around everywhere
                     boat.remove();
-                    player.getInventory().addItem(new ItemStack(Material.getMaterial(((Boat) boat).getWoodType().toString() + "_BOAT"), 1));
+                    Material boatMat = Material.getMaterial(((Boat) boat).getWoodType().toString() + "_BOAT");
+                    if (boatMat == null) {
+                        boatMat = Material.OAK_BOAT;
+                    }
+                    player.getInventory().addItem(new ItemStack(boatMat, 1));
                     player.updateInventory();
                 }
             }
@@ -806,7 +812,7 @@ public class IslandsManager {
                         .filter(Objects::nonNull)
                         .filter(n -> !duplicatedUUIDRemovedSet.add(n))
                         .collect(Collectors.toSet());
-                if (duplicated.size() > 0) {
+                if (!duplicated.isEmpty()) {
                     plugin.logError("**** Owners that have more than one island = " + duplicated.size());
                     for (UUID uuid : duplicated) {
                         Set<Island> set = islandCache.getIslands().stream().filter(i -> uuid.equals(i.getOwner())).collect(Collectors.toSet());
@@ -919,10 +925,6 @@ public class IslandsManager {
                 if (spawn.containsKey(w)) {
                     // go to island spawn
                     p.teleport(spawn.get(w).getSpawnPoint(w.getEnvironment()));
-                } else {
-                    plugin.logWarning("During island deletion player " + p.getName() + " could not be sent home so was placed into spectator mode.");
-                    p.setGameMode(GameMode.SPECTATOR);
-                    p.setFlying(true);
                 }
             }
         });
@@ -940,7 +942,6 @@ public class IslandsManager {
                 plugin.logError("Could not save island to database when running sync! " + e.getMessage());
             }
         }
-
     }
 
     /**
@@ -1030,14 +1031,20 @@ public class IslandsManager {
     }
 
     /**
-     * Clear an area of mobs as per world rules. Radius is 5 blocks in every direction.
+     * Clear an area of mobs as per world rules. Radius is default 5 blocks in every direction.
+     * Value is set in BentoBox config.yml
+     * Will not remove any named monsters.
      * @param loc - location to clear
      */
     public void clearArea(Location loc) {
-        loc.getWorld().getNearbyEntities(loc, 5D, 5D, 5D).stream()
+        if (!plugin.getIWM().inWorld(loc)) return;
+        loc.getWorld().getNearbyEntities(loc, plugin.getSettings().getClearRadius(),
+                plugin.getSettings().getClearRadius(),
+                plugin.getSettings().getClearRadius()).stream()
         .filter(en -> Util.isHostileEntity(en)
                 && !plugin.getIWM().getRemoveMobsWhitelist(loc.getWorld()).contains(en.getType())
                 && !(en instanceof PufferFish))
+        .filter(en -> en.getCustomName() == null)
         .forEach(Entity::remove);
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
index ee6b8d4b9..f16e6d2a1 100644
--- a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
@@ -1,15 +1,5 @@
 package world.bentobox.bentobox.managers;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.file.YamlConfiguration;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bentobox.api.localization.BentoBoxLocale;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.util.FileLister;
-import world.bentobox.bentobox.util.Util;
-
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -23,6 +13,17 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.jar.JarFile;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.localization.BentoBoxLocale;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.util.FileLister;
+import world.bentobox.bentobox.util.Util;
+
 /**
  * @author tastybento, Poslovitch
  */
@@ -189,7 +190,7 @@ public class LocalesManager {
 
     private void copyFile(String name, File targetFile) {
         try (InputStream initialStream = plugin.getResource(name)) {
-            if (!targetFile.exists()) {
+            if (initialStream != null && !targetFile.exists()) {
                 java.nio.file.Files.copy(initialStream, targetFile.toPath());
             }
         } catch (IOException e) {
diff --git a/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java
index 687196687..86716415d 100644
--- a/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java
@@ -1,8 +1,14 @@
 package world.bentobox.bentobox.managers;
 
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
@@ -11,11 +17,6 @@ import world.bentobox.bentobox.hooks.placeholders.MVdWPlaceholderAPIHook;
 import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
 import world.bentobox.bentobox.lists.GameModePlaceholder;
 
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.Optional;
-
 /**
  * Manages placeholder integration.
  *
diff --git a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
index 989a84843..dccd67957 100644
--- a/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
@@ -1,15 +1,5 @@
 package world.bentobox.bentobox.managers;
 
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.database.Database;
-import world.bentobox.bentobox.database.objects.Names;
-import world.bentobox.bentobox.database.objects.Players;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -18,6 +8,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.Database;
+import world.bentobox.bentobox.database.objects.Names;
+import world.bentobox.bentobox.database.objects.Players;
+
 public class PlayersManager {
 
     private BentoBox plugin;
@@ -421,16 +423,35 @@ public class PlayersManager {
         return User.getInstance(uuid);
     }
 
-
     /**
      * Adds a reset to this player's number of resets
-     * @param world
-     * @param playerUUID
+     * @param world world where island is
+     * @param playerUUID player's UUID
      */
     public void addReset(World world, UUID playerUUID) {
         addPlayer(playerUUID);
         playerCache.get(playerUUID).addReset(world);
-
     }
 
+    /**
+     * Sets the Flags display mode for the Settings Panel for this player.
+     * @param playerUUID player's UUID
+     * @param displayMode the {@link Flag.Mode} to set
+     * @since 1.6.0
+     */
+    public void setFlagsDisplayMode(UUID playerUUID, Flag.Mode displayMode) {
+        addPlayer(playerUUID);
+        playerCache.get(playerUUID).setFlagsDisplayMode(displayMode);
+    }
+
+    /**
+     * Returns the Flags display mode for the Settings Panel for this player.
+     * @param playerUUID player's UUID
+     * @return the {@link Flag.Mode display mode} for the Flags in the Settings Panel.
+     * @since 1.6.0
+     */
+    public Flag.Mode getFlagsDisplayMode(UUID playerUUID) {
+        addPlayer(playerUUID);
+        return playerCache.get(playerUUID).getFlagsDisplayMode();
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/managers/WebManager.java b/src/main/java/world/bentobox/bentobox/managers/WebManager.java
index f192bd26a..832633d00 100644
--- a/src/main/java/world/bentobox/bentobox/managers/WebManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/WebManager.java
@@ -1,19 +1,23 @@
 package world.bentobox.bentobox.managers;
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Optional;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+
+import io.github.TheBusyBiscuit.GitHubWebAPI4Java.GitHubWebAPI;
+import io.github.TheBusyBiscuit.GitHubWebAPI4Java.objects.repositories.GitHubRepository;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.web.catalog.CatalogEntry;
-import world.bentobox.githubapi4java.GitHub;
-import world.bentobox.githubapi4java.objects.GitHubGist;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
 
 /**
  * Handles web-related stuff.
@@ -24,7 +28,7 @@ import java.util.Optional;
 public class WebManager {
 
     private @NonNull BentoBox plugin;
-    private @Nullable GitHub gitHub;
+    private @Nullable GitHubWebAPI gitHub;
     private @NonNull List<CatalogEntry> addonsCatalog;
     private @NonNull List<CatalogEntry> gamemodesCatalog;
 
@@ -35,15 +39,15 @@ public class WebManager {
 
         // Setup the GitHub connection
         if (plugin.getSettings().isGithubDownloadData()) {
-            this.gitHub = new GitHub();
+            this.gitHub = new GitHubWebAPI();
 
             long connectionInterval = plugin.getSettings().getGithubConnectionInterval() * 20L * 60L;
             if (connectionInterval <= 0) {
                 // If below 0, it means we shouldn't run this as a repeating task.
                 plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, () -> requestGitHubData(true), 20L);
             } else {
-                // Set connection interval to be at least 15 minutes.
-                connectionInterval = Math.max(connectionInterval, 15 * 20 * 60L);
+                // Set connection interval to be at least 60 minutes.
+                connectionInterval = Math.max(connectionInterval, 60 * 20 * 60L);
                 plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> requestGitHubData(true), 20L, connectionInterval);
             }
         }
@@ -54,26 +58,71 @@ public class WebManager {
             if (plugin.getSettings().isLogGithubDownloadData()) {
                 plugin.log("Downloading data from GitHub...");
             }
+            GitHubRepository repo = new GitHubRepository(gh, "BentoBoxWorld/weblink");
+
+            String tagsContent = "";
+            String topicsContent = "";
+            String catalogContent = "";
+
+            // Downloading the data
             try {
-                JsonElement gistContent = new GitHubGist(gh, "bccabc20bce17f358d0f94bbbe83babd").getRawResponseAsJson();
-                if (gistContent != null) {
-                    if (clearCache) {
-                        gh.clearCache();
-                        this.addonsCatalog.clear();
-                        this.gamemodesCatalog.clear();
-                    }
-
-                    String catalogContent = gistContent.getAsJsonObject().getAsJsonObject("files").getAsJsonObject("catalog.json")
-                            .get("content").getAsString().replace("\n", "").replace("\\", "");
-
-                    JsonObject catalog = new JsonParser().parse(catalogContent).getAsJsonObject();
-                    catalog.getAsJsonArray("gamemodes").forEach(gamemode -> gamemodesCatalog.add(new CatalogEntry(gamemode.getAsJsonObject())));
-                    catalog.getAsJsonArray("addons").forEach(addon -> addonsCatalog.add(new CatalogEntry(addon.getAsJsonObject())));
+                tagsContent = repo.getContent("catalog/tags.json").getContent().replaceAll("\\n", "");
+                topicsContent = repo.getContent("catalog/topics.json").getContent().replaceAll("\\n", "");
+                catalogContent = repo.getContent("catalog/catalog.json").getContent().replaceAll("\\n", "");
+            } catch (IllegalAccessException e) {
+                if (plugin.getSettings().isLogGithubDownloadData()) {
+                    plugin.log("Could not connect to GitHub.");
                 }
             } catch (Exception e) {
-                plugin.logError("An error occurred when downloading or parsing data from GitHub...");
+                plugin.logError("An error occurred when downloading data from GitHub...");
                 plugin.logStacktrace(e);
             }
+            
+            // People were concerned that the download took ages, so we need to tell them it's over now.
+            if (plugin.getSettings().isLogGithubDownloadData()) {
+                plugin.log("Successfully downloaded data from GitHub.");
+            }
+
+            // Decoding the Base64 encoded contents
+            tagsContent = new String(Base64.getDecoder().decode(tagsContent), StandardCharsets.UTF_8);
+            topicsContent = new String(Base64.getDecoder().decode(topicsContent), StandardCharsets.UTF_8);
+            catalogContent = new String(Base64.getDecoder().decode(catalogContent), StandardCharsets.UTF_8);
+
+            /* Parsing the data */
+
+            // Register the tags translations in the locales
+            if (!tagsContent.isEmpty()) {
+                JsonObject tags = new JsonParser().parse(tagsContent).getAsJsonObject();
+                tags.entrySet().forEach(entry -> plugin.getLocalesManager().getLanguages().values().forEach(locale -> {
+                    JsonElement translation = entry.getValue().getAsJsonObject().get(locale.toLanguageTag());
+                    if (translation != null) {
+                        locale.set("catalog.tags." + entry.getKey(), translation.getAsString());
+                    }
+                }));
+            }
+
+            // Register the topics translations in the locales
+            if (!topicsContent.isEmpty()) {
+                JsonObject topics = new JsonParser().parse(topicsContent).getAsJsonObject();
+                topics.entrySet().forEach(entry -> plugin.getLocalesManager().getLanguages().values().forEach(locale -> {
+                    JsonElement translation = entry.getValue().getAsJsonObject().get(locale.toLanguageTag());
+                    if (translation != null) {
+                        locale.set("catalog.topics." + entry.getKey(), translation.getAsString());
+                    }
+                }));
+            }
+
+            // Register the catalog data
+            if (!catalogContent.isEmpty()) {
+                if (clearCache) {
+                    this.addonsCatalog.clear();
+                    this.gamemodesCatalog.clear();
+                }
+
+                JsonObject catalog = new JsonParser().parse(catalogContent).getAsJsonObject();
+                catalog.getAsJsonArray("gamemodes").forEach(gamemode -> gamemodesCatalog.add(new CatalogEntry(gamemode.getAsJsonObject())));
+                catalog.getAsJsonArray("addons").forEach(addon -> addonsCatalog.add(new CatalogEntry(addon.getAsJsonObject())));
+            }
         });
     }
 
@@ -98,12 +147,12 @@ public class WebManager {
     }
 
     /**
-     * Returns an optional that may contain the {@link GitHub} instance only and only if {@link Settings#isGithubDownloadData()} is {@code true}.
+     * Returns an optional that may contain the {@link GitHubWebAPI} instance only and only if {@link Settings#isGithubDownloadData()} is {@code true}.
      * @return the GitHub instance.
      * @since 1.5.0
      */
     @NonNull
-    public Optional<GitHub> getGitHub() {
+    public Optional<GitHubWebAPI> getGitHub() {
         return Optional.ofNullable(gitHub);
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
index f53674b00..9a7857f9e 100644
--- a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
+++ b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
@@ -2,7 +2,9 @@ package world.bentobox.bentobox.managers.island;
 
 import java.io.IOException;
 import java.util.EnumMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -35,7 +37,7 @@ public class NewIsland {
     private final User user;
     private final Reason reason;
     private final World world;
-    private final String name;
+    private String name;
     private final boolean noPaste;
     private GameModeAddon addon;
 
@@ -102,16 +104,6 @@ public class NewIsland {
             return this;
         }
 
-        /**
-         * @param world
-         * @deprecated use {@link #addon} instead
-         */
-        @Deprecated
-        public Builder world(World world) {
-            this.world2 = world;
-            return this;
-        }
-
         /**
          * Set the addon
          * @param addon a game mode addon
@@ -153,19 +145,35 @@ public class NewIsland {
 
     /**
      * Makes an island.
-     * @param oldIsland
+     * @param oldIsland old island that is being replaced, if any
      */
     public void newIsland(Island oldIsland) {
-        Location next = getNextIsland();
-        if (next == null) {
-            plugin.logError("Failed to make island - no unoccupied spot found");
-            return;
+        Location next = null;
+        if (plugin.getIslands().hasIsland(world, user)) {
+            // Island exists, it just needs pasting
+            island = plugin.getIslands().getIsland(world, user);
+            if (island != null && island.isReserved()) {
+                next = island.getCenter();
+                // Clear the reservation
+                island.setReserved(false);
+            } else {
+                // This should never happen unless we allow another way to paste over islands without reserving
+                plugin.logError("New island for user " + user.getName() + " was not reserved!");
+            }
         }
-        // Add to the grid
-        island = plugin.getIslands().createIsland(next, user.getUniqueId());
-        if (island == null) {
-            plugin.logError("Failed to make island! Island could not be added to the grid.");
-            return;
+        // If the reservation fails, then we need to make a new island anyway
+        if (next == null) {
+            next = getNextIsland();
+            if (next == null) {
+                plugin.logError("Failed to make island - no unoccupied spot found");
+                return;
+            }
+            // Add to the grid
+            island = plugin.getIslands().createIsland(next, user.getUniqueId());
+            if (island == null) {
+                plugin.logError("Failed to make island! Island could not be added to the grid.");
+                return;
+            }
         }
 
         // Clear any old home locations (they should be clear, but just in case)
@@ -174,6 +182,15 @@ public class NewIsland {
         // Set home location
         plugin.getPlayers().setHomeLocation(user, new Location(next.getWorld(), next.getX() + 0.5D, next.getY(), next.getZ() + 0.5D), 1);
 
+        // Reset deaths
+        if (plugin.getIWM().isDeathsResetOnNewIsland(world)) {
+            plugin.getPlayers().setDeaths(world, user.getUniqueId(), 0);
+        }
+
+        // Check if owner has a different range permission than the island size
+        island.setProtectionRange(user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld())
+                .map(GameModeAddon::getPermissionPrefix).orElse("") + "island.range", island.getProtectionRange()));
+
         // Save the player so that if the server crashes weird things won't happen
         plugin.getPlayers().save(user.getUniqueId());
 
@@ -183,10 +200,24 @@ public class NewIsland {
                 .reason(reason)
                 .island(island)
                 .location(island.getCenter())
+                .blueprintBundle(plugin.getBlueprintsManager().getBlueprintBundles(addon).get(name))
                 .build();
         if (event.isCancelled()) {
             return;
         }
+
+        // Get the new BlueprintBundle if it was changed
+        switch (reason) {
+        case CREATE:
+            name = ((IslandEvent.IslandCreateEvent) event).getBlueprintBundle().getUniqueId();
+            break;
+        case RESET:
+            name = ((IslandEvent.IslandResetEvent) event).getBlueprintBundle().getUniqueId();
+            break;
+        default:
+            break;
+        }
+
         // Task to run after creating the island
         Runnable task = () -> {
             // Set initial spawn point if one exists
@@ -207,7 +238,7 @@ public class NewIsland {
             // Delete old island
             if (oldIsland != null) {
                 // Delete the old island
-                plugin.getIslands().deleteIsland(oldIsland, true);
+                plugin.getIslands().deleteIsland(oldIsland, true, user.getUniqueId());
             }
 
             // Fire exit event
@@ -237,7 +268,9 @@ public class NewIsland {
         }
         // Set default settings
         island.setFlagsDefaults();
-        plugin.getMetrics().ifPresent(BStats::increaseIslandsCreatedCount);
+        if (!reason.equals(Reason.RESERVED)) {
+            plugin.getMetrics().ifPresent(BStats::increaseIslandsCreatedCount);
+        }
         // Save island
         plugin.getIslands().save(island);
     }
@@ -257,9 +290,11 @@ public class NewIsland {
         }
         // Find a free spot
         Map<Result, Integer> result = new EnumMap<>(Result.class);
+        // Check center
         Result r = isIsland(last);
+
         while (!r.equals(Result.FREE) && result.getOrDefault(Result.BLOCK_AT_CENTER, 0) < MAX_UNOWNED_ISLANDS) {
-            last = nextGridLocation(last);
+            nextGridLocation(last);
             result.merge(r, 1, (k,v) -> v++);
             r = isIsland(last);
         }
@@ -282,8 +317,21 @@ public class NewIsland {
      */
     private Result isIsland(Location location){
         location = Util.getClosestIsland(location);
-        if (plugin.getIslands().getIslandAt(location).isPresent() || plugin.getIslandDeletionManager().inDeletion(location)) {
-            return Result.ISLAND_FOUND;
+
+        // Check 4 corners
+        int dist = plugin.getIWM().getIslandDistance(location.getWorld());
+        Set<Location> locs = new HashSet<>();
+        locs.add(location);
+
+        locs.add(new Location(location.getWorld(), location.getX() - dist, 0, location.getZ() - dist));
+        locs.add(new Location(location.getWorld(), location.getX() - dist, 0, location.getZ() + dist - 1));
+        locs.add(new Location(location.getWorld(), location.getX() + dist - 1, 0, location.getZ() - dist));
+        locs.add(new Location(location.getWorld(), location.getX() + dist - 1, 0, location.getZ() + dist - 1));
+
+        for (Location l : locs) {
+            if (plugin.getIslands().getIslandAt(l).isPresent() || plugin.getIslandDeletionManager().inDeletion(l)) {
+                return Result.ISLAND_FOUND;
+            }
         }
 
         if (!plugin.getIWM().isUseOwnGenerator(location.getWorld())) {
diff --git a/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java b/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java
index 87eff18fe..31e1afb54 100644
--- a/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java
+++ b/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java
@@ -49,6 +49,7 @@ public class BlueprintManagementPanel {
     private static final int MAX_WORLD_SLOT = 9;
     private static final int MIN_WORLD_SLOT = 0;
     public static final int MAX_BP_SLOT = 35;
+    private static final String INSTRUCTION = "instruction";
     private Entry<Integer, Blueprint> selected;
     private Map<Integer, Blueprint> blueprints = new HashMap<>();
     private final User user;
@@ -58,9 +59,9 @@ public class BlueprintManagementPanel {
         this.plugin = plugin;
         this.user = user;
         this.addon = addon;
-        normalBlueprint = new Blueprint().setIcon(Material.GREEN_STAINED_GLASS_PANE).setName(t("normal")).setDescription(t("instruction"));
-        netherBlueprint = new Blueprint().setIcon(Material.RED_STAINED_GLASS_PANE).setName(t("nether")).setDescription(t("instruction"));
-        endBlueprint = new Blueprint().setIcon(Material.YELLOW_STAINED_GLASS_PANE).setName(t("end")).setDescription(t("instruction"));
+        normalBlueprint = new Blueprint().setIcon(Material.GREEN_STAINED_GLASS_PANE).setName(t("normal")).setDescription(t(INSTRUCTION));
+        netherBlueprint = new Blueprint().setIcon(Material.RED_STAINED_GLASS_PANE).setName(t("nether")).setDescription(t(INSTRUCTION));
+        endBlueprint = new Blueprint().setIcon(Material.YELLOW_STAINED_GLASS_PANE).setName(t("end")).setDescription(t(INSTRUCTION));
         slotToEnvironment = ImmutableMap.of(3, World.Environment.NORMAL, 5, World.Environment.NETHER, 7, World.Environment.THE_END);
         environmentToBlueprint = ImmutableMap.of(World.Environment.NORMAL, normalBlueprint, World.Environment.NETHER, netherBlueprint, World.Environment.THE_END, endBlueprint);
     }
diff --git a/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java b/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java
index 109eddd9b..daf2125e8 100644
--- a/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java
+++ b/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java
@@ -1,9 +1,12 @@
 package world.bentobox.bentobox.panels;
 
+import java.util.List;
+
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.eclipse.jdt.annotation.NonNull;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
@@ -11,8 +14,6 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.web.catalog.CatalogEntry;
 
-import java.util.List;
-
 /**
  * @since 1.5.0
  * @author Poslovitch
@@ -20,7 +21,7 @@ import java.util.List;
 public class CatalogPanel {
 
     private static final String LOCALE_REF = "catalog.panel.";
-    private static final int[] PANES = {0, 3, 4, 5, 6, 7, 8, 9, 17, 18, 26, 27, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,};
+    private static final int[] PANES = {0, 3, 4, 5, 6, 7, 8, 9, 17, 18, 26, 27, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44};
 
     private CatalogPanel() {}
 
@@ -77,7 +78,12 @@ public class CatalogPanel {
             for (CatalogEntry addon : catalog) {
                 PanelItemBuilder itemBuilder = new PanelItemBuilder();
 
-                itemBuilder.icon(addon.getIcon()).name(ChatColor.WHITE + addon.getName());
+                String name = ChatColor.WHITE + addon.getName();
+                if (addon.getTag() != null) {
+                    name += " " + ChatColor.AQUA + "" + ChatColor.BOLD + user.getTranslation("catalog.tags." + addon.getTag());
+                }
+
+                itemBuilder.icon(addon.getIcon()).name(name);
 
                 // If the addon is already installed, then tell the user it's already installed
                 String install;
@@ -89,7 +95,7 @@ public class CatalogPanel {
                 }
 
                 itemBuilder.description(user.getTranslation(LOCALE_REF + "icon.description-template",
-                        "[topic]", StringUtils.capitalize(addon.getTopic()),
+                        "[topic]", StringUtils.capitalize(user.getTranslation("catalog.topics." + addon.getTopic())),
                         "[install]", install,
                         "[description]", addon.getDescription()));
 
diff --git a/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java b/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java
index 7976d299a..eca66856b 100644
--- a/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java
+++ b/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java
@@ -1,8 +1,12 @@
 package world.bentobox.bentobox.panels;
 
+import java.util.Locale;
+
+import org.apache.commons.lang.WordUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.localization.BentoBoxLocale;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -11,13 +15,11 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.LocalesManager;
 
-import java.util.Locale;
-
 /**
  * @author Poslovitch
  */
 public class LanguagePanel {
-    
+
     private LanguagePanel() {}
 
     /**
@@ -41,16 +43,15 @@ public class LanguagePanel {
             } else {
                 localeIcon.icon(new ItemStack(Material.WHITE_BANNER, 1)); // Set to a blank banner.
             }
-
-            localeIcon.name(ChatColor.WHITE + fancyLocaleDisplayName(user, locale))
-                    .clickHandler((panel, u, click, slot) -> {
-                        BentoBox.getInstance().getPlayers().setLocale(u.getUniqueId(), locale.toLanguageTag());
-                        u.sendMessage("language.edited", "[lang]", fancyLocaleDisplayName(u, locale));
-                        openPanel(u);
-                        return true;
-                    });
-
-            if (user.getLocale().toLanguageTag().equals(locale.toLanguageTag())) {
+            String lang = WordUtils.capitalize(locale.getDisplayName(user.getLocale()));
+            localeIcon.name(ChatColor.WHITE + lang)
+            .clickHandler((panel, u, click, slot) -> {
+                BentoBox.getInstance().getPlayers().setLocale(u.getUniqueId(), locale.toLanguageTag());
+                u.sendMessage("language.edited", "[lang]", lang);
+                openPanel(u);
+                return true;
+            });
+            if (user.getLocale().equals(locale)) {
                 localeIcon.description(user.getTranslation("language.description.selected"), "");
             } else {
                 localeIcon.description(user.getTranslation("language.description.click-to-select"), "");
@@ -67,19 +68,4 @@ public class LanguagePanel {
         panelBuilder.build().open(user);
     }
 
-    /**
-     * Returns a properly capitalized String based on locale's display name from user's current locale.
-     * @param user - the User
-     * @param locale - the Locale to get the display name from
-     * @return properly capitalized String of the locale's display name in user's current locale
-     */
-    private static String fancyLocaleDisplayName(User user, Locale locale) {
-        // Get the display name of the locale based on current user's locale
-        String localeDisplayName = locale.getDisplayName(user.getLocale());
-
-        // Set the first letter to an uppercase, to make it nice and fancy :D
-        localeDisplayName = localeDisplayName.substring(0,1).toUpperCase() + localeDisplayName.substring(1);
-
-        return localeDisplayName;
-    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java b/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java
deleted file mode 100644
index 1419b373f..000000000
--- a/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package world.bentobox.bentobox.panels;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.bukkit.Material;
-import org.bukkit.World;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
-import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
-import world.bentobox.bentobox.api.user.User;
-
-/**
- * Creates settings panels
- * @author Poslovitch, tastybento
- */
-public class SettingsPanel {
-
-    private static final String PROTECTION_PANEL = "protection.panel.";
-
-    private SettingsPanel() {}
-
-    /**
-     * Dynamically creates the panel.
-     * @param plugin - plugin
-     * @param user - user to show panel to
-     * @param flagType - initial view
-     * @param world - world
-     */
-    public static void openPanel(BentoBox plugin, User user, Flag.Type flagType, World world, int page) {
-        String friendlyWorldName = plugin.getIWM().getFriendlyName(world);
-        // Create the panel
-        PanelBuilder panelBuilder = new PanelBuilder()
-                .name(user.getTranslation(PROTECTION_PANEL + flagType.toString() + ".title", "[world_name]", friendlyWorldName))
-                .size(54);
-
-        setupHeader(user, panelBuilder, flagType, world, friendlyWorldName);
-
-        // Get a list of flags of the correct type and sort by the translated names
-        List<Flag> flags = plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(flagType))
-                .sorted(Comparator.comparing(flag -> user.getTranslation(flag.getNameReference())))
-                .collect(Collectors.toList());
-        // Remove any that are not for this game mode
-        plugin.getIWM().getAddon(world).ifPresent(gm -> flags.removeIf(f -> !f.getGameModes().isEmpty() && !f.getGameModes().contains(gm)));
-
-        // Use paging
-        flags.stream().skip(page * 43L).limit(page * 43L + 43L)
-        .forEach((f -> panelBuilder.item(f.toPanelItem(plugin, user, plugin.getIWM().getHiddenFlags(world).contains(f.getID())))));
-        // Add forward and backward icons
-        if (page > 0) {
-            // Previous page icon
-            panelBuilder.item(new PanelItemBuilder().icon(Material.ARROW).name(user.getTranslation(PROTECTION_PANEL + "previous")).clickHandler((panel, user1, clickType, slot1) -> {
-                openPanel(BentoBox.getInstance(), user, flagType, world, page - 1);
-                return true;
-            }).build());
-        }
-        if ((page + 1) * 44 < flags.size()) {
-            // Next page icon
-            panelBuilder.item(new PanelItemBuilder().icon(Material.ARROW).name(user.getTranslation(PROTECTION_PANEL + "next")).clickHandler((panel, user1, clickType, slot1) -> {
-                openPanel(BentoBox.getInstance(), user, flagType, world, page + 1);
-                return true;
-            }).build());
-        }
-
-        // Show it to the player
-        panelBuilder.build().open(user);
-    }
-
-    private static void setupHeader(User user, PanelBuilder panelBuilder, Flag.Type currentFlagType, World world, String friendlyWorldName) {
-        int slot = 2;
-        for (Flag.Type flagType : Flag.Type.values()) {
-            PanelItem panelItem = new PanelItemBuilder()
-                    .icon(flagType.getIcon())
-                    .name(user.getTranslation(PROTECTION_PANEL + flagType.toString() + ".title", "[world_name]", friendlyWorldName))
-                    .description(user.getTranslation(PROTECTION_PANEL + flagType.toString() + ".description"))
-                    .glow(flagType.equals(currentFlagType))
-                    .clickHandler((panel, user1, clickType, slot1) -> {
-                        if (!flagType.equals(currentFlagType)) {
-                            openPanel(BentoBox.getInstance(), user, flagType, world, 0);
-                        }
-                        return true;
-                    })
-                    .build();
-            panelBuilder.item(slot, panelItem);
-            slot += 2;
-        }
-
-        for (int i = 0; i < 9; i++) {
-            if (!panelBuilder.slotOccupied(i)) {
-                panelBuilder.item(i, new PanelItemBuilder().icon(Material.LIGHT_GRAY_STAINED_GLASS_PANE).name(" ").build());
-            }
-        }
-    }
-}
diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java
new file mode 100644
index 000000000..63746b157
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/panels/settings/SettingsTab.java
@@ -0,0 +1,217 @@
+package world.bentobox.bentobox.panels.settings;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.World;
+import org.bukkit.event.inventory.ClickType;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag.Type;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.panels.Panel;
+import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
+import world.bentobox.bentobox.api.panels.Tab;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
+import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.lists.Flags;
+
+/**
+ * Implements a {@link Tab} that shows settings for
+ * {@link world.bentobox.bentobox.api.flags.Flag.Type#PROTECTION}, {@link world.bentobox.bentobox.api.flags.Flag.Type#SETTING}, {@link world.bentobox.bentobox.api.flags.Flag.Type#WORLD_SETTING}
+ * @author tastybento
+ * @since 1.6.0
+ *
+ */
+public class SettingsTab implements Tab, ClickHandler {
+
+    protected static final String PROTECTION_PANEL = "protection.panel.";
+    protected BentoBox plugin = BentoBox.getInstance();
+    protected Flag.Type type;
+    protected User user;
+    protected World world;
+    protected Island island;
+
+    /**
+     * Show a tab of settings
+     * @param world - world
+     * @param user - user who is viewing the tab
+     * @param island - the island
+     * @param type - flag type
+     */
+    public SettingsTab(World world, User user, Island island, Type type) {
+        this.world = world;
+        this.user = user;
+        this.island = island;
+        this.type = type;
+    }
+
+    /**
+     * Show a tab of settings
+     * @param world - world
+     * @param user - user who is viewing the tab
+     * @param type - flag type
+     */
+    public SettingsTab(World world, User user, Type type) {
+        this.world = world;
+        this.user = user;
+        this.type = type;
+    }
+
+    /**
+     * @return list of flags that will be shown in this panel
+     */
+    protected List<Flag> getFlags() {
+        // Get a list of flags of the correct type and sort by the translated names
+        List<Flag> flags = plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(type))
+                .sorted(Comparator.comparing(flag -> user.getTranslation(flag.getNameReference())))
+                .collect(Collectors.toList());
+        // Remove any that are not for this game mode
+        plugin.getIWM().getAddon(world).ifPresent(gm -> flags.removeIf(f -> !f.getGameModes().isEmpty() && !f.getGameModes().contains(gm)));
+        // Remove any that are the wrong rank or that will be on the top row
+        Flag.Mode mode = plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId());
+        plugin.getIWM().getAddon(world).ifPresent(gm -> flags.removeIf(f -> f.getMode().isGreaterThan(mode) ||
+                f.getMode().equals(Flag.Mode.TOP_ROW)));
+        return flags;
+    }
+
+    /**
+     * Get the icon for this tab
+     * @return panel item
+     */
+    @Override
+    public PanelItem getIcon() {
+        PanelItemBuilder pib = new PanelItemBuilder();
+        // Set the icon
+        pib.icon(type.getIcon());
+        pib.name(getName());
+        pib.description(user.getTranslation(PROTECTION_PANEL + type.toString() + ".description"));
+        return pib.build();
+    }
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.api.panels.Tab#getName()
+     */
+    @Override
+    public String getName() {
+        return user.getTranslation(PROTECTION_PANEL + type.toString() + ".title", "[world_name]", plugin.getIWM().getFriendlyName(world));
+    }
+
+    /**
+     * Get all the flags as panel items
+     * @return list of all the panel items for this flag type
+     */
+    @Override
+    @NonNull
+    public List<@Nullable PanelItem> getPanelItems() {
+        List<Flag> flags = getFlags();
+        int i = 0;
+        // Jump past empty tabs
+        while (flags.isEmpty() && i++ < Flag.Mode.values().length) {
+            plugin.getPlayers().setFlagsDisplayMode(user.getUniqueId(), plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId()).getNext());
+            flags = getFlags();
+        }
+        return flags.stream().map((f -> f.toPanelItem(plugin, user, island, plugin.getIWM().getHiddenFlags(world).contains(f.getID())))).collect(Collectors.toList());
+    }
+
+    @Override
+    public Map<Integer, PanelItem> getTabIcons() {
+        Map<Integer, PanelItem> icons = new HashMap<>();
+        // Add the lock icon - we want it to be displayed no matter the tab
+        if (island != null) {
+            icons.put(5, Flags.LOCK.toPanelItem(plugin, user, island, false));
+        }
+        // Add the mode icon
+        switch(plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId())) {
+        case ADVANCED:
+            icons.put(7, new PanelItemBuilder().icon(Material.GOLD_INGOT)
+                    .name(user.getTranslation(PROTECTION_PANEL + "mode.advanced.name"))
+                    .description(user.getTranslation(PROTECTION_PANEL + "mode.advanced.description"), "",
+                            user.getTranslation(PROTECTION_PANEL + "mode.click-to-switch",
+                                    TextVariables.NEXT, user.getTranslation(PROTECTION_PANEL + "mode.expert.name")))
+                    .clickHandler(this)
+                    .build());
+            break;
+        case EXPERT:
+            icons.put(7, new PanelItemBuilder().icon(Material.NETHER_BRICK)
+                    .name(user.getTranslation(PROTECTION_PANEL + "mode.expert.name"))
+                    .description(user.getTranslation(PROTECTION_PANEL + "mode.expert.description"), "",
+                            user.getTranslation(PROTECTION_PANEL + "mode.click-to-switch",
+                                    TextVariables.NEXT, user.getTranslation(PROTECTION_PANEL + "mode.basic.name")))
+                    .clickHandler(this)
+                    .build());
+            break;
+        default:
+            icons.put(7, new PanelItemBuilder().icon(Material.IRON_INGOT)
+                    .name(user.getTranslation(PROTECTION_PANEL + "mode.basic.name"))
+                    .description(user.getTranslation(PROTECTION_PANEL + "mode.basic.description"), "",
+                            user.getTranslation(PROTECTION_PANEL + "mode.click-to-switch",
+                                    TextVariables.NEXT, user.getTranslation(PROTECTION_PANEL + "mode.advanced.name")))
+                    .clickHandler(this)
+                    .build());
+        }
+        return icons;
+    }
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.api.panels.Tab#getPermission()
+     */
+    @Override
+    public String getPermission() {
+        // All of these tabs can be seen by anyone
+        return "";
+    }
+
+    /**
+     * @return the type
+     */
+    public Flag.Type getType() {
+        return type;
+    }
+
+    /**
+     * @return the user
+     */
+    public User getUser() {
+        return user;
+    }
+
+    /**
+     * @return the world
+     */
+    public World getWorld() {
+        return world;
+    }
+
+    /**
+     * @return the island
+     */
+    public Island getIsland() {
+        return island;
+    }
+
+    @Override
+    public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
+        // Cycle the mode
+        plugin.getPlayers().setFlagsDisplayMode(user.getUniqueId(), plugin.getPlayers().getFlagsDisplayMode(user.getUniqueId()).getNext());
+        if (panel instanceof TabbedPanel) {
+            TabbedPanel tp = ((TabbedPanel)panel);
+            tp.setActivePage(0);
+            tp.refreshPanel();
+            user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_STONE_BUTTON_CLICK_OFF, 1F, 1F);
+        }
+        return true;
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java
new file mode 100644
index 000000000..68b3ed5d1
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java
@@ -0,0 +1,87 @@
+package world.bentobox.bentobox.panels.settings;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.bukkit.Material;
+import org.bukkit.World;
+
+import world.bentobox.bentobox.api.flags.Flag.Type;
+import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick;
+import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.Tab;
+import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Implements a {@link Tab} that enables the default world protection settings to be set
+ * @author tastybento
+ * @since 1.6.0
+ *
+ */
+public class WorldDefaultSettingsTab extends SettingsTab implements Tab {
+
+    /**
+     * @param world - world
+     * @param user - user
+     */
+    public WorldDefaultSettingsTab(World world, User user) {
+        super(world, user, Type.PROTECTION);
+    }
+
+    /**
+     * Get the icon for this tab
+     * @return panel item
+     */
+    @Override
+    public PanelItem getIcon() {
+        PanelItemBuilder pib = new PanelItemBuilder();
+        pib.icon(Material.STONE_BRICKS);
+        pib.name(getName());
+        // Different description
+        pib.description(user.getTranslation(PROTECTION_PANEL + "WORLD_DEFAULTS.description"));
+        return pib.build();
+    }
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.panels.settings.SettingsTab#getName()
+     */
+    @Override
+    public String getName() {
+        // Different name
+        return user.getTranslation(PROTECTION_PANEL + "WORLD_DEFAULTS.title", "[world_name]", plugin.getIWM().getFriendlyName(world));
+    }
+
+    /* (non-Javadoc)
+     * @see world.bentobox.bentobox.panels.settings.SettingsTab#getPermission()
+     */
+    @Override
+    public String getPermission() {
+        // This permission should be in the Game Mode Addon's permissions list
+        return plugin.getIWM().getPermissionPrefix(world) + "admin.set-world-defaults";
+    }
+
+    /**
+     * Get all the flags as panel items
+     * @return list of all the panel items for this flag type
+     */
+    @Override
+    public List<PanelItem> getPanelItems() {
+        // Different description and click handlers
+        return getFlags().stream().map(f -> {
+            PanelItem i = f.toPanelItem(plugin, user, null, false);
+            // Replace the click handler with WorldToggleClick
+            i.setClickHandler(new WorldToggleClick(f.getID()));
+            // Replace the description
+            String worldSetting = f.isSetForWorld(user.getWorld()) ? user.getTranslation("protection.panel.flag-item.setting-active")
+                    : user.getTranslation("protection.panel.flag-item.setting-disabled");
+            i.setDescription(Arrays.asList(user.getTranslation("protection.panel.flag-item.setting-layout",
+                    TextVariables.DESCRIPTION, user.getTranslation(f.getDescriptionReference()),
+                    "[setting]", worldSetting).split("\n")));
+            return i;
+        }).collect(Collectors.toList());
+    }
+
+}
diff --git a/src/main/java/world/bentobox/bentobox/schems/Converter.java b/src/main/java/world/bentobox/bentobox/schems/Converter.java
index 94bd6c9a1..f4f1a6db8 100644
--- a/src/main/java/world/bentobox/bentobox/schems/Converter.java
+++ b/src/main/java/world/bentobox/bentobox/schems/Converter.java
@@ -64,9 +64,7 @@ public class Converter {
                     .map(this::convertLegacyEntity)
                     // Collect into a map
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-            if (le != null) {
-                bp.setEntities(le);
-            }
+            bp.setEntities(le);
         }
         // Attached blocks
         if (bc.isConfigurationSection(ATTACHED_YAML_PREFIX)) {
diff --git a/src/main/java/world/bentobox/bentobox/schems/SchemToBlueprint.java b/src/main/java/world/bentobox/bentobox/schems/SchemToBlueprint.java
index b01c12c3a..e3aeaa333 100644
--- a/src/main/java/world/bentobox/bentobox/schems/SchemToBlueprint.java
+++ b/src/main/java/world/bentobox/bentobox/schems/SchemToBlueprint.java
@@ -36,36 +36,38 @@ public class SchemToBlueprint {
 
     /**
      * Converts schems to blueprints and blueprint bundles
+     *
      * @param addon - GameModeAddon
      */
     public void convertSchems(GameModeAddon addon) {
-        File schems = new File(addon.getDataFolder(), FOLDER_NAME);
-        if (!schems.exists()) {
-            return;
-        }
-        // Convert all schems in folder
-        // Look through the folder
-        FilenameFilter schemFilter = (File dir, String name) -> name.toLowerCase(java.util.Locale.ENGLISH).endsWith(FILE_EXTENSION)
-                && !name.toLowerCase(java.util.Locale.ENGLISH).startsWith("nether-")
-                && !name.toLowerCase(java.util.Locale.ENGLISH).startsWith("end-");
+            File schems = new File(addon.getDataFolder(), FOLDER_NAME);
+            if (!schems.exists()) {
+                return;
+            }
+            // Convert all schems in folder
+            // Look through the folder
+            FilenameFilter schemFilter = (File dir, String name) -> name.toLowerCase(java.util.Locale.ENGLISH).endsWith(FILE_EXTENSION)
+                    && !name.toLowerCase(java.util.Locale.ENGLISH).startsWith("nether-")
+                    && !name.toLowerCase(java.util.Locale.ENGLISH).startsWith("end-");
 
-        Arrays.stream(Objects.requireNonNull(schems.list(schemFilter)))
-        .map(name -> name.substring(0, name.length() - FILE_EXTENSION.length()))
-        .forEach(name -> importSchemSet(addon, schems, name));
+            Arrays.stream(Objects.requireNonNull(schems.list(schemFilter)))
+                    .map(name -> name.substring(0, name.length() - FILE_EXTENSION.length()))
+                    .forEach(name -> importSchemSet(addon, schems, name));
 
-        File newDir = new File(addon.getDataFolder(), FOLDER_NAME + "_converted");
-        try {
-            Files.move(schems.toPath(), newDir.toPath());
-        } catch (IOException e) {
-            plugin.logError("Could not move schems folder: " + e.getLocalizedMessage());
-        }
+            File newDir = new File(addon.getDataFolder(), FOLDER_NAME + "_converted");
+            try {
+                Files.move(schems.toPath(), newDir.toPath());
+            } catch (IOException e) {
+                plugin.logError("Could not move schems folder: " + e.getLocalizedMessage());
+            }
     }
 
     /**
      * Imports one schem set to the game mode
-     * @param addon - game mode addon
-     * @param schems
-     * @param name
+     *
+     * @param addon  - game mode addon
+     * @param schems - schems folder
+     * @param name - name of the schematic
      */
     private void importSchemSet(GameModeAddon addon, File schems, String name) {
         // Make a new blueprint bundle
diff --git a/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java
index 622cbb0ab..a2c17713f 100644
--- a/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java
+++ b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java
@@ -1,21 +1,16 @@
 package world.bentobox.bentobox.util;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
-import org.bukkit.World.Environment;
-import org.bukkit.block.Biome;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.generator.ChunkGenerator.BiomeGrid;
+import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
@@ -49,14 +44,14 @@ public class DeleteIslandChunks {
         task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
             for (int i = 0; i < SPEED; i++) {
                 plugin.getIWM().getAddon(di.getWorld()).ifPresent(gm -> {
-
-                    regerateChunk(gm, di.getWorld().getChunkAt(chunkX, chunkZ));
+                    Chunk chunk = di.getWorld().getChunkAt(chunkX, chunkZ);
+                    regenerateChunk(gm, chunk);
 
                     if (plugin.getIWM().isNetherGenerate(di.getWorld()) && plugin.getIWM().isNetherIslands(di.getWorld())) {
-                        regerateChunk(gm, plugin.getIWM().getNetherWorld(di.getWorld()).getChunkAt(chunkX, chunkZ));
+                        regenerateChunk(gm, plugin.getIWM().getNetherWorld(di.getWorld()).getChunkAt(chunkX, chunkZ));
                     }
                     if (plugin.getIWM().isEndGenerate(di.getWorld()) && plugin.getIWM().isEndIslands(di.getWorld())) {
-                        regerateChunk(gm, plugin.getIWM().getEndWorld(di.getWorld()).getChunkAt(chunkX, chunkZ));
+                        regenerateChunk(gm, plugin.getIWM().getEndWorld(di.getWorld()).getChunkAt(chunkX, chunkZ));
                     }
                     chunkZ++;
                     if (chunkZ > di.getMaxZChunk()) {
@@ -74,54 +69,35 @@ public class DeleteIslandChunks {
         }, 0L, 1L);
     }
 
-    private void regerateChunk(GameModeAddon gm, Chunk chunk) {
+    private void regenerateChunk(GameModeAddon gm, Chunk chunk) {
+        boolean isLoaded = chunk.isLoaded();
         // Clear all inventories
         Arrays.stream(chunk.getTileEntities()).filter(te -> (te instanceof InventoryHolder))
         .filter(te -> di.inBounds(te.getLocation().getBlockX(), te.getLocation().getBlockZ()))
         .forEach(te -> ((InventoryHolder)te).getInventory().clear());
         // Reset blocks
         MyBiomeGrid grid = new MyBiomeGrid(chunk.getWorld().getEnvironment());
-        ChunkData cd = gm.getDefaultWorldGenerator(chunk.getWorld().getName(), "").generateChunkData(chunk.getWorld(), new Random(), chunk.getX(), chunk.getZ(), grid);
-        int baseX = chunk.getX() << 4;
-        int baseZ = chunk.getZ() << 4;
-        for (int x = 0; x < 16; x++) {
-            for (int z = 0; z < 16; z++) {
-                if (di.inBounds(baseX + x, baseZ + z)) {
-                    chunk.getBlock(x, 0, z).setBiome(grid.getBiome(x, z));
-                    for (int y = 0; y < chunk.getWorld().getMaxHeight(); y++) {
-                        chunk.getBlock(x, y, z).setBlockData(cd.getBlockData(x, y, z));
+        ChunkGenerator cg = gm.getDefaultWorldGenerator(chunk.getWorld().getName(), "");
+        // Will be null if use-own-generator is set to true
+        if (cg != null) {
+            ChunkData cd = cg.generateChunkData(chunk.getWorld(), new Random(), chunk.getX(), chunk.getZ(), grid);
+            int baseX = chunk.getX() << 4;
+            int baseZ = chunk.getZ() << 4;
+            for (int x = 0; x < 16; x++) {
+                for (int z = 0; z < 16; z++) {
+                    if (di.inBounds(baseX + x, baseZ + z)) {
+                        chunk.getBlock(x, 0, z).setBiome(grid.getBiome(x, z));
+                        for (int y = 0; y < chunk.getWorld().getMaxHeight(); y++) {
+                            chunk.getBlock(x, y, z).setBlockData(cd.getBlockData(x, y, z));
+                        }
                     }
                 }
             }
         }
         // Remove all entities in chunk, including any dropped items as a result of clearing the blocks above
         Arrays.stream(chunk.getEntities()).filter(e -> !(e instanceof Player) && di.inBounds(e.getLocation().getBlockX(), e.getLocation().getBlockZ())).forEach(Entity::remove);
-    }
-
-    class MyBiomeGrid implements BiomeGrid {
-        Map<Vector, Biome> map = new HashMap<>();
-        private Biome defaultBiome;
-        public MyBiomeGrid(Environment environment) {
-            switch(environment) {
-            case NETHER:
-                defaultBiome = Biome.NETHER;
-                break;
-            case THE_END:
-                defaultBiome = Biome.THE_END;
-                break;
-            default:
-                defaultBiome = Biome.PLAINS;
-                break;
-            }
-
-        }
-        @Override
-        public Biome getBiome(int x, int z) {
-            return map.getOrDefault(new Vector(x,0,z), defaultBiome);
-        }
-        @Override
-        public void setBiome(int x, int z, Biome bio) {
-            map.put(new Vector(x,0,z), bio);
+        if (!isLoaded) {
+            chunk.unload(true);
         }
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/util/ItemParser.java b/src/main/java/world/bentobox/bentobox/util/ItemParser.java
index e94d7c2d4..9481201c9 100644
--- a/src/main/java/world/bentobox/bentobox/util/ItemParser.java
+++ b/src/main/java/world/bentobox/bentobox/util/ItemParser.java
@@ -9,6 +9,7 @@ import org.bukkit.inventory.meta.BannerMeta;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionType;
+import world.bentobox.bentobox.BentoBox;
 
 /**
  * Utility class that parses a String into an ItemStack.
@@ -113,15 +114,21 @@ public class ItemParser {
     private static ItemStack banner(String[] part) {
         try {
             if (part.length >= 2) {
-                ItemStack result = new ItemStack(Material.getMaterial(part[0]), Integer.parseInt(part[1]));
+                Material bannerMat = Material.getMaterial(part[0]);
+                if (bannerMat == null) {
+                    BentoBox.getInstance().logError("Could not parse banner item " + part[0] + " so using a white banner.");
+                    bannerMat = Material.WHITE_BANNER;
+                }
+                ItemStack result = new ItemStack(bannerMat, Integer.parseInt(part[1]));
 
                 BannerMeta meta = (BannerMeta) result.getItemMeta();
-                for (int i = 2; i < part.length; i += 2) {
-                    meta.addPattern(new Pattern(DyeColor.valueOf(part[i + 1]), PatternType.valueOf(part[i])));
+                if (meta != null) {
+                    for (int i = 2; i < part.length; i += 2) {
+                        meta.addPattern(new Pattern(DyeColor.valueOf(part[i + 1]), PatternType.valueOf(part[i])));
+                    }
+                    result.setItemMeta(meta);
                 }
 
-                result.setItemMeta(meta);
-
                 return result;
             } else {
                 return null;
diff --git a/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java
new file mode 100644
index 000000000..64954ee06
--- /dev/null
+++ b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java
@@ -0,0 +1,41 @@
+package world.bentobox.bentobox.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.World.Environment;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.ChunkGenerator.BiomeGrid;
+import org.bukkit.util.Vector;
+
+/**
+ * A biome grid for generators
+ * @author tastybento
+ *
+ */
+public class MyBiomeGrid implements BiomeGrid {
+    Map<Vector, Biome> map = new HashMap<>();
+    private Biome defaultBiome;
+    public MyBiomeGrid(Environment environment) {
+        switch(environment) {
+        case NETHER:
+            defaultBiome = Biome.NETHER;
+            break;
+        case THE_END:
+            defaultBiome = Biome.THE_END;
+            break;
+        default:
+            defaultBiome = Biome.PLAINS;
+            break;
+        }
+
+    }
+    @Override
+    public Biome getBiome(int x, int z) {
+        return map.getOrDefault(new Vector(x,0,z), defaultBiome);
+    }
+    @Override
+    public void setBiome(int x, int z, Biome bio) {
+        map.put(new Vector(x,0,z), bio);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java
index 83e1d7a2d..e9f2bc099 100644
--- a/src/main/java/world/bentobox/bentobox/util/Util.java
+++ b/src/main/java/world/bentobox/bentobox/util/Util.java
@@ -195,7 +195,7 @@ public class Util {
     }
 
     /**
-     * Checks is world = world2 irrespective of the world type
+     * Checks is world = world2 irrespective of the world type. Only strips _nether and _the_end from world name.
      * @param world - world
      * @param world2 - world
      * @return true if the same
@@ -205,14 +205,13 @@ public class Util {
     }
 
     private static String stripName(World world) {
-        switch (world.getEnvironment()) {
-        case NETHER:
+        if (world.getName().endsWith(NETHER)) {
             return world.getName().substring(0, world.getName().length() - NETHER.length());
-        case THE_END:
-            return world.getName().substring(0, world.getName().length() - THE_END.length());
-        default:
-            return world.getName();
         }
+        if (world.getName().endsWith(THE_END)) {
+            return world.getName().substring(0, world.getName().length() - THE_END.length());
+        }
+        return world.getName();
     }
 
     /**
diff --git a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
index 822219742..c46df8128 100644
--- a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
+++ b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
@@ -1,8 +1,12 @@
 package world.bentobox.bentobox.util.teleport;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChunkSnapshot;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -11,16 +15,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Pair;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-
 /**
  * A class that calculates finds a safe spot asynchronously and then teleports the player there.
  * @author tastybento
@@ -40,7 +40,6 @@ public class SafeSpotTeleport {
     private final Location location;
     private boolean portal;
     private final int homeNumber;
-    private final boolean overrideGamemode;
 
     // Locations
     private Location bestSpot;
@@ -57,18 +56,12 @@ public class SafeSpotTeleport {
      * @param portal - true if this is a portal teleport
      * @param homeNumber - home number to go to
      */
-    public SafeSpotTeleport(BentoBox plugin, final Entity entity, final Location location, final String failureMessage, boolean portal, int homeNumber, boolean overrideGamemode) {
+    public SafeSpotTeleport(BentoBox plugin, final Entity entity, final Location location, final String failureMessage, boolean portal, int homeNumber) {
         this.plugin = plugin;
         this.entity = entity;
         this.location = location;
         this.portal = portal;
         this.homeNumber = homeNumber;
-        this.overrideGamemode = overrideGamemode;
-
-        // Put player into spectator mode
-        if (overrideGamemode && entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SURVIVAL)) {
-            ((Player)entity).setGameMode(GameMode.SPECTATOR);
-        }
 
         // If there is no portal scan required, try the desired location immediately
         if (plugin.getIslands().isSafeLocation(location)) {
@@ -78,13 +71,6 @@ public class SafeSpotTeleport {
             } else {
                 // If this is not a portal teleport, then go to the safe location immediately
                 entity.teleport(location);
-                // Exit spectator mode if in it
-                if (entity instanceof Player) {
-                    Player player = (Player)entity;
-                    if (overrideGamemode && player.getGameMode().equals(GameMode.SPECTATOR)) {
-                        player.setGameMode(plugin.getIWM().getDefaultGameMode(player.getWorld()));
-                    }
-                }
                 return;
             }
         }
@@ -108,7 +94,9 @@ public class SafeSpotTeleport {
                 // Add chunk snapshots to the list
                 while (it.hasNext() && chunkSnapshot.size() < MAX_CHUNKS) {
                     Pair<Integer, Integer> pair = it.next();
-                    chunkSnapshot.add(location.getWorld().getChunkAt(pair.x, pair.z).getChunkSnapshot());
+                    if (location.getWorld() != null) {
+                        chunkSnapshot.add(location.getWorld().getChunkAt(pair.x, pair.z).getChunkSnapshot());
+                    }
                     it.remove();
                 }
                 // Move to next step
@@ -125,25 +113,17 @@ public class SafeSpotTeleport {
         if (portal && bestSpot != null) {
             // Portals found, teleport to the best spot we found
             teleportEntity(bestSpot);
-            if (overrideGamemode && entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
-                ((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(bestSpot.getWorld()));
-            }
         } else if (entity instanceof Player) {
             // Failed, no safe spot
             if (!failureMessage.isEmpty()) {
                 User.getInstance(entity).notify(failureMessage);
             }
-            if (overrideGamemode && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
-                if (plugin.getIWM().inWorld(entity.getLocation())) {
-                    ((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(entity.getWorld()));
+            if (!plugin.getIWM().inWorld(entity.getLocation())) {
+                // Last resort
+                if (Bukkit.getServer().isPrimaryThread()) {
+                    ((Player)entity).performCommand("spawn");
                 } else {
-                    // Last resort
-                    ((Player)entity).setGameMode(GameMode.SURVIVAL);
-                    if (Bukkit.getServer().isPrimaryThread()) {
-                        ((Player)entity).performCommand("spawn");
-                    } else {
-                        Bukkit.getScheduler().runTask(plugin, () -> ((Player)entity).performCommand("spawn"));
-                    }
+                    Bukkit.getScheduler().runTask(plugin, () -> ((Player)entity).performCommand("spawn"));
                 }
             }
         }
@@ -247,17 +227,8 @@ public class SafeSpotTeleport {
             }
             Vector velocity = entity.getVelocity();
             entity.teleport(loc);
-            // Exit spectator mode if in it
-            if (entity instanceof Player) {
-                Player player = (Player)entity;
-                if (overrideGamemode && player.getGameMode().equals(GameMode.SPECTATOR)) {
-                    player.setGameMode(plugin.getIWM().getDefaultGameMode(loc.getWorld()));
-                }
-            } else {
-                entity.setVelocity(velocity);
-            }
+            entity.setVelocity(velocity);
         });
-
     }
 
     /**
@@ -333,7 +304,6 @@ public class SafeSpotTeleport {
         private boolean portal = false;
         private String failureMessage = "";
         private Location location;
-        private boolean overrideGamemode = true;
 
         public Builder(BentoBox plugin) {
             this.plugin = plugin;
@@ -402,9 +372,10 @@ public class SafeSpotTeleport {
          * Sets whether the player's gamemode should be overridden. Default is <tt>true</tt>
          * @param overrideGamemode whether the player's gamemode should be overridden.
          * @return Builder
+         * @deprecated As of 1.6.0, for removal. No longer in use as the player's gamemode is no longer changed upon teleporting.
          */
+        @Deprecated
         public Builder overrideGamemode(boolean overrideGamemode) {
-            this.overrideGamemode = overrideGamemode;
             return this;
         }
 
@@ -426,7 +397,7 @@ public class SafeSpotTeleport {
             if (failureMessage.isEmpty() && entity instanceof Player) {
                 failureMessage = "general.errors.no-safe-location-found";
             }
-            return new SafeSpotTeleport(plugin, entity, location, failureMessage, portal, homeNumber, overrideGamemode);
+            return new SafeSpotTeleport(plugin, entity, location, failureMessage, portal, homeNumber);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
index 1eac21784..b95268d17 100644
--- a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
+++ b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
@@ -1,13 +1,13 @@
 package world.bentobox.bentobox.versions;
 
-import org.bukkit.Bukkit;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.bukkit.Bukkit;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Checks and ensures the current server software is compatible with BentoBox.
  * @author Poslovitch
@@ -107,7 +107,15 @@ public class ServerCompatibility {
         /**
          * @since 1.5.0
          */
-        V1_14_2(Compatibility.SUPPORTED);
+        V1_14_2(Compatibility.SUPPORTED),
+        /**
+         * @since 1.6.0
+         */
+        V1_14_3(Compatibility.SUPPORTED),
+        /**
+         * @since 1.6.0
+         */
+        V1_14_4(Compatibility.SUPPORTED);
 
         private Compatibility compatibility;
 
diff --git a/src/main/java/world/bentobox/bentobox/web/catalog/CatalogEntry.java b/src/main/java/world/bentobox/bentobox/web/catalog/CatalogEntry.java
index 1d2cb66e4..fea1bc1cf 100644
--- a/src/main/java/world/bentobox/bentobox/web/catalog/CatalogEntry.java
+++ b/src/main/java/world/bentobox/bentobox/web/catalog/CatalogEntry.java
@@ -1,12 +1,11 @@
 package world.bentobox.bentobox.web.catalog;
 
-import com.google.gson.JsonObject;
 import org.bukkit.Material;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
 
 /**
  * @author Poslovitch
@@ -22,7 +21,7 @@ public class CatalogEntry {
     private @NonNull String name;
     private @NonNull String description;
     private @Nullable String topic;
-    private @NonNull List<String> tags = new ArrayList<>();
+    private @Nullable String tag;
     private @NonNull String repository;
 
     public CatalogEntry(@NonNull JsonObject object) {
@@ -33,6 +32,7 @@ public class CatalogEntry {
         this.description = object.get("description").getAsString();
         this.repository = object.get("repository").getAsString();
         this.topic = object.get("topic").getAsString();
+        this.tag = (!(object.get("tag") instanceof JsonNull)) ? object.get("tag").getAsString() : null;
     }
 
     public int getSlot() {
@@ -59,9 +59,9 @@ public class CatalogEntry {
         return topic;
     }
 
-    @NonNull
-    public List<String> getTags() {
-        return tags;
+    @Nullable
+    public String getTag() {
+        return tag;
     }
 
     @NonNull
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a16d43096..2aae1f19e 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -11,10 +11,11 @@ general:
   # If there is no economy plugin present anyway, money will be automatically disabled.
   use-economy: true
   database:
-    # JSON, MYSQL, MARIADB (10.2.3+), MONGODB, and YAML(deprecated).
+    # JSON, MYSQL, MARIADB (10.2.3+), MONGODB, SQLITE and YAML(deprecated).
     # Transition database options are:
-    #   YAML2JSON, YAML2MARIADB, YAML2MYSQL
-    #   JSON2MARIADB, JSON2MYSQL, MYSQL2JSON
+    #   YAML2JSON, YAML2MARIADB, YAML2MYSQL, YAML2MONGODB, YAML2SQLITE
+    #   JSON2MARIADB, JSON2MYSQL, JSON2MONGODB, JSON2SQLITE
+    #   MYSQL2JSON, MARIADB2JSON, MONGODB2JSON, SQLITE2JSON
     # If you need others, please make a feature request.
     # Transition options enable migration from one database type to another. Use /bbox migrate.
     # YAML and JSON are file-based databases.
@@ -38,8 +39,6 @@ general:
   # /!\ This feature is experimental and might not work as expected or might not work at all.
   fakeplayers:
     - '[CoFH]'
-  # Rank required to use a command. e.g., use the invite command. Default is owner rank is required.
-  rank-command: {}
 panel:
   close-on-click-outside: true
 logs:
@@ -79,10 +78,18 @@ island:
       kick: true
       leave: true
       reset: true
+  delay:
+    # Time in seconds that players have to stand still before teleport commands activate, e.g. island go.
+    time: 0 
   name:
     # These set the minimum and maximum size of a name.
     min-length: 4
     max-length: 20
+  # Remove hostile mob on teleport box radius
+  # If hostile mobs are cleared on player teleport, then this sized box will be cleared
+  # around the player. e.g. 5 means a 10 x 10 x 10 box around the player
+  # Be careful not to make this too big. Does not cover standard nether or end teleports.
+  clear-radius: 5
   # Number of blocks to paste per tick when pasting blueprints
   # Smaller values will help reduce noticeable lag but will make pasting take longer
   paste-speed: 1000
diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
index f43735325..9c5f5c1df 100644
--- a/src/main/resources/locales/en-US.yml
+++ b/src/main/resources/locales/en-US.yml
@@ -57,6 +57,29 @@ commands:
       reset:
         description: "resets the resets of this player to 0"
         parameters: "<player>"
+    purge:
+      parameters: "[days]" 
+      description: "purge islands abandoned for more than [days]"
+      days-or-more: "Must be at least 1 day or more"     
+      purgable-islands: "Found [number] purgable islands."
+      purge-in-progress: "&cPurging in progress. Use purge stop to cancel"
+      number-error: "&cArgument must be a number of days"
+      confirm: "&dType [label] purge confirm to start purging"  
+      completed: "&aPurging stopped"
+      see-console-for-status: "Purge started. See console for status" 
+      protect:
+        description: "Toggle island purge protection"
+        move-to-island: "&cMove to an island first!"
+        protecting: "&aPurge-protecting island"
+        unprotecting: "&aRemoving purge protection"
+      stop:
+        description: "Stop a purge in progress"
+        stopping: "Stopping the purge"
+        no-purge-in-progress: "&cNo purge in progress!"
+      unowned:
+        description: "Purge unowned islands - requires confirmation"
+        unowned-islands: "&dFound [number] islands"
+        
     team:
       add:
         parameters: "<owner> <player>"
@@ -111,6 +134,7 @@ commands:
       parameters: "<player>"
       description: "register player to unowned island you are on"
       registered-island: "&aRegistered player to island at [xyz]."
+      reserved-island: "&aReserved island at [xyz] for player."
       already-owned: "&cIsland is already owned by another player!"
       no-island-here: "&cThere is no island here. Confirm to make one."
       in-deletion: "&cThis island space is currently being deleted. Try later."
@@ -136,6 +160,7 @@ commands:
       island-coords: "Island coordinates: [xz1] to [xz2]"
       islands-in-trash: "&dPlayer has islands in trash."
       protection-range: "Protection range: [range]"
+      purge-protected: "Island is purge protected"
       max-protection-range: "Largest historical protection range: [range]"
       protection-coords: "Protection coordinates: [xz1] to [xz2]"
       is-spawn: "Island is a spawn island"
@@ -151,7 +176,8 @@ commands:
       parameters: "<player> <number>"
       description: "switch player's island to the numbered one in trash"
       out-of-range: "&cNumber must be between 1 and [number]. Use &l[label] trash [player] &r&cto see island numbers"
-      cannot-switch: "&cSwitch failed. See console log for error."   
+      cannot-switch: "&cSwitch failed. See console log for error."
+      success: "&aSuccessfully switched the player's island to the specified one."
     trash:
       no-unowned-in-trash: "&cNo unowned islands in trash"
       no-islands-in-trash: "&cPlayer has no islands in trash"
@@ -164,12 +190,13 @@ commands:
     emptytrash:
       parameters: "[player]"
       description: "Clear trash for player, or all unowned islands in trash"
+      success: "&aTrash successfully emptied."
     version:
       description: "display BentoBox and addons versions"
     setrange:
       parameters: "<player> <range>"
       description: "set the range of player's island"
-      range-updated: "Island range updated to [number]"
+      range-updated: "&aIsland range updated to &b[number]&a."
     reload:
       description: "reload"
     tp:
@@ -184,15 +211,21 @@ commands:
       parameters: "<player> <rank>"
       description: "set a player's rank on their island"
       unknown-rank: "&cUnknown rank!"
+      not-possible: "&cRank must be higher than visitor"
       rank-set: "&aRank set from [from] to [to]."
     setspawn:
-      description: "set an Island as spawn for this world"
+      description: "set an island as spawn for this world"
       already-spawn: "&cThis island is already a spawn!"
       no-island-here: "&cThere is no island here."
-      confirmation: "&cAre you sure you want to set this Island as the spawn for this world?"
+      confirmation: "&cAre you sure you want to set this island as the spawn for this world?"
+      success: "&aSuccessfully set this island as the spawn for this world."
+    settings:
+      parameters: "[player]"
+      description: "open system settings or island settings for player"
     blueprint:
       parameters: "<load/copy/paste/pos1/pos2/save>"
       description: "manipulate blueprints"
+      bedrock-required: "&cAt least one bedrock block must be in a blueprint!"
       copy-first: "&cCopy first!"
       file-exists: "&cFile already exists, overwrite?"
       no-such-file: "&cNo such file!"
@@ -278,6 +311,7 @@ commands:
           &aRight click to decrement
     resetflags:
       description: "Reset all islands to default flag settings in config.yml"
+      success: "&aSuccessfully reset all islands' flags to the default settings."
     world:
       description: "Manage world settings"
     delete:
@@ -321,6 +355,7 @@ commands:
       addon-syntax: "&2[name] &3[version] &7(&3[state]&7)"
       game-world: "&2[name] &7(&3[addon]&7): &aOverworld&7, &r[nether_color]Nether&7, &r[end_color]End"
       server: "&2Running &3[name] [version]&2."
+      database: "&2Database: &3[database]"
     manage:
       description: "displays the Management Panel"
     catalog:
@@ -342,6 +377,10 @@ commands:
     confirm: "&cType command again within &b[seconds]s&c to confirm."
     previous-request-cancelled: "&6Previous confirmation request cancelled."
     request-cancelled: "&cConfirmation timeout - &brequest cancelled."
+  delay:
+    previous-command-cancelled: "&cPrevious command cancelled"
+    stand-still: "&6Do not move! Teleporting in [seconds] seconds"
+    moved-so-command-cancelled: "&cYou moved. Teleport cancelled!"
   island:
     about:
       description: "About this addon"
@@ -350,7 +389,6 @@ commands:
       description: "teleport you to your island"
       teleport: "&aTeleporting you to your island."
       teleported: "&aTeleported you to home &e#[number]."
-      tip: "&bType /[label] help &afor help."
     help:
       description: "The main island command"
       pick-world: "&cSpecify world from [worlds]"
@@ -414,6 +452,7 @@ commands:
         cannot-coop-yourself: "&cYou cannot coop yourself!"
         already-has-rank: "&cPlayer already has a rank!"
         you-are-a-coop-member: "&2You were cooped by [name]"
+        success: "&aYou cooped &b[name]."
       uncoop:
         description: "remove a coop rank from player"
         parameters: "<player>"
@@ -422,20 +461,23 @@ commands:
         player-not-cooped: "&cPlayer is not cooped!"
         you-are-no-longer-a-coop-member: "&cYou are no longer a coop member of [name]'s island"
         all-members-logged-off: "&cAll island members logged off so you are no longer a coop member of [name]'s island"
+        success: "&b[name] &ais no longer a coop member of your island."
       trust:
         description: "give a player trusted rank on your island"
         parameters: "<player>"
         trust-in-yourself: "&cTrust in yourself!"
         members-trusted: "&cMembers are already trusted"
         player-already-trusted: "&cPlayer is already trusted!"
-        you-are-trusted: "&2You are trusted by [name]!"
+        you-are-trusted: "&2You are trusted by &b[name]&a!"
+        success: "&aYou trusted &b[name]&a."
       untrust:
         description: "remove trusted player rank from player"
         parameters: "<player>"
         cannot-untrust-yourself: "&cYou cannot untrust yourself!"
         cannot-untrust-member: "&cYou cannot untrust a team member!"
         player-not-trusted: "&cPlayer is not trusted!"
-        you-are-no-longer-trusted: "&cYou are no longer trusted by [name]!"
+        you-are-no-longer-trusted: "&cYou are no longer trusted by &b[name]&a!"
+        success: "&b[name] &ais no longer trusted on your island."
       invite:
         description: "invite a player to join your island"
         invitation-sent: "&aInvitation sent to [name]"
@@ -470,6 +512,7 @@ commands:
         cannot-leave: "&cOwners cannot leave! Become a member first, or kick all members."
         description: "leave your island"
         left-your-island: "&c[name] &cleft your island"
+        success: "&aYou left this island."
       kick:
         description: "remove a member from your island"
         parameters: "<player>"
@@ -479,6 +522,8 @@ commands:
       demote:
         description: "demote a player on your island down a rank"
         parameters: "<player>"
+        errors:
+          cant-demote-yourself: "&cYou can't demote yourself!"
         failure: "&cPlayer cannot be demoted any further!"
         success: "&aDemoted [name] to [rank]"      
       promote:
@@ -530,6 +575,7 @@ commands:
       cannot-ban-member: "&cYou cannot expel a team member!"
       not-on-island: "&cThat player is not on your island!"
       player-expelled-you: "&b[name]&c expelled you from the island!"
+      success: "&aYou expelled &b[name] &afrom the island."
 
 ranks:
   owner: "Owner"
@@ -605,6 +651,10 @@ protection:
       name: "Droppers"
       description: "Toggle dropper interaction"
       hint: "Dropper interaction disabled"
+    ELYTRA:
+      name: "Elytra"
+      description: "Toggle elytra allowed or not"
+      hint: "&cWARNING: Elytra cannot be used here!"
     HOPPER:
       name: "Hoppers"
       description: "Toggle hopper interaction"
@@ -679,11 +729,7 @@ protection:
       description: "Toggle egg throwing"
       name: "Egg throwing"
       hint: "No egg throwing"
-    ELYTRA: 
-      description: "Toggle use on island"
-      name: "Elytra"
-      hint: "No elytra flying allowed"
-    ENCHANTING: 
+    ENCHANTING:
       description: "Toggle use"
       name: "Enchanting table"
       hint: "No table use"
@@ -1008,13 +1054,30 @@ protection:
         &aback to their island using commands
         &aif they are falling.
       hint: "&cYou cannot teleport back to your island while you are falling."
+    WITHER_DAMAGE:
+      name: "Toggle wither damage"
+      description: |-
+        &aIf active, withers can
+        &adamage blocks and players
   locked: "&cThis island is locked!"
   protected: "&cIsland protected: [description]"
+  world-protected: "&cWorld protected: [description]"
   spawn-protected: "&cSpawn protected: [description]"
 
   panel:
     next: "Next Page"
     previous: "Previous Page"
+    mode:
+      advanced:
+        name: "&6Advanced Settings"
+        description: "&aDisplays a sensible amount of settings."
+      basic:
+        name: "&aBasic Settings"
+        description: "&aDisplays the most useful settings."
+      expert:
+        name: "&cExpert Settings"
+        description: "&aDisplays all the available settings."
+      click-to-switch: "&eClick &ato switch to the &r[next]&r&a."
     PROTECTION:
       title: "&6Protection"
       description: |-
@@ -1028,6 +1091,11 @@ protection:
     WORLD_SETTING:
       title: "&b[world_name] &6Settings"
       description: "&aSettings for this game world"
+    WORLD_DEFAULTS:
+      title: "&b[world_name] &6World Protections"
+      description: |
+        &aProtection settings when
+        &aplayer is outside their island
     flag-item:
       name-layout: "&a[name]"
       description-layout: |
@@ -1038,6 +1106,7 @@ protection:
       blocked-rank: "&3- &c"
       minimal-rank: "&3- &2"
       menu-layout: "&a[description]"
+      setting-cooldown: "&cSetting is on cooldown"
       setting-layout: |
         &a[description]
         
diff --git a/src/main/resources/locales/fr-FR.yml b/src/main/resources/locales/fr-FR.yml
index 5f5c9c879..f04d6a508 100644
--- a/src/main/resources/locales/fr-FR.yml
+++ b/src/main/resources/locales/fr-FR.yml
@@ -7,7 +7,7 @@
 
 meta:
   authors:
-    - Poslovitch
+  - Poslovitch
   banner: "WHITE_BANNER:1:STRIPE_TOP:BLUE:STRIPE_BOTTOM:RED"
 
 general:
@@ -118,6 +118,23 @@ commands:
       parameters: "<joueur>"
     getrank:
       parameters: "<joueur>"
+      description: "affiche le rang d'un joueur sur son île"
+      rank-is: "&aCe joueur est &b[rank] &asur son île."
+    setrank:
+      parameters: "<joueur> <rang>"
+      description: "modifie le rang d'un joueur sur son île"
+      unknown-rank: "&cRang inconnu!"
+      not-possible: "&cLe rang spécifié doit être supérieur à Visiteur."
+      rank-set: "&aRang modifié de &b[from] &aà &b[to]&a."
+    setspawn:
+      description: "définit une île comme étant le spawn de ce monde"
+      already-spawn: "&cCette île est déjà le spawn !"
+      no-island-here: "&cIl n'y a pas d'île ici."
+      confirmation: "&cÊtes-vous certain de vouloir définir cette île comme étant le spawn de ce monde ?"
+      success: "&aCette île a été définie comme spawn pour ce monde."
+    settings:
+      parameters: "[joueur]"
+      description: "affiche les paramètres du monde ou de l'île du joueur"
     delete:
       parameters: "<joueur>"
     why:
@@ -144,6 +161,7 @@ commands:
       addon-syntax: "&2[name] &3[version] &7(&3[state]&7)"
       game-world: "&2[name] &7(&3[addon]&7): &aOverworld&7, &r[nether_color]Nether&7, &r[end_color]End"
       server: "&2Serveur : &3[name] [version]&2."
+      database: "&2Base de données : &3[database]"
     manage:
       description: "affiche le menu de gestion"
     catalog:
@@ -180,6 +198,19 @@ commands:
         parameters: "<joueur>"
       setowner:
         parameters: "<joueur>"
+        description: "transfère la propriété de l'île à un membre"
+        errors:
+          cant-transfer-to-yourself: "&cVous ne pouvez pas transférer la propriété à vous-même! &7(&oTechniquement, c'est possible. Mais nous ne voulons pas que vous le fassiez. Parce que c'est inutile.&r&7)"
+          target-is-not-member: "&cCe joueur n'est pas membre sur votre île."
+        name-is-the-owner: "&a[name] est désormais le propriétaire de l'île !"
+        you-are-the-owner: "&aVous êtes désormais le propriétaire de l'île !"
+      leave:
+        cannot-leave: |
+          &cEn tant que propriétaire, vous ne pouvez pas quittez l'île.
+          &cVous devez d'abord devenir membre sur l'île ou en expulser les membres actuels.
+        description: "quittez votre île"
+        left-your-island: "&c[name] &ca quitté votre île."
+        success: "&aVous avez quitté l'île."
     ban:
       parameters: "<joueur>"
     unban:
@@ -190,6 +221,7 @@ commands:
       description: "sélectionne la langue"
     expel:
       parameters: "<joueur>"
+      success: "&aVous avez expulsé &b[name] &ade votre île."
 
 ranks:
   owner: "Propriétaire"
@@ -247,6 +279,17 @@ protection:
   panel:
     next: "Page suivante"
     previous: "Page précédente"
+    mode:
+      advanced:
+        name: "&6Paramètres avancés"
+        description: "&aAffiche un nombre important de paramètres."
+      basic:
+        name: "&aParamètres simplifiés"
+        description: "&aAffiche les paramètres les plus utilisés."
+      expert:
+        name: "&cParamètres complets"
+        description: "&aAffiche tous les paramètres disponibles."
+      click-to-switch: "&eCliquez &apour afficher les &r[next]&r&a."
     PROTECTION:
       title: "&6Protection"
       description: |-
diff --git a/src/main/resources/locales/it-IT.yml b/src/main/resources/locales/it-IT.yml
index 44f460a5d..1522541ec 100644
--- a/src/main/resources/locales/it-IT.yml
+++ b/src/main/resources/locales/it-IT.yml
@@ -807,7 +807,6 @@ protection:
       description: "Abilita/disabilita uso"
       name: "Uso di leve"
       hint: "Uso di leve disabilitato"
-      hint: "Uso di leve disabilitato"
     LIQUIDS_FLOWING_OUT:
       name: "Liquidi scorrono fuori dall'isola"
       description: |-
diff --git a/src/main/resources/locales/lv-LV.yml b/src/main/resources/locales/lv-LV.yml
index 6e907ce4c..baf6fe4be 100644
--- a/src/main/resources/locales/lv-LV.yml
+++ b/src/main/resources/locales/lv-LV.yml
@@ -61,6 +61,29 @@ commands:
       reset:
         description: "uzstāta spēlētājam 'resetus' uz 0"
         parameters: "<spēlētājs>"
+    purge:
+      parameters: "[days]"
+      description: "nodzēst salas kas nav aktīvas vairāk par [days] dienām"
+      days-or-more: "Nevar būt mazāks par 1 dienu"
+      purgable-islands: "Atrastas [number] dzēšamas salas."
+      purge-in-progress: "&cNotiek salu dzēšana. Izmanto '&e[label] purge stop&c', lai atceltu."
+      number-error: "&cParametram ir jābūt dienu skatitam."
+      confirm: "&dRaksti &e[label] purge confirm&d, lai sāktu dzēšanu"
+      completed: "&aDzēšana pabeigta."
+      see-console-for-status: "Dzēšana uzsākta. Skati terminālī, lai redzētu satusu."
+      stop:
+        description: "Apturēt uzsāktu dzēšanu."
+        stopping: "Apstādina dzēšanu"
+        no-purge-in-progress: "&cNav aktīvas dzēšanas!"
+      unowned:
+        description: "Dzēst bezīpašnieku salas - nepieciešams apstiprinājums"
+        unowned-islands: "&dAtrastas [number] salas"
+      protect:
+        description: Pārslēgt salas aizsargāšanu no dzēšanas
+        move-to-island: '&cSākumā pārvietojies uz salas!'
+        protecting: '&aDzēšanas aizsardzība aktivizēta'
+        unprotecting: '&aDzēšanas aizsardzība noņemta'
+
     team:
       add:
         parameters: "<īpašnieks> <spēlētājs>"
@@ -119,6 +142,7 @@ commands:
       no-island-here: "&cŠeit neatrodas neviena sala! Apstiprini, lai izveidotu."
       in-deletion: "&cŠī salas pozīcija šobrīt tiek dzēsta. Mēģini vēlāk."
       cannot-make-island: "&cAtvaino, bet neizdevās izveidot šeit salu. Iespējams konsulē ir kļūdas paziņojumi."
+      reserved-island: '&aSala ir rezērvēta [xyz] priekš spēlētāja.'
     unregister:
       parameters: "<īpašnieks>"
       description: "atreģistrē īpašnieku no salas paturot salas blokus"
@@ -146,11 +170,13 @@ commands:
       banned-players: "Spēlētāji, kam liegts atrasties uz salas:"
       banned-format: "&c[name]"
       unowned: "&cBez īpašnieka"
+      purge-protected: Sala ir aizsargāta no dzēšanas
     switchto:
       parameters: "<spēlētājs> <numurs>"
       description: "uzstāda spēlētāja salu kā pirmo (vai doto) atkritnē"
       out-of-range: "&cNumuram jābūt starp 1 un [number]. Lieto &l[label] trash [player]&r&c, lai redzētu salas numuru"
       cannot-switch: "&cPārslēgšana neizdevās! Skaties kļūdu paziņojumu konsulē."
+      success: '&aSpēlētāja sala veiskmīgi pārslēgta uz uzstādīto numuru.'
     trash:
       no-unowned-in-trash: "&cNav salas atkritnē bez īpašniekiem"
       no-islands-in-trash: "&cSpēlētājam nav salas atkritnē"
@@ -163,6 +189,7 @@ commands:
     emptytrash:
       parameters: "[spēlētājs]"
       description: "iztīra atkritni no spēlētāja salām vai salām bez īpašnieka"
+      success: '&aAtkritne ir iztīrīta.'
     version:
       description: "attaino BentoBox un papildinājumu versijas"
     setrange:
@@ -184,11 +211,16 @@ commands:
       description: "uzstāda spēlētājam rangu uz viņa salas"
       unknown-rank: "&cNezināms rangs!"
       rank-set: "&aSpēlētājam nomainīts rangs no [from] uz [to]."
+      not-possible: '&cRangam ir jābūt lielākam par apmeklētāju'
     setspawn:
       description: "uzstāda kā sākuma salu šajā pasaulē visiem spēlētājiem"
       already-spawn: "&cŠī sala jau ir uzstādīta kā sākuma sala!"
       no-island-here: "&cŠeit nav neveinas salas."
       confirmation: "&cVai tiešām vēlies uzstādīt šo salu kā sākuma salu?"
+      success: '&aŠī sala ir veiksmīgi uzstādīta kā sākuma sala šajā pasaulē.'
+    settings:
+      parameters: '[spēlētājs]'
+      description: atver sistēmas vai spēlētāja salas iestatījumus
     blueprint:
       management:
         back: Atpakaļ
@@ -235,6 +267,10 @@ commands:
           default-color: ''
           success: Izdevās!
           cancelling: Atceļ
+        slot: '&fVēlamā vieta [number]'
+        slot-instructions: |
+          &aKrisais klikšķis, lai palielinātu
+          &aLabais klikšķis, lai samazinātu 
       parameters: "<load/copy/paste/pos1/pos2/save>"
       description: "manipulē ar shēmām"
       copy-first: "&cKopē shēmu sākumā!"
@@ -273,8 +309,10 @@ commands:
       copying: '&bKopē blokus...'
       mid-copy: '&cKopēšana vēl notiek. Pagaidi, kad tā beidzas.'
       copied-percent: '&6Nokopēti [number]%'
+      bedrock-required: '&cVismaz vienam klintsakmenim ir jābūt shēmā!'
     resetflags:
       description: "Atiestatī visu salu noklusējuma karodziņu iestatījumus no config.yml"
+      success: '&aVeiksmīgi atiestatīti visi salu iestatījumi uz sākotnējām vērtībām.'
     world:
       description: "Pārvaldīt pasaules iestatījumus"
     delete:
@@ -309,13 +347,15 @@ commands:
     about:
       description: "parādīt autortiesības un licenses informāciju"
     reload:
-      description: "parādīt iestatījumu, papildinājumus (ja atbalstīts) un valodas"
+      description: "parlādēt iestatījumus, papildinājumus (ja atbalstīts) un valodas"
       locales-reloaded: "&2Valodas faili pārlādēti."
       addons-reloaded: "&2Papildinājumu pārlādēti."
       settings-reloaded: "&2Iestatījumi pārlādēti."
       addon: '&6Pārlādē &b[name]&2.'
       addon-reloaded: '&b[name] &2pārlādēts.'
       unknown-addon: '&2Nezināms papildinājums!'
+      warning: '&cUzmanību: Pārlādēšana var izraisīt nestabilitāti, tādēļ, ja saskarieties ar problēmām,
+        pārstartējiet serveri.'
     version:
       plugin-version: "&2BentoBox versija: &3[version]"
       description: "parādīt BentoBox un papildinājumu versijas"
@@ -324,6 +364,7 @@ commands:
       addon-syntax: "&2[name] &3[version] &7(&3[state]&7)"
       game-world: "&2[name] &7(&3[addon]&7): &aOverworld&7, &r[nether_color]Nether&7, &r[end_color]End"
       server: "&2Darbojas uz &3[name] [version]&2."
+      database: '&2Databāze: &3[database]'
     manage:
       description: "parādīt pārvaldīšanas paneli"
     catalog:
@@ -332,7 +373,11 @@ commands:
       description: "veikt valodas faila analīzi"
       see-console: |-
         &aPārbaudi izdrukas, lai redzētu trūkstošos tulkojumus.
-        &aŠī komanda var atgiezt pārāk daudz teksta, lai to rādītu sarakstē... 
+        &aŠī komanda var atgiezt pārāk daudz teksta, lai to rādītu sarakstē...
+  delay:
+    previous-command-cancelled: '&cIepriekšēja komanda tika atcelta!'
+    stand-still: '&6Apstājies! Teleportēšana notiks pēc [seconds] sekundēm'
+    moved-so-command-cancelled: '&cTu pakustējies. Teleportēšana atcelta!'
   confirmation:
     confirm: "&cIevadi komandu atkārtoti &b[seconds]s&c laikā, lai apstiprinātu."
     previous-request-cancelled: "&6Iepriekšējais apstiprinājumu pieprasījums ir apturēts."
@@ -410,6 +455,7 @@ commands:
         cannot-coop-yourself: "&cTu nevari uzlikt sev šo rangu!"
         already-has-rank: "&cSpēlētājam jau ir šis rangs!"
         you-are-a-coop-member: "&2Tu esi uzstādīts kā sabiedrotajs spēlētājam [name]"
+        success: '&aSabiedrotā rangs uzstādīts spēlētājam &b[name].'
       uncoop:
         description: "noņemt spēlētājam sabiedrotā rangu"
         parameters: "<spēlētājs>"
@@ -419,6 +465,7 @@ commands:
         player-not-cooped: "&cSpēlētājs nav tavs sabiedrotais!"
         you-are-no-longer-a-coop-member: "&cTu vairs neesi sabiedrotais [name] salā."
         all-members-logged-off: "&cVisi salas spēlētāji ir izgājuši, tā ka tu vairs neesi sabiedrotais [name] salā."
+        success: '&b[name] &avairs nav sabiedrotais uz tavas salas.'
       trust:
         description: "uzstādīt spēlētājam uzticams rangu"
         parameters: "<spēlētājs>"
@@ -426,6 +473,7 @@ commands:
         members-trusted: "&cKomandas biedriem jau ir šis rangs!"
         player-already-trusted: "&cSpēlētājam jau ir šis rangs!"
         you-are-trusted: "&2Spēlētājs [name] tev uzticas!"
+        success: '&aUzticamā rangs uzstādīts spēlētājam &b[name]&a.'
       untrust:
         description: "noņemt spēlētājam uzticams rangu"
         parameters: "<spēlētājs>"
@@ -433,6 +481,7 @@ commands:
         cannot-untrust-member: "&cTu nevari noņemt šo rangu komandas spēlētājam!"
         player-not-trusted: "&cSpēlētājam nav šis rangs!"
         you-are-no-longer-trusted: "&cSpēlētājs [name] vairs tev neuzticas!"
+        success: '&b[name] &avairs nav uzticamais uz tavas salas.'
       invite:
         description: "uzaicini spēlētāju pievienoties tavai salai"
         invitation-sent: "&aIelūgums nosūtīts [name]"
@@ -467,6 +516,7 @@ commands:
         cannot-leave: "&cĪpašnieks nevar pamest komandu! Nodod salu citam vai izmet visus no komandas."
         description: "pamest savu komandu"
         left-your-island: "&c[name] &cpameta tavu komandu!"
+        success: '&aTu pameti šo salu.'
       kick:
         description: "izmest spēlētāju no tavas salas"
         parameters: "<spēlētājs>"
@@ -478,6 +528,8 @@ commands:
         parameters: "<spēlētājs>"
         failure: "&cSpēlētājs jau sasniedzis zemāko rangu!"
         success: "&aSpēlētājs [name] tika pazemināts uz [rank]"
+        errors:
+          cant-demote-yourself: '&cTu nevari pazemināt rangu pats sev!'
       promote:
         description: "paaugstina spēlētāja komandas rangu"
         parameters: "<spēlētājs>"
@@ -527,6 +579,7 @@ commands:
       cannot-ban-member: "&cTu nevari izraidīt komandas biedrus!"
       not-on-island: "&cŠis spēlētājs nav uz tavas salas!"
       player-expelled-you: "&b[name]&c izraidīja tevi no salas!"
+      success: '&aTu izmeti spēlētāju &b[name] &ano savas salas.'
 
 ranks:
   owner: "Īpašnieks"
@@ -538,26 +591,26 @@ ranks:
   banned: "Aizliegtais"
   admin: "Administrators"
   mod: "Moderators"
-  
+
 protection:
   command-is-banned: "Komanda nav atļauta apmeklētājiem"
   flags:
-    ANIMAL_SPAWN: 
+    ANIMAL_SPAWN:
       description: "Pārslēdz radīšanu"
       name: "Dzīvnieku radīšana"
-    ANVIL: 
+    ANVIL:
       description: "Pārslēdz izmantošanu"
       name: "Laktas"
       hint: "Laktas lietošana atslēgta"
-    ARMOR_STAND: 
+    ARMOR_STAND:
       description: "Pārslēdz izmantošanu"
       name: "Bruņu statīvi"
       hint: "Bruņu statīva lietošana atslēgta"
-    BEACON: 
+    BEACON:
       description: "Pārslēdz izmantošanu"
       name: "Signāluguņi"
       hint: "Signāluguņa lietošana atslēgta"
-    BED: 
+    BED:
       description: "Pārslēdz izmantošanu"
       name: "Gultas"
       hint: "Gultas lietošana atslēgta"
@@ -565,23 +618,23 @@ protection:
       name: "Laivas"
       description: "Pārslēdz laivas izmantošanu"
       hint: "Laivu lietošana atslēgta"
-    BREAK_BLOCKS: 
+    BREAK_BLOCKS:
       description: "Pārslēdz plēšanu"
       name: "Bloku plēšana"
       hint: "Bloku plēšana atslēgta"
-    BREEDING: 
+    BREEDING:
       description: "Pārslēdz vairošanu"
       name: "Dzīvnieku vairošana"
       hint: "Dzīvnieku vairošana ir aizsargāta"
-    BREWING: 
+    BREWING:
       description: "Pārslēdz izmantošanu"
       name: "Brūvēšanas satīvi"
       hint: "Brūvēšana nav atļauta"
-    BUCKET: 
+    BUCKET:
       description: "Pārslēdz izmantošanu"
       name: "Spaiņi"
       hint: "Spaiņu lietošana nav atļauta"
-    BUTTON: 
+    BUTTON:
       description: "Pārslēdz pogu izmantošanu"
       name: "Pogas"
       hint: "Pogu spiešana nav atļauta"
@@ -613,40 +666,40 @@ protection:
     CHEST_DAMAGE:
       description: "Pārslēdz lāžu bojāšanu no sprādzieniem"
       name: "Lāžu bojāšana"
-    CHORUS_FRUIT: 
+    CHORUS_FRUIT:
       description: "Pārslēdz teleportāciju"
       name: "Kora augļi"
       hint: "Teleportācija nav atļauta"
     CLEAN_SUPER_FLAT:
       description: |-
-          &aIeslēdz, lai notīrītu
-          &asuper-plakanos gabalus
-          &asalu pasaulēs
+        &aIeslēdz, lai notīrītu
+        &asuper-plakanos gabalus
+        &asalu pasaulēs
       name: "Notīrīt plakanos gabalus"
     COARSE_DIRT_TILLING:
       description: |-
-          &aPārslēdz rupjās zemes
-          &aapstrādāšanu un podzola
-          &asaplēšanu, lai iegūtu
-          &amelnzemi
+        &aPārslēdz rupjās zemes
+        &aapstrādāšanu un podzola
+        &asaplēšanu, lai iegūtu
+        &amelnzemi
       name: "Rupjās zemes apstrādāšana"
       hint: "Rupjās zemes apstrādāšana nav atļauta"
-    COLLECT_LAVA: 
+    COLLECT_LAVA:
       description: |-
-          &aPārslēdz lavas savākšanu
-          &a(pārraksta Spaiņu lietošanu)
+        &aPārslēdz lavas savākšanu
+        &a(pārraksta Spaiņu lietošanu)
       name: "Savākt lavu"
       hint: "Lavas savākšana nav atļauta"
-    COLLECT_WATER: 
+    COLLECT_WATER:
       description: |-
-          &aPārslēdz ūdens savākšanu
-          &a(pārraksta Spaiņu lietošanu)
+        &aPārslēdz ūdens savākšanu
+        &a(pārraksta Spaiņu lietošanu)
       name: "Ūdens savākšana"
       hint: "Ūdens savākšana nav atļauta"
     COMMAND_RANKS:
       name: "&eKomandas Rangi"
       description: "&aKonfigurēt komandas rangus"
-    CRAFTING: 
+    CRAFTING:
       description: "Pārslēdz izmantošanu"
       name: "Darbagaldi"
       hint: "Darbagaldu lietošana nav atļauta"
@@ -657,11 +710,11 @@ protection:
       description: "Pārslēdz krīpera postījumus"
       name: "Krīpera postījumi"
       hint: "Krīpera postījumi ir atslēgti"
-    CROP_TRAMPLE: 
+    CROP_TRAMPLE:
       description: "Pārslēdz augu nomīdīšanu"
       name: "Augu nomīdīšana"
       hint: "Augu nomīdīšana ir atslēgta"
-    DOOR: 
+    DOOR:
       description: "Pārslēdz durvju izmantošanu"
       name: "Durvju izmantošana"
       hint: "Durvju lietošana nav atļauta"
@@ -673,15 +726,15 @@ protection:
         &cŠis liedz tās nolikt vai
         &csaplēst.
       hint: "Pūķa olu lietošana nav atļauta"
-    EGGS: 
+    EGGS:
       description: "Pārslēdz olu mētāšanu"
       name: "Olu mētāšana"
       hint: "Olu mētāšana nav atļauta"
-    ELYTRA: 
+    ELYTRA:
       description: "Pārslēdz deltaplāna lietošanu"
       name: "Deltaplāns"
       hint: "Deltaplāna lietošana nav atļauta"
-    ENCHANTING: 
+    ENCHANTING:
       description: "Pārslēdz burvestību galda lietošanu"
       name: "Burvestību galds"
       hint: "Burvestību galda lietošana nav atļauta"
@@ -689,22 +742,22 @@ protection:
       description: "Pārslēdz Ender lāžu veidošanu/lietošanu"
       name: "Ender lādes"
       hint: "Ender lādes ir izslēgtas šaja pasaulē"
-    ENDERMAN_DEATH_DROP: 
+    ENDERMAN_DEATH_DROP:
       description: |-
-         &aEndermeni nometīs jebkuru
-         &abloku, kuru viņi tur, kad
-         &atiek nogalināti
+        &aEndermeni nometīs jebkuru
+        &abloku, kuru viņi tur, kad
+        &atiek nogalināti
       name: "Endermena nāves nomešana"
-    ENDERMAN_GRIEFING: 
+    ENDERMAN_GRIEFING:
       description: |-
-         &aEndermeni var paņemt
-         &ajebkuru bloku uz salas
+        &aEndermeni var paņemt
+        &ajebkuru bloku uz salas
       name: "Endermena bloku celšana"
-    ENDER_PEARL: 
+    ENDER_PEARL:
       description: "Pārslēdz Ender pērļu lietošanu"
       name: "Ender Pērles"
       hint: "Ender pērļu lietošana nav atļauta"
-    ENTER_EXIT_MESSAGES: 
+    ENTER_EXIT_MESSAGES:
       description: "Attaino ieejas/izejas ziņu"
       island: "[name] sala"
       name: "Ieejas/Izejas ziņa"
@@ -746,49 +799,49 @@ protection:
         &auguni izmantojot karmu un
         &adzelzi vai ugunsbumbas.
       hint: "Karma un dzelzs un ugunsbumbas lietošana nav atļauta"
-    FURNACE: 
+    FURNACE:
       description: "Pārslēdz iespēju lietot krāsnis"
       name: "Krāsns"
       hint: "Krāsns lietošana nav atļauta"
-    GATE: 
+    GATE:
       description: "Pārslēdz iespēju lietot vārtus"
       name: "Vārti"
       hint: "Vārtu lietošana nav atļauta"
-    GEO_LIMIT_MOBS: 
+    GEO_LIMIT_MOBS:
       description: |-
-         &aNoņemt visas būtnes, kas
-         &apamet salas aizsardzības
-         &alaukumu
+        &aNoņemt visas būtnes, kas
+        &apamet salas aizsardzības
+        &alaukumu
       name: "&eIerobežot būtnes iekš salas"
-    HURT_ANIMALS: 
+    HURT_ANIMALS:
       description: "Pārslēdz iespēju ievainot dzīvniekus"
       name: "Ievainot dzīvniekus"
       hint: "Dzīvnieku ievainošana nav atļauta"
-    HURT_MONSTERS: 
+    HURT_MONSTERS:
       description: "Pārslēdz iespēju ievainot briesmoņus"
       name: "Ievainot briesmoņus"
       hint: "Briesmoņu ievainošana nav atļauta"
-    HURT_VILLAGERS: 
+    HURT_VILLAGERS:
       description: |-
-         &aPārslēdz iespēju ievainot
-         &aciemata iedzīvotājus
+        &aPārslēdz iespēju ievainot
+        &aciemata iedzīvotājus
       name: "Ievainot ciematniekus"
       hint: "Ciemata ievainošana ievainošana nav atļauta"
     ITEM_FRAME:
       name: "Priekšmetu rāmis"
       description: |-
-         &aPārslēdz iespēju izmantot
-         &apriekšmeta rāmjus
+        &aPārslēdz iespēju izmantot
+        &apriekšmeta rāmjus
       hint: "Priekšmeta rāmju lietošana nav atļauta"
     ITEM_FRAME_DAMAGE:
       description: |-
-         &aPārslēdz iespēju briesmoņiem
-         &abojāt priekšmeta rāmjus.
+        &aPārslēdz iespēju briesmoņiem
+        &abojāt priekšmeta rāmjus.
       name: "Priekšmetu rāmju bojāšana"
-    INVINCIBLE_VISITORS: 
+    INVINCIBLE_VISITORS:
       description: |-
-         &aPārslēdz neuzveicamos
-         &aapmeklētājus
+        &aPārslēdz neuzveicamos
+        &aapmeklētājus
       name: "&eNeuzveicamie apmeklētāji"
       hint: "&cApmeklētāji ir aizsargāti"
     ISLAND_RESPAWN:
@@ -796,11 +849,11 @@ protection:
         &aSpēlētāji parādīsies uz salas
         &apēc nāves
       name: "Parādīšanās uz salas"
-    ITEM_DROP: 
+    ITEM_DROP:
       description: "Pārslēdz priekšmetu nomešanu"
       name: "Priekšmetu nomešana"
       hint: "Priekšmeti nevar tikt nomesti"
-    ITEM_PICKUP: 
+    ITEM_PICKUP:
       description: "Pārslēdz priekšmetu pacelšanu"
       name: "Priekšmetu pacelšana"
       hint: "Priekšmeti nevar tikt pacelti"
@@ -811,7 +864,7 @@ protection:
     LEAF_DECAY:
       name: "Lapu pūšana"
       description: "Pārslēdz dabīgo lapu pūšanu"
-    LEASH: 
+    LEASH:
       description: "Pārslēdz pavadu lietošanu"
       name: "Pavadi"
     LEVER:
@@ -831,10 +884,10 @@ protection:
         &cvarēs tecēt vertikāli, taču tie
         &cneizplatīsies horizontālā virzienā,
         &cja novietoti ārpus aizsardzības laukuma.
-    LOCK: 
+    LOCK:
       description: "Pārslēdz salas aizslēgšanu"
       name: "Aizslēgt salu"
-    MILKING: 
+    MILKING:
       description: "Pārslēdz iespēju slaukt govis"
       name: "Slaukšana"
       hint: "Govju slaukšana nav atļauta"
@@ -842,10 +895,10 @@ protection:
       name: "Vagoni"
       description: "Pārslēdz iespēju lietot vagonus"
       hint: "Vagonu lietošana nav atļauta"
-    MONSTER_SPAWN: 
+    MONSTER_SPAWN:
       description: "Pārslēdz briesmoņu rašanos"
       name: "Briesmoņu rašanās"
-    MOUNT_INVENTORY: 
+    MOUNT_INVENTORY:
       description: |-
         &aPārslēdz iespēju lietot
         &aatvērt uzliekamos
@@ -866,7 +919,7 @@ protection:
         &cŅem vērā, ka tas neapturēs radību
         &crašanos no radību izsacuējiem vai
         &cradīšanas olām.
-    NOTE_BLOCK: 
+    NOTE_BLOCK:
       description: "Pārslēdz iespēju lietot nošu blokus"
       name: "Nošu bloks"
       hint: "Nošu blokus lietot nav atļauts"
@@ -893,12 +946,12 @@ protection:
         &aiemītniekiem nav tiešsaitē.
         &aVar samazināt servera noslodzi.
       name: "Bezsaistes Sarkanakmens"
-    PISTON_PUSH: 
+    PISTON_PUSH:
       description: |-
         &aĻauj virzulim izstumt
         &ablokus ārpus salas
       name: "Bloku izbīdīšana"
-    PLACE_BLOCKS: 
+    PLACE_BLOCKS:
       description: |-
         &aPārslēdz iespēju novietot blokus
         &auz salas.
@@ -923,27 +976,27 @@ protection:
         &aBeigu protālu
       name: "Beigu Portāls"
       hint: "Beigu portālu lietošana nav atļauta"
-    PRESSURE_PLATE: 
+    PRESSURE_PLATE:
       description: |-
         &aPārslēdz iespēju izmantot
         &aspiedienu plāksnes
       name: "Spiediena plāksne"
       hint: "Spiedienu plāksnes lietošana nav atļauta"
-    PVP_END: 
+    PVP_END:
       description: |-
         &cIeslēgt/Izslēgt spēlētājs
         &cpret spēlētāja režīmu (PVP)
         &cBeigu pasaulē.
       name: "Biegu pasaules PVP"
       hint: "&cSpēlētājs nevar izdarīt bojājumus citam spēlētājam Beigu pasaulē"
-    PVP_NETHER: 
+    PVP_NETHER:
       description: |-
         &cIeslēgt/Izslēgt spēlētājs
         &cpret spēlētāja režīmu (PVP)
         &cEllē.
       name: "Elles PVP"
       hint: "&cSpēlētājs nevar izdarīt bojājumus citam spēlētājam Ellē"
-    PVP_OVERWORLD: 
+    PVP_OVERWORLD:
       description: |-
         &cIeslēgt/Izslēgt spēlētājs
         &cpret spēlētāja režīmu (PVP)
@@ -951,7 +1004,7 @@ protection:
       name: "Virszemes PVP"
       hint: "&cSpēlētājs nevar izdarīt bojājumus citam spēlētājam Virszemē"
       active: "&cSpēlētāji var viens otram izdarīt bojājumus uz šīs salas!"
-    REDSTONE: 
+    REDSTONE:
       description: |-
         &aPārslēdz iespēju izmantot
         &asarkanakmens lietas
@@ -963,25 +1016,25 @@ protection:
         &auz salas, kas atrodas 0,0
         &akoordinātēs
       name: "Beigu izejas protāls"
-    REMOVE_MOBS: 
+    REMOVE_MOBS:
       description: |-
         &aNoņemt briesmoņus, kad
         &aspēlētājs teleportējas
         &auz salas.
       name: "Noņemt briesmoņus"
-    RIDING: 
+    RIDING:
       description: |-
         &aPārslēdz iespēju spēlētājiem
         &ajāt uz dzīviekiem.
       name: "Jāšana uz dzīvniekiem"
       hint: "Jāšana uz dzīvniekiem nav atļauta"
-    SHEARING: 
+    SHEARING:
       description: |-
         &aPārslēdz iespēju spēlētājiem
         &acirpt aitas vai Mušmires.
       name: "Cirpšana"
       hint: "Cirpšana nav atļauta"
-    SPAWN_EGGS: 
+    SPAWN_EGGS:
       description: |-
         &aPārslēdz iespēju mest
         &aradīšanas olas.
@@ -1003,7 +1056,7 @@ protection:
         &aun Dzelzs lietošanas opcijas.
       name: "Dinamīta aizdedzināšana"
       hint: "Aizdedzināt dinamītu nav atļauts"
-    TRADING: 
+    TRADING:
       description: |-
         &aPārslēdz iespēju tirogties
         &aar ciemata iedzīvotājiem.
@@ -1047,13 +1100,30 @@ protection:
         &aNeļauj spēlētājam izmantot teleporta
         &afunkcionalitāti, kamēr viņš krīt.
       hint: "&cTu nevari teleportēties, kamēr krīti."
+    WITHER_DAMAGE:
+      name: Pārslēgt
+      description: |-
+        &aĻauj katlem saplēst blokus
+        &aun bojāt radības.
   locked: "&cŠī sala ir slēgta!"
   protected: "&cSala ir aizsargāta: [description]"
   spawn-protected: "&cSākuma sala ir aizsargāta: [description]"
+  world-protected: "&cPasaule aizsargāta: [description]"
 
   panel:
     next: "Nākošā Lapa"
     previous: "Iepriekšējā Lapa"
+    mode:
+      advanced:
+        name: '&6Advancētie iestatījumi'
+        description: '&aSatur saprātīga daudzuma iestatījumus.'
+      basic:
+        name: '&aBāzes iestatījumi'
+        description: '&aSatur biežāk lietotos iestatījumus.'
+      expert:
+        name: '&cEksperta iestatījumi'
+        description: '&aSatur visus iestatījumus.'
+      click-to-switch: '&eUzspied&a, lai pārslēgtos uz &r[next]&r&a.'
     PROTECTION:
       title: "&6Aizsardzība"
       description: |-
@@ -1064,9 +1134,6 @@ protection:
       description: |-
         &aĢenerālie iestatījumi
         &apriekš šīs salas
-    WORLD_SETTING:
-      title: "&b[world_name] &6Iestatījumi"
-      description: "&aSpēles režīma iestatījumi"
     flag-item:
       name-layout: "&a[name]"
       description-layout: |
@@ -1079,10 +1146,20 @@ protection:
       menu-layout: "&a[description]"
       setting-layout: |
         &a[description]
-        
+
         &7Šībrīža iestatījumi: [setting]
       setting-active: "&aAktīvs"
       setting-disabled: "&cIzslēgts"
+      setting-cooldown: '&cIestatījumu maiņa ir ierobežota.'
+    WORLD_SETTING:
+      title: "&b[world_name] &6Iestatījumi"
+      description: "&aSpēles režīma iestatījumi"
+    WORLD_DEFAULTS:
+      title: '&b[world_name] &6Pasaules aizsardzība'
+      description: |
+        &aAizsardzības iestatījumi kuri ir
+        &aaktīvi, ja spēlētājs ir ārpus
+        &asavas salas
 
 language:
   panel-title: "Izvēlies valodu"
diff --git a/src/main/resources/locales/tr-TR.yml b/src/main/resources/locales/tr-TR.yml
new file mode 100644
index 000000000..141366042
--- /dev/null
+++ b/src/main/resources/locales/tr-TR.yml
@@ -0,0 +1,1155 @@
+###########################################################################################
+# This is a YML file. Be careful when editing. Check your edits in a YAML checker like    #
+# the one at http://yaml-online-parser.appspot.com                                        #
+###########################################################################################
+
+# This locale is current with 1.6.0.
+
+meta:
+  authors:
+  - Over_Brave
+  banner: "RED_BANNER:1:RHOMBUS_MIDDLE:WHITE:CIRCLE_MIDDLE:RED:HALF_HORIZONTAL_MIRROR:RED:TRIANGLE_BOTTOM:WHITE:STRIPE_BOTTOM:RED"
+
+general:
+  success: "&9Başarılı!"
+  invalid: "&4Geçersiz!"
+  errors:
+    command-cancelled: "&4Komut iptal edildi!"
+    no-permission: "&4Bu izne sahip degilsin! Ada açamıyorsan &e/ada"
+    use-in-game: "&4Bunu sadece oyundayken kullanabilirsin!"
+    no-team: "&4Senin bir takımın yok!"
+    no-island: "&4Bir adaya sahip degilsin!"
+    player-has-island: "&4Oyuncunun zaten adası var!"
+    player-has-no-island: "&4Oyuncunun adası yok!"
+    already-have-island: "&4Zaten adan var!"
+    no-safe-location: "&4Adanda korumalı bölge bulunamadı!"
+    not-owner: "&4Bu adanın sahibi degilsin!"
+    not-in-team: "&4Oyuncu senin takımında degil!"
+    offline-player: "&4Oyuncu cevrim dısı ya da yok."
+    unknown-player: "&e[name] &4adlı bir oyuncu yok!"
+    general: "&Bu komut henüz hazır değil. - Admin ile iteşimie geç!"
+    unknown-command: "&4Bilinmeyen komut. &b/[label] help"
+    wrong-world: "&4Bu komudu kullanmak için adanda olmalısın!"
+    you-must-wait: "&4Komut yazabilmek için &e[number] &4saniye beklemelisin!"
+    must-be-positive-number: "&e[number] &4bu pozitif bir sayı değil!"
+  tips:
+    changing-obsidian-to-lava: "&9Obsidyen lava dönüştü dostum bu bir harika!"
+
+commands:
+  # Parameters in <> are required, parameters in [] are optional
+  help:
+    header: "&eYardım"
+    syntax: "&d[usage] &9[parameters] &a» &5[description]"
+    syntax-no-parameters: "&d[usage] &a» &5[description]"
+    end: "&eYardım"
+    parameters: "[command]"
+    description: "Yardım komutları"
+    console: "Konsol"
+  admin:
+    help:
+      description: "Admin komutları"
+    resets:
+      description: "Oyuncunun ada sıfırlamasını ayarla."
+      set:
+        description: "Oyuncunun ada sıfırlamasını ayarla."
+        parameters: "<player> <resets>"
+      reset:
+        description: "Oyuncunun ada sıfırlamasını sıfırla."
+        parameters: "<player>"
+    team:
+      add:
+        parameters: "<owner> <player>"
+        description: "Adaya oyuncu ekle"
+        name-not-owner: "&d[name] &4ada sahibi degil!"
+        name-has-island: "&e[name] &4bir adaya sahip. "
+        success: "&d[name] &bbaşarıyla &9[owner] &badasına eklendi!"
+      disband:
+        parameters: "<owner>"
+        description: "Ada sahibinin ada takımını dağıt."
+        use-disband-owner: "&4Sahibi degilsin. Sahibi &d[owner]"
+        disbanded: "&4Admin takımınızı dağıttı!"
+        success: "&d[name] &btakımı dağıtıldı!"
+      kick:
+        parameters: "<team player>"
+        description: "takımından oyuncu at"
+        cannot-kick-owner: "&4Ada sahibini atamazsın. İlk önce diğer üyeleri at."
+        not-in-team: "&4Bu oyunbu bu takımda değil!"
+        admin-kicked: "&9Admin seni takımından attı!"
+        success: "&d[name] &9[owner] &4adasından atıldı!"
+      setowner:
+        parameters: "<player>"
+        description: "Oyuncuya ada liderligini ver!"
+        already-owner: "&d[name] &4zaten ada sahibi!"
+        success: "&d[name] &bartık adanın sahibi!"
+    range:
+      description: "Admin ada menzili ayarlama"
+      display:
+        already-off: "&4Göstergeler zaten kapalı"
+        already-on: "&4Göstergeler zaten açık."
+        description: "Adanın menzil göstergelerini kapat/aç."
+        hiding: "&2Menzil göstergeleri saklanıyor."
+        hint: |-
+          &4Kırmızı bariyer ikonları &fmevcut ada koruma limitlerini gösterir.
+          &7Gri parçacıklar &fadadanın maximum limitini gösterir.
+          &aYeşil parçacıklar &feğer adanın koruma alanı değişmisse normal koruma alanını gösterir.
+        showing: "&2Menzil göstergeleri gösteriliyor."
+      set:
+        parameters: "<player> <range>"
+        description: "Adanın koruma bölgesini ayarla."
+        invalid-value:
+          not-numeric: "&e[number] &4tam bir sayı değil!"
+          too-low: "&4Koruma aralığı 1'den büyük olmalıdır!"
+          too-high: "&4Koruma aralığı &e[number] &4büyük ya da küçük olmalıdır!"
+          same-as-before: "&4Koruma aralığı zaten &e[number] &4olarak ayarlandı!"
+        success: "&2Adanın koruma menzili &e[number] &2olarak ayarlandı!"
+      reset:
+        parameters: "<player>"
+        description: "Adayı dünyanın varsayılan koruma bölgesine göre sıfırla."
+        success: "&2Adanın koruma aralığı sfırlanarak &e[number] &2olarak ayarlandı!"
+    register:
+      parameters: "<player>"
+      description: "Sahipsiz adalara oyuncu ver."
+      registered-island: "&9Oyuncunun adası [xyz] kordinatlarına kaydedildi."
+      already-owned: "&4Bu ada zaten sahipli!"
+      no-island-here: "&4Burda ada yok. Olusturmak icin kabul et!"
+      in-deletion: "&4Ada şuanda siliniyor daha sonra tekrar dene!"
+      cannot-make-island: "&5Buraya ada yerleştirilemiyor. Lütfen detaylı bilgi için konsola bakınız!"
+    unregister:
+      parameters: "<owner>"
+      description: "Oyuncuyu adadan siler ama ada silinmez."
+      unregistered-island: "&aOyuncu başarıyla &e[xyz] &akoordinatlarındaki adadan silindi!"
+    info:
+      parameters: "<player>"
+      description: "Ada hakkında bilgi verir"
+      no-island: "&4Herhangi bir adada degilsin..."
+      title: "&eAda Bilgileri"
+      island-uuid: "&5UUID: [uuid]"
+      owner: "&bSahibi: &5[owner] ([uuid])"
+      last-login: "&bSon giris: &5[date]"
+      deaths: "&bÖlme sayısı: &5[number]"
+      resets-left: "&bSıfırlama hakkı: &5[number] (Max: [total])"
+      team-members-title: "&bTakım üyeleri:"
+      team-owner-format: "&d[name] [rank]"
+      team-member-format: "&d[name] [rank]"
+      island-location: "&bAda lokasyonu: [xyz]"
+      island-coords: "&bAda kordinatları: [xz1] ile [xz2] arasında"
+      islands-in-trash: "&bOyuncun adası çöp kutusunda!"
+      protection-range: "&bKoruma alanı: [range]"
+      max-protection-range: "&bÖnceki en büyük koruma alanı: [range]"
+      protection-coords: "&bKoruma kordinatları: [xz1] ile [xz2] arasında."
+      is-spawn: "&bBu ada başlangıç adası"
+      banned-players: "&b Banlanan oyuncular:"
+      banned-format: "&4[name]"
+      unowned: "&eBilinmiyor"
+    switch:
+      description: "Koruma izinlerine açma/kapama"
+      op: "&cSen zaten tüm korumalardan izinlisin. Yetkini aldıktan sonra tekrar dene."
+      removing: "Korumalara olan izin siliniyor..."
+      adding: "Korumalara olan izin ekleniyor..."
+    switchto:
+      parameters: "<player> <number>"
+      description: "oyuncunun adasını bir numaralı çöp kutusuna çevir"
+      out-of-range: "&cSayı 1 ila [number] arasında olmalıdır. &d[player] &9Çöp olan ada numaralarını görmek için &1[label]"
+      cannot-switch: "&cSwitch failed. See console log for error."
+      success: "&aBaşarıyla oyuncunun adasını belirtilen ada değiştirdi.."
+    trash:
+      no-unowned-in-trash: "&cÇöpte sahipsiz ada yok."
+      no-islands-in-trash: "&cOyuncunun çöpte adası yok."
+      parameters: "[player]"
+      description: "Çöp kutusundaki sahipsiz veya oyuncuların adını gösterir."
+      title: "&d=========== Çöpteki adalar ==========="
+      count: "&l&dAda [number]:"
+      use-switch: "&l[label] &9kullanarak &d<player> &e<number> &9olarak çöp kutusundaki yerini değişebilirsin."
+      use-emptytrash: "&l[label] &9kullanarak &d[player] &9tüm eşyalarını sonsuza kadar silebilirsiniz."
+    emptytrash:
+      parameters: "[player]"
+      description: "Oyuncu için çöpleri veya çöp kutusundaki tüm sahipsiz adaları temizleyin"
+      success: "&aÇöp kutusu başarıyla boşaltıldı."
+    version:
+      description: "Bentobox ve eklentileri hakkında bilgi verir."
+    setrange:
+      parameters: "<player> <range>"
+      description: "Oyuncunun ada menzilini ayarlar."
+      range-updated: "&9Ada menzili &e[number] &9olarak ayarlandı!"
+    reload:
+      description: "Yenile"
+    tp:
+      parameters: "<player>"
+      description: "Oyuncunun adasına git!"
+      manual: "&4Guvenli warp noktası bulunamadı! &b[location] &4ısınlanarak kontrol edebilirsin!"
+    getrank:
+      parameters: "<player>"
+      description: "Olduğun ada üstündeki oyuncunun rankını gösterir."
+      rank-is: "&aAda üstündeki yetkisi: &e[rank]."
+    setrank:
+      parameters: "<player> <rank>"
+      description: "Olduğun ada üstündeki oyuncuya yetkisini ayarlar"
+      unknown-rank: "&4Bilinmeyen rütbe!"
+      rank-set: "&aRütbe &c[from]&a'dan &e[to] &ayükseltildi."
+    setspawn:
+      description: "Dünyanın adanın spawlanacağı bölgeyi seçer."
+      already-spawn: "&cBu ada zaten spawnalacak bölgede."
+      no-island-here: "&cBurada bir ada yok."
+      confirmation: "&cAdayı dünyanın spawn noktası olarak ayarlıcaksın. Emin misin?"
+      success: "&aBaşarıyla bu ada dünyanın spawn bölgesi oldu."
+    blueprint:
+      parameters: "<load/copy/paste/pos1/pos2/save>"
+      description: "Ada şekillerini değişir."
+      bedrock-required: "&cEn az bir bedrock bloğu ada içinde olmalı!"
+      copy-first: "&cİlk önce kopyala!"
+      file-exists: "&cDosya zaten mevcut, üstüne yaz?"
+      no-such-file: "&cBöyle bir dosya yok!"
+      could-not-load: "&cBu dosya yüklenemedi!"
+      could-not-save: "&cHmm, bu dosyayı kaydederken bir şeyler ters gitti: [message]"
+      set-pos1: "&aKonum 1 &e[vector] &aolarak ayarlandı."
+      set-pos2: "&aKonum 2 &e[vector] &aolarak ayarlandıç"
+      set-different-pos: "&cFarklı bir pozisyon seç, burası zaten seçildi!"
+      need-pos1-pos2: "&cİlk önce poziyon 1 ve 2'yi seç!"
+      copying: "&bBloklar kopyalanıyor..."
+      copied-blocks: "&e[number] &9blok panoya kopyalandı."
+      look-at-a-block: "&cAyarlamak için 20 blok içerisindeki bloğa bakın"
+      mid-copy: "&cSen orta kopyadasın. Kopyalama tamamlanana kadar bekleyin."
+      copied-percent: "&6Kopyalandı [number]%"
+      copy:
+        parameters: "[air]"
+        description: "Pozisyon 1 ve 2'nin seçildiği aradaki yeri kopyalar. Opsiyonel olarak havayıda kaydedebilir."
+      load:
+        parameters: "<name>"
+        description: "Panodaki taslakları önbelleğe yükler."
+      list:
+        description: "Sunucuda bulunan taslakları gösterir."
+        no-blueprints: "&cTaslak dosyasında taslak yok!"
+        available-blueprints: "&aBu taslaklar yükleme için uygun:"
+      origin:
+        description: "Taslağın orta noktası olduğun pozisyon olarak belirler."
+      paste:
+        description: "Panodaki taslağı olduğun bölgeye yapıştırır."
+        pasting: "&Yapıştırılıyor..."
+      pos1:
+        description: "Kare bir alan için 1. pozisyonu ayarlar."
+      pos2:
+        description: "Kare bir alan için 2. pozisyonu ayarlar."
+      save:
+        parameters: "<blueprint name>"
+        description: "Panodaki kopyalanmış taslağı kaydeder."
+      management:
+        back: "Geri"
+        instruction: "Taslağa tıkladıktan sonra buraya tıkla."
+        normal: "Normal"
+        nether: "Nether"
+        end: "The End"
+        title: "Taslak Paket Yöneticisi"
+        edit: "Tıkla ve düzenle"
+        rename: "Sağ tıkla ve ismini değiş"
+        edit-description: "Tıkla ve açıklamayı değiş"
+        world-name-syntax: "[name] dünya"
+        world-instructions: |
+          Place blueprint
+          to right to set
+        trash: "Çöp"
+        trash-instructions: "Silmek için sağ tıkla"
+        permission: "Yetki"
+        perm-required: "Yetki ihtyacı gerekli."
+        perm-not-required: "Yetki ihtiyacı yok."
+        perm-format: "&e"
+        remove: "Silmek için sağ tıkla"
+        blueprint-instruction: |
+          Tıkla ve seç,
+          ve pakete ekle.
+          Sağ tıkla isim değiş.
+        select-first: "İlk önce taslak seç"
+        new-bundle: "Yeni paket"
+        new-bundle-instructions: "Tıkla ve yeni paket oluştur."
+        name:
+          quit: "çık"
+          prompt: "İsim gir ya da çıkmak için 'quit' yaz."
+          too-long: "&cÇok uzun."
+          pick-a-unique-name: "Lütfen daha benzersiz bir ad seçin"
+          success: "Başarılı!"
+          conversation-prefix: ">"
+        description:
+          quit: "quit"
+          instructions: |
+            [name] için çok satırlı bir açıklama girin.
+            ve bitirmek için boş satıra 'quit' yazın.
+          default-color: ""
+          success: "Başarılı!"
+          cancelling: "İptal ediliyor."
+        slot: "&fTercih edilen slot [number]"
+        slot-instructions: |
+          &aArtırmak için sol
+          &aAzaltmak için sağ tıklayın.
+    resetflags:
+      description: "Config.yml'deki tüm adaları varsayılan etiket ayarlarına sıfırla"
+      success: "&aBaşarıyla tüm adalar varsayılan etiket ayarlarına döndü."
+    world:
+      description: Dünya ayarlarını yönet"
+    delete:
+      parameters: "<player>"
+      description: "Oyuncunun adasını siler."
+      cannot-delete-owner: "&4Silmeden önce adadaki herkesi at."
+      deleted-island: "&e[xyz] &bkordinatlarındaki ada başarıyla silindi"
+    why:
+      parameters: "<player>"
+      description:  "Konsolu koruma hata ayıklama raporlaması"
+      turning-on: "&D[name] &9için konsol hata ayıklaması açıldı."
+      turning-off: "&D[name] &9için konsol hata ayıklaması kapatıldı."
+    deaths:
+      description: "oyuncuların ölümlerini düzenleme"
+      reset:
+        description: "Oyuncuların ölmesini sıfırlar."
+        parameters: "<player>"
+        success: "&d[name] &aölme puanı sıfırlandı!"
+      set:
+        description: "Oyuncuların ölmesin sayısını ayarlar."
+        parameters: "<player> <deaths>"
+        success: "&aBaşarıyla &d[name]&a ölüm skorlarını &e[number] &aolarak ayarladın."
+  bentobox:
+    description: "BentoBox admin komudu"
+    about:
+      description: "Telif ve lisans bilgileri"
+    reload:
+      parameters: "[addon]"
+      description: "Ayarları, eklentileri (destekliyorsa) ve dil dosyalarını günceller."
+      locales-reloaded: "&bDiller güncellendi."
+      addons-reloaded: "&bEklentiler güncellendi."
+      settings-reloaded: "&bAyalar güncellendi."
+      addon: "&e[name] &bgüncelleniyor."
+      addon-reloaded: "&e[name] &bgüncellendi!"
+      unknown-addon: "&4Bilinmeyen eklenti!"
+    version:
+      plugin-version: "&bBentoBox sürümü: &3[version]"
+      description: "Bilgi verir."
+      loaded-addons: "Yüklenen eklentiler:"
+      loaded-game-worlds: "Yüklenen oyun dünyaları:"
+      addon-syntax: "&2[name] &3[version]" 
+      game-worlds: "&2[name] &3([addon])"
+      server: "&2Sunucu &3[name] [version] &2sürümünde çalışıyor."
+    manage:
+      description: "Ayarlar panelini açar."
+    catalog:
+      description: "Eklenti kataloğunu gösterir."
+    locale:
+      description: "Yerel analiz yapmak"
+      see-console: |-
+        &aGeri bildirimi görmek için konsolu kontrol edin.
+        &aBu komut o kadar spammiş ki geri bildirimler sohbetten okunamıyor ...
+    migrate:
+      description: "Verileri bir veritabanından diğerine geçirir"
+      players: "&6Geçen oyuncular"
+      names: "&6Geçen isimler"
+      addons: "&6Geçen eklentiler"
+      class: "&6Geçen [description]"
+      migrated: "&AGeçirildi!"
+      
+  confirmation:
+    confirm: "&4Onaylamak icin &e[seconds] &4saniye icinde tekrar yaz!"
+    previous-request-cancelled: "&4Istek iptal edildi!"
+    request-cancelled: "&4Istek zaman aşımına ugradı ve iptal edildi!"
+  island:
+    about:
+      description: "Eklenti hakkında bilgi verir."
+    go:
+      parameters: "[home number]"
+      description: "Adana ışınlar."
+      teleport: "&9Adana ışınlanıyorsun!"
+      teleported: "&e#[number] &bnumaralı evine gidiyorsun."
+      tip: "&9Yardım için &e/is help"
+    help:
+      description: "Ana ada komudu"
+      pick-world: "&4Specify world from [worlds]"
+    spawn:
+      description: "Başlangıç noktasına ışınlar."
+      teleporting: " &aBaşlangıç noktasına ışınlanıyorsun!"
+      no-spawn: "&4Bu dünyada başlangıç noktan yok!"
+    create:
+      description: "Ada olustur"
+      parameters: "<blueprint>"
+      too-many-islands: "&4Ada olusturulacak bolge kalmadı."
+      unable-create-island: "&4Adan olusturulamıyor. Yetkili ile gorus!"
+      creating-island: "&9Adan oluşturuluyor, birazcık bekle!"
+      pick: "&9Ada gözükmüyorsa &e/ada"
+      unknown-schem: "&4Taslak yüklenemedi!"
+    info:
+      description: "Ada hakkında bilgi verir."
+      parameters: "<player>"
+    near:
+      description: "Etrafında bulunan adaları gösterir."
+      parameters: ""
+      the-following-islands: "&eYakındaki adalar"
+      syntax: "&d[direction] &a&l» &b[name]"
+      north: Kuzey
+      south: Güney
+      east: Doğu
+      west: Batı
+      no-neighbors: "&4Yakınında ada yok!"
+    reset:
+      description: "Eski adanı siler yenisi açar"
+      parameters: "<blueprint>"
+      must-remove-members: "&4Restartlamadan önce adadan herkesi at (/island team kick <player>)."
+      none-left: "&4Sıfırlama hakkın kalmadı!"
+      resets-left: "&e[number] &4sıfırlama hakkın kaldı!"
+    sethome:
+      description: "Oldugun noktaya ev olarak kaydeder"
+      must-be-on-your-island: "&4Önce adanda olmalısın!"
+      num-homes: "&4Evlerini [number] olarak kaydet."
+      home-set: "&9Oldugun lokasyon ev olarak kaydedildi!"
+      nether:
+        not-allowed: "&4Netherde ev kaydetmek icin yetkin yok!."
+        confirmation: "&4Nethera ev kaydetmek istedigine emin misin?"
+      the-end:
+        not-allowed: "&4Ende ev kaydetmek icin yetin yok!"
+        confirmation: "&4Ende ev kaydetmek istedigine emin misin?"
+      parameters: "[home number]"
+    setname:
+      description: "Ada ismini degistir."
+      name-too-short: "&4Cok kısa. En az &e[number] &4karakter olabilir!."
+      name-too-long: "&4Cok uzun. En uzun &E[number] &4olabilir."
+      parameters: "<name>"
+    resetname:
+      description: "Ada ismini resetle."
+    team:
+      description: "Takımını yönet!"
+      info:
+        description: "Takımında hakkın detayli bilgi verir!"
+      coop:
+        description: "Adana işçi ekle!"
+        parameters: "<player>"
+        cannot-coop-yourself: "&4Kendini isci olarak ekleyemezsin!"
+        already-has-rank: "&4Oyuncu zaten isci!"
+        you-are-a-coop-member: "&d[name] &bseni işçi olarak adanasına aldı!"
+        success: "&d[name] &9işçi olarak ekledin."
+      uncoop:
+        description: "İşçiyi adandan çıkar"
+        parameters: "<player>"
+        cannot-uncoop-yourself: "&4Kendini isten cıkaramazsın!"
+        cannot-uncoop-member: "&4Sen isciyi cıkartamazsın!"
+        player-not-cooped: "&4Bu oyuncu isci degil!"
+        you-are-no-longer-a-coop-member: "&e[name]&4 adasından isci yetkin alındı!"
+        all-members-logged-off: "&4Tum ada oyuncuları cevrımdısı. Isci yetkin &e[name]&4adasından alındı!"
+        success: "&d[name] &a9artık adanda işçi değil!"
+      trust:
+        description: "Adana arkadas ekle"
+        parameters: "<player>"
+        trust-in-yourself: "&4Kendine guven!"
+        members-trusted: "&4Uye arkadas olarak eklendi!"
+        player-already-trusted: "&4Oyuncu zaten arkadas!"
+        you-are-trusted: "&e[name] &bseni arkadaş olarak ekledi!"
+        success: "&d[name] &9arkadaş olarak eklendin!"
+      untrust:
+        description: "Arkadaslık yetkisini kaldır!"
+        parameters: "<player>"
+        cannot-untrust-yourself: "&4Kendi guvenini kaldıramazsın!"
+        cannot-untrust-member: "&4Arkadas yetkisini kaldıramazsın!"
+        player-not-trusted: "&4Oyuncu zaten arkadas degil!"
+        you-are-no-longer-trusted: "&4Artık &d[name] &4arkadaşı degilsin!"
+        success: "&d[name] &9artık arkadaşın değil!"
+      invite:
+        description: "Adana oyuncu davet et."
+        invitation-sent: "&d[name] &boyuncusuna davet gonderildi!"
+        removing-invite: "&4Davet iptal edildi."
+        name-has-invited-you: "&d[name] &bseni adasına katılman icin davet etti!"
+        to-accept-or-reject: "&5/[label] team accept &byazarsan kabul &5/[label] team reject &byazarsan iptal edersin!"
+        you-will-lose-your-island: "&4DIKKAT! Kabul edersen adan silinir!"
+        errors:
+          cannot-invite-self: "&4Kendine davet atamazsın!"
+          cooldown: "&4Başkasına davet göndermek için [number] saniye bekle!"
+          island-is-full: "&4Adan dolu daha fazla kimseyi davet edemezsin!"
+          none-invited-you: "&4Seni davet eden kimse yok -_-"
+          you-already-are-in-team: "&4Zaten bir takımdasın!"
+          already-on-team: "&4Oyuncu zaten takımda!"
+          invalid-invite: "&4Davet suresi bitti, uzgunum."
+        parameters: "<player>"
+        you-can-invite: "&e[number] &bdaha oyuncu davet edebilirsin!"
+        accept:
+          description: "Daveti kabul et"
+          you-joined-island: "&9Adaya girdin. &5/[label] team info &byazarak diger uyelere bakabilirsin!"
+          name-joined-your-island: "&d[name] &badana katıldı!"
+          confirmation: |-
+            &cAre you sure you want to accept this invite?
+            &c&lYou will &nLOSE &r&c&lyour current island!
+        reject:
+          description: "Daveti reddet"
+          you-rejected-invite: "&9Ada katılma istegini reddettin!"
+          name-rejected-your-invite: "&d[name] &4davetini reddetti!"
+        cancel:
+          description: "Adanıza davet ettiğin birisinin davetiyesini iptal ettin!"
+      leave:
+        cannot-leave: "&4Ada sahibi cıkamaz! İlk önce adadan herkesi atması gerekir!"
+        description: "Adandan çık"
+        left-your-island: "&d[name] &cadandan çıktı!"
+        success: "&cAdadan ayrıldın."
+      kick:
+        description: "Adandan oyuncu at!"
+        parameters: "<player>"
+        owner-kicked: "&4Ada sahibi adasından seni attı!"
+        cannot-kick: "&4Kendini atamazsın!"
+        success: "&9[name] &badandan atıldı!"
+      demote:
+        description: "Adandaki oyuncunun rankını düşürür."
+        parameters: "<player>"
+        failure: "&4Oyuncunun rankı daha fazla düşürelemiyor!"
+        success: "&d[name] &crütbesi &e[rank] &cdüşürüldü."    
+      promote:
+        description: "Adandaki üyelerin yetkisini yükselt."
+        parameters: "<player>"
+        failure: "&4Oyuncunun rankı daha fazla artıralamıyor!"
+        success: "&d[name] &arütbesi &e[rank] &ayükseltildi."
+      setowner:
+        description: "Ada liderliğini bir üyeye ver."
+        errors:
+          cant-transfer-to-yourself: "&4Kendine ada liderligini veremezsin!"
+          target-is-not-member: "&4Bu oyuncu senin ada takımında degil!"
+        name-is-the-owner: "&d[name] &bartık yeni ada sahibi!"
+        parameters: "<player>"
+        you-are-the-owner: "&9Artık ada sahibi sensin!"
+    ban:
+      description: "Adandan oyuncu banla."
+      parameters: "<player>"
+      cannot-ban-yourself: "&4Kendini banlayamazsın!"
+      cannot-ban: "&4Oyuncu banlanamaz."
+      cannot-ban-member: "&4ilk önce adandan at ondan sonra banla!"
+      cannot-ban-more-players: "&4Banlama sınırını astin! Daha fazla kimseyi banlayamazsın."
+      player-already-banned: "&4Oyuncu zaten banlı!"
+      player-banned: "&d[name] &badandan banlandı!"
+      owner-banned-you: "&d[name] &4adandan banlandı!"
+      you-are-banned: "&9Adadan banlandın!"
+    unban:
+      description: "Oyuncunun ada banını aç."
+      parameters: "<player>"
+      cannot-unban-yourself: "&4Kendi banını acamazsın!"
+      player-not-banned: "&4Oyuncu banlı degil!"
+      player-unbanned: "&d[name] &bbanı adandan kaldırıldı!"
+      you-are-unbanned: "&d[name] &bbanını adadan kaldırdı!"
+    banlist:
+      description: "Banlı oyuncuları gor!"
+      noone: "&9Adanda banlı kimse yok!"
+      the-following: "&9Bu oyuncular banlı!:"
+      names: "&4[line]"
+      you-can-ban: "&e[number] &bdaha oyuncuya banlayabilirsin!"
+    settings:
+      description: "Ada ayarları"
+    language:
+      description: "Dili seç."
+    expel:
+      description: "Adandan bir misafiri at."
+      parameters: "<player>"
+      cannot-expel-yourself: "&4Adadan kendini atamazsın!"
+      cannot-expel: "&4Bu oyuncu atılamaz!"
+      cannot-ban-member: "&9Takımdan birisini adadan atamazsın!"
+      not-on-island: "&4Bu misafir şuanda adanda değil!"
+      player-expelled-you: "&d[name] &4seni adadan attı!"
+      success: "&d[name] &9oyuncusunu adadan attın!"
+
+ranks:
+  owner: "Ada-Sahibi"
+  sub-owner: "Yardımcı"
+  member: "Üye"
+  trusted: "Arkadaş"
+  coop: "İşçi"
+  visitor: "Misafir"
+  banned: "Banlı"
+  admin: "Admin"
+  mod: "Mod"
+  
+protection:
+  command-is-banned: "Ziyaretçileri banlar."
+  flags:
+    ANIMAL_SPAWN: 
+      description: "Doğmayı değiş"
+      name: "Hayvan doğuşu"
+    ANVIL: 
+      description: "Örs kullanımı değiş."
+      name: "Anvils"
+      hint: "Anvil kapalıda kullan."
+    ARMOR_STAND: 
+      description: "Zırh askısı kullanımı değiş."
+      name: "Zırh askısı"
+      hint: "Zırh askısı kapalıda kullan."
+    BEACON: 
+      description: "Fener kullanımı değiş."
+      name: "Fener"
+      hint: "Feneri kapalıda kullan."
+    BED: 
+      description: "Yatak kullanımı değiş."
+      name: "Yatak"
+      hint: "Yatağı kapalıda kullan."
+    BOAT:
+      name: "Tekne"
+      description: "Tekne kullanımı değiş."
+      hint: "Tekne etkileşimini kapalıda kullan"
+    BREAK_BLOCKS: 
+      description: "Kırmayı değiş"
+      name: "Blok kırma"
+      hint: "Blok kırma kapalı."
+    BREEDING: 
+      description: "Çiftleştirme değiş"
+      name: "Hayvan çiftleştirme"
+      hint: "Hayvan çiftleştirmesi korumada"
+    BREWING: 
+      description: "İksir stand kullanımı değiş."
+      name: "İksir standı"
+      hint: "İksir standı kullanımı kapalı."
+    BUCKET: 
+      description: "Kova kullanımı değiş."
+      name: "Kova"
+      hint: "Kova kullanımı kapalı."
+    BUTTON: 
+      description: "Buton kullanımı değiş."
+      name: "Buton"
+      hint: "Buton kullanımı kapalı."
+    CONTAINER:
+      name: "Kutular"
+      description: |-
+        &aSandıklar ile olan etkileşimi değişir,
+        &asandık, shulker ve saksılar.
+
+        &7Diğer kutular diğer etiketleri ilgilendirmekte.
+      hint: "Kutu kullanımı kapalı."
+    DISPENSER:
+      name: "Fırlatıcı"
+      description: "Fırlatıcı kullanımı değiş."
+      hint: "Fırlatıcı etkileşimi kapalı."
+    DROPPER:
+      name: "Bırakıcı"
+      description: "Bırakıcı kullanımı değiş."
+      hint: "Bırakıcı etkileşimi kapalı"
+    HOPPER:
+      name: "Huni"
+      description: "Huni kullanımı değiş."
+      hint: "Huni etkileşimi kapalı."
+    CHEST_DAMAGE:
+      description: "Sandık patlamalarındaki etki alım türü"
+      name: "Sandık hasarı"
+    CHORUS_FRUIT: 
+      description: "Işınlanma kullanımı değiş."
+      name: "Nakarat meyvesi"
+      hint: "Işınlanma kapalı"
+    CLEAN_SUPER_FLAT:
+      description: |-
+          &aHer hangi bir ada
+          &adüz bir chunk varsa
+          &aorayı temizler.
+      name: "Süper düz alanları temizle"
+    COARSE_DIRT_TILLING:
+      description: |-
+          &aÇapa ile iri taneli toprak
+          &atopraği sürmeyi kapar/açar.
+          &aobtain dirt
+      name: "İri taneli toprak sürme"
+      hint: "İri taneli toprağı sürme kapalı."
+    COLLECT_LAVA: 
+      description: |-
+          &aLavın toplamasını kapar/açar.
+          &a(Kovaları geçersiz kılar)
+      name: "Lav toplama"
+      hint: "Lav toplaması kapalı"
+    COLLECT_WATER: 
+      description: |-
+          &aSuyun toplamasını kapar/açar.
+          &a(Kovaları geçersiz kılar)
+      name: "Su toplaması"
+      hint: "Su toplaması kapalı"
+    COMMAND_RANKS:
+      name: "&eKomut sırlaması"
+      description: "&aKomut sıralarını yapılandır"
+    CRAFTING: 
+      description: "Kullanımı değiş."
+      name: "Çalışma masası"
+      hint: "Çalışma masası kullanımı kapalı."
+    CREEPER_DAMAGE:
+      description: "Creeper hasarını değiş."
+      name: "Creeper hasarı"
+    CREEPER_GRIEFING:
+      description: "Creeper patlamasını değiş."
+      name: "Creeper patlaması"
+      hint: "Creeper patlama hasarı yoktur."
+    CROP_TRAMPLE: 
+      description: "Ekinleri ezilmesini değiş."
+      name: "Ekin ezilmesi"
+      hint: "Ekinler korunuyor."
+    DOOR: 
+      description: "Kapıların kullanımını değiş."
+      name: "Kapıların kullanımı"
+      hint: "Kapı kullanımı kapalı"
+    DRAGON_EGG:
+      name: "Ejderha Yumurtası"
+      description: |-
+        &aEjderha yumurtasına dokunulmasını engeller.
+
+        &cBu yumurtanın koyulmasını ya da
+        &ckırılmasını engellemez.
+      hint: "Ejderha yumurtası etkileşimi yok."
+    DYE:
+      description: "Boya kullanımını değiş"
+      name: "Boya kullanımı"
+      hint: "Boyama kapalı"
+    EGGS: 
+      description: "Yumurta atmayı değiş"
+      name: "Yumurta atma."
+      hint: "Yumurta atılması kapalı."
+    ELYTRA: 
+      description: "Kullanımı değiş."
+      name: "Elitra"
+      hint: "Elitra ile uçmaya izin verilmez."
+    ENCHANTING: 
+      description: "Kullanımı değiş."
+      name: "Büyü masası"
+      hint: "Büyü masası kullanılamaz."
+    ENDER_CHEST:
+      description: "Kullanımı ve yapımını kapat/aç."
+      name: "Ender Sandığı"
+      hint: "Ender sandıkları bu dünyada kullanıma kapalı."
+    ENDERMAN_DEATH_DROP: 
+      description: |-
+         &aEnderman ölünce elinde
+         &atuttuğu blok düşürmeyi değişir.
+      name: "Enderman ölme eşyası"
+    ENDERMAN_GRIEFING: 
+      description: |-
+         &aEndermenin adadan blok almasına izin verir.
+      name: "Enderman hasarı"
+    ENDER_PEARL: 
+      description: "Kullanımı değiş."
+      name: "Ender İncisi"
+      hint: "Ender İncisi kullanımı kapalı"
+    ENTER_EXIT_MESSAGES: 
+      description: "Adaya giriş/çıkışları gösterir."
+      island: "[name]"
+      name: "Giriş/çıkış mesajları"
+      now-entering: "&d[name] &badasına girdin!"
+      now-leaving: "&d[name] &badasından çıktın!"
+    EXPERIENCE_BOTTLE_THROWING:
+      name: "XP şisesi fırlatması"
+      description: "XP şişe fırlatılmasını değiş."
+      hint: "XP şişelerin fırlatılmasına izin verilmez."
+    FIRE_BURNING:
+      name: "Ateşin yanması"
+      description: |-
+        &aBlokların ateşle yanmasını ayarlar.
+    FIRE_EXTINGUISH: 
+      description: "Ateş söndürme değiş."
+      name: "Ateş söndürme"
+      hint: "Yangın söndürmeye izin verilmez"
+    FIRE_IGNITE:
+      name: "Ateş yakma"
+      description: |-
+        &aAteşin oyuncu olmayan yollarla 
+        &atutuşup tutuşmayacağı arasında geçiş yapın.
+    FIRE_SPREAD:
+      name: "Ateşin yayılması"
+      description: |-
+        &aAteşin yanındaki bloklara
+        &asaçılmasını ayarlar.
+    FISH_SCOOPING:
+      name: "Kovayla balık tutma."
+      description: "Kovayla balık almasını değiş."
+      hint: "Balık tutma kapalı"
+    FLINT_AND_STEEL:
+      name: "Çakmak taşı"
+      description: |-
+        &aOyuncuların blaze ve çakmak taşı
+        &aile ateş yakmasını ayarlar.
+      hint: "Ateş oluşturan eşyaların kullanımı kapalı."
+    FURNACE: 
+      description: "Kullanımı değiş."
+      name: "Fırın"
+      hint: "Fırın kullanımı kapalı."
+    GATE: 
+      description: "Kullanımı değiş."
+      name: "Kapılar"
+      hint: "Kapı kullanımı kapalı."
+    GEO_LIMIT_MOBS: 
+      description: |-
+         &aAdanın koruma alanının dışındaki 
+         &amobları siler.
+      name: "&eVarlıkları adayla sınırla."
+    HURT_ANIMALS: 
+      description: "Hasar alımını değiş"
+      name: "Hayvan Hasarı"
+      hint: "Hayvan hasarı kapalı"
+    HURT_MONSTERS: 
+      description: "Hasar alımını değiş"
+      name: "Canavar hasarı"
+      hint: "Canavar hasar alımı kapalı."
+    HURT_VILLAGERS: 
+      description: "Hasar alımını değiş"
+      name: "Köylü hasar alımı"
+      hint: "Köylü hasar alımı kapalı."
+    ITEM_FRAME:
+      name: "Eşya Çerçevesi"
+      description: "Etkileşimi değiş"
+      hint: "Eşya çerçevesi kapalıda kullan."
+    ITEM_FRAME_DAMAGE:
+      description: |-
+          &aEşya çervelerine varlıkların
+          &ahasar verip veremiyeceğini ayarlar.
+      name: "Item Frame Hasarı"
+    INVINCIBLE_VISITORS: 
+      description: |-
+          &aZiyaretçi ayarlarını ayarlar.
+      name: "&eGörünmez misafirler"
+      hint: "&cMisafirler korunuyor."
+    ISLAND_RESPAWN:
+      description: |-
+        &aOyuncunun adada doğup
+        &adoğamıyacağını ayarlar.
+      name: "Ada canlanması"
+    ITEM_DROP: 
+      description: "Eşya atımını değiş."
+      name: "Eşya atılması"
+      hint: "Eşya atımı kapalı"
+    ITEM_PICKUP: 
+      description: "Eşya alımını değiş."
+      name: "Eşya alımı"
+      hint: "Yerden eşya alımı kapalı."
+    JUKEBOX:
+      description: "Kullanımını değiş."
+      name: "Müzik kutusu kullanımı."
+      hint: "No jukebox use allowed"
+    LEAF_DECAY:
+      name: "Yaprak düşümü"
+      description: "Yaprak düşümünü değiş."
+    LEASH: 
+      description: "Kullanımını değiş."
+      name: "Kayış kullanımı"
+    LEVER:
+      description: "Kullanımını değiş."
+      name: "Şalter kullanımı"
+      hint: "Şalter kullanımı kapalı"
+    LIQUIDS_FLOWING_OUT:
+      name: "Adaların dışında akan sıvı"
+      description: |-
+        &aAdaların koruma alanlarının
+        &adışına sıvıların akmamasını sağlar.
+        &aBu sayede 2 ada arasında
+        &akırıktaş oluşumu kapanır.
+
+        &cSıvıların dikey olarak akacağını unutmayın
+        &cAyrıca bir adanın koruma menzilinin dışına
+        &cyerleştirilirse yatay olarak yayılmazlar.
+    LOCK: 
+      description: "Ada kilitlemesini değiş."
+      name: "Ada kiliti"
+    MILKING: 
+      description: "İnek süt sağmasını değiş."
+      name: "Süt sağma"
+      hint: "Süt alımı kapalı."
+    MINECART:
+      name: "Vagonlar"
+      description: "Vagon etkileşimini değiş."
+      hint: "Vagon etkileşimi yok"
+    MONSTER_SPAWN: 
+      description: "Doğuşu değiş."
+      name: "Canavar doğuşu"
+    MOUNT_INVENTORY: 
+      description: |-
+        &aHayvanın envanterini
+        &aaçabilmesini ayarlar.
+      name: "Hayvan envanteri"
+      hint: "Hayvan envanterine erişim kapalı."
+    NAME_TAG:
+      name: "İsim etiketleri"
+      description: "Kullanımını değiş."
+      hint: "İsim etiketini kullanımı kapalı."
+    NATURAL_SPAWNING_OUTSIDE_RANGE:
+      name: "Normalin dışında doğuşu değiş."
+      description: |-
+        &aYaratıkların (hayvanlar ve canavarlar) 
+        &abir adanın koruma alanının dışında
+        &adoğal olarak doğup doğamadığı arasında geçiş yap.
+
+        &cUnutmayın bu el ile koyulan
+        &ccanlandırıcı yumurtalarında çalışmaz!
+    NOTE_BLOCK: 
+      description: "Kullanımını değiş."
+      name: "Nota bloğu"
+      hint: "No note block use"
+    OBSIDIAN_SCOOPING:
+      name: "Obsidiyeni lava dönüştürme"
+      description: | 
+        &aLav'dan dönüşmüş
+        &aobsidyeni kovayla sağ tıkladığınızda
+        &ageri alıp alamadığınızı ayarlar.
+    OFFLINE_GROWTH:
+      description: |-
+        &aEğer deaktif olursa
+        &aadadaki hiç bir oyuncu aktif
+        &adeğilse bitkiler büyümez.
+        &aLagı azaltmanızda yardımcı olabilir.
+      name: "Büyüme kapalı"
+    OFFLINE_REDSTONE:
+      description: |-
+          &aEğer deaktif olursa
+          &aadadaki hiç bir oyuncu aktif
+          &adeğilse redstonelar çalışmaz.
+          &aLagı azaltmanızda yardımcı olabilir.
+      name: "Kapalı Redstone"
+    PISTON_PUSH: 
+      description: |-
+          &aPistonun ada dışına
+          &açalışmasına izin verir.
+      name: "Piston itmesi"
+    PLACE_BLOCKS: 
+      description: "Blok koyma ayarı değişimi"
+      name: "Blok yerleştirme"
+      hint: "Blok koymaya izin verilmez."
+    POTION_THROWING:
+      name: "Potion throwing"
+      description: |-
+        &aİksirlerin atılmasını ayarlar.
+      hint: "İksir atmaya izin verilmez."
+    NETHER_PORTAL:
+      description: "Kullanımı değiş."
+      name: "Nether Portal"
+      hint: "Portal use is disallowed"
+    END_PORTAL:
+      description: "Kullanımı değiş."
+      name: "End Portal"
+      hint: "Portal use is disallowed"
+    PRESSURE_PLATE: 
+      description: "Kullanımı değiş."
+      name: "Basınç plakası"
+      hint: "Baskı plakası kullanımı kapalı"
+    PVP_END: 
+      description: |-
+          &cEND'de PVP'yi ayarlar.
+      name: "End PVP"
+      hint: "END'de PVP'ye izin verilmez."
+    PVP_NETHER: 
+      description: |-
+          &cNether'da PVP'yi ayarlar.
+      name: "Nether PVP"
+      hint: "Nether'da PVP'ye izin verilmez."
+    PVP_OVERWORLD: 
+      description: |-
+          &cAda'da PVP'yi ayarlar.
+      name: "Ada pvp"
+      hint: "&4PVP burada aktif değil!"
+      active: "&9PVP burada aktif!"
+    REDSTONE: 
+      description: "Kullanımı değiş."
+      name: "Kızıltaş eşyaları"
+      hint: "Redstone maddesi kullanımı yok"
+    REMOVE_END_EXIT_ISLAND:
+      description: |-
+        &aÇıkış adasının 0,0 koordinatlarda üretmesini engeller.
+      name: "Bitiş adasını kaldır"
+    REMOVE_MOBS: 
+      description: |-
+        &aAdaya ışınlanıldığında canavarları siler.
+      name: "Canavarları sil"
+    RIDING: 
+      description: "Sürmeyi değiş."
+      name: "Hayvan sürmesi"
+      hint: "Hayvan sürülmesine izin verilmez."
+    SHEARING: 
+      description: "Kırpma-Kesmeyi değiş."
+      name: "Kırpma-Kesme"
+      hint: "Kırma yok"
+    SPAWN_EGGS: 
+      description: "Kullanımı değiş."
+      name: "Spawn yumurtuları"
+      hint: "Canlandırma yumurtaları fırlatılması yok"
+    TNT_DAMAGE:
+      description: |-
+        &aTnt ve ve tnt'li vagonların
+        &avarlıklara ve bloklara hasar
+        &avermesini ayarlar.
+      name: "TNT hasarı"
+    TNT_PRIMING:
+      description: |-
+        &aTNT'nin etkinleşmesini engeller.
+      name: "TNT aktifleşmesi"
+      hint: "TNT aktifleşmesi yok"
+    TRADING: 
+      description: "Takası değiş."
+      name: "Köylü takası"
+      hint: "Köylü ticareti yok"
+    TRAPDOOR:
+      description: "Kullanıma izin ver"
+      name: "Tuzak kapısı"
+      hint: "Tuzak kapısı kullanımı yok"
+    TREES_GROWING_OUTSIDE_RANGE:
+      name: "Ağaçların sınır dışına büyümesi"
+      description: |-
+        &aAğaçların bir adanın koruma alanı 
+        &adışında büyüyüp büyüyemeyeceğini değiştirin. 
+        &aSadece bir adanın koruma aralığının dışına 
+        &ayerleştirilen fidanların büyümesini 
+        &aengellemekle kalmayacak, aynı zamanda 
+        &aadanın dışında yaprak / kütük oluşumunu 
+        &aengelleyecek ve böylece ağacı kesecektir.
+    TURTLE_EGGS:
+      description: "Kırılmayı değiş."
+      name: "Kaplumbağa yumurtası"
+      hint: "Turtle eggs cannot be crushed!"
+    FROST_WALKER:
+      description: "Kığırlaştırıcı büyüsünü kapat/aç."
+      name: "Kığırlaştırıcı"
+      hint: "Frost Walker cannot be used here"
+    EXPERIENCE_PICKUP:
+      name: "XP yerden al"
+      description: "XP alışını değiş."
+      hint: "Yerden xp alamazsın."
+    PREVENT_TELEPORT_WHEN_FALLING:
+      name: "Düşünce ışınlanmayı önle."
+      description: |-
+        &aOyuncular adadan aşağa düşerken
+        &aadaya geri dönme komudunu engeller.
+      hint: "&cAdandan aşağaya düşerken adana geri ışınlanamazsın!"
+  locked: "&4Bu ada kilitli!"
+  protected: "&4Ada korunuyor: [description]"
+  spawn-protected: "&4Spawn koruması: [description]"
+
+  panel:
+    next: "Sonraki sayfa"
+    previous: "önceki sayfa"
+    PROTECTION:
+      title: "&9Korumalar"
+      description: |-
+        &aAdanın koruma ayarları
+    SETTING:
+      title: "&9Ayarlar"
+      description: |-
+        &aAdanın genel ayarları
+    WORLD_SETTING:
+      title: "&e[world_name] &bAyarları"
+      description: "&9Dunya ayarları"
+    flag-item:
+      name-layout: "&a[name]"
+      description-layout: |
+        &a[description]
+
+        &7Allowed for:
+      allowed-rank: "&3- &a"
+      blocked-rank: "&3- &4"
+      minimal-rank: "&3- &2"
+      menu-layout: "&a[description]"
+      setting-layout: |
+        &a[description]
+        
+        &7Geçerli ayar: [setting]
+      setting-active: "&9Aktif"
+      setting-disabled: "&4Deaktif"
+
+language:
+  panel-title: "Dilini seç"
+  description:
+    selected: "&9Dil secildi!"
+    click-to-select: "&9Tıkla ve seç."
+    authors: "&bHazırlayan:"
+    author: "&3- &d[name]"
+  edited: "&9Dilin &e[lang] &bolarak değiştirildi!"
+
+management:
+  panel:
+    title: "BentoBox Yönetimi"
+    views:
+      gamemodes:
+        name: "&6Oyun Modları"
+        description: "&aTıkla ve yüklü oyun modlarını gör."
+        blueprints:
+          name: "&6Taslaklar"
+          description: "&aOpens the Admin Blueprint menu."
+        gamemode:
+          name: "&f[name]"
+          description: |+
+            &aAdalar: &b[islands]
+      addons:
+        name: "&6Eklentiler"
+        description: "&aYüklü &ceklentileri &agörmek için &etıklayınız."
+      hooks:
+        name: "&6Hooks"
+        description: "&aYüklü &chookları &agörmek için &etıklayınız."
+    actions:
+      reload:
+        name: "&cYenile"
+        description: "&aBentoboxu yenilemek için &c2 kez &etıklayın."
+    buttons:
+      catalog:
+        name: "&6Eklenti kataloğu"
+        description: "&aEklentiler Kataloğunu açar"
+      empty-here:
+        name: "&bBurası boş gibi gözüküyor..."
+        description: "&aKataloğumuza bakarsanız ne olur?"
+    information:
+      state:
+        name: "&6Uyumluluk"
+        description:
+          COMPATIBLE: |+
+            &aÇalıştığı sürüm: &e[name] [version]&a.
+
+            &aBentoBox şu anda bir &2UYUMLU &asunucu
+            &ayazılımı ve sürümü üzerinde çalışmaktadır. 
+            
+            &aBu ortamda çalışması için tamamen tasarlanmıştır.
+          SUPPORTED: |+
+            &aÇalıştığı sürüm: &e[name] [version]&a.
+
+            &aBentoBox şu anda bir &eDESTEKLENEN &asunucu
+            &ayazılımı ve sürümü üzerinde çalışmaktadır. 
+
+            &aBu ortamda özelliklerinin çoğu sorunsuz çalışacaktır.
+          NOT_SUPPORTED: |+
+            &aÇalıştığı sürüm: &e[name] [version]&a.
+
+            &aBentoBox şu anda bir &cDESTEKLENMEYEN &asunucu
+            &ayazılımı ve sürümü üzerinde çalışmaktadır. 
+
+            &2Özelliklerinin çoğu düzgün çalışacak olsa da,
+            &2platforma özgü hatalar veya sorunlar beklenebilir.
+          INCOMPATIBLE: |+
+            &aÇalıştığı sürüm: &e[name] [version]&a.
+
+            &aBentoBox şu anda bir &4UYUMSUZ &asunucu
+            &ayazılımı ve sürümü üzerinde çalışmaktadır. 
+
+            &cGarip davranışlar ve hatalar oluşabilir ve 
+            &cçoğu özellik kararsız olabilir.
+
+catalog:
+  panel:
+    GAMEMODES:
+      title: "Oyunmodu kataloğu"
+    ADDONS:
+      title: "Eklenti Kataloğu"
+    views:
+      gamemodes:
+        name: "&6Oyun Modları"
+        description: |+
+          &eClick &ato browse through the
+          &aavailable official Gamemodes.
+      addons:
+        name: "&6Eklentiler"
+        description: |+
+          &aMevcut resmi Oyun Modlarına göz atmak için tıklayın.
+    icon:
+      description-template: |+
+        &8[topic]
+        &a[install]
+
+        &7&o[description]
+
+        &eTıkla &ave en sonra sürümü elde et!
+      already-installed: "Zaten yüklenmiş!"
+      install-now: "Şimdi yükle!"
+
+    empty-here:
+      name: "&9Burası boş gibi gözüküyor..."
+      description: |+
+        &cBentoBox github'a bağlanamadı!
+
+        &aBentoBox'un konfigürasyondaki GitHub'a
+        &abağlanmasına izin verin veya daha sonra tekrar deneyin.
+
+successfully-loaded: |
+
+  &6  ____             _        ____
+  &6 |  _ \           | |      |  _ \             &bYazım yanlışları varsa iletişim:
+  &6 | |_) | ___ _ __ | |_ ___ | |_) | _____  __  &cOver_Brave#9324 &b2017 - 2019
+  &6 |  _ < / _ \ '_ \| __/ _ \|  _ < / _ \ \/ /  &bYapımcısı : &atastybento &band &ePoslovitch
+  &6 | |_) |  __/ | | | || (_) | |_) | (_) >  <   &bVersiyon &e[version]
+  &6 |____/ \___|_| |_|\__\___/|____/ \___/_/\_\  &e[time] &bsaniyede yüklendi!
+
+
diff --git a/src/test/java/world/bentobox/bentobox/TestBentoBox.java b/src/test/java/world/bentobox/bentobox/TestBentoBox.java
index 4c2bfa328..b2e928c42 100644
--- a/src/test/java/world/bentobox/bentobox/TestBentoBox.java
+++ b/src/test/java/world/bentobox/bentobox/TestBentoBox.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -41,7 +41,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -117,7 +116,7 @@ public class TestBentoBox {
         visitorToIsland = mock(Player.class);
         Mockito.when(player.hasPermission(Mockito.anyString())).thenReturn(true);
         User.getInstance(player);
-        when(Bukkit.getPlayer(Mockito.any(UUID.class))).thenReturn(player);
+        when(Bukkit.getPlayer(any(UUID.class))).thenReturn(player);
 
         location = mock(Location.class);
         Mockito.when(location.getWorld()).thenReturn(world);
@@ -146,9 +145,9 @@ public class TestBentoBox {
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
         // We want the read tabLimit call here
-        when(Util.tabLimit(Mockito.any(), Mockito.anyString())).thenCallRealMethod();
+        when(Util.tabLimit(any(), Mockito.anyString())).thenCallRealMethod();
 
         // Islands
         IslandsManager im = mock(IslandsManager.class);
@@ -162,8 +161,8 @@ public class TestBentoBox {
         members.put(OWNER_UUID, RanksManager.OWNER_RANK);
         members.put(MEMBER_UUID, RanksManager.MEMBER_RANK);
         island.setMembers(members);
-        Mockito.when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
-        when(im.getProtectedIslandAt(Mockito.any())).thenReturn(Optional.of(island));
+        Mockito.when(im.getIslandAt(any())).thenReturn(Optional.of(island));
+        when(im.getProtectedIslandAt(any())).thenReturn(Optional.of(island));
 
         Settings settings = mock(Settings.class);
         Mockito.when(plugin.getSettings()).thenReturn(settings);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java
new file mode 100644
index 000000000..28f6615af
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetrankCommandTest.java
@@ -0,0 +1,227 @@
+package world.bentobox.bentobox.api.commands.admin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.RanksManager;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
+public class AdminSetrankCommandTest {
+
+    @Mock
+    private CompositeCommand ac;
+    @Mock
+    private User user;
+    @Mock
+    private IslandsManager im;
+    @Mock
+    private PlayersManager pm;
+
+    @Mock
+    private RanksManager rm;
+    private AdminSetrankCommand c;
+
+    private UUID targetUUID;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        BentoBox plugin = mock(BentoBox.class);
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+
+        // Ranks Manager
+        when(plugin.getRanksManager()).thenReturn(rm);
+
+        // Players Manager
+        when(plugin.getPlayers()).thenReturn(pm);
+
+        // Islands manager
+        when(plugin.getIslands()).thenReturn(im);
+
+        // Target
+        targetUUID = UUID.randomUUID();
+        Player p = mock(Player.class);
+        when(p.getUniqueId()).thenReturn(targetUUID);
+        User.getInstance(p);
+
+        // Command
+        c = new AdminSetrankCommand(ac);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+        User.clearUsers();
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#AdminSetrankCommand(world.bentobox.bentobox.api.commands.CompositeCommand)}.
+     */
+    @Test
+    public void testAdminSetrankCommand() {
+        assertEquals("setrank", c.getLabel());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#setup()}.
+     */
+    @Test
+    public void testSetup() {
+        assertEquals("admin.setrank", c.getPermission());
+        assertFalse(c.isOnlyPlayer());
+        assertEquals("commands.admin.setrank.parameters", c.getParameters());
+        assertEquals("commands.admin.setrank.description", c.getDescription());
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteNoArgs() {
+        assertFalse(c.canExecute(user, "", Collections.emptyList()));
+        verify(user).getTranslation("commands.help.console");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteOneArg() {
+        assertFalse(c.canExecute(user, "", Collections.singletonList("test")));
+        verify(user).getTranslation("commands.help.console");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteUnknownPlayer() {
+        assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "member")));
+        verify(user).sendMessage("general.errors.unknown-player",
+                "[name]",
+                "tastybento");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteKnownPlayerNoIsland() {
+        when(pm.getUUID(any())).thenReturn(targetUUID);
+        assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "member")));
+        verify(user).sendMessage("general.errors.player-has-no-island");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteKnownPlayerHasIslandUnknownRank() {
+        when(pm.getUUID(any())).thenReturn(targetUUID);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
+        assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "xxx")));
+        verify(user).sendMessage("commands.admin.setrank.unknown-rank");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteKnownPlayerHasIslandTooLowRank() {
+        when(pm.getUUID(any())).thenReturn(targetUUID);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
+        when(rm.getRanks()).thenReturn(Collections.singletonMap("visitor", 0));
+        when(user.getTranslation(anyString())).thenReturn("visitor");
+        assertFalse(c.canExecute(user, "", Arrays.asList("tastybento", "visitor")));
+        verify(user).sendMessage("commands.admin.setrank.not-possible");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteKnownPlayerHasIslandSuccess() {
+        when(pm.getUUID(any())).thenReturn(targetUUID);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
+        when(rm.getRanks()).thenReturn(Collections.singletonMap("member", 500));
+        when(user.getTranslation(anyString())).thenReturn("member");
+        assertTrue(c.canExecute(user, "", Arrays.asList("tastybento", "member")));
+    }
+
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfString() {
+        // Set the target
+        testCanExecuteKnownPlayerHasIslandSuccess();
+        Island island = mock(Island.class);
+        when(island.getRank(any())).thenReturn(RanksManager.SUB_OWNER_RANK);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        when(user.getTranslation(any())).thenReturn("sub-owner", "member");
+        assertTrue(c.execute(user, "", Arrays.asList("tastybento", "member")));
+        verify(user).sendMessage(eq("commands.admin.setrank.rank-set"),
+                eq("[from]"),
+                eq("sub-owner"),
+                eq("[to]"),
+                eq("member"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand#tabComplete(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testTabCompleteUserStringListOfString() {
+        when(rm.getRanks()).thenReturn(Collections.singletonMap("visitor", 0));
+        when(user.getTranslation(any())).thenReturn("visitor");
+        Optional<List<String>> result = c.tabComplete(user, "", Collections.emptyList());
+        assertTrue(result.isPresent());
+        result.ifPresent(list -> {
+            assertTrue(list.size() == 1);
+            assertEquals("visitor", list.get(0));
+        });
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
index 1d0ad7c94..7ce13db80 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSetspawnCommandTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.bentobox.api.commands.admin;
 
 import static org.junit.Assert.assertEquals;
@@ -8,6 +5,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.any;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -76,6 +74,7 @@ public class AdminSetspawnCommandTest {
         when(user.getUniqueId()).thenReturn(uuid);
         when(user.getPlayer()).thenReturn(p);
         when(user.getName()).thenReturn("tastybento");
+        when(user.getLocation()).thenReturn(mock(Location.class));
         User.setPlugin(plugin);
 
         // Parent command has no aliases
@@ -90,10 +89,10 @@ public class AdminSetspawnCommandTest {
 
         // Player has island to begin with
         im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
-        when(im.hasIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(true);
-        when(im.isOwner(Mockito.any(),Mockito.any())).thenReturn(true);
-        when(im.getOwner(Mockito.any(),Mockito.any())).thenReturn(uuid);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
+        when(im.hasIsland(any(), any(User.class))).thenReturn(true);
+        when(im.isOwner(any(),any())).thenReturn(true);
+        when(im.getOwner(any(),any())).thenReturn(uuid);
         when(plugin.getIslands()).thenReturn(im);
 
 
@@ -104,10 +103,10 @@ public class AdminSetspawnCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        when(lm.get(Mockito.any(), Mockito.any())).thenReturn("mock translation");
+        when(lm.get(any(), any())).thenReturn("mock translation");
         when(plugin.getLocalesManager()).thenReturn(lm);
         // Return the reference (USE THIS IN THE FUTURE)
-        when(user.getTranslation(Mockito.anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.getTranslation(Mockito.anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
 
         // Plugin Manager
         Server server = mock(Server.class);
@@ -147,7 +146,7 @@ public class AdminSetspawnCommandTest {
     public void testExecuteUserStringListOfString() {
         Island island = mock(Island.class);
         Optional<Island> oi = Optional.of(island);
-        when(im.getIslandAt(Mockito.any(Location.class))).thenReturn(oi);
+        when(im.getIslandAt(any(Location.class))).thenReturn(oi);
         AdminSetspawnCommand c = new AdminSetspawnCommand(ac);
         assertTrue(c.execute(user, "setspawn", Collections.emptyList()));
         Mockito.verify(user).getTranslation("commands.admin.setspawn.confirmation");
@@ -158,7 +157,7 @@ public class AdminSetspawnCommandTest {
      */
     @Test
     public void testExecuteUserStringListOfStringNoIsland() {
-        when(im.getIslandAt(Mockito.any(Location.class))).thenReturn(Optional.empty());
+        when(im.getIslandAt(any(Location.class))).thenReturn(Optional.empty());
         AdminSetspawnCommand c = new AdminSetspawnCommand(ac);
         assertFalse(c.execute(user, "setspawn", Collections.emptyList()));
         Mockito.verify(user).sendMessage("commands.admin.setspawn.no-island-here");
@@ -172,7 +171,7 @@ public class AdminSetspawnCommandTest {
         Island island = mock(Island.class);
         when(island.isSpawn()).thenReturn(true);
         Optional<Island> oi = Optional.of(island);
-        when(im.getIslandAt(Mockito.any(Location.class))).thenReturn(oi);
+        when(im.getIslandAt(any(Location.class))).thenReturn(oi);
         AdminSetspawnCommand c = new AdminSetspawnCommand(ac);
         assertTrue(c.execute(user, "setspawn", Collections.emptyList()));
         Mockito.verify(user).sendMessage("commands.admin.setspawn.already-spawn");
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
index d85f12bab..aa5a52e9d 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommandTest.java
@@ -3,11 +3,11 @@ package world.bentobox.bentobox.api.commands.admin;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -120,7 +120,7 @@ public class AdminTeleportCommandTest {
 
             @Override
             public String answer(InvocationOnMock invocation) throws Throwable {
-                return invocation.getArgumentAt(0, String.class);
+                return invocation.getArgument(0, String.class);
             }});
 
         // Island location
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java
new file mode 100644
index 000000000..b06ff34a2
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommandTest.java
@@ -0,0 +1,342 @@
+/**
+ *
+ */
+package world.bentobox.bentobox.api.commands.admin.purge;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.eclipse.jdt.annotation.NonNull;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeletedEvent;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.CommandsManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.RanksManager;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
+public class AdminPurgeCommandTest {
+
+    @Mock
+    private BentoBox plugin;
+    @Mock
+    private CompositeCommand ac;
+    @Mock
+    private User user;
+    @Mock
+    private IslandsManager im;
+
+    private AdminPurgeCommand apc;
+    @Mock
+    private Addon addon;
+    @Mock
+    private Island island;
+    @Mock
+    private World world;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+
+        // Command manager
+        CommandsManager cm = mock(CommandsManager.class);
+        when(plugin.getCommandsManager()).thenReturn(cm);
+        when(ac.getWorld()).thenReturn(world);
+
+        when(ac.getAddon()).thenReturn(addon);
+        when(ac.getTopLabel()).thenReturn("bsb");
+
+        // Island manager
+        when(plugin.getIslands()).thenReturn(im);
+        // No islands by default
+        when(im.getIslands()).thenReturn(Collections.emptyList());
+
+        // IWM
+
+        IslandWorldManager iwm = mock(IslandWorldManager.class);
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
+        when(plugin.getIWM()).thenReturn(iwm);
+
+        // Command
+        apc = new AdminPurgeCommand(ac);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#AdminPurgeCommand(CompositeCommand)}.
+     */
+    @Test
+    public void testConstructor() {
+        verify(addon).registerListener(apc);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#setup()}.
+     */
+    @Test
+    public void testSetup() {
+        assertEquals("admin.purge", apc.getPermission());
+        assertFalse(apc.isOnlyPlayer());
+        assertEquals("commands.admin.purge.parameters", apc.getParameters());
+        assertEquals("commands.admin.purge.description", apc.getDescription());
+        assertEquals(4, apc.getSubCommands().size());
+    }
+
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteUserStringListOfStringEmptyArgs() {
+        assertFalse(apc.canExecute(user, "protect", Collections.emptyList()));
+        verify(user).sendMessage("commands.help.header",
+                "[label]",
+                "BSkyBlock");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteUserStringListOfStringWithArg() {
+        assertTrue(apc.canExecute(user, "protect", Collections.singletonList("23")));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNotNumber() {
+        assertFalse(apc.execute(user, "protect", Collections.singletonList("abc")));
+        verify(user).sendMessage(eq("commands.admin.purge.number-error"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringZero() {
+        assertFalse(apc.execute(user, "protect", Collections.singletonList("0")));
+        verify(user).sendMessage(eq("commands.admin.purge.days-one-or-more"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslands() {
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslandsPurgeProtected() {
+        when(island.getPurgeProtected()).thenReturn(true);
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslandsWrongWorld() {
+        when(island.getPurgeProtected()).thenReturn(false);
+        when(island.getWorld()).thenReturn(mock(World.class));
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslandsUnowned() {
+        when(island.getPurgeProtected()).thenReturn(false);
+        when(island.getWorld()).thenReturn(world);
+        when(island.getOwner()).thenReturn(null);
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslandsTeamIsland() {
+        when(island.getPurgeProtected()).thenReturn(false);
+        when(island.getWorld()).thenReturn(world);
+        when(island.getOwner()).thenReturn(UUID.randomUUID());
+        Map<UUID, Integer> team = new HashMap<>();
+        team.put(UUID.randomUUID(), RanksManager.OWNER_RANK);
+        team.put(UUID.randomUUID(), RanksManager.MEMBER_RANK);
+        when(island.getMembers()).thenReturn(team);
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringNoIslandsRecentLogin() {
+        when(island.getPurgeProtected()).thenReturn(false);
+        when(island.getWorld()).thenReturn(world);
+        when(island.getOwner()).thenReturn(UUID.randomUUID());
+        Map<UUID, Integer> team = new HashMap<>();
+        team.put(UUID.randomUUID(), RanksManager.OWNER_RANK);
+        when(island.getMembers()).thenReturn(team);
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        PowerMockito.mockStatic(Bukkit.class);
+        OfflinePlayer op = mock(OfflinePlayer.class);
+        when(op.getLastPlayed()).thenReturn(System.currentTimeMillis());
+        when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(op);
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("0"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testExecuteUserStringListOfStringIslandsFound() {
+        when(island.getPurgeProtected()).thenReturn(false);
+        when(island.getWorld()).thenReturn(world);
+        when(island.getOwner()).thenReturn(UUID.randomUUID());
+        Map<UUID, Integer> team = new HashMap<>();
+        team.put(UUID.randomUUID(), RanksManager.OWNER_RANK);
+        when(island.getMembers()).thenReturn(team);
+        when(im.getIslands()).thenReturn(Collections.singleton(island));
+        PowerMockito.mockStatic(Bukkit.class);
+        OfflinePlayer op = mock(OfflinePlayer.class);
+        when(op.getLastPlayed()).thenReturn(0L);
+        when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(op);
+        assertFalse(apc.execute(user, "protect", Collections.singletonList("10")));
+        verify(user).sendMessage(eq("commands.admin.purge.purgable-islands"), eq("[number]"), eq("1"));
+        verify(user).sendMessage(eq("commands.admin.purge.confirm"), eq("[label]"), eq("bsb"));
+    }
+
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#removeIslands()}.
+     */
+    @Test
+    public void testRemoveIslands() {
+        @NonNull
+        Optional<Island> opIsland = Optional.of(island);
+        when(im.getIslandById(any())).thenReturn(opIsland);
+        testExecuteUserStringListOfStringIslandsFound();
+        assertTrue(apc.execute(user, "protect", Collections.singletonList("confirm")));
+        verify(im).deleteIsland(eq(island), eq(true), eq(null));
+        verify(plugin).log(eq("1 islands purged"));
+        verify(user).sendMessage(eq("commands.admin.purge.see-console-for-status"));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#onIslandDeleted(world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeletedEvent)}.
+     */
+    @Test
+    public void testOnIslandDeletedNotInPurge() {
+        IslandDeletedEvent e = mock(IslandDeletedEvent.class);
+        apc.onIslandDeleted(e);
+        verify(user, Mockito.never()).sendMessage(any());
+        verify(plugin, Mockito.never()).log(any());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#onIslandDeleted(world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeletedEvent)}.
+     */
+    @Test
+    public void testOnIslandDeletedPurgeCompleted() {
+        testRemoveIslands();
+        IslandDeletedEvent e = mock(IslandDeletedEvent.class);
+        apc.onIslandDeleted(e);
+        verify(user).sendMessage(eq("commands.admin.purge.completed"));
+        verify(plugin, Mockito.never()).log("");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#isInPurge()}.
+     */
+    @Test
+    public void testIsInPurge() {
+        assertFalse(apc.isInPurge());
+        testRemoveIslands();
+        assertTrue(apc.isInPurge());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#stop()}.
+     */
+    @Test
+    public void testStop() {
+        testRemoveIslands();
+        assertTrue(apc.isInPurge());
+        apc.stop();
+        assertFalse(apc.isInPurge());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.admin.purge.AdminPurgeCommand#setUser(world.bentobox.bentobox.api.user.User)}.
+     */
+    @Test
+    public void testSetUser() {
+        apc.setUser(user);
+        apc.removeIslands();
+        verify(user, Mockito.times(2)).sendMessage(any());
+    }
+
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java
index 8bc03843b..163ee7922 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java
@@ -101,7 +101,7 @@ public class AdminRangeCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
         when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer );
         when(plugin.getLocalesManager()).thenReturn(lm);
 
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java
index fda336641..dec2e0f71 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommandTest.java
@@ -103,9 +103,9 @@ public class AdminRangeDisplayCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
-            when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer );
-            when(plugin.getLocalesManager()).thenReturn(lm);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
+        when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer );
+        when(plugin.getLocalesManager()).thenReturn(lm);
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java
index 3a39ce235..e6d99dbeb 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java
@@ -117,7 +117,7 @@ public class AdminRangeResetCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
 
         when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer );
         when(plugin.getLocalesManager()).thenReturn(lm);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java
index 4c853af43..0eb039d26 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java
@@ -119,7 +119,7 @@ public class AdminRangeSetCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
 
         when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer );
         when(plugin.getLocalesManager()).thenReturn(lm);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java
index eb02890b1..c53adbb9f 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/CustomIslandMultiHomeHelpTest.java
@@ -1,12 +1,12 @@
-/**
- *
- */
 package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
@@ -48,6 +48,8 @@ public class CustomIslandMultiHomeHelpTest {
     @Mock
     private User user;
     private CustomIslandMultiHomeHelp ch;
+    @Mock
+    private IslandWorldManager iwm;
 
     /**
      * @throws java.lang.Exception
@@ -73,8 +75,8 @@ public class CustomIslandMultiHomeHelpTest {
         UUID uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
         when(user.getPlayer()).thenReturn(player);
-        when(user.hasPermission(Mockito.anyString())).thenReturn(true);
-        when(user.getTranslation(Mockito.anyVararg())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.hasPermission(anyString())).thenReturn(true);
+        when(user.getTranslation(any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
         User.setPlugin(plugin);
         // Set up user already
         User.getInstance(player);
@@ -90,10 +92,10 @@ public class CustomIslandMultiHomeHelpTest {
 
         // No island for player to begin with (set it later in the tests)
         IslandsManager im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
+        when(im.hasIsland(any(), Mockito.eq(uuid))).thenReturn(false);
+        when(im.isOwner(any(), Mockito.eq(uuid))).thenReturn(false);
         // Has team
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), Mockito.eq(uuid))).thenReturn(true);
         when(plugin.getIslands()).thenReturn(im);
 
 
@@ -106,9 +108,11 @@ public class CustomIslandMultiHomeHelpTest {
         when(Bukkit.getScheduler()).thenReturn(sch);
 
         // IWM friendly name
-        IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
         when(plugin.getIWM()).thenReturn(iwm);
+        
+        // Locales
+        
 
         // Command
         ch = new CustomIslandMultiHomeHelp(ic);
@@ -166,7 +170,7 @@ public class CustomIslandMultiHomeHelpTest {
     @Test
     public void testExecuteUserStringListOfString() {
         assertTrue(ch.execute(user, "", Collections.emptyList()));
-        Mockito.verify(user).sendMessage(
+        verify(user).sendMessage(
                 "commands.help.syntax",
                 "[usage]",
                 "",
@@ -184,7 +188,7 @@ public class CustomIslandMultiHomeHelpTest {
     public void testExecuteUserStringListOfStringMaxHomes() {
         when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(20);
         assertTrue(ch.execute(user, "", Collections.emptyList()));
-        Mockito.verify(user).sendMessage(
+        verify(user).sendMessage(
                 "commands.help.syntax",
                 "[usage]",
                 "",
@@ -194,5 +198,5 @@ public class CustomIslandMultiHomeHelpTest {
                 "description"
                 );
     }
-
+   
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java
index b8c633504..32092a0df 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanCommandTest.java
@@ -2,7 +2,12 @@ package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -23,10 +28,11 @@ import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
@@ -36,6 +42,7 @@ import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
@@ -43,6 +50,8 @@ import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.LocalesManager;
+import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.managers.PlayersManager;
 import world.bentobox.bentobox.managers.RanksManager;
 
@@ -51,15 +60,25 @@ import world.bentobox.bentobox.managers.RanksManager;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
+@PrepareForTest({Bukkit.class, BentoBox.class})
 public class IslandBanCommandTest {
 
+    @Mock
     private CompositeCommand ic;
     private UUID uuid;
+    @Mock
     private User user;
+    @Mock
     private IslandsManager im;
+    @Mock
     private PlayersManager pm;
+    @Mock
     private Island island;
+    @Mock
+    private Addon addon;
+    private IslandBanCommand ibc;
+    @Mock
+    private Player targetPlayer;
 
     @Before
     public void setUp() throws Exception {
@@ -74,32 +93,28 @@ public class IslandBanCommandTest {
 
         // Settings
         Settings s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
         Player p = mock(Player.class);
         // Sometimes use Mockito.withSettings().verboseLogging()
-        user = mock(User.class);
         when(user.isOp()).thenReturn(false);
         uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
         when(user.getPlayer()).thenReturn(p);
         when(user.getName()).thenReturn("tastybento");
+        when(user.getPermissionValue(anyString(), anyInt())).thenReturn(-1);
 
         // Parent command has no aliases
-        ic = mock(CompositeCommand.class);
         when(ic.getSubCommandAliases()).thenReturn(new HashMap<>());
 
-        // No island for player to begin with (set it later in the tests)
-        im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
+        // Player has island to begin with
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(true);
+        when(im.isOwner(any(), eq(uuid))).thenReturn(true);
         when(plugin.getIslands()).thenReturn(im);
 
         // Has team
-        pm = mock(PlayersManager.class);
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), eq(uuid))).thenReturn(true);
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Server & Scheduler
@@ -108,23 +123,54 @@ public class IslandBanCommandTest {
         when(Bukkit.getScheduler()).thenReturn(sch);
 
         // Island Banned list initialization
-        island = mock(Island.class);
         when(island.getBanned()).thenReturn(new HashSet<>());
-        when(island.isBanned(Mockito.any())).thenReturn(false);
-        when(island.getRank(Mockito.any())).thenReturn(RanksManager.OWNER_RANK);
-        when(im.getIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(island);
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(island.isBanned(any())).thenReturn(false);
+        when(island.getRank(any())).thenReturn(RanksManager.OWNER_RANK);
+        when(im.getIsland(any(), any(User.class))).thenReturn(island);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         // IWM friendly name
         IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
         when(plugin.getIWM()).thenReturn(iwm);
 
+
         // Server and Plugin Manager for events
         Server server = mock(Server.class);
         when(Bukkit.getServer()).thenReturn(server);
         PluginManager pim = mock(PluginManager.class);
         when(server.getPluginManager()).thenReturn(pim);
+
+        // Addon
+        when(ic.getAddon()).thenReturn(addon);
+
+        // Locales
+        LocalesManager lm = mock(LocalesManager.class);
+        when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(invocation -> invocation.getArgument(1, String.class));
+        when(plugin.getLocalesManager()).thenReturn(lm);
+        PlaceholdersManager phm = mock(PlaceholdersManager.class);
+        when(phm.replacePlaceholders(any(), any())).thenAnswer(invocation -> invocation.getArgument(1, String.class));
+        // Placeholder manager
+        when(plugin.getPlaceholdersManager()).thenReturn(phm);
+
+        // Target bill - default target. Non Op, online, no ban prevention permission
+        UUID uuid = UUID.randomUUID();
+        when(pm.getUUID(Mockito.anyString())).thenReturn(uuid);
+        when(targetPlayer.getName()).thenReturn("bill");
+        when(targetPlayer.getUniqueId()).thenReturn(uuid);
+        when(targetPlayer.isOp()).thenReturn(false);
+        when(targetPlayer.isOnline()).thenReturn(true);
+        when(targetPlayer.hasPermission(Mockito.anyString())).thenReturn(false);
+        User.getInstance(targetPlayer);
+
+        // Island Ban Command
+        ibc = new IslandBanCommand(ic);
+
+    }
+
+    @After
+    public void tearDown() {
+        User.clearUsers();
     }
 
     /**
@@ -147,167 +193,118 @@ public class IslandBanCommandTest {
 
     @Test
     public void testNoArgs() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        assertFalse(ibc.execute(user, ibc.getLabel(), new ArrayList<>()));
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), new ArrayList<>()));
     }
 
     @Test
     public void testNoIsland() {
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("general.errors.no-island");
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(false);
+        when(im.isOwner(any(), eq(uuid))).thenReturn(false);
+        when(im.inTeam(any(), eq(uuid))).thenReturn(false);
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("general.errors.no-island");
     }
 
     @Test
     public void testTooLowRank() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("general.errors.no-permission");
+        when(island.getRank(any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("general.errors.no-permission");
     }
 
     @Test
     public void testUnknownUser() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
         when(pm.getUUID(Mockito.anyString())).thenReturn(null);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "bill");
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("general.errors.unknown-player", "[name]", "bill");
     }
 
     @Test
     public void testBanSelf() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
         when(pm.getUUID(Mockito.anyString())).thenReturn(uuid);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.cannot-ban-yourself");
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("commands.island.ban.cannot-ban-yourself");
     }
 
     @Test
     public void testBanTeamMate() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
         UUID teamMate = UUID.randomUUID();
         when(pm.getUUID(Mockito.anyString())).thenReturn(teamMate);
         Set<UUID> members = new HashSet<>();
         members.add(uuid);
         members.add(teamMate);
-        when(im.getMembers(Mockito.any(), Mockito.any())).thenReturn(members);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.cannot-ban-member");
+        when(im.getMembers(any(), any())).thenReturn(members);
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("commands.island.ban.cannot-ban-member");
     }
 
     @Test
     public void testBanAlreadyBanned() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
         UUID bannedUser = UUID.randomUUID();
         when(pm.getUUID(Mockito.anyString())).thenReturn(bannedUser);
-        when(island.isBanned(Mockito.eq(bannedUser))).thenReturn(true);
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.player-already-banned");
+        when(island.isBanned(eq(bannedUser))).thenReturn(true);
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("commands.island.ban.player-already-banned");
     }
 
     @Test
-    @Ignore("NPE in IslandBanCommand:77")
     public void testBanOp() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        UUID op = UUID.randomUUID();
-        when(pm.getUUID(Mockito.anyString())).thenReturn(op);
-        PowerMockito.mockStatic(User.class);
-        User opUser = mock(User.class);
-        when(opUser.isOp()).thenReturn(true);
-        when(opUser.hasPermission(Mockito.anyString())).thenReturn(true);
-        when(opUser.isPlayer()).thenReturn(true);
-        when(User.getInstance(Mockito.any(UUID.class))).thenReturn(opUser);
-
-        assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.cannot-ban");
+        when(targetPlayer.isOp()).thenReturn(true);
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+        verify(user).sendMessage("commands.island.ban.cannot-ban");
     }
 
     @Test
-    @Ignore("NPE in IslandBanCommand:77")
-    public void testBanOfflineUser() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        UUID targetUuid = UUID.randomUUID();
-        when(pm.getUUID(Mockito.anyString())).thenReturn(targetUuid);
-        PowerMockito.mockStatic(User.class);
-        User targetUser = mock(User.class);
-        when(targetUser.isOp()).thenReturn(false);
-        when(targetUser.isPlayer()).thenReturn(true);
-        when(targetUser.isOnline()).thenReturn(false);
-        when(User.getInstance(targetUuid)).thenReturn(targetUser);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(-1);
+    public void testBanOnlineNoBanPermission() {
+        when(targetPlayer.hasPermission(Mockito.anyString())).thenReturn(true);
+        User.getInstance(targetPlayer);
+
+        assertFalse(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("billy")));
+        verify(user).sendMessage("commands.island.ban.cannot-ban");
+    }
+
+    @Test
+    public void testBanOfflineUserSuccess() {
+        when(targetPlayer.isOnline()).thenReturn(false);
+        assertTrue(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
 
         // Allow adding to ban list
-        when(island.ban(Mockito.any(), Mockito.any())).thenReturn(true);
-
+        when(island.ban(any(), any())).thenReturn(true);
+        // Run execute
         assertTrue(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.player-banned", TextVariables.NAME, targetUser.getName());
-        Mockito.verify(targetUser).sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, user.getName());
+        verify(user).sendMessage("commands.island.ban.player-banned", "[name]", "bill");
+        verify(targetPlayer).sendMessage("commands.island.ban.owner-banned-you");
     }
 
     @Test
-    @Ignore("NPE in IslandBanCommand:77")
-    public void testBanOnlineUser() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        UUID op = UUID.randomUUID();
-        when(pm.getUUID(Mockito.anyString())).thenReturn(op);
-        PowerMockito.mockStatic(User.class);
-        User targetUser = mock(User.class);
-        when(targetUser.isOp()).thenReturn(false);
-        when(targetUser.isPlayer()).thenReturn(true);
-        when(targetUser.isOnline()).thenReturn(true);
-        when(User.getInstance(Mockito.any(UUID.class))).thenReturn(targetUser);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(-1);
+    public void testBanOnlineUserSuccess() {
+        assertTrue(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+
         // Allow adding to ban list
-        when(island.ban(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(island.ban(any(), any())).thenReturn(true);
 
         assertTrue(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user).sendMessage("commands.island.ban.player-banned", TextVariables.NAME, targetUser.getName());
-        Mockito.verify(targetUser).sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, user.getName());
+        verify(user).sendMessage("commands.island.ban.player-banned", "[name]", "bill");
+        verify(targetPlayer).sendMessage("commands.island.ban.owner-banned-you");
     }
 
     @Test
-    @Ignore("NPE in IslandBanCommand:77")
     public void testCancelledBan() {
-        IslandBanCommand ibc = new IslandBanCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        UUID op = UUID.randomUUID();
-        when(pm.getUUID(Mockito.anyString())).thenReturn(op);
-        PowerMockito.mockStatic(User.class);
-        User targetUser = mock(User.class);
-        when(targetUser.isOp()).thenReturn(false);
-        when(targetUser.isPlayer()).thenReturn(true);
-        when(targetUser.isOnline()).thenReturn(true);
-        when(User.getInstance(Mockito.any(UUID.class))).thenReturn(targetUser);
-        // Disallow adding to ban list - even cancelled
-        when(island.ban(Mockito.any(), Mockito.any())).thenReturn(false);
+        assertTrue(ibc.canExecute(user, ibc.getLabel(), Collections.singletonList("bill")));
+
+        // Disallow adding to ban list - event cancelled
+        when(island.ban(any(), any())).thenReturn(false);
 
         assertFalse(ibc.execute(user, ibc.getLabel(), Collections.singletonList("bill")));
-        Mockito.verify(user, Mockito.never()).sendMessage("commands.island.ban.player-banned", TextVariables.NAME, targetUser.getName());
-        Mockito.verify(targetUser, Mockito.never()).sendMessage("commands.island.ban.owner-banned-you", "[owner]", user.getName());
+        verify(user, Mockito.never()).sendMessage("commands.island.ban.player-banned", TextVariables.NAME, targetPlayer.getName());
+        verify(targetPlayer, Mockito.never()).sendMessage("commands.island.ban.owner-banned-you");
     }
 
     @Test
     public void testTabCompleteNoIsland() {
         // No island
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(null);
-        IslandBanCommand ibc = new IslandBanCommand(ic);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(null);
         // Set up the user
         User user = mock(User.class);
         when(user.getUniqueId()).thenReturn(UUID.randomUUID());
@@ -351,22 +348,21 @@ public class IslandBanCommandTest {
             onlinePlayers.add(p);
         }
 
-        when(island.isBanned(Mockito.any(UUID.class))).thenAnswer((Answer<Boolean>) invocation -> banned.contains(invocation.getArgumentAt(0, UUID.class)));
+        when(island.isBanned(any(UUID.class))).thenAnswer((Answer<Boolean>) invocation -> banned.contains(invocation.getArgument(0, UUID.class)));
         // Create the names
-        when(pm.getName(Mockito.any(UUID.class))).then((Answer<String>) invocation -> online.getOrDefault(invocation.getArgumentAt(0, UUID.class), "tastybento"));
+        when(pm.getName(any(UUID.class))).then((Answer<String>) invocation -> online.getOrDefault(invocation.getArgument(0, UUID.class), "tastybento"));
 
         // Return a set of online players
         PowerMockito.mockStatic(Bukkit.class);
         when(Bukkit.getOnlinePlayers()).then((Answer<Set<Player>>) invocation -> onlinePlayers);
 
-        IslandBanCommand ibc = new IslandBanCommand(ic);
         // Set up the user
         User user = mock(User.class);
         when(user.getUniqueId()).thenReturn(UUID.randomUUID());
         Player player = mock(Player.class);
         // Player can see every other player except Ian
-        when(player.canSee(Mockito.any(Player.class))).thenAnswer((Answer<Boolean>) invocation -> {
-            Player p = invocation.getArgumentAt(0, Player.class);
+        when(player.canSee(any(Player.class))).thenAnswer((Answer<Boolean>) invocation -> {
+            Player p = invocation.getArgument(0, Player.class);
             return !p.getName().equals("ian");
         });
         when(user.getPlayer()).thenReturn(player);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java
index 6f145840b..de4b75331 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandBanlistCommandTest.java
@@ -1,14 +1,14 @@
-/**
- *
- */
 package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -22,7 +22,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
+import org.mockito.Mock;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -38,6 +38,7 @@ import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.RanksManager;
 
 /**
  * @author tastybento
@@ -47,11 +48,16 @@ import world.bentobox.bentobox.managers.PlayersManager;
 @PrepareForTest({Bukkit.class, BentoBox.class, User.class })
 public class IslandBanlistCommandTest {
 
+    @Mock
     private CompositeCommand ic;
     private UUID uuid;
+    @Mock
     private User user;
+    @Mock
     private IslandsManager im;
+    @Mock
     private PlayersManager pm;
+    @Mock
     private Island island;
 
     /**
@@ -74,7 +80,6 @@ public class IslandBanlistCommandTest {
         // Player
         Player p = mock(Player.class);
         // Sometimes use Mockito.withSettings().verboseLogging()
-        user = mock(User.class);
         when(user.isOp()).thenReturn(false);
         uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
@@ -82,19 +87,16 @@ public class IslandBanlistCommandTest {
         when(user.getName()).thenReturn("tastybento");
 
         // Parent command has no aliases
-        ic = mock(CompositeCommand.class);
         when(ic.getSubCommandAliases()).thenReturn(new HashMap<>());
         when(ic.getTopLabel()).thenReturn("island");
 
         // No island for player to begin with (set it later in the tests)
-        im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(false);
+        when(im.isOwner(any(), eq(uuid))).thenReturn(false);
         when(plugin.getIslands()).thenReturn(im);
 
         // Has team
-        pm = mock(PlayersManager.class);
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), eq(uuid))).thenReturn(true);
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Server & Scheduler
@@ -103,47 +105,71 @@ public class IslandBanlistCommandTest {
         when(Bukkit.getScheduler()).thenReturn(sch);
 
         // Island Banned list initialization
-        island = mock(Island.class);
         when(island.getBanned()).thenReturn(new HashSet<>());
-        when(island.isBanned(Mockito.any())).thenReturn(false);
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(island.isBanned(any())).thenReturn(false);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         // IWM friendly name
         IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
         when(plugin.getIWM()).thenReturn(iwm);
 
     }
 
     /**
-     * Test method for .
+     * Test method for {@link IslandBanlistCommand#canExecute(User, String, java.util.List)}.
      */
     @Test
     public void testWithArgs() {
         IslandBanlistCommand iubc = new IslandBanlistCommand(ic);
-        assertFalse(iubc.execute(user, iubc.getLabel(), Collections.singletonList("bill")));
+        assertFalse(iubc.canExecute(user, iubc.getLabel(), Collections.singletonList("bill")));
         // Verify show help
+        verify(user).sendMessage("commands.help.header", "[label]", null);
     }
 
+    /**
+     * Test method for {@link IslandBanlistCommand#canExecute(User, String, java.util.List)}.
+     */
     @Test
     public void testNoIsland() {
+        // not in team
+        when(im.inTeam(any(), eq(uuid))).thenReturn(false);
         IslandBanlistCommand iubc = new IslandBanlistCommand(ic);
-        assertFalse(iubc.execute(user, iubc.getLabel(), new ArrayList<>()));
-        Mockito.verify(user).sendMessage("general.errors.no-island");
+        assertFalse(iubc.canExecute(user, iubc.getLabel(), Collections.emptyList()));
+        verify(user).sendMessage("general.errors.no-island");
     }
 
+    /**
+     * Test method for {@link IslandBanlistCommand#canExecute(User, String, java.util.List)}.
+     */
+    @Test
+    public void testTooLowRank() {
+        when(island.getRank(any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
+        IslandBanlistCommand iubc = new IslandBanlistCommand(ic);
+        assertFalse(iubc.canExecute(user, iubc.getLabel(), Collections.emptyList()));
+        verify(user).sendMessage("general.errors.no-permission");
+    }
+
+    /**
+     * Test method for {@link IslandBanlistCommand#execute(User, String, java.util.List)}.
+     */
     @Test
     public void testBanlistNooneBanned() {
         IslandBanlistCommand iubc = new IslandBanlistCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
-        assertTrue(iubc.execute(user, iubc.getLabel(), new ArrayList<>()));
-        Mockito.verify(user).sendMessage("commands.island.banlist.noone");
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(true);
+        iubc.canExecute(user, iubc.getLabel(), Collections.emptyList());
+        assertTrue(iubc.execute(user, iubc.getLabel(), Collections.emptyList()));
+        verify(user).sendMessage("commands.island.banlist.noone");
     }
 
+    /**
+     * Test method for {@link IslandBanlistCommand#execute(User, String, java.util.List)}.
+     */
     @Test
     public void testBanlistBanned() {
         IslandBanlistCommand iubc = new IslandBanlistCommand(ic);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(true);
         // Make a ban list
         String[] names = {"adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", "harry", "ian", "joe"};
         Set<UUID> banned = new HashSet<>();
@@ -155,9 +181,10 @@ public class IslandBanlistCommandTest {
         }
         when(island.getBanned()).thenReturn(banned);
         // Respond to name queries
-        when(pm.getName(Mockito.any(UUID.class))).then((Answer<String>) invocation -> uuidToName.getOrDefault(invocation.getArgumentAt(0, UUID.class), "tastybento"));
-        assertTrue(iubc.execute(user, iubc.getLabel(), new ArrayList<>()));
-        Mockito.verify(user).sendMessage("commands.island.banlist.the-following");
+        when(pm.getName(any(UUID.class))).then((Answer<String>) invocation -> uuidToName.getOrDefault(invocation.getArgument(0, UUID.class), "tastybento"));
+        iubc.canExecute(user, iubc.getLabel(), Collections.emptyList());
+        assertTrue(iubc.execute(user, iubc.getLabel(), Collections.emptyList()));
+        verify(user).sendMessage("commands.island.banlist.the-following");
     }
 
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java
index fa2e679d3..0cd80108e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertEquals;
@@ -23,6 +20,7 @@ import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.eclipse.jdt.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -102,7 +100,7 @@ public class IslandCreateCommandTest {
         when(user.getUniqueId()).thenReturn(uuid);
         when(user.getPlayer()).thenReturn(player);
         when(user.hasPermission(Mockito.anyString())).thenReturn(true);
-        when(user.getTranslation(Mockito.anyVararg())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.getTranslation(Mockito.anyVararg())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
         User.setPlugin(plugin);
         // Set up user already
         User.getInstance(player);
@@ -126,6 +124,7 @@ public class IslandCreateCommandTest {
         when(im.isOwner(any(), eq(uuid))).thenReturn(false);
         // Has team
         when(im.inTeam(any(), eq(uuid))).thenReturn(true);
+
         when(plugin.getIslands()).thenReturn(im);
 
 
@@ -146,7 +145,6 @@ public class IslandCreateCommandTest {
         when(NewIsland.builder()).thenReturn(builder);
         when(builder.player(any())).thenReturn(builder);
         when(builder.name(Mockito.anyString())).thenReturn(builder);
-        when(builder.world(any())).thenReturn(builder);
         when(builder.addon(addon)).thenReturn(builder);
         when(builder.reason(any())).thenReturn(builder);
         when(builder.build()).thenReturn(mock(Island.class));
@@ -194,7 +192,9 @@ public class IslandCreateCommandTest {
      */
     @Test
     public void testCanExecuteUserStringListOfStringHasIsland() {
-        when(im.hasIsland(any(), Mockito.any(UUID.class))).thenReturn(true);
+        @Nullable
+        Island island = mock(Island.class);
+        when(im.getIsland(any(), Mockito.any(User.class))).thenReturn(island);
         assertFalse(cc.canExecute(user, "", Collections.emptyList()));
         verify(user).sendMessage(eq("general.errors.already-have-island"));
     }
@@ -203,11 +203,13 @@ public class IslandCreateCommandTest {
      * Test method for {@link world.bentobox.bentobox.api.commands.island.IslandCreateCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
      */
     @Test
-    public void testCanExecuteUserStringListOfStringInTeam() {
-        when(im.hasIsland(any(), Mockito.any(UUID.class))).thenReturn(false);
-        when(im.inTeam(any(), Mockito.any(UUID.class))).thenReturn(true);
-        assertFalse(cc.canExecute(user, "", Collections.emptyList()));
-        verify(user).sendMessage(eq("general.errors.already-have-island"));
+    public void testCanExecuteUserStringListOfStringHasIslandReserved() {
+        @Nullable
+        Island island = mock(Island.class);
+        when(im.getIsland(any(), Mockito.any(User.class))).thenReturn(island);
+        when(island.isReserved()).thenReturn(true);
+        assertTrue(cc.canExecute(user, "", Collections.emptyList()));
+        verify(user, never()).sendMessage(eq("general.errors.already-have-island"));
 
     }
 
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java
index 19f000b8d..894e993b9 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommandTest.java
@@ -6,6 +6,7 @@ package world.bentobox.bentobox.api.commands.island;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -91,7 +92,6 @@ public class IslandExpelCommandTest {
 
         // Settings
         Settings s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -141,7 +141,7 @@ public class IslandExpelCommandTest {
         when(island.getWorld()).thenReturn(mock(World.class));
 
         // Locales
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
         when(lm.get(Mockito.any(User.class), Mockito.anyString())).thenAnswer(answer);
         when(plugin.getLocalesManager()).thenReturn(lm);
 
@@ -237,6 +237,7 @@ public class IslandExpelCommandTest {
     public void testCanExecuteLowRank() {
         when(im.hasIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(true);
         when(island.getRank(Mockito.any())).thenReturn(RanksManager.VISITOR_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         assertFalse(iec.canExecute(user, "", Collections.singletonList("tasty")));
         Mockito.verify(user).sendMessage("general.errors.no-permission");
     }
@@ -367,7 +368,7 @@ public class IslandExpelCommandTest {
     public void testExecuteUserStringListOfStringHasIsland() {
         testCanExecute();
         assertTrue(iec.execute(user, "", Collections.singletonList("tasty")));
-        Mockito.verify(user).sendMessage("general.success");
+        Mockito.verify(user).sendMessage("commands.island.expel.success", TextVariables.NAME, "target");
         Mockito.verify(im).homeTeleport(Mockito.any(), Mockito.any());
     }
 
@@ -381,7 +382,7 @@ public class IslandExpelCommandTest {
         testCanExecute();
         when(im.hasIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(false);
         assertTrue(iec.execute(user, "", Collections.singletonList("tasty")));
-        Mockito.verify(user).sendMessage("general.success");
+        Mockito.verify(user).sendMessage("commands.island.expel.success", TextVariables.NAME, "target");
         Mockito.verify(im).spawnTeleport(Mockito.any(), Mockito.any());
     }
 
@@ -401,7 +402,7 @@ public class IslandExpelCommandTest {
         testCanExecute();
         when(im.hasIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(false);
         assertTrue(iec.execute(user, "", Collections.singletonList("tasty")));
-        Mockito.verify(user).sendMessage("general.success");
+        Mockito.verify(user).sendMessage("commands.island.expel.success", TextVariables.NAME, "target");
         Mockito.verify(addon).logWarning(Mockito.eq("Expel: target had no island, so one was created"));
     }
 
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java
index 83a4c8111..6c283a7be 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandGoCommandTest.java
@@ -1,26 +1,43 @@
-/**
- * 
- */
 package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -29,12 +46,17 @@ import org.powermock.reflect.Whitebox;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.user.Notifier;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.LocalesManager;
+import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.managers.PlayersManager;
 import world.bentobox.bentobox.util.Util;
 
@@ -46,10 +68,27 @@ import world.bentobox.bentobox.util.Util;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Bukkit.class, BentoBox.class, Util.class})
 public class IslandGoCommandTest {
+    @Mock
     private CompositeCommand ic;
     private User user;
+    @Mock
     private IslandsManager im;
+    @Mock
     private Island island;
+    @Mock
+    private PluginManager pim;
+    @Mock
+    private Settings s;
+    @Mock
+    private BukkitTask task;
+    @Mock
+    private Player player;
+    private IslandGoCommand igc;
+    @Mock
+    private Notifier notifier;
+    @Mock
+    private World world;
+    private @Nullable WorldSettings ws;
 
     /**
      * @throws java.lang.Exception
@@ -65,127 +104,602 @@ public class IslandGoCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        Settings s = mock(Settings.class);
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
-        Player player = mock(Player.class);
-        // Sometimes use Mockito.withSettings().verboseLogging()
-        user = mock(User.class);
-        when(user.isOp()).thenReturn(false);
+        when(player.isOp()).thenReturn(false);
         UUID uuid = UUID.randomUUID();
-        when(user.getUniqueId()).thenReturn(uuid);
-        when(user.getPlayer()).thenReturn(player);
-        when(user.getName()).thenReturn("tastybento");
+        when(player.getUniqueId()).thenReturn(uuid);
+        when(player.getName()).thenReturn("tastybento");
+        when(player.getWorld()).thenReturn(world);
+        user = User.getInstance(player);
+        // Set the User class plugin as this one
+        User.setPlugin(plugin);
+
 
         // Parent command has no aliases
-        ic = mock(CompositeCommand.class);
         when(ic.getSubCommandAliases()).thenReturn(new HashMap<>());
         when(ic.getTopLabel()).thenReturn("island");
+        // Have the create command point to the ic command
+        Optional<CompositeCommand> createCommand = Optional.of(ic);
+        when(ic.getSubCommand(eq("create"))).thenReturn(createCommand);
 
         // No island for player to begin with (set it later in the tests)
-        im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(false);
+        when(im.isOwner(any(), eq(uuid))).thenReturn(false);
         when(plugin.getIslands()).thenReturn(im);
 
         // Has team
         PlayersManager pm = mock(PlayersManager.class);
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), eq(uuid))).thenReturn(true);
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Server & Scheduler
         BukkitScheduler sch = mock(BukkitScheduler.class);
         PowerMockito.mockStatic(Bukkit.class);
         when(Bukkit.getScheduler()).thenReturn(sch);
+        when(sch.runTaskLater(any(), any(Runnable.class), any(Long.class))).thenReturn(task);
+        // Event register
+        when(Bukkit.getPluginManager()).thenReturn(pim);
 
         // Island Banned list initialization
-        island = mock(Island.class);
         when(island.getBanned()).thenReturn(new HashSet<>());
-        when(island.isBanned(Mockito.any())).thenReturn(false);
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(island.isBanned(any())).thenReturn(false);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         // IWM friendly name
         IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
         when(plugin.getIWM()).thenReturn(iwm);
-        
-        // Number of homes
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+        ws = new MyWorldSettings();
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
+        // Just return an empty addon for now
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
+
         PowerMockito.mockStatic(Util.class);
-        // 1 home for now
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(1);
+
+        // Locales
+        LocalesManager lm = mock(LocalesManager.class);
+        when(lm.get(Mockito.any(), Mockito.any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
+        when(plugin.getLocalesManager()).thenReturn(lm);
+        // Return the same string
+        PlaceholdersManager phm = mock(PlaceholdersManager.class);
+        when(phm.replacePlaceholders(any(), anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
+        when(plugin.getPlaceholdersManager()).thenReturn(phm);
+
+        // Notifier
+        when(plugin.getNotifier()).thenReturn(notifier);
+
+        // Command
+        igc = new IslandGoCommand(ic);
+
+    }
+
+    @After
+    public void tearDown() {
+        User.clearUsers();
     }
 
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
      */
     @Test
     public void testExecuteNoArgsNoIsland() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(null);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        assertFalse(igc.execute(user, igc.getLabel(), new ArrayList<>()));
-        Mockito.verify(user).sendMessage("general.errors.no-island");
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(null);
+        assertFalse(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
+        verify(player).sendMessage("general.errors.no-island");
     }
-    
+
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
      */
     @Test
     public void testExecuteNoArgs() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        assertTrue(igc.execute(user, igc.getLabel(), new ArrayList<>()));
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        assertTrue(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
     }
-    
+
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsReservedIsland() {
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        when(ic.call(any(), any(), any())).thenReturn(true);
+        when(island.isReserved()).thenReturn(true);
+        assertFalse(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
+        verify(ic).call(any(), any(), any());
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsReservedIslandNoCreateCommand() {
+        when(ic.getSubCommand(eq("create"))).thenReturn(Optional.empty());
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        when(ic.call(any(), any(), any())).thenReturn(true);
+        when(island.isReserved()).thenReturn(true);
+        assertFalse(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
+        verify(ic, Mockito.never()).call(any(), any(), any());
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsNoTeleportWhenFalling() {
+        Flags.PREVENT_TELEPORT_WHEN_FALLING.setSetting(world, true);
+        when(player.getFallDistance()).thenReturn(10F);
+        assertFalse(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
+        verify(player).sendMessage(eq("protection.flags.PREVENT_TELEPORT_WHEN_FALLING.hint"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#canExecute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsNoTeleportWhenFallingNotFalling() {
+        Flags.PREVENT_TELEPORT_WHEN_FALLING.setSetting(world, true);
+        when(player.getFallDistance()).thenReturn(0F);
+        assertTrue(igc.canExecute(user, igc.getLabel(), Collections.emptyList()));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
      */
     @Test
     public void testExecuteNoArgsMultipleHomes() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(3);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        assertTrue(igc.execute(user, igc.getLabel(), new ArrayList<>()));
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        //when(user.getPermissionValue(anyString(), anyInt())).thenReturn(3);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.emptyList()));
     }
-    
+
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
      */
     @Test
     public void testExecuteArgs1MultipleHomes() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(3);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        List<String> args = new ArrayList<>();
-        args.add("1");
-        assertTrue(igc.execute(user, igc.getLabel(), args));
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        //when(user.getPermissionValue(anyString(), anyInt())).thenReturn(3);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.singletonList("1")));
     }
-    
+
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
      */
     @Test
     public void testExecuteArgs2MultipleHomes() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(3);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        List<String> args = new ArrayList<>();
-        args.add("2");
-        assertTrue(igc.execute(user, igc.getLabel(), args));
-        Mockito.verify(user).sendMessage("commands.island.go.tip", TextVariables.LABEL, "island");
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        //when(user.getPermissionValue(anyString(), anyInt())).thenReturn(3);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.singletonList("2")));
     }
 
-    
+
     /**
-     * Test method for .
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
      */
     @Test
     public void testExecuteArgsJunkMultipleHomes() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
-        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(3);
-        IslandGoCommand igc = new IslandGoCommand(ic);
-        List<String> args = new ArrayList<>();
-        args.add("sdfsdf");
-        assertTrue(igc.execute(user, igc.getLabel(), args));
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        //when(user.getPermissionValue(anyString(), anyInt())).thenReturn(3);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.singletonList("sdfghhj")));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsDelay() {
+        when(s.getDelayTime()).thenReturn(10);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.emptyList()));
+        verify(player).sendMessage(eq("commands.delay.stand-still"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsDelayTwice() {
+        when(s.getDelayTime()).thenReturn(10);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.emptyList()));
+        // Twice
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.emptyList()));
+        verify(task).cancel();
+        verify(player).sendMessage(eq("commands.delay.previous-command-cancelled"));
+        verify(player, Mockito.times(2)).sendMessage(eq("commands.delay.stand-still"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#execute(User, String, List)}
+     */
+    @Test
+    public void testExecuteNoArgsDelayMultiHome() {
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        //when(user.getPermissionValue(anyString(), anyInt())).thenReturn(3);
+        when(s.getDelayTime()).thenReturn(10);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        assertTrue(igc.execute(user, igc.getLabel(), Collections.singletonList("2")));
+        verify(player).sendMessage(eq("commands.delay.stand-still"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#onPlayerMove(PlayerMoveEvent)}
+     */
+    @Test
+    public void testOnPlayerMoveHeadMoveNothing() {
+        Location l = mock(Location.class);
+        Vector vector = mock(Vector.class);
+        when(l.toVector()).thenReturn(vector);
+        when(player.getLocation()).thenReturn(l);
+        PlayerMoveEvent e = new PlayerMoveEvent(player, l, l);
+        igc.onPlayerMove(e);
+        verify(player, Mockito.never()).sendMessage(eq("commands.delay.moved-so-command-cancelled"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#onPlayerMove(PlayerMoveEvent)}
+     */
+    @Test
+    public void testOnPlayerMoveHeadMoveTeleportPending() {
+        Location l = mock(Location.class);
+        Vector vector = mock(Vector.class);
+        when(l.toVector()).thenReturn(vector);
+        when(player.getLocation()).thenReturn(l);
+        testExecuteNoArgsDelay();
+        PlayerMoveEvent e = new PlayerMoveEvent(player, l, l);
+        igc.onPlayerMove(e);
+        verify(player, Mockito.never()).sendMessage(eq("commands.delay.moved-so-command-cancelled"));
+    }
+
+    /**
+     * Test method for {@link IslandGoCommand#onPlayerMove(PlayerMoveEvent)}
+     */
+    @Test
+    public void testOnPlayerMovePlayerMoveTeleportPending() {
+        Location l = mock(Location.class);
+        Vector vector = mock(Vector.class);
+        when(l.toVector()).thenReturn(vector);
+        when(player.getLocation()).thenReturn(l);
+        testExecuteNoArgsDelay();
+        Location l2 = mock(Location.class);
+        Vector vector2 = mock(Vector.class);
+        when(l2.toVector()).thenReturn(vector2);
+        PlayerMoveEvent e = new PlayerMoveEvent(player, l, l2);
+        igc.onPlayerMove(e);
+        verify(notifier).notify(any(), eq("commands.delay.moved-so-command-cancelled"));
+    }
+
+    class MyWorldSettings implements WorldSettings {
+
+        private Map<String, Boolean> worldFlags = new HashMap<>();
+
+        /**
+         * @param worldFlags the worldFlags to set
+         */
+        public void setWorldFlags(Map<String, Boolean> worldFlags) {
+            this.worldFlags = worldFlags;
+        }
+
+        @Override
+        public GameMode getDefaultGameMode() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<Flag, Integer> getDefaultIslandFlags() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<Flag, Integer> getDefaultIslandSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Difficulty getDifficulty() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public void setDifficulty(Difficulty difficulty) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public String getFriendlyName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getIslandDistance() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandHeight() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandProtectionRange() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandStartX() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandStartZ() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandXOffset() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandZOffset() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public List<String> getIvSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getMaxHomes() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getMaxIslands() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getMaxTeamSize() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getNetherSpawnRadius() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public String getPermissionPrefix() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Set<EntityType> getRemoveMobsWhitelist() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getSeaHeight() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public List<String> getHiddenFlags() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public List<String> getVisitorBannedCommands() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<String, Boolean> getWorldFlags() {
+            return worldFlags;
+        }
+
+        @Override
+        public String getWorldName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public boolean isDragonSpawn() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isEndGenerate() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isEndIslands() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isNetherGenerate() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isNetherIslands() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetEnderChest() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetMoney() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetEnderChest() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetMoney() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isUseOwnGenerator() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isWaterUnsafe() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public List<String> getGeoLimitSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getResetLimit() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public long getResetEpoch() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public void setResetEpoch(long timestamp) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public boolean isTeamJoinDeathReset() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public int getDeathsMax() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public boolean isDeathsCounted() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isDeathsResetOnNewIsland() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isAllowSetHomeInNether() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isAllowSetHomeInTheEnd() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isRequireConfirmationToSetHomeInNether() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isRequireConfirmationToSetHomeInTheEnd() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public int getBanLimit() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public boolean isLeaversLoseReset() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isKickedKeepInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java
index 0c6b674ea..d2d2f0d5c 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java
@@ -2,8 +2,8 @@ package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -19,7 +19,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -174,7 +173,6 @@ public class IslandResetCommandTest {
         verify(user).sendMessage("commands.island.reset.none-left");
     }
 
-    @Ignore("NPE with ChatColor")
     @Test
     public void testNoConfirmationRequired() throws IOException {
         IslandResetCommand irc = new IslandResetCommand(ic);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java
index e4c2173b6..3fedf0f17 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommandTest.java
@@ -78,7 +78,7 @@ public class IslandSethomeCommandTest {
         when(user.getPlayer()).thenReturn(player);
         when(user.getName()).thenReturn("tastybento");
         when(user.getWorld()).thenReturn(mock(World.class));
-        when(user.getTranslation(Mockito.anyString())).thenAnswer(i -> i.getArgumentAt(0, String.class));
+        when(user.getTranslation(Mockito.anyString())).thenAnswer(i -> i.getArgument(0, String.class));
 
         // Parent command has no aliases
         ic = mock(CompositeCommand.class);
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java
index 96cece518..795ab5167 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommandTest.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.api.commands.island;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -73,8 +74,6 @@ public class IslandUnbanCommandTest {
 
         // Settings
         Settings s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
-
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -162,6 +161,7 @@ public class IslandUnbanCommandTest {
         IslandUnbanCommand iubc = new IslandUnbanCommand(ic);
         when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
         when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         assertFalse(iubc.execute(user, iubc.getLabel(), Collections.singletonList("bill")));
         Mockito.verify(user).sendMessage("general.errors.no-permission");
     }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java
index efee7596c..dc15144ed 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommandTest.java
@@ -6,6 +6,7 @@ package world.bentobox.bentobox.api.commands.island.team;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -23,6 +24,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -32,6 +34,7 @@ import org.powermock.reflect.Whitebox;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.CommandsManager;
@@ -50,13 +53,19 @@ import world.bentobox.bentobox.managers.RanksManager;
 @PrepareForTest({Bukkit.class, BentoBox.class, User.class })
 public class IslandTeamCoopCommandTest {
 
+    @Mock
     private CompositeCommand ic;
     private UUID uuid;
+    @Mock
     private User user;
+    @Mock
     private IslandsManager im;
+    @Mock
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
+    @Mock
     private Island island;
 
     /**
@@ -72,16 +81,11 @@ public class IslandTeamCoopCommandTest {
         CommandsManager cm = mock(CommandsManager.class);
         when(plugin.getCommandsManager()).thenReturn(cm);
 
-        // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
-
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
         Player p = mock(Player.class);
         // Sometimes use Mockito.withSettings().verboseLogging()
-        user = mock(User.class);
         when(user.isOp()).thenReturn(false);
         uuid = UUID.randomUUID();
         notUUID = UUID.randomUUID();
@@ -94,16 +98,14 @@ public class IslandTeamCoopCommandTest {
         User.setPlugin(plugin);
 
         // Parent command has no aliases
-        ic = mock(CompositeCommand.class);
         when(ic.getSubCommandAliases()).thenReturn(new HashMap<>());
 
         // Player has island to begin with
-        im = mock(IslandsManager.class);
         when(im.hasIsland(any(), Mockito.any(UUID.class))).thenReturn(true);
         when(im.inTeam(any(), Mockito.any(UUID.class))).thenReturn(true);
         when(im.isOwner(any(), any())).thenReturn(true);
         when(im.getOwner(any(), any())).thenReturn(uuid);
-        island = mock(Island.class);
+        // Island
         when(island.getRank(any())).thenReturn(RanksManager.OWNER_RANK);
         when(im.getIsland(any(), Mockito.any(User.class))).thenReturn(island);
         when(im.getIsland(any(), Mockito.any(UUID.class))).thenReturn(island);
@@ -113,8 +115,6 @@ public class IslandTeamCoopCommandTest {
         when(im.inTeam(any(), eq(uuid))).thenReturn(true);
 
         // Player Manager
-        pm = mock(PlayersManager.class);
-
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Server & Scheduler
@@ -133,7 +133,7 @@ public class IslandTeamCoopCommandTest {
         when(plugin.getIWM()).thenReturn(iwm);
 
         PlaceholdersManager phm = mock(PlaceholdersManager.class);
-        when(phm.replacePlaceholders(any(), any())).thenAnswer(invocation -> invocation.getArgumentAt(1, String.class));
+        when(phm.replacePlaceholders(any(), any())).thenAnswer(invocation -> invocation.getArgument(1, String.class));
         // Placeholder manager
         when(plugin.getPlaceholdersManager()).thenReturn(phm);
     }
@@ -161,6 +161,7 @@ public class IslandTeamCoopCommandTest {
     @Test
     public void testCanExecuteLowRank() {
         when(island.getRank(any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         IslandTeamCoopCommand itl = new IslandTeamCoopCommand(ic);
         assertFalse(itl.canExecute(user, itl.getLabel(), Collections.singletonList("bill")));
         verify(user).sendMessage(eq("general.errors.no-permission"));
@@ -298,9 +299,7 @@ public class IslandTeamCoopCommandTest {
         // Execute
         when(im.getIsland(any(), Mockito.any(UUID.class))).thenReturn(island);
         assertTrue(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento")));
-        verify(user).sendMessage(eq("general.success"));
+        verify(user).sendMessage("commands.island.team.coop.success",  TextVariables.NAME, null);
         verify(island).setRank(target, RanksManager.COOP_RANK);
     }
-
-
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
index 6b3358960..1bb05c49d 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommandTest.java
@@ -1,11 +1,9 @@
-/**
- *
- */
 package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -21,6 +19,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -32,6 +31,9 @@ import com.google.common.collect.HashBiMap;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent.TeamEventBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.CommandsManager;
@@ -46,7 +48,7 @@ import world.bentobox.bentobox.managers.RanksManager;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Bukkit.class, BentoBox.class, User.class })
+@PrepareForTest({Bukkit.class, BentoBox.class, User.class, TeamEvent.class })
 public class IslandTeamInviteAcceptCommandTest {
 
     private IslandTeamCommand ic;
@@ -55,6 +57,7 @@ public class IslandTeamInviteAcceptCommandTest {
     private IslandsManager im;
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
     private Island island;
     private IslandTeamInviteAcceptCommand c;
@@ -76,8 +79,6 @@ public class IslandTeamInviteAcceptCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -216,6 +217,28 @@ public class IslandTeamInviteAcceptCommandTest {
         Mockito.verify(pim).callEvent(Mockito.any());
     }
 
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteAcceptCommand#canExecute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
+     */
+    @Test
+    public void testCanExecuteEventBlocked() {
+        biMap.put(uuid, notUUID);
+        when(im.inTeam(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
+        // Block event
+        PowerMockito.mockStatic(TeamEvent.class);
+        TeamEventBuilder teb = mock(TeamEventBuilder.class);
+        when(teb.island(any())).thenReturn(teb);
+        when(teb.involvedPlayer(any())).thenReturn(teb);
+        when(teb.reason(any())).thenReturn(teb);
+        IslandBaseEvent ibe = mock(IslandBaseEvent.class);
+        when(ibe.isCancelled()).thenReturn(true);
+        when(teb.build()).thenReturn(ibe);
+        when(TeamEvent.builder()).thenReturn(teb);
+        assertFalse(c.canExecute(user, "accept", Collections.emptyList()));
+        Mockito.verify(pim).callEvent(Mockito.any());
+    }
+
     /**
      * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteAcceptCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
      */
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
index 0986b594c..05e49cb7e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommandTest.java
@@ -4,6 +4,7 @@
 package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -18,6 +19,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -50,6 +52,7 @@ public class IslandTeamInviteCommandTest {
     private IslandsManager im;
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
     private Island island;
 
@@ -67,8 +70,6 @@ public class IslandTeamInviteCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -126,40 +127,41 @@ public class IslandTeamInviteCommandTest {
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#canExecute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteNoIsland() {
         when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
         when(im.inTeam(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
         IslandTeamInviteCommand itl = new IslandTeamInviteCommand(ic);
-        assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>()));
+        assertFalse(itl.canExecute(user, itl.getLabel(), new ArrayList<>()));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-island"));
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#canExecute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteLowRank() {
         when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         IslandTeamInviteCommand itl = new IslandTeamInviteCommand(ic);
-        assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>()));
+        assertFalse(itl.canExecute(user, itl.getLabel(), new ArrayList<>()));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-permission"));
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#canExecute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteNoTarget() {
         IslandTeamInviteCommand itl = new IslandTeamInviteCommand(ic);
-        assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>()));
+        assertFalse(itl.canExecute(user, itl.getLabel(), new ArrayList<>()));
         // Show help
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#execute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteUnknownPlayer() {
@@ -172,7 +174,7 @@ public class IslandTeamInviteCommandTest {
 
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#execute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteOfflinePlayer() {
@@ -187,7 +189,7 @@ public class IslandTeamInviteCommandTest {
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#execute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteSamePlayer() {
@@ -203,7 +205,7 @@ public class IslandTeamInviteCommandTest {
 
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#execute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteDifferentPlayerInTeam() {
@@ -219,7 +221,7 @@ public class IslandTeamInviteCommandTest {
     }
 
     /**
-     * Test method for .
+     * Test method for {@link world.bentobox.bentobox.api.commands.island.team.IslandTeamInviteCommand#execute(User, String, java.util.List)}.
      */
     @Test
     public void testExecuteCoolDownActive() {
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java
index ca3111774..f72c1d797 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommandTest.java
@@ -2,11 +2,12 @@ package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.anyString;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -45,6 +46,7 @@ import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.RanksManager;
 
 /**
  * @author tastybento
@@ -73,6 +75,8 @@ public class IslandTeamKickCommandTest {
     private Player target;
     @Mock
     private CompositeCommand subCommand;
+    @Mock
+    private Island island;
 
     /**
      * @throws java.lang.Exception
@@ -159,9 +163,10 @@ public class IslandTeamKickCommandTest {
         when(Bukkit.getServer()).thenReturn(server);
 
         // Island
-        Island island = mock(Island.class);
         when(island.getUniqueId()).thenReturn("uniqueid");
         when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
+        when(im.getIsland(any(), any(User.class))).thenReturn(island);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.VISITOR_RANK);
 
     }
 
@@ -226,11 +231,24 @@ public class IslandTeamKickCommandTest {
     public void testExecuteDifferentPlayerNotInTeam() {
         IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
         when(pm.getUUID(any())).thenReturn(notUUID);
-        when(im.getMembers(any(), any())).thenReturn(new HashSet<>());
+        when(im.getMembers(any(), any())).thenReturn(Collections.emptySet());
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
         verify(user).sendMessage(eq("general.errors.not-in-team"));
     }
 
+    /**
+     * Test method for {@link IslandTeamKickCommand#execute(User, String, java.util.List)}
+     */
+    @Test
+    public void testExecuteDifferentPlayerNoRank() {
+        IslandTeamKickCommand itl = new IslandTeamKickCommand(ic);
+        when(pm.getUUID(any())).thenReturn(notUUID);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
+        when(island.getRank(any())).thenReturn(RanksManager.VISITOR_RANK);
+        assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("poslovitch")));
+        verify(user).sendMessage(eq("general.errors.no-permission"));
+    }
+
     /**
      * Test method for {@link IslandTeamKickCommand#execute(User, String, java.util.List)}
      */
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java
index 0543a8789..dadb08a1d 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommandTest.java
@@ -168,7 +168,7 @@ public class IslandTeamLeaveCommandTest {
         IslandTeamLeaveCommand itl = new IslandTeamLeaveCommand(ic);
         assertTrue(itl.execute(user, itl.getLabel(), new ArrayList<>()));
         verify(im).setLeaveTeam(any(), eq(uuid));
-        verify(user).sendMessage(eq("general.success"));
+        verify(user).sendMessage(eq("commands.island.team.leave.success"));
     }
 
     /**
@@ -227,7 +227,7 @@ public class IslandTeamLeaveCommandTest {
         IslandTeamLeaveCommand itl = new IslandTeamLeaveCommand(ic);
         assertTrue(itl.execute(user, itl.getLabel(), new ArrayList<>()));
         verify(im).setLeaveTeam(any(), eq(uuid));
-        verify(user).sendMessage(eq("general.success"));
+        verify(user).sendMessage(eq("commands.island.team.leave.success"));
         verify(pm).addReset(eq(world), eq(uuid));
         verify(user).sendMessage(eq("commands.island.reset.resets-left"), eq(TextVariables.NUMBER), eq("100"));
     }
@@ -255,7 +255,7 @@ public class IslandTeamLeaveCommandTest {
         IslandTeamLeaveCommand itl = new IslandTeamLeaveCommand(ic);
         assertTrue(itl.execute(user, itl.getLabel(), new ArrayList<>()));
         verify(im).setLeaveTeam(any(), eq(uuid));
-        verify(user).sendMessage(eq("general.success"));
+        verify(user).sendMessage(eq("commands.island.team.leave.success"));
 
         verify(enderChest).clear();
         verify(inv).clear();
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java
index 76e8ca090..ae60ab91e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommandTest.java
@@ -4,6 +4,7 @@
 package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -19,6 +20,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -51,6 +53,7 @@ public class IslandTeamTrustCommandTest {
     private IslandsManager im;
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
     private Island island;
 
@@ -68,9 +71,6 @@ public class IslandTeamTrustCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
-
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -146,6 +146,7 @@ public class IslandTeamTrustCommandTest {
     @Test
     public void testExecuteLowRank() {
         when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         IslandTeamTrustCommand itl = new IslandTeamTrustCommand(ic);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("bill")));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-permission"));
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java
index da4aec887..3f36cd45e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommandTest.java
@@ -5,6 +5,7 @@ package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -25,6 +26,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -60,6 +62,7 @@ public class IslandTeamUncoopCommandTest {
     private IslandsManager im;
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
     private Island island;
 
@@ -77,9 +80,6 @@ public class IslandTeamUncoopCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
-
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -155,6 +155,7 @@ public class IslandTeamUncoopCommandTest {
     @Test
     public void testExecuteLowRank() {
         when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(anyString())).thenReturn(RanksManager.OWNER_RANK);
         IslandTeamUncoopCommand itl = new IslandTeamUncoopCommand(ic);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("bill")));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-permission"));
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java
index db947abeb..80f28e806 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUntrustCommandTest.java
@@ -5,6 +5,7 @@ package world.bentobox.bentobox.api.commands.island.team;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -25,6 +26,7 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -60,6 +62,7 @@ public class IslandTeamUntrustCommandTest {
     private IslandsManager im;
     private PlayersManager pm;
     private UUID notUUID;
+    @Mock
     private Settings s;
     private Island island;
 
@@ -77,9 +80,6 @@ public class IslandTeamUntrustCommandTest {
         when(plugin.getCommandsManager()).thenReturn(cm);
 
         // Settings
-        s = mock(Settings.class);
-        when(s.getRankCommand(Mockito.anyString())).thenReturn(RanksManager.OWNER_RANK);
-
         when(plugin.getSettings()).thenReturn(s);
 
         // Player
@@ -103,18 +103,18 @@ public class IslandTeamUntrustCommandTest {
 
         // Player has island to begin with
         im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
-        when(im.inTeam(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
-        when(im.isOwner(Mockito.any(), Mockito.any())).thenReturn(true);
-        when(im.getOwner(Mockito.any(), Mockito.any())).thenReturn(uuid);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
+        when(im.inTeam(any(), any(UUID.class))).thenReturn(true);
+        when(im.isOwner(any(), any())).thenReturn(true);
+        when(im.getOwner(any(), any())).thenReturn(uuid);
         island = mock(Island.class);
-        when(island.getRank(Mockito.any())).thenReturn(RanksManager.OWNER_RANK);
-        when(im.getIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(island);
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(island.getRank(any())).thenReturn(RanksManager.OWNER_RANK);
+        when(im.getIsland(any(), any(User.class))).thenReturn(island);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
         when(plugin.getIslands()).thenReturn(im);
 
         // Has team
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), Mockito.eq(uuid))).thenReturn(true);
 
         // Player Manager
         pm = mock(PlayersManager.class);
@@ -128,12 +128,12 @@ public class IslandTeamUntrustCommandTest {
 
         // Locales
         LocalesManager lm = mock(LocalesManager.class);
-        when(lm.get(Mockito.any(), Mockito.any())).thenReturn("mock translation");
+        when(lm.get(any(), any())).thenReturn("mock translation");
         when(plugin.getLocalesManager()).thenReturn(lm);
 
         // IWM friendly name
         IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
+        when(iwm.getFriendlyName(any())).thenReturn("BSkyBlock");
         when(plugin.getIWM()).thenReturn(iwm);
     }
 
@@ -142,8 +142,8 @@ public class IslandTeamUntrustCommandTest {
      */
     @Test
     public void testExecuteNoisland() {
-        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
-        when(im.inTeam(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
+        when(im.inTeam(any(), any(UUID.class))).thenReturn(false);
         IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("bill")));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-island"));
@@ -154,7 +154,8 @@ public class IslandTeamUntrustCommandTest {
      */
     @Test
     public void testExecuteLowRank() {
-        when(island.getRank(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRank(any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getRankCommand(any())).thenReturn(RanksManager.OWNER_RANK);
         IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("bill")));
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-permission"));
@@ -176,7 +177,7 @@ public class IslandTeamUntrustCommandTest {
     @Test
     public void testExecuteUnknownPlayer() {
         IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic);
-        when(pm.getUUID(Mockito.any())).thenReturn(null);
+        when(pm.getUUID(any())).thenReturn(null);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento")));
         Mockito.verify(user).sendMessage("general.errors.unknown-player", "[name]", "tastybento");
     }
@@ -187,10 +188,10 @@ public class IslandTeamUntrustCommandTest {
     @Test
     public void testExecuteSamePlayer() {
         PowerMockito.mockStatic(User.class);
-        when(User.getInstance(Mockito.any(UUID.class))).thenReturn(user);
+        when(User.getInstance(any(UUID.class))).thenReturn(user);
         when(user.isOnline()).thenReturn(true);
         IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic);
-        when(pm.getUUID(Mockito.any())).thenReturn(uuid);
+        when(pm.getUUID(any())).thenReturn(uuid);
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("tastybento")));
         Mockito.verify(user).sendMessage(Mockito.eq("commands.island.team.untrust.cannot-untrust-yourself"));
     }
@@ -202,12 +203,12 @@ public class IslandTeamUntrustCommandTest {
     @Test
     public void testExecutePlayerHasRank() {
         PowerMockito.mockStatic(User.class);
-        when(User.getInstance(Mockito.any(UUID.class))).thenReturn(user);
+        when(User.getInstance(any(UUID.class))).thenReturn(user);
         when(user.isOnline()).thenReturn(true);
         IslandTeamUntrustCommand itl = new IslandTeamUntrustCommand(ic);
-        when(pm.getUUID(Mockito.any())).thenReturn(notUUID);
-        when(im.inTeam(Mockito.any(), Mockito.any())).thenReturn(true);
-        when(im.getMembers(Mockito.any(), Mockito.any())).thenReturn(Collections.singleton(notUUID));
+        when(pm.getUUID(any())).thenReturn(notUUID);
+        when(im.inTeam(any(), any())).thenReturn(true);
+        when(im.getMembers(any(), any())).thenReturn(Collections.singleton(notUUID));
         assertFalse(itl.execute(user, itl.getLabel(), Collections.singletonList("bento")));
         Mockito.verify(user).sendMessage(Mockito.eq("commands.island.team.untrust.cannot-untrust-member"));
     }
@@ -227,7 +228,7 @@ public class IslandTeamUntrustCommandTest {
     @Test
     public void testTabCompleteNoIsland() {
         // No island
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(null);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(null);
         IslandTeamUntrustCommand ibc = new IslandTeamUntrustCommand(ic);
         // Set up the user
         User user = mock(User.class);
@@ -263,9 +264,9 @@ public class IslandTeamUntrustCommandTest {
         // Return a set of players
         PowerMockito.mockStatic(Bukkit.class);
         OfflinePlayer offlinePlayer = mock(OfflinePlayer.class);
-        when(Bukkit.getOfflinePlayer(Mockito.any(UUID.class))).thenReturn(offlinePlayer);
+        when(Bukkit.getOfflinePlayer(any(UUID.class))).thenReturn(offlinePlayer);
         when(offlinePlayer.getName()).thenReturn("adam", "ben", "cara", "dave", "ed", "frank", "freddy", "george", "harry", "ian", "joe");
-        when(island.getRank(Mockito.any())).thenReturn(
+        when(island.getRank(any())).thenReturn(
                 RanksManager.TRUSTED_RANK,
                 RanksManager.TRUSTED_RANK,
                 RanksManager.TRUSTED_RANK,
diff --git a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java
index 8bed25b70..787f6055e 100644
--- a/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java
@@ -10,6 +10,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.any;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -63,6 +64,10 @@ public class FlagTest {
     @Mock
     private World world;
     private Map<String, Boolean> worldFlags;
+    @Mock
+    private IslandWorldManager iwm;
+    @Mock
+    private BentoBox plugin;
 
     /**
      * @throws java.lang.Exception
@@ -70,18 +75,19 @@ public class FlagTest {
     @Before
     public void setUp() throws Exception {
         // Set up plugin
-        BentoBox plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
         PowerMockito.mockStatic(Util.class);
         // Return world
-        when(Util.getWorld(Mockito.any())).thenAnswer((Answer<World>) invocation -> invocation.getArgumentAt(0, World.class));
+        when(Util.getWorld(Mockito.any())).thenAnswer((Answer<World>) invocation -> invocation.getArgument(0, World.class));
 
         // World Settings
-        IslandWorldManager iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
 
         worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
@@ -93,7 +99,7 @@ public class FlagTest {
         when(Bukkit.getItemFactory()).thenReturn(itemF);
 
         // Flag
-        f = new Flag.Builder("flagID", Material.ACACIA_PLANKS).listener(listener).build();
+        f = new Flag.Builder("flagID", Material.ACACIA_PLANKS).type(Flag.Type.PROTECTION).listener(listener).build();
 
     }
 
@@ -194,9 +200,11 @@ public class FlagTest {
     @Test
     public void testSetDefaultSettingBoolean() {
         f.setDefaultSetting(true);
+        // Checking will set it to the default
         assertTrue(f.isSetForWorld(world));
         f.setDefaultSetting(false);
-        assertFalse(f.isSetForWorld(world));
+        // Checking again will use the previous default
+        assertTrue(f.isSetForWorld(world));
     }
 
     /**
@@ -204,12 +212,23 @@ public class FlagTest {
      */
     @Test
     public void testSetDefaultSettingWorldBoolean() {
+
         f.setDefaultSetting(world, true);
         assertTrue(f.isSetForWorld(world));
         f.setDefaultSetting(world, false);
         assertFalse(f.isSetForWorld(world));
     }
 
+    /**
+     * Test method for {@link world.bentobox.bentobox.api.flags.Flag#setDefaultSetting(org.bukkit.World, boolean)}.
+     */
+    @Test
+    public void testSetDefaultSettingWorldBooleanNullWorldSettings() {
+        when(iwm.getWorldSettings(any())).thenReturn(null);
+        f.setDefaultSetting(world, true);
+        verify(plugin).logError("Attempt to set default world setting for unregistered world. Register flags in onEnable.");
+    }
+
     /**
      * Test method for {@link world.bentobox.bentobox.api.flags.Flag#getType()}.
      */
@@ -356,10 +375,10 @@ public class FlagTest {
         when(rm.getRank(Mockito.eq(RanksManager.OWNER_RANK))).thenReturn("Owner");
 
 
-        PanelItem pi = f.toPanelItem(plugin, user, false);
+        PanelItem pi = f.toPanelItem(plugin, user, island, false);
 
         verify(user).getTranslation(Mockito.eq("protection.flags.flagID.name"));
-        verify(user).getTranslation(Mockito.eq("protection.panel.flag-item.name-layout"), Mockito.anyVararg());
+        verify(user).getTranslation(Mockito.eq("protection.panel.flag-item.name-layout"), any());
 
         assertEquals(Material.ACACIA_PLANKS, pi.getItem().getType());
 
@@ -384,4 +403,5 @@ public class FlagTest {
         assertTrue(aaa.compareTo(aaa) == 0);
     }
 
+
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java
index ea5195ecb..e1e087842 100644
--- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java
@@ -3,7 +3,11 @@ package world.bentobox.bentobox.api.flags.clicklisteners;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
@@ -17,11 +21,12 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -30,9 +35,9 @@ import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.events.flags.FlagProtectionChangeEvent;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
 import world.bentobox.bentobox.api.user.Notifier;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
@@ -42,6 +47,7 @@ import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlayersManager;
 import world.bentobox.bentobox.managers.RanksManager;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
 import world.bentobox.bentobox.util.Util;
 
 @RunWith(PowerMockRunner.class)
@@ -52,16 +58,29 @@ public class CycleClickTest {
     private static final Integer X = 600;
     private static final Integer Y = 120;
     private static final Integer Z = 10000;
+    @Mock
     private BentoBox plugin;
     private UUID uuid;
+    @Mock
     private User user;
+    @Mock
     private IslandsManager im;
+    @Mock
     private Island island;
+    @Mock
     private Flag flag;
-    private Panel panel;
+    @Mock
+    private TabbedPanel panel;
+    @Mock
     private Inventory inv;
+    @Mock
     private IslandWorldManager iwm;
+    @Mock
     private RanksManager rm;
+    @Mock
+    private PluginManager pim;
+    @Mock
+    private SettingsTab settingsTab;
 
     /**
      * @throws java.lang.Exception - exception
@@ -70,7 +89,6 @@ public class CycleClickTest {
     public void setUp() throws Exception {
 
         // Set up plugin
-        plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
         // World
@@ -83,7 +101,6 @@ public class CycleClickTest {
         // Player
         Player p = mock(Player.class);
         // Sometimes use Mockito.withSettings().verboseLogging()
-        user = mock(User.class);
         User.setPlugin(plugin);
         when(user.isOp()).thenReturn(false);
         uuid = UUID.randomUUID();
@@ -91,17 +108,16 @@ public class CycleClickTest {
         when(user.getPlayer()).thenReturn(p);
         when(user.getName()).thenReturn("tastybento");
         when(user.getWorld()).thenReturn(world);
-        when(user.hasPermission(Mockito.anyString())).thenReturn(true);
+        when(user.hasPermission(anyString())).thenReturn(true);
 
         // No island for player to begin with (set it later in the tests)
-        im = mock(IslandsManager.class);
-        when(im.hasIsland(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
-        when(im.isOwner(Mockito.any(), Mockito.eq(uuid))).thenReturn(false);
+        when(im.hasIsland(any(), eq(uuid))).thenReturn(false);
+        when(im.isOwner(any(), eq(uuid))).thenReturn(false);
         when(plugin.getIslands()).thenReturn(im);
 
         // Has team
         PlayersManager pm = mock(PlayersManager.class);
-        when(im.inTeam(Mockito.any(), Mockito.eq(uuid))).thenReturn(true);
+        when(im.inTeam(any(), eq(uuid))).thenReturn(true);
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Server & Scheduler
@@ -119,9 +135,8 @@ public class CycleClickTest {
         when(plugin.getNotifier()).thenReturn(notifier);
 
         // Island Banned list initialization
-        island = mock(Island.class);
         when(island.getBanned()).thenReturn(new HashSet<>());
-        when(island.isBanned(Mockito.any())).thenReturn(false);
+        when(island.isBanned(any())).thenReturn(false);
         Location loc = mock(Location.class);
         when(loc.getWorld()).thenReturn(world);
         when(loc.getBlockX()).thenReturn(X);
@@ -130,11 +145,11 @@ public class CycleClickTest {
         when(island.getCenter()).thenReturn(loc);
         when(island.getProtectionRange()).thenReturn(PROTECTION_RANGE);
         // Island is not locked by default
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any(), any())).thenReturn(true);
         // Island owner is user by default
         when(island.getOwner()).thenReturn(uuid);
 
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         // Common from to's
         Location outside = mock(Location.class);
@@ -156,67 +171,56 @@ public class CycleClickTest {
         when(inside.getBlockZ()).thenReturn(Z);
 
         Optional<Island> opIsland = Optional.ofNullable(island);
-        when(im.getProtectedIslandAt(Mockito.eq(inside))).thenReturn(opIsland);
-        when(im.getProtectedIslandAt(Mockito.eq(inside2))).thenReturn(opIsland);
-        when(im.getProtectedIslandAt(Mockito.eq(outside))).thenReturn(Optional.empty());
-        when(im.getIslandAt(Mockito.any())).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(inside))).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(inside2))).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(outside))).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(opIsland);
 
-        PanelItem panelItem = mock(PanelItem.class);
-        flag = mock(Flag.class);
-        when(flag.toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false))).thenReturn(panelItem);
-        when(panelItem.getItem()).thenReturn(mock(ItemStack.class));
         FlagsManager fm = mock(FlagsManager.class);
-        when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag));
+        when(fm.getFlag(anyString())).thenReturn(Optional.of(flag));
         when(plugin.getFlagsManager()).thenReturn(fm);
 
-        rm = mock(RanksManager.class);
-
+        // Ranks Manager
         when(plugin.getRanksManager()).thenReturn(rm);
 
         // Provide a current rank value - member
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.MEMBER_RANK);
         // Set up up and down ranks
-        when(rm.getRankUpValue(Mockito.eq(RanksManager.VISITOR_RANK))).thenReturn(RanksManager.COOP_RANK);
-        when(rm.getRankUpValue(Mockito.eq(RanksManager.COOP_RANK))).thenReturn(RanksManager.TRUSTED_RANK);
-        when(rm.getRankUpValue(Mockito.eq(RanksManager.TRUSTED_RANK))).thenReturn(RanksManager.MEMBER_RANK);
-        when(rm.getRankUpValue(Mockito.eq(RanksManager.MEMBER_RANK))).thenReturn(RanksManager.OWNER_RANK);
-        when(rm.getRankDownValue(Mockito.eq(RanksManager.OWNER_RANK))).thenReturn(RanksManager.MEMBER_RANK);
-        when(rm.getRankDownValue(Mockito.eq(RanksManager.MEMBER_RANK))).thenReturn(RanksManager.TRUSTED_RANK);
-        when(rm.getRankDownValue(Mockito.eq(RanksManager.TRUSTED_RANK))).thenReturn(RanksManager.COOP_RANK);
-        when(rm.getRankDownValue(Mockito.eq(RanksManager.COOP_RANK))).thenReturn(RanksManager.VISITOR_RANK);
-
-        panel = mock(Panel.class);
-        inv = mock(Inventory.class);
-        when(panel.getInventory()).thenReturn(inv);
+        when(rm.getRankUpValue(eq(RanksManager.VISITOR_RANK))).thenReturn(RanksManager.COOP_RANK);
+        when(rm.getRankUpValue(eq(RanksManager.COOP_RANK))).thenReturn(RanksManager.TRUSTED_RANK);
+        when(rm.getRankUpValue(eq(RanksManager.TRUSTED_RANK))).thenReturn(RanksManager.MEMBER_RANK);
+        when(rm.getRankUpValue(eq(RanksManager.MEMBER_RANK))).thenReturn(RanksManager.OWNER_RANK);
+        when(rm.getRankDownValue(eq(RanksManager.OWNER_RANK))).thenReturn(RanksManager.MEMBER_RANK);
+        when(rm.getRankDownValue(eq(RanksManager.MEMBER_RANK))).thenReturn(RanksManager.TRUSTED_RANK);
+        when(rm.getRankDownValue(eq(RanksManager.TRUSTED_RANK))).thenReturn(RanksManager.COOP_RANK);
+        when(rm.getRankDownValue(eq(RanksManager.COOP_RANK))).thenReturn(RanksManager.VISITOR_RANK);
 
         // IslandWorldManager
-        iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
 
         // Util
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
+
+        // Event
+        when(Bukkit.getPluginManager()).thenReturn(pim);
+
+        // Active tab
+        when(panel.getActiveTab()).thenReturn(settingsTab);
+        when(settingsTab.getIsland()).thenReturn(island);
 
-    }
 
-    @Test
-    public void testNotInWorld() {
-        when(iwm.inWorld(any(World.class))).thenReturn(false);
-        when(iwm.inWorld(any(Location.class))).thenReturn(false);
-        CycleClick udc = new CycleClick("LOCK");
-        assertTrue(udc.onClick(panel, user, ClickType.LEFT, 5));
-        Mockito.verify(user).sendMessage(Mockito.eq("general.errors.wrong-world"));
     }
 
     @Test
     public void testNoPremission() {
-        when(user.hasPermission(Mockito.anyString())).thenReturn(false);
+        when(user.hasPermission(anyString())).thenReturn(false);
         CycleClick udc = new CycleClick("LOCK");
         assertTrue(udc.onClick(panel, user, ClickType.LEFT, 5));
-        Mockito.verify(user).sendMessage(Mockito.eq("general.errors.no-permission"), Mockito.eq("[permission]"), Mockito.eq("bskyblock.settings.LOCK"));
+        verify(user).sendMessage(eq("general.errors.no-permission"), eq("[permission]"), eq("bskyblock.settings.LOCK"));
     }
 
     @Test
@@ -232,37 +236,31 @@ public class CycleClickTest {
         // Rank starts at member
         // Click left
         assertTrue(udc.onClick(panel, user, ClickType.LEFT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.OWNER_RANK));
-        Mockito.verify(flag).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.OWNER_RANK));
         // Check rollover
         // Clicking when Owner should go to Visitor
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.OWNER_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.OWNER_RANK);
         assertTrue(udc.onClick(panel, user, ClickType.LEFT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.VISITOR_RANK));
-        Mockito.verify(flag, Mockito.times(2)).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv, Mockito.times(2)).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.VISITOR_RANK));
+        verify(pim, times(2)).callEvent(any(FlagProtectionChangeEvent.class));
     }
 
     @Test
     public void testOnLeftClickSetMinMax() {
         // Provide a current rank value - coop
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.COOP_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.COOP_RANK);
         final int SLOT = 5;
         CycleClick udc = new CycleClick("LOCK", RanksManager.COOP_RANK, RanksManager.MEMBER_RANK);
         // Rank starts at member
         // Click left
         assertTrue(udc.onClick(panel, user, ClickType.LEFT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.TRUSTED_RANK));
-        Mockito.verify(flag).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.TRUSTED_RANK));
         // Check rollover
         // Clicking when Member should go to Coop
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.MEMBER_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.MEMBER_RANK);
         assertTrue(udc.onClick(panel, user, ClickType.LEFT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.COOP_RANK));
-        Mockito.verify(flag, Mockito.times(2)).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv, Mockito.times(2)).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.COOP_RANK));
+        verify(pim, times(2)).callEvent(any(FlagProtectionChangeEvent.class));
     }
 
     @Test
@@ -272,37 +270,31 @@ public class CycleClickTest {
         // Rank starts at member
         // Right click - down rank to Trusted
         assertTrue(udc.onClick(panel, user, ClickType.RIGHT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.TRUSTED_RANK));
-        Mockito.verify(flag).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.TRUSTED_RANK));
         // Check rollover
         // Clicking when Visitor should go to Owner
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.VISITOR_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.VISITOR_RANK);
         assertTrue(udc.onClick(panel, user, ClickType.RIGHT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.OWNER_RANK));
-        Mockito.verify(flag, Mockito.times(2)).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv, Mockito.times(2)).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.OWNER_RANK));
+        verify(pim, times(2)).callEvent(any(FlagProtectionChangeEvent.class));
     }
 
     @Test
     public void testOnRightClickMinMaxSet() {
         // Provide a current rank value - coop
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.TRUSTED_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.TRUSTED_RANK);
         final int SLOT = 5;
         CycleClick udc = new CycleClick("LOCK", RanksManager.COOP_RANK, RanksManager.MEMBER_RANK);
         // Rank starts at member
         // Right click
         assertTrue(udc.onClick(panel, user, ClickType.RIGHT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.COOP_RANK));
-        Mockito.verify(flag).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.COOP_RANK));
         // Check rollover
         // Clicking when Coop should go to Member
-        when(island.getFlag(Mockito.any())).thenReturn(RanksManager.COOP_RANK);
+        when(island.getFlag(any())).thenReturn(RanksManager.COOP_RANK);
         assertTrue(udc.onClick(panel, user, ClickType.RIGHT, SLOT));
-        Mockito.verify(island).setFlag(Mockito.eq(flag), Mockito.eq(RanksManager.MEMBER_RANK));
-        Mockito.verify(flag, Mockito.times(2)).toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false));
-        Mockito.verify(inv, Mockito.times(2)).setItem(Mockito.eq(SLOT), Mockito.any());
+        verify(island).setFlag(eq(flag), eq(RanksManager.MEMBER_RANK));
+        verify(pim, times(2)).callEvent(any(FlagProtectionChangeEvent.class));
     }
 
     @Test
@@ -310,21 +302,21 @@ public class CycleClickTest {
         // Test all possible click types
         CycleClick udc = new CycleClick("LOCK");
         Arrays.asList(ClickType.values()).forEach(c -> assertTrue(udc.onClick(panel, user, c, 0)));
+        verify(pim, times(2)).callEvent(any(FlagProtectionChangeEvent.class));
     }
 
     @Test
     public void testNotOwner() {
         UUID u = UUID.randomUUID();
-
         when(island.getOwner()).thenReturn(u);
-        Mockito.verify(plugin, Mockito.never()).getRanksManager();
+        verify(plugin, Mockito.never()).getRanksManager();
 
     }
 
     @Test
     public void testNullIsland() {
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(null);
-        Mockito.verify(plugin, Mockito.never()).getRanksManager();
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(null);
+        verify(plugin, Mockito.never()).getRanksManager();
     }
 
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java
index 5259423a6..5c2508fd8 100644
--- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java
@@ -1,21 +1,26 @@
 package world.bentobox.bentobox.api.flags.clicklisteners;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -23,28 +28,39 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.events.flags.FlagSettingChangeEvent;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bentobox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.TabbedPanel;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.FlagsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.panels.settings.SettingsTab;
 import world.bentobox.bentobox.util.Util;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({BentoBox.class, Util.class })
+@PrepareForTest({Bukkit.class, BentoBox.class, Util.class })
 public class IslandToggleClickTest {
 
+    @Mock
     private IslandWorldManager iwm;
     private IslandToggleClick listener;
-    private Panel panel;
+    @Mock
+    private TabbedPanel panel;
+    @Mock
     private User user;
+    @Mock
     private Flag flag;
+    @Mock
     private IslandsManager im;
+    @Mock
     private Island island;
     private UUID uuid;
+    @Mock
+    private PluginManager pim;
+    @Mock
+    private SettingsTab settingsTab;
 
     /**
      * @throws java.lang.Exception
@@ -59,12 +75,12 @@ public class IslandToggleClickTest {
         iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(any())).thenReturn("bskyblock.");
         when(plugin.getIWM()).thenReturn(iwm);
 
         listener = new IslandToggleClick("test");
 
-        panel = mock(Panel.class);
+        // Panel
         when(panel.getInventory()).thenReturn(mock(Inventory.class));
         // Sometimes use Mockito.withSettings().verboseLogging()
         user = mock(User.class);
@@ -75,61 +91,56 @@ public class IslandToggleClickTest {
         uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
+        when(Util.getWorld(any())).thenReturn(mock(World.class));
 
         FlagsManager fm = mock(FlagsManager.class);
-        flag = mock(Flag.class);
-        when(flag.isSetForWorld(Mockito.any())).thenReturn(false);
-        PanelItem item = mock(PanelItem.class);
-        when(item.getItem()).thenReturn(mock(ItemStack.class));
-        when(flag.toPanelItem(Mockito.any(), Mockito.eq(user), Mockito.eq(false))).thenReturn(item);
+        when(flag.isSetForWorld(any())).thenReturn(false);
         when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag));
         when(plugin.getFlagsManager()).thenReturn(fm);
 
         // Island Manager
-        im = mock(IslandsManager.class);
-        island = mock(Island.class);
         when(island.getOwner()).thenReturn(uuid);
-        when(im.getIsland(Mockito.any(World.class), Mockito.any(User.class))).thenReturn(island);
+        when(im.getIsland(any(World.class), any(User.class))).thenReturn(island);
         when(plugin.getIslands()).thenReturn(im);
 
         // Optional island
         Optional<Island> opIsland = Optional.ofNullable(island);
-        when(im.getIslandAt(Mockito.any())).thenReturn(opIsland);
+        when(im.getIslandAt(any())).thenReturn(opIsland);
 
-    }
+        // Event
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getPluginManager()).thenReturn(pim);
 
-    @Test
-    public void testOnClickWrongWorld() {
-        when(iwm.inWorld(any(World.class))).thenReturn(false);
-        when(iwm.inWorld(any(Location.class))).thenReturn(false);
-        listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.wrong-world");
+        // Active tab
+        when(panel.getActiveTab()).thenReturn(settingsTab);
+        when(settingsTab.getIsland()).thenReturn(island);
     }
 
     @Test
     public void testOnClickNoPermission() {
         when(user.hasPermission(Mockito.anyString())).thenReturn(false);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.settings.test");
+        verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.settings.test");
     }
 
     @Test
     public void testOnClick() {
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(island).toggleFlag(flag);
+        verify(island).toggleFlag(flag);
+        verify(pim).callEvent(any(FlagSettingChangeEvent.class));
     }
 
     @Test
     public void testOnClickNoIsland() {
-        when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
-        when(im.getIsland(Mockito.any(), Mockito.any(User.class))).thenReturn(null);
+        when(settingsTab.getIsland()).thenReturn(null);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(island, Mockito.never()).toggleFlag(flag);
+        verify(island, never()).toggleFlag(flag);
     }
 
     @Test
     public void testOnClickNotOwner() {
+        // No permission
+        when(user.hasPermission(anyString())).thenReturn(false);
         // Pick a different UUID from owner
         UUID u = UUID.randomUUID();
         while(u.equals(uuid)) {
@@ -137,7 +148,7 @@ public class IslandToggleClickTest {
         }
         when(island.getOwner()).thenReturn(u);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(island, Mockito.never()).toggleFlag(flag);
+        verify(island, never()).toggleFlag(flag);
     }
 
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java
index 93429d813..c3a59bf07 100644
--- a/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java
@@ -2,16 +2,18 @@ package world.bentobox.bentobox.api.flags.clicklisteners;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,16 +26,16 @@ import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.events.flags.FlagWorldSettingChangeEvent;
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.FlagsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.util.Util;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({BentoBox.class, Util.class })
+@PrepareForTest({Bukkit.class, BentoBox.class, Util.class })
 public class WorldToggleClickTest {
 
     @Mock
@@ -46,6 +48,8 @@ public class WorldToggleClickTest {
     private Flag flag;
     @Mock
     private GameModeAddon addon;
+    @Mock
+    private PluginManager pim;
 
     /**
      * @throws java.lang.Exception
@@ -59,7 +63,7 @@ public class WorldToggleClickTest {
         // Island World Manager
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
         Optional<GameModeAddon> optionalAddon = Optional.of(addon);
         when(iwm.getAddon(Mockito.any())).thenReturn(optionalAddon);
         when(plugin.getIWM()).thenReturn(iwm);
@@ -84,11 +88,12 @@ public class WorldToggleClickTest {
         flag = mock(Flag.class);
         when(flag.isSetForWorld(Mockito.any())).thenReturn(false);
 
-        PanelItem item = mock(PanelItem.class);
-        when(item.getItem()).thenReturn(mock(ItemStack.class));
-        when(flag.toPanelItem(Mockito.any(), Mockito.eq(user), Mockito.eq(false))).thenReturn(item);
         when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag));
         when(plugin.getFlagsManager()).thenReturn(fm);
+
+        // Event
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getPluginManager()).thenReturn(pim);
     }
 
     @Test
@@ -96,24 +101,24 @@ public class WorldToggleClickTest {
         when(iwm.inWorld(any(World.class))).thenReturn(false);
         when(iwm.inWorld(any(Location.class))).thenReturn(false);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.wrong-world");
-        Mockito.verify(addon, Mockito.never()).saveWorldSettings();
+        verify(user).sendMessage("general.errors.wrong-world");
+        verify(addon, Mockito.never()).saveWorldSettings();
     }
 
     @Test
     public void testOnClickNoPermission() {
         when(user.hasPermission(Mockito.anyString())).thenReturn(false);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.admin.world.settings.test");
-        Mockito.verify(addon, Mockito.never()).saveWorldSettings();
+        verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.admin.world.settings.test");
+        verify(addon, Mockito.never()).saveWorldSettings();
     }
 
     @Test
     public void testOnClick() {
         when(user.hasPermission(Mockito.anyString())).thenReturn(true);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(flag).setSetting(Mockito.any(), Mockito.eq(true));
-        Mockito.verify(panel).getInventory();
-        Mockito.verify(addon).saveWorldSettings();
+        verify(flag).setSetting(Mockito.any(), Mockito.eq(true));
+        verify(addon).saveWorldSettings();
+        verify(pim).callEvent(any(FlagWorldSettingChangeEvent.class));
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
index 7f8db6276..68b1f9005 100644
--- a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
@@ -5,11 +5,11 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.HashSet;
 import java.util.Locale;
@@ -113,7 +113,7 @@ public class UserTest {
         PlaceholdersManager placeholdersManager = mock(PlaceholdersManager.class);
         when(plugin.getPlaceholdersManager()).thenReturn(placeholdersManager);
         // This will just return the value of the second argument of replacePlaceholders. i.e., it won't change anything
-        when(placeholdersManager.replacePlaceholders(any(), any())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(1, String.class));
+        when(placeholdersManager.replacePlaceholders(any(), any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
 
     }
 
@@ -481,6 +481,16 @@ public class UserTest {
         assertEquals(33, u.getPermissionValue("bskyblock.max", 2));
     }
 
+    /**
+     * Test for {@link User#getPermissionValue(String, int)}
+     */
+    @Test
+    public void testGetPermissionValueConsole() {
+        User.clearUsers();
+        CommandSender console = mock(CommandSender.class);
+        User u = User.getInstance(console);
+        assertEquals(35, u.getPermissionValue("bskyblock.max", 35));
+    }
 
     /**
      * Test for {@link User#getPermissionValue(String, int)}
diff --git a/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java
index cc4937be2..0cc5995cc 100644
--- a/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/commands/BentoBoxReloadCommandTest.java
@@ -98,7 +98,7 @@ public class BentoBoxReloadCommandTest {
         when(Bukkit.getScheduler()).thenReturn(sch);
 
         // User
-        when(user.getTranslation(Mockito.anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.getTranslation(Mockito.anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
 
         // Panels
         PowerMockito.mockStatic(PanelListenerManager.class);
diff --git a/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java b/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java
index 30ca6940f..2342bc6f2 100644
--- a/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java
+++ b/src/test/java/world/bentobox/bentobox/database/DatabaseTest.java
@@ -67,11 +67,11 @@ public class DatabaseTest {
         when(plugin.getLogger()).thenReturn(logger);
 
         PowerMockito.mockStatic(DatabaseSetup.class);
-
         dbSetup = mock(DatabaseSetup.class);
         handler = mock(AbstractDatabaseHandler.class);
         when(dbSetup.getHandler(Mockito.any())).thenReturn(handler);
-        when(DatabaseSetup.getDatabase()).thenReturn(dbSetup);
+        // Set the internal state of the static database variable to null for each test
+        Whitebox.setInternalState(Database.class, "databaseSetup", dbSetup);
 
         when(handler.loadObject(Mockito.anyString())).thenReturn(island);
         objectList = new ArrayList<>();
@@ -87,6 +87,7 @@ public class DatabaseTest {
      */
     @After
     public void tearDown() throws Exception {
+        dbSetup = null;
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandlerTest.java
deleted file mode 100644
index 29809c5db..000000000
--- a/src/test/java/world/bentobox/bentobox/database/mariadb/MariaDBDatabaseHandlerTest.java
+++ /dev/null
@@ -1,477 +0,0 @@
-package world.bentobox.bentobox.database.mariadb;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.database.mysql.MySQLDatabaseConnector;
-import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bentobox.util.Util;
-
-/**
- * @author tastybento
- *
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest( { Bukkit.class, BentoBox.class, Util.class })
-public class MariaDBDatabaseHandlerTest {
-
-    private static final String JSON = "{\n" +
-            "  \"deleted\": false,\n" +
-            "  \"uniqueId\": \"xyz\",\n" +
-            "  \"range\": 0,\n" +
-            "  \"protectionRange\": 0,\n" +
-            "  \"maxEverProtectionRange\": 0,\n" +
-            "  \"createdDate\": 0,\n" +
-            "  \"updatedDate\": 0,\n" +
-            "  \"members\": {},\n" +
-            "  \"spawn\": false,\n" +
-            "  \"purgeProtected\": false,\n" +
-            "  \"flags\": {},\n" +
-            "  \"history\": [],\n" +
-            "  \"levelHandicap\": 0,\n" +
-            "  \"spawnPoint\": {},\n" +
-            "  \"doNotLoad\": false\n" +
-            "}";
-    private MariaDBDatabaseHandler<Island> handler;
-    private Island instance;
-    private String UNIQUE_ID = "xyz";
-    @Mock
-    private MySQLDatabaseConnector dbConn;
-    @Mock
-    private BentoBox plugin;
-    @Mock
-    private BukkitScheduler sch;
-    @Mock
-    private PluginManager pluginManager;
-    @Mock
-    private Connection connection;
-    @Mock
-    private PreparedStatement ps;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        // Setup plugin
-        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
-        when(plugin.isEnabled()).thenReturn(true);
-
-        // Bukkit
-        PowerMockito.mockStatic(Bukkit.class);
-        when(Bukkit.getScheduler()).thenReturn(sch);
-
-        // Plugin Manager
-        pluginManager = mock(PluginManager.class);
-        when(Bukkit.getPluginManager()).thenReturn(pluginManager);
-
-        // MySQLDatabaseConnector
-        when(dbConn.createConnection()).thenReturn(connection);
-
-        // Queries
-        when(connection.prepareStatement(Mockito.anyString())).thenReturn(ps);
-        when(connection.createStatement()).thenReturn(ps);
-        ResultSet rs = mock(ResultSet.class);
-        when(ps.executeQuery()).thenReturn(rs);
-        when(ps.executeQuery(Mockito.anyString())).thenReturn(rs);
-
-        // Instance to save
-        instance = new Island();
-        instance.setUniqueId(UNIQUE_ID);
-        handler = new MariaDBDatabaseHandler<>(plugin, Island.class, dbConn);
-
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObjects()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjectsNoConnection() throws SQLException {
-        when(connection.createStatement()).thenThrow(new SQLException("no connection"));
-        handler.loadObjects();
-        verify(plugin).logError("Could not load objects no connection");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObjects()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjects() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenReturn(JSON);
-        // Three islands
-        when(resultSet.next()).thenReturn(true, true, true, false);
-        when(ps.executeQuery(Mockito.anyString())).thenReturn(resultSet);
-        List<Island> objects = handler.loadObjects();
-        verify(ps).executeQuery("SELECT `json` FROM `world.bentobox.bentobox.database.objects.Island`");
-        assertTrue(objects.size() == 3);
-        assertEquals("xyz", objects.get(2).getUniqueId());
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObjects()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjectsBadJSON() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenReturn("sfdasfasdfsfd");
-        // Three islands
-        when(resultSet.next()).thenReturn(true, true, true, false);
-        when(ps.executeQuery(Mockito.anyString())).thenReturn(resultSet);
-        List<Island> objects = handler.loadObjects();
-        verify(ps).executeQuery("SELECT `json` FROM `world.bentobox.bentobox.database.objects.Island`");
-        assertTrue(objects.isEmpty());
-        verify(plugin, Mockito.times(3)).logError("Could not load object java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 1 path $");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObjects()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjectsError() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenThrow(new SQLException("SQL error"));
-        // Three islands
-        when(resultSet.next()).thenReturn(true, true, true, false);
-        when(ps.executeQuery(Mockito.anyString())).thenReturn(resultSet);
-        List<Island> objects = handler.loadObjects();
-        verify(ps).executeQuery("SELECT `json` FROM `world.bentobox.bentobox.database.objects.Island`");
-        assertTrue(objects.isEmpty());
-        verify(plugin).logError("Could not load objects SQL error");
-
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObject(java.lang.String)}.
-     */
-    @Test
-    public void testLoadObjectNoConnection() throws SQLException {
-        when(connection.prepareStatement(Mockito.anyString())).thenThrow(new SQLException("no connection"));
-        handler.loadObject("abc");
-        verify(plugin).logError("Could not load object abc no connection");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObject(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObject() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenReturn(JSON);
-        when(resultSet.next()).thenReturn(true);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        Island object = handler.loadObject("abc");
-        verify(ps).executeQuery();
-        verify(ps).setString(1, "\"abc\"");
-        verify(resultSet).next();
-        assertNotNull(object);
-        assertEquals("xyz", object.getUniqueId());
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObject(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjectBadJSON() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenReturn("afdsaf");
-        when(resultSet.next()).thenReturn(true);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        Island object = handler.loadObject("abc");
-        assertNull(object);
-        verify(plugin).logError("Could not load object abc java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 1 path $");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#loadObject(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testLoadObjectError() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(resultSet.getString(any())).thenReturn(JSON);
-        when(resultSet.next()).thenThrow(new SQLException("SQL Exception"));
-        when(ps.executeQuery()).thenReturn(resultSet);
-        Island object = handler.loadObject("abc");
-        assertNull(object);
-        verify(plugin).logError("Could not load object abc SQL Exception");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#saveObject(java.lang.Object)}.
-     */
-    @Test
-    public void testSaveObjectNull() {
-        handler.saveObject(null);
-        verify(plugin).logError(eq("MySQL database request to store a null. "));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#saveObject(java.lang.Object)}.
-     */
-    @Test
-    public void testSaveObjectNotDataObject() {
-        @SuppressWarnings("rawtypes")
-        MariaDBDatabaseHandler<List> h = new MariaDBDatabaseHandler<List>(plugin, List.class, dbConn);
-        h.saveObject(Collections.singletonList("test"));
-        verify(plugin).logError(eq("This class is not a DataObject: java.util.Collections$SingletonList"));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#saveObject(java.lang.Object)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testSaveObject() throws SQLException {
-        // Disable plugin
-        when(plugin.isEnabled()).thenReturn(false);
-        handler.saveObject(instance);
-        verify(ps).execute();
-        verify(ps).setString(1, JSON);
-        verify(ps).setString(2, "{\n" +
-                "  \"deleted\": false,\n" +
-                "  \"uniqueId\": \"xyz\",\n" +
-                "  \"range\": 0,\n" +
-                "  \"protectionRange\": 0,\n" +
-                "  \"maxEverProtectionRange\": 0,\n" +
-                "  \"createdDate\": 0,\n" +
-                "  \"updatedDate\": 0,\n" +
-                "  \"members\": {},\n" +
-                "  \"spawn\": false,\n" +
-                "  \"purgeProtected\": false,\n" +
-                "  \"flags\": {},\n" +
-                "  \"history\": [],\n" +
-                "  \"levelHandicap\": 0,\n" +
-                "  \"spawnPoint\": {},\n" +
-                "  \"doNotLoad\": false\n" +
-                "}");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#saveObject(java.lang.Object)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testSaveObjectFail() throws SQLException {
-        // Disable plugin
-        when(plugin.isEnabled()).thenReturn(false);
-        when(ps.execute()).thenThrow(new SQLException("fail!"));
-        handler.saveObject(instance);
-        verify(plugin).logError(eq("Could not save object world.bentobox.bentobox.database.objects.Island fail!"));
-
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#deleteObject(java.lang.Object)}.
-     */
-    @Test
-    public void testDeleteObjectNull() {
-        handler.deleteObject(null);
-        verify(plugin).logError(eq("MariaDB database request to delete a null."));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#deleteObject(java.lang.Object)}.
-     */
-    @Test
-    public void testDeleteObjectIncorrectType() {
-        @SuppressWarnings("rawtypes")
-        MariaDBDatabaseHandler<List> h = new MariaDBDatabaseHandler<List>(plugin, List.class, dbConn);
-        h.deleteObject(Collections.singletonList("test"));
-        verify(plugin).logError(eq("This class is not a DataObject: java.util.Collections$SingletonList"));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#deleteObject(java.lang.Object)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testDeleteObject() throws SQLException {
-        // Disable plugin
-        when(plugin.isEnabled()).thenReturn(false);
-        handler.deleteObject(instance);
-        verify(ps).execute();
-        verify(ps).setString(1, "\"xyz\"");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#objectExists(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testObjectExistsNot() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        when(resultSet.next()).thenReturn(false);
-        assertFalse(handler.objectExists("hello"));
-        //verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )");
-        verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))");
-        verify(ps).executeQuery();
-        verify(ps).setString(1, "\"hello\"");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#objectExists(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testObjectExistsFalse() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        when(resultSet.next()).thenReturn(true);
-        when(resultSet.getBoolean(eq(1))).thenReturn(false);
-        assertFalse(handler.objectExists("hello"));
-        //verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )");
-        verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))");
-        verify(ps).executeQuery();
-        verify(ps).setString(1, "\"hello\"");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#objectExists(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testObjectExists() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        when(resultSet.next()).thenReturn(true);
-        when(resultSet.getBoolean(eq(1))).thenReturn(true);
-        assertTrue(handler.objectExists("hello"));
-        //verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )");
-        verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))");
-        verify(ps).executeQuery();
-        verify(ps).setString(1, "\"hello\"");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#objectExists(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testObjectExistsError() throws SQLException {
-        ResultSet resultSet = mock(ResultSet.class);
-        when(ps.executeQuery()).thenReturn(resultSet);
-        when(resultSet.next()).thenThrow(new SQLException("error"));
-        handler.objectExists("hello");
-        verify(plugin).logError(eq("Could not check if key exists in database! hello error"));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#close()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testClose() throws SQLException {
-        handler.close();
-        verify(connection).close();
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#close()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testCloseError() throws SQLException {
-        Mockito.doThrow(new SQLException("error")).when(connection).close();
-        handler.close();
-        verify(plugin).logError(eq("Could not close database for some reason"));
-    }
-
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#deleteID(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testDeleteID() throws SQLException {
-        // Disable plugin
-        when(plugin.isEnabled()).thenReturn(false);
-        handler.deleteID("abc123");
-        verify(ps).execute();
-        verify(ps).setString(1, "\"abc123\"");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#deleteID(java.lang.String)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testDeleteIDError() throws SQLException {
-        // Disable plugin
-        when(plugin.isEnabled()).thenReturn(false);
-        when(ps.execute()).thenThrow(new SQLException("fail!"));
-        handler.deleteID("abc123");
-        verify(plugin).logError(eq("Could not delete object world.bentobox.bentobox.database.objects.Island abc123 fail!"));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#MariaDBDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
-     */
-    @Test
-    public void testMariaDBDatabaseHandlerBadPassword() {
-        when(dbConn.createConnection()).thenReturn(null);
-        new MariaDBDatabaseHandler<>(plugin, Island.class, dbConn);
-        verify(plugin).logError("Are the settings in config.yml correct?");
-        verify(pluginManager).disablePlugin(plugin);
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#MariaDBDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testMariaDBDatabaseHandlerCreateSchema() throws SQLException {
-        verify(dbConn).createConnection();
-        //verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )");
-        verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (JSON_EXTRACT(json, \"$.uniqueId\")), UNIQUE INDEX i (uniqueId))");
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mariadb.MariaDBDatabaseHandler#MariaDBDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
-     * @throws SQLException
-     */
-    @Test
-    public void testMariaDBDatabaseHandlerSchemaFail() throws SQLException {
-        when(ps.executeUpdate()).thenThrow(new SQLException("oh no!"));
-        handler = new MariaDBDatabaseHandler<>(plugin, Island.class, dbConn);
-        verify(plugin).logError("Problem trying to create schema for data object world.bentobox.bentobox.database.objects.Island oh no!");
-
-    }
-
-}
diff --git a/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java
new file mode 100644
index 000000000..5b4c55dbe
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseConnectorTest.java
@@ -0,0 +1,156 @@
+package world.bentobox.bentobox.database.sql.mysql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+import org.bukkit.Bukkit;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( { Bukkit.class, DriverManager.class })
+public class MySQLDatabaseConnectorTest {
+
+    @Mock
+    private DatabaseConnectionSettingsImpl dbSettings;
+    @Mock
+    private Connection connection;
+    @Mock
+    private Logger logger;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        when(dbSettings.getDatabaseName()).thenReturn("bentobox");
+        when(dbSettings.getHost()).thenReturn("localhost");
+        when(dbSettings.getPort()).thenReturn(1234);
+        when(dbSettings.getUsername()).thenReturn("username");
+        when(dbSettings.getPassword()).thenReturn("password");
+
+        mockStatic(DriverManager.class);
+        when(DriverManager.getConnection(
+                "jdbc:mysql://localhost:1234/bentobox?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8",
+                "username",
+                "password"
+                )).thenReturn(connection);
+
+        // Logger
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getLogger()).thenReturn(logger);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#MySQLDatabaseConnector(world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl)}.
+     */
+    @Test
+    public void testMySQLDatabaseConnector() {
+        new MySQLDatabaseConnector(dbSettings);
+        verify(dbSettings).getDatabaseName();
+        verify(dbSettings).getHost();
+        verify(dbSettings).getPort();
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#createConnection()}.
+     */
+    @Ignore("This is apparently very hard to do!")
+    @Test
+    public void testCreateConnection() {
+        MySQLDatabaseConnector dc = new MySQLDatabaseConnector(dbSettings);
+        assertEquals(connection, dc.createConnection(null));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#createConnection()}.
+     * @throws SQLException
+     */
+    @Test
+    public void testCreateConnectionError() throws SQLException {
+        PowerMockito.doThrow(new SQLException("error")).when(DriverManager.class);
+        DriverManager.getConnection(any(), any(), any());
+        MySQLDatabaseConnector dc = new MySQLDatabaseConnector(dbSettings);
+        dc.createConnection(null);
+        verify(logger).severe("Could not connect to the database! No suitable driver found for jdbc:mysql://localhost:1234/bentobox?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#getConnectionUrl()}.
+     */
+    @Test
+    public void testGetConnectionUrl() {
+        MySQLDatabaseConnector dc = new MySQLDatabaseConnector(dbSettings);
+        assertEquals("jdbc:mysql://localhost:1234/bentobox"
+                + "?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8", dc.getConnectionUrl());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#getUniqueId(java.lang.String)}.
+     */
+    @Test
+    public void testGetUniqueId() {
+        assertTrue(new MySQLDatabaseConnector(dbSettings).getUniqueId("any").isEmpty());
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#uniqueIdExists(java.lang.String, java.lang.String)}.
+     */
+    @Test
+    public void testUniqueIdExists() {
+        assertFalse(new MySQLDatabaseConnector(dbSettings).uniqueIdExists("", ""));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#closeConnection()}.
+     */
+    @Test
+    public void testCloseConnection() {
+        MySQLDatabaseConnector dc = new MySQLDatabaseConnector(dbSettings);
+        dc.createConnection(null);
+        dc.closeConnection(null);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#closeConnection()}.
+     */
+    @Test
+    public void testCloseConnectionError() throws SQLException {
+        MySQLDatabaseConnector dc = new MySQLDatabaseConnector(dbSettings);
+        dc.createConnection(null);
+        dc.closeConnection(null);
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java
similarity index 77%
rename from src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java
rename to src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java
index 3b4a985c7..60f8b74ff 100644
--- a/src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java
+++ b/src/test/java/world/bentobox/bentobox/database/sql/mysql/MySQLDatabaseHandlerTest.java
@@ -1,4 +1,4 @@
-package world.bentobox.bentobox.database.mysql;
+package world.bentobox.bentobox.database.sql.mysql;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,6 +22,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -32,8 +33,9 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.database.mysql.MySQLDatabaseConnector;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector;
+import world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -59,7 +61,8 @@ public class MySQLDatabaseHandlerTest {
             "  \"history\": [],\n" +
             "  \"levelHandicap\": 0,\n" +
             "  \"spawnPoint\": {},\n" +
-            "  \"doNotLoad\": false\n" +
+            "  \"doNotLoad\": false,\n" +
+            "  \"cooldowns\": {}\n" +
             "}";
     private MySQLDatabaseHandler<Island> handler;
     private Island instance;
@@ -95,7 +98,7 @@ public class MySQLDatabaseHandlerTest {
         when(Bukkit.getPluginManager()).thenReturn(pluginManager);
 
         // MySQLDatabaseConnector
-        when(dbConn.createConnection()).thenReturn(connection);
+        when(dbConn.createConnection(any())).thenReturn(connection);
 
         // Queries
         when(connection.prepareStatement(Mockito.anyString())).thenReturn(ps);
@@ -112,7 +115,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObjects()}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObjects()}.
      * @throws SQLException
      */
     @Test
@@ -123,7 +126,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObjects()}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObjects()}.
      * @throws SQLException
      */
     @Test
@@ -140,7 +143,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObjects()}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObjects()}.
      * @throws SQLException
      */
     @Test
@@ -157,7 +160,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObjects()}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObjects()}.
      * @throws SQLException
      */
     @Test
@@ -175,7 +178,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
      */
     @Test
     public void testLoadObjectNoConnection() throws SQLException {
@@ -185,7 +188,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -203,7 +206,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -218,7 +221,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#loadObject(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -233,16 +236,16 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
      */
     @Test
     public void testSaveObjectNull() {
         handler.saveObject(null);
-        verify(plugin).logError(eq("MySQL database request to store a null. "));
+        verify(plugin).logError(eq("SQL database request to store a null. "));
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
      */
     @Test
     public void testSaveObjectNotDataObject() {
@@ -253,10 +256,11 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
      * @throws SQLException
      */
     @Test
+    @Ignore("Async cannot be tested")
     public void testSaveObject() throws SQLException {
         // Disable plugin
         when(plugin.isEnabled()).thenReturn(false);
@@ -278,15 +282,17 @@ public class MySQLDatabaseHandlerTest {
                 "  \"history\": [],\n" +
                 "  \"levelHandicap\": 0,\n" +
                 "  \"spawnPoint\": {},\n" +
-                "  \"doNotLoad\": false\n" +
+                "  \"doNotLoad\": false,\n" +
+                "  \"cooldowns\": {}\n" +
                 "}");
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#saveObject(java.lang.Object)}.
      * @throws SQLException
      */
     @Test
+    @Ignore("Async cannot be tested")
     public void testSaveObjectFail() throws SQLException {
         // Disable plugin
         when(plugin.isEnabled()).thenReturn(false);
@@ -297,16 +303,16 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
      */
     @Test
     public void testDeleteObjectNull() {
         handler.deleteObject(null);
-        verify(plugin).logError(eq("MySQL database request to delete a null."));
+        verify(plugin).logError(eq("SQL database request to delete a null."));
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
      */
     @Test
     public void testDeleteObjectIncorrectType() {
@@ -317,10 +323,11 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteObject(java.lang.Object)}.
      * @throws SQLException
      */
     @Test
+    @Ignore("Async cannot be tested")
     public void testDeleteObject() throws SQLException {
         // Disable plugin
         when(plugin.isEnabled()).thenReturn(false);
@@ -330,7 +337,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -345,7 +352,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -361,7 +368,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -377,7 +384,7 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#objectExists(java.lang.String)}.
      * @throws SQLException
      */
     @Test
@@ -390,32 +397,11 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#close()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testClose() throws SQLException {
-        handler.close();
-        verify(connection).close();
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#close()}.
-     * @throws SQLException
-     */
-    @Test
-    public void testCloseError() throws SQLException {
-        Mockito.doThrow(new SQLException("error")).when(connection).close();
-        handler.close();
-        verify(plugin).logError(eq("Could not close database for some reason"));
-    }
-
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
      * @throws SQLException
      */
     @Test
+    @Ignore("Cannot test async")
     public void testDeleteID() throws SQLException {
         // Disable plugin
         when(plugin.isEnabled()).thenReturn(false);
@@ -425,10 +411,11 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#deleteID(java.lang.String)}.
      * @throws SQLException
      */
     @Test
+    @Ignore("Cannot test async")
     public void testDeleteIDError() throws SQLException {
         // Disable plugin
         when(plugin.isEnabled()).thenReturn(false);
@@ -438,28 +425,28 @@ public class MySQLDatabaseHandlerTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
      */
     @Test
     public void testMySQLDatabaseHandlerBadPassword() {
-        when(dbConn.createConnection()).thenReturn(null);
+        when(dbConn.createConnection(any())).thenReturn(null);
         new MySQLDatabaseHandler<>(plugin, Island.class, dbConn);
         verify(plugin).logError("Are the settings in config.yml correct?");
         verify(pluginManager).disablePlugin(plugin);
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
      * @throws SQLException
      */
     @Test
     public void testMySQLDatabaseHandlerCreateSchema() throws SQLException {
-        verify(dbConn).createConnection();
+        verify(dbConn).createConnection(any());
         verify(connection).prepareStatement("CREATE TABLE IF NOT EXISTS `world.bentobox.bentobox.database.objects.Island` (json JSON, uniqueId VARCHAR(255) GENERATED ALWAYS AS (json->\"$.uniqueId\"), UNIQUE INDEX i (uniqueId) )");
     }
 
     /**
-     * Test method for {@link world.bentobox.bentobox.database.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
+     * Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseHandler#MySQLDatabaseHandler(world.bentobox.bentobox.BentoBox, java.lang.Class, world.bentobox.bentobox.database.DatabaseConnector)}.
      * @throws SQLException
      */
     @Test
diff --git a/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java b/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java
index b4a92aedc..7ad40379e 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java
@@ -56,7 +56,7 @@ public class BannedVisitorCommandsTest {
         iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
         when(iwm.getVisitorBannedCommands(Mockito.any())).thenReturn(new ArrayList<>());
         when(plugin.getIWM()).thenReturn(iwm);
 
diff --git a/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java
new file mode 100644
index 000000000..773cfbde1
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java
@@ -0,0 +1,597 @@
+package world.bentobox.bentobox.listeners;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.World.Environment;
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.api.flags.Flag;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.util.Util;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({BentoBox.class, Util.class, Bukkit.class })
+public class BlockEndDragonTest {
+
+    @Mock
+    private Player player;
+    private BlockEndDragon bed;
+    @Mock
+    private World world;
+    @Mock
+    private Location loc;
+    @Mock
+    private IslandWorldManager iwm;
+    @Mock
+    private Block block;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        BentoBox plugin = mock(BentoBox.class);
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+        // IWM
+        when(plugin.getIWM()).thenReturn(iwm);
+        @Nullable
+        WorldSettings ws = new MyWorldSettings();
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
+        // World is the end to start
+        when(iwm.isIslandEnd(any())).thenReturn(true);
+        when(iwm.isEndGenerate(any())).thenReturn(true);
+        when(iwm.isEndIslands(any())).thenReturn(true);
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+
+        // World
+        when(block.getType()).thenReturn(Material.AIR);
+        when(block.getY()).thenReturn(255);
+        when(block.getX()).thenReturn(0);
+        when(block.getZ()).thenReturn(0);
+        when(block.getWorld()).thenReturn(world);
+        when(world.getBlockAt(anyInt(), anyInt(), anyInt())).thenReturn(block);
+        when(world.getEnvironment()).thenReturn(Environment.THE_END);
+        // Player
+        UUID uuid = UUID.randomUUID();
+        when(player.getUniqueId()).thenReturn(uuid);
+        when(player.getLocation()).thenReturn(loc);
+        when(loc.getWorld()).thenReturn(world);
+        User.getInstance(player);
+
+        // Set flag
+        Flags.REMOVE_END_EXIT_ISLAND.setSetting(world, true);
+
+        // Class
+        bed = new BlockEndDragon(plugin);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+        User.clearUsers();
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onPlayerChangeWorld(org.bukkit.event.player.PlayerChangedWorldEvent)}.
+     */
+    @Test
+    public void testOnPlayerChangeWorld() {
+        PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(player, world);
+        bed.onPlayerChangeWorld(event);
+        verify(block).setType(eq(Material.END_PORTAL), eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onPlayerChangeWorld(org.bukkit.event.player.PlayerChangedWorldEvent)}.
+     */
+    @Test
+    public void testOnPlayerChangeWorldNotEnd() {
+        when(iwm.isIslandEnd(any())).thenReturn(false);
+        PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(player, world);
+        bed.onPlayerChangeWorld(event);
+        verify(block, never()).setType(eq(Material.END_PORTAL), eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onPlayerChangeWorld(org.bukkit.event.player.PlayerChangedWorldEvent)}.
+     */
+    @Test
+    public void testOnPlayerChangeWorldBlockSet() {
+        when(block.getType()).thenReturn(Material.END_PORTAL);
+        PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(player, world);
+        bed.onPlayerChangeWorld(event);
+        verify(block, never()).setType(eq(Material.END_PORTAL), eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onPlayerChangeWorld(org.bukkit.event.player.PlayerChangedWorldEvent)}.
+     */
+    @Test
+    public void testOnPlayerChangeWorldNoFlag() {
+        Flags.REMOVE_END_EXIT_ISLAND.setSetting(world, false);
+        PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(player, world);
+        bed.onPlayerChangeWorld(event);
+        verify(block, never()).setType(eq(Material.END_PORTAL), eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onPlayerJoinWorld(org.bukkit.event.player.PlayerJoinEvent)}.
+     */
+    @Test
+    public void testOnPlayerJoinWorld() {
+        PlayerJoinEvent event = new PlayerJoinEvent(player, "");
+        bed.onPlayerJoinWorld(event);
+        verify(block).setType(eq(Material.END_PORTAL), eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlace() {
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertTrue(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceX() {
+        when(block.getX()).thenReturn(23);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceZ() {
+        when(block.getZ()).thenReturn(23);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceY() {
+        when(block.getY()).thenReturn(23);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceNether() {
+        when(world.getEnvironment()).thenReturn(Environment.NETHER);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceNoFlag() {
+        Flags.REMOVE_END_EXIT_ISLAND.setSetting(world, false);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}.
+     */
+    @Test
+    public void testOnEndBlockPlaceWrongWorld() {
+        when(iwm.isEndGenerate(any())).thenReturn(false);
+        when(iwm.isEndIslands(any())).thenReturn(true);
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+        BlockPlaceEvent e = new BlockPlaceEvent(block, null, block, null, player, false, null);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+
+        when(iwm.isEndGenerate(any())).thenReturn(true);
+        when(iwm.isEndIslands(any())).thenReturn(false);
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+
+        when(iwm.isEndGenerate(any())).thenReturn(true);
+        when(iwm.isEndIslands(any())).thenReturn(true);
+        when(iwm.inWorld(any(World.class))).thenReturn(false);
+        bed.onEndBlockPlace(e);
+        assertFalse(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.BlockEndDragon#onEndBlockBreak(org.bukkit.event.block.BlockBreakEvent)}.
+     */
+    @Test
+    public void testOnEndBlockBreak() {
+        BlockBreakEvent e = new BlockBreakEvent(block, player);
+        bed.onEndBlockBreak(e);
+        assertTrue(e.isCancelled());
+    }
+
+    /*
+     * internal storage class
+     */
+    class MyWorldSettings implements WorldSettings {
+
+        private Map<String, Boolean> worldFlags = new HashMap<>();
+
+
+        @Override
+        public GameMode getDefaultGameMode() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<Flag, Integer> getDefaultIslandFlags() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<Flag, Integer> getDefaultIslandSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Difficulty getDifficulty() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public void setDifficulty(Difficulty difficulty) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public String getFriendlyName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getIslandDistance() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandHeight() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandProtectionRange() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandStartX() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandStartZ() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandXOffset() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getIslandZOffset() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public List<String> getIvSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getMaxHomes() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getMaxIslands() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getMaxTeamSize() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public int getNetherSpawnRadius() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public String getPermissionPrefix() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Set<EntityType> getRemoveMobsWhitelist() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getSeaHeight() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public List<String> getHiddenFlags() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public List<String> getVisitorBannedCommands() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public Map<String, Boolean> getWorldFlags() {
+            return worldFlags;
+        }
+
+        @Override
+        public String getWorldName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public boolean isDragonSpawn() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isEndGenerate() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isEndIslands() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isNetherGenerate() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isNetherIslands() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetEnderChest() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnJoinResetMoney() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetEnderChest() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isOnLeaveResetMoney() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isUseOwnGenerator() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isWaterUnsafe() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public List<String> getGeoLimitSettings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public int getResetLimit() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public long getResetEpoch() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public void setResetEpoch(long timestamp) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public boolean isTeamJoinDeathReset() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public int getDeathsMax() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public boolean isDeathsCounted() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isDeathsResetOnNewIsland() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isAllowSetHomeInNether() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isAllowSetHomeInTheEnd() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isRequireConfirmationToSetHomeInNether() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isRequireConfirmationToSetHomeInTheEnd() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public int getBanLimit() {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        @Override
+        public boolean isLeaversLoseReset() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+        @Override
+        public boolean isKickedKeepInventory() {
+            // TODO Auto-generated method stub
+            return false;
+        }
+
+    }
+}
diff --git a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
index 9e4176a37..5b72f7781 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
@@ -47,7 +47,7 @@ public class DeathListenerTest {
         iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
         when(iwm.getVisitorBannedCommands(Mockito.any())).thenReturn(new ArrayList<>());
         when(plugin.getIWM()).thenReturn(iwm);
 
diff --git a/src/test/java/world/bentobox/bentobox/listeners/NetherTreesListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/NetherTreesListenerTest.java
deleted file mode 100644
index bdecbeb9d..000000000
--- a/src/test/java/world/bentobox/bentobox/listeners/NetherTreesListenerTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package world.bentobox.bentobox.listeners;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-
-import world.bentobox.bentobox.BentoBox;
-import world.bentobox.bentobox.managers.IslandWorldManager;
-
-/**
- * Tests {@link NetherTreesListener}.
- *
- * @author Poslovitch
- * @since 1.3.0
- */
-@Ignore
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({BentoBox.class})
-public class NetherTreesListenerTest {
-
-    /* Plugin */
-    private BentoBox plugin;
-
-    /* Island World Manager */
-    private IslandWorldManager iwm;
-
-    /* Listener */
-    private NetherTreesListener listener;
-
-    @Before
-    public void setUp() {
-        /* Plugin */
-        plugin = mock(BentoBox.class);
-        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
-
-        /* Island World Manager */
-        iwm = mock(IslandWorldManager.class);
-        when(plugin.getIWM()).thenReturn(iwm);
-
-        /* Listener */
-        listener = new NetherTreesListener(plugin);
-    }
-}
diff --git a/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java
index 5a3c3e5ed..5ae56b405 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java
@@ -24,8 +24,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
index cdf289517..5156f4d81 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListenerTest.java
@@ -3,7 +3,10 @@ package world.bentobox.bentobox.listeners.flags.protection;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
@@ -47,6 +50,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
@@ -76,14 +80,21 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest( {BentoBox.class, Flags.class, Util.class, Bukkit.class} )
 public class BreakBlocksListenerTest {
 
+    @Mock
     private Location location;
+    @Mock
     private BentoBox plugin;
+    @Mock
     private Notifier notifier;
 
     private BreakBlocksListener bbl;
+    @Mock
     private Player player;
+    @Mock
     private World world;
+    @Mock
     private Island island;
+    @Mock
     private IslandWorldManager iwm;
 
 
@@ -93,11 +104,9 @@ public class BreakBlocksListenerTest {
     @Before
     public void setUp() throws Exception {
         // Set up plugin
-        plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
         Server server = mock(Server.class);
-        world = mock(World.class);
         when(server.getLogger()).thenReturn(Logger.getAnonymousLogger());
         when(server.getWorld("world")).thenReturn(world);
         when(server.getVersion()).thenReturn("BSB_Mocking");
@@ -115,7 +124,8 @@ public class BreakBlocksListenerTest {
         when(itemFactory.getItemMeta(any())).thenReturn(meta);
         when(Bukkit.getItemFactory()).thenReturn(itemFactory);
         when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger());
-        location = mock(Location.class);
+
+        // Location
         when(location.getWorld()).thenReturn(world);
         when(location.getBlockX()).thenReturn(0);
         when(location.getBlockY()).thenReturn(0);
@@ -126,8 +136,7 @@ public class BreakBlocksListenerTest {
         when(plugin.getFlagsManager()).thenReturn(flagsManager);
 
 
-        // Worlds
-        iwm = mock(IslandWorldManager.class);
+        // Island World Manager
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
         when(plugin.getIWM()).thenReturn(iwm);
@@ -152,31 +161,28 @@ public class BreakBlocksListenerTest {
 
         // World Settings
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
 
         // Island manager
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
-        island = mock(Island.class);
         Optional<Island> optional = Optional.of(island);
-        when(im.getProtectedIslandAt(Mockito.any())).thenReturn(optional);
+        when(im.getProtectedIslandAt(any())).thenReturn(optional);
         // Default is that everything is allowed
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any(), any())).thenReturn(true);
 
         // Notifier
-        notifier = mock(Notifier.class);
         when(plugin.getNotifier()).thenReturn(notifier);
 
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
+        when(Util.getWorld(any())).thenReturn(mock(World.class));
 
         // Addon
-        when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // Player
-        player = mock(Player.class);
         when(player.getLocation()).thenReturn(location);
         when(player.getUniqueId()).thenReturn(UUID.randomUUID());
         when(player.getName()).thenReturn("tastybento");
@@ -208,13 +214,13 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnBlockBreakNotAllowed() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         Block block = mock(Block.class);
         when(block.getLocation()).thenReturn(location);
         BlockBreakEvent e = new BlockBreakEvent(block, player);
         bbl.onBlockBreak(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq("protection.protected"));
+        verify(notifier).notify(any(), eq("protection.protected"));
     }
 
     /**
@@ -235,14 +241,14 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnBreakHangingNotAllowed() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         Hanging hanging = mock(Hanging.class);
         when(hanging.getLocation()).thenReturn(location);
         RemoveCause cause = RemoveCause.ENTITY;
         HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, player, cause);
         bbl.onBreakHanging(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq("protection.protected"));
+        verify(notifier).notify(any(), eq("protection.protected"));
     }
 
     /**
@@ -312,7 +318,7 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnPlayerInteractHitCakeSpawnerDragonEggNotOK() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         ItemStack item = mock(ItemStack.class);
         Block block = mock(Block.class);
         when(block.getLocation()).thenReturn(location);
@@ -328,7 +334,7 @@ public class BreakBlocksListenerTest {
         e = new PlayerInteractEvent(player, Action.LEFT_CLICK_BLOCK, item, block, BlockFace.EAST);
         bbl.onPlayerInteract(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier, Mockito.times(3)).notify(Mockito.any(), Mockito.eq("protection.protected"));
+        verify(notifier, times(3)).notify(any(), eq("protection.protected"));
     }
 
     /**
@@ -348,13 +354,13 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnVehicleDamageEventNotAllowed() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         Vehicle vehicle = mock(Vehicle.class);
         when(vehicle.getLocation()).thenReturn(location);
         VehicleDamageEvent e = new VehicleDamageEvent(vehicle, player, 10);
         bbl.onVehicleDamageEvent(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq("protection.protected"));
+        verify(notifier).notify(any(), eq("protection.protected"));
     }
 
     /**
@@ -421,7 +427,7 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnEntityDamageNotAllowed() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
         Entity damagee = mock(ArmorStand.class);
         when(damagee.getLocation()).thenReturn(location);
@@ -439,7 +445,7 @@ public class BreakBlocksListenerTest {
         e = new EntityDamageByEntityEvent(damager, damagee, cause, 10);
         bbl.onEntityDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier, Mockito.times(3)).notify(Mockito.any(), Mockito.eq("protection.protected"));
+        verify(notifier, times(3)).notify(any(), eq("protection.protected"));
     }
 
     /**
@@ -492,7 +498,7 @@ public class BreakBlocksListenerTest {
      */
     @Test
     public void testOnEntityDamageNotAllowedProjectile() {
-        when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any(), any())).thenReturn(false);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
         Entity damagee = mock(ArmorStand.class);
         when(damagee.getLocation()).thenReturn(location);
@@ -501,23 +507,21 @@ public class BreakBlocksListenerTest {
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, cause, 10);
         bbl.onEntityDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(damagee).setFireTicks(0);
+        verify(damagee).setFireTicks(0);
 
         damagee = mock(ItemFrame.class);
         when(damagee.getLocation()).thenReturn(location);
         e = new EntityDamageByEntityEvent(damager, damagee, cause, 10);
         bbl.onEntityDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(damagee).setFireTicks(0);
+        verify(damagee).setFireTicks(0);
 
         damagee = mock(EnderCrystal.class);
         when(damagee.getLocation()).thenReturn(location);
         e = new EntityDamageByEntityEvent(damager, damagee, cause, 10);
         bbl.onEntityDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier, Mockito.times(3)).notify(Mockito.any(), Mockito.eq("protection.protected"));
-        Mockito.verify(damager, Mockito.times(3)).remove();
-        Mockito.verify(damagee).setFireTicks(0);
-
+        verify(notifier, times(3)).notify(any(), eq("protection.protected"));
+        verify(damagee).setFireTicks(0);
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java
index 4bb5b486e..3d57ccb57 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java
@@ -2,7 +2,7 @@ package world.bentobox.bentobox.listeners.flags.protection;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -30,7 +30,7 @@ import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -39,6 +39,7 @@ import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
@@ -56,9 +57,15 @@ public class FireListenerTest {
 
     private Location location;
     private BentoBox plugin;
+    @Mock
+    private World world;
+
+    private Map<String, Boolean> worldFlags = new HashMap<>();
 
     @Before
     public void setUp() {
+        worldFlags.clear();
+
         PowerMockito.mockStatic(Bukkit.class);
         // Set up plugin
         plugin = mock(BentoBox.class);
@@ -126,8 +133,11 @@ public class FireListenerTest {
         // World Settings
         WorldSettings ws = mock(WorldSettings.class);
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
-        Map<String, Boolean> worldFlags = new HashMap<>();
+
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
 
         PowerMockito.mockStatic(Util.class);
         when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
@@ -139,7 +149,7 @@ public class FireListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Block on fire
         Block block = mock(Block.class);
@@ -167,12 +177,12 @@ public class FireListenerTest {
         assertFalse(listener.checkFire(e, location, Flags.FLINT_AND_STEEL));
 
         // Check with no island
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
         // Fire is not allowed, so should be cancelled
         Flags.FLINT_AND_STEEL.setDefaultSetting(false);
         assertTrue(listener.checkFire(e, location, Flags.FLINT_AND_STEEL));
         // Fire allowed
-        Flags.FLINT_AND_STEEL.setDefaultSetting(true);
+        Flags.FLINT_AND_STEEL.setDefaultSetting(world, true);
         assertFalse(listener.checkFire(e, location, Flags.FLINT_AND_STEEL));
     }
 
@@ -182,7 +192,7 @@ public class FireListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Block on fire
         Block block = mock(Block.class);
@@ -210,10 +220,12 @@ public class FireListenerTest {
         assertFalse(listener.onBlockBurn(e));
 
         // Check with no island
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        e = new BlockBurnEvent(block, block);
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
         // Fire is not allowed, so should be cancelled
         Flags.FIRE_BURNING.setDefaultSetting(false);
-        assertTrue(listener.onBlockBurn(e));
+        listener.onBlockBurn(e);
+        assertTrue(e.isCancelled());
         // Fire allowed
         Flags.FIRE_BURNING.setDefaultSetting(true);
         assertFalse(listener.onBlockBurn(e));
@@ -225,7 +237,7 @@ public class FireListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Block on fire spread
 
@@ -258,7 +270,7 @@ public class FireListenerTest {
         assertFalse(listener.onBlockSpread(e));
 
         // Check with no island
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
         // Fire spread is not allowed, so should be cancelled
         Flags.FIRE_SPREAD.setDefaultSetting(false);
         assertTrue(listener.onBlockSpread(e));
@@ -273,7 +285,7 @@ public class FireListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Block on fire spread
 
@@ -310,7 +322,7 @@ public class FireListenerTest {
         assertFalse(listener.onBlockIgnite(e));
 
         // Check with no island
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
         // Fire spread is not allowed, so should be cancelled
         Flags.FIRE_IGNITE.setDefaultSetting(false);
         assertTrue(listener.onBlockIgnite(e));
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
index 7f7cc9575..207a1d00f 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/HurtingListenerTest.java
@@ -143,7 +143,7 @@ public class HurtingListenerTest {
         // Locales
         lm = mock(LocalesManager.class);
         when(plugin.getLocalesManager()).thenReturn(lm);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
         when(lm.get(Mockito.any(), Mockito.any())).thenAnswer(answer);
 
         // Placeholders
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
index bd2286e30..f81b50241 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/InventoryListenerTest.java
@@ -29,6 +29,7 @@ import org.bukkit.block.Hopper;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Villager;
 import org.bukkit.entity.minecart.StorageMinecart;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryAction;
@@ -75,7 +76,8 @@ public class InventoryListenerTest {
 
     private final static List<Class<?>> HOLDERS = Arrays.asList(Horse.class, Chest.class,ShulkerBox.class, StorageMinecart.class,
             Dispenser.class,
-            Dropper.class, Hopper.class, Furnace.class, BrewingStand.class, Beacon.class);
+            Dropper.class, Hopper.class, Furnace.class, BrewingStand.class, Beacon.class,
+            Villager.class);
 
     private Location location;
     private BentoBox plugin;
@@ -352,4 +354,5 @@ public class InventoryListenerTest {
         assertFalse(e.isCancelled());
     }
 
+
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
index a4259a788..c2a554662 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListenerTest.java
@@ -80,7 +80,7 @@ public class LockAndBanListenerTest {
 
         // Island world manager
         IslandWorldManager iwm = mock(IslandWorldManager.class);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
 
         when(plugin.getIWM()).thenReturn(iwm);
 
@@ -361,6 +361,7 @@ public class LockAndBanListenerTest {
         passengers.add(player);
         passengers.add(player2);
         when(vehicle.getPassengers()).thenReturn(passengers);
+        when(vehicle.getWorld()).thenReturn(world);
         // Move vehicle
         listener.onVehicleMove(new VehicleMoveEvent(vehicle, outside, inside));
         // Player should see a message and nothing should be sent to Player 2
@@ -694,7 +695,7 @@ public class LockAndBanListenerTest {
         when(player2.getUniqueId()).thenReturn(uuid2);
 
         // Player 1 is not a member, player 2 is an island member
-        when(island.isAllowed(Mockito.any(User.class), Mockito.any())).thenAnswer((Answer<Boolean>) invocation -> invocation.getArgumentAt(0, User.class).getUniqueId().equals(uuid2));
+        when(island.isAllowed(Mockito.any(User.class), Mockito.any())).thenAnswer((Answer<Boolean>) invocation -> invocation.getArgument(0, User.class).getUniqueId().equals(uuid2));
 
         // Create vehicle and put two players in it. One is a member, the other is not
         Vehicle vehicle = mock(Vehicle.class);
@@ -702,6 +703,7 @@ public class LockAndBanListenerTest {
         passengers.add(player);
         passengers.add(player2);
         when(vehicle.getPassengers()).thenReturn(passengers);
+        when(vehicle.getWorld()).thenReturn(world);
         // Move vehicle
         listener.onVehicleMove(new VehicleMoveEvent(vehicle, outside, inside));
         // Player should see a message and nothing should be sent to Player 2
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
index 357b47b0a..0415da409 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
@@ -2,7 +2,7 @@ package world.bentobox.bentobox.listeners.flags.protection;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -41,7 +41,6 @@ import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
@@ -68,9 +67,9 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest( {BentoBox.class, Flags.class, Util.class, Bukkit.class} )
 public class TNTListenerTest {
 
-    private static Location location;
-    private static BentoBox plugin;
-    private static Notifier notifier;
+    private Location location;
+    private BentoBox plugin;
+    private Notifier notifier;
 
     @Before
     public void setUp() {
@@ -219,7 +218,7 @@ public class TNTListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
         when(im.getProtectedIslandAt(Mockito.any())).thenReturn(Optional.of(island));
 
         // Block on fire
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
index a7fc3b499..fa8b6ebc9 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListenerTest.java
@@ -2,7 +2,7 @@ package world.bentobox.bentobox.listeners.flags.settings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -25,10 +25,8 @@ import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
@@ -37,6 +35,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
@@ -60,6 +59,8 @@ public class MobSpawnListenerTest {
     private Cow cow;
     @Mock
     private IslandWorldManager iwm;
+    @Mock
+    private LivingEntity livingEntity;
 
     @Before
     public void setUp() {
@@ -117,16 +118,21 @@ public class MobSpawnListenerTest {
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
 
         // Default - plugin is loaded
         when(plugin.isLoaded()).thenReturn(true);
+
+        // Living Entity
+        when(livingEntity.getLocation()).thenReturn(location);
     }
 
-    @Ignore //FIXME don't know why it is failing
     @Test
     public void testNotLoaded() {
         when(plugin.isLoaded()).thenReturn(false);
-        CreatureSpawnEvent e = new CreatureSpawnEvent(null, SpawnReason.NATURAL);
+        CreatureSpawnEvent e = new CreatureSpawnEvent(livingEntity, SpawnReason.NATURAL);
         MobSpawnListener l = new MobSpawnListener();
         assertFalse(l.onNaturalMobSpawn(e));
         assertFalse(e.isCancelled());
@@ -138,7 +144,7 @@ public class MobSpawnListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Set up entity
         LivingEntity entity = mock(LivingEntity.class);
@@ -164,7 +170,7 @@ public class MobSpawnListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Block mobs
         when(island.isAllowed(Mockito.any())).thenReturn(false);
@@ -210,7 +216,7 @@ public class MobSpawnListenerTest {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
         Island island = mock(Island.class);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
 
         // Allow mobs
         when(island.isAllowed(Mockito.any())).thenReturn(true);
@@ -246,7 +252,7 @@ public class MobSpawnListenerTest {
     public void testOnNaturalMonsterSpawnBlockedNoIsland() {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
 
         // Block mobs
         Flags.MONSTER_SPAWN.setDefaultSetting(false);
@@ -274,7 +280,7 @@ public class MobSpawnListenerTest {
     public void testOnNaturalMobSpawnUnBlockedNoIsland() {
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
-        when(im.getIslandAt(Matchers.any())).thenReturn(Optional.empty());
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
 
         // Block mobs
         Flags.MONSTER_SPAWN.setDefaultSetting(true);
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
index 32c8fc863..2257d0314 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
@@ -1,14 +1,15 @@
-/**
- *
- */
 package world.bentobox.bentobox.listeners.flags.settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.times;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,6 +45,7 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,6 +62,7 @@ import com.google.common.collect.ImmutableMap;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.panels.Panel;
@@ -109,9 +112,9 @@ public class PVPListenerTest {
         iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
         // No visitor protection right now
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(new ArrayList<>());
+        when(iwm.getIvSettings(any())).thenReturn(new ArrayList<>());
         when(plugin.getIWM()).thenReturn(iwm);
 
         Panel panel = mock(Panel.class);
@@ -142,25 +145,25 @@ public class PVPListenerTest {
         User.getInstance(player2);
 
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
+        when(Util.getWorld(any())).thenReturn(mock(World.class));
 
         FlagsManager fm = mock(FlagsManager.class);
         Flag flag = mock(Flag.class);
-        when(flag.isSetForWorld(Mockito.any())).thenReturn(false);
+        when(flag.isSetForWorld(any())).thenReturn(false);
         PanelItem item = mock(PanelItem.class);
         when(item.getItem()).thenReturn(mock(ItemStack.class));
-        when(flag.toPanelItem(Mockito.any(), Mockito.any(), Mockito.eq(false))).thenReturn(item);
+        when(flag.toPanelItem(any(), any(), any(), eq(false))).thenReturn(item);
         when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag));
         when(plugin.getFlagsManager()).thenReturn(fm);
 
         im = mock(IslandsManager.class);
         // Default is that player in on their island
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(im.userIsOnIsland(any(), any())).thenReturn(true);
         island = mock(Island.class);
-        when(im.getIslandAt(Mockito.any())).thenReturn(Optional.of(island));
-        when(im.getProtectedIslandAt(Mockito.any())).thenReturn(Optional.of(island));
+        when(im.getIslandAt(any())).thenReturn(Optional.of(island));
+        when(im.getProtectedIslandAt(any())).thenReturn(Optional.of(island));
         // All flags are disallowed by default.
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
         when(plugin.getIslands()).thenReturn(im);
 
         // Settings
@@ -170,7 +173,7 @@ public class PVPListenerTest {
         // Locales - this returns the string that was requested for translation
         LocalesManager lm = mock(LocalesManager.class);
         when(plugin.getLocalesManager()).thenReturn(lm);
-        Answer<String> answer = (Answer<String>) invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = (Answer<String>) invocation -> invocation.getArgument(1, String.class);
         when(lm.get(any(), any())).thenAnswer(answer);
 
         // Placeholders
@@ -193,19 +196,27 @@ public class PVPListenerTest {
 
         // World Settings
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
 
         // Notifier
         notifier = mock(Notifier.class);
         when(plugin.getNotifier()).thenReturn(notifier);
 
         // Addon
-        when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
     }
 
+    @After
+    public void tearDown() {
+        User.clearUsers();
+    }
+
     private void wrongWorld() {
         when(iwm.inWorld(any(World.class))).thenReturn(false);
         when(iwm.inWorld(any(Location.class))).thenReturn(false);
@@ -299,8 +310,7 @@ public class PVPListenerTest {
         e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
                 new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
-        when(iwm.inWorld(any(World.class))).thenReturn(false);
-        when(iwm.inWorld(any(Location.class))).thenReturn(false);
+        wrongWorld();
         new PVPListener().onEntityDamage(e);
         assertFalse(e.isCancelled());
     }
@@ -310,6 +320,28 @@ public class PVPListenerTest {
      */
     @Test
     public void testOnEntityDamageOnVisitorByZombieVisitorProtected() {
+        Entity damager = mock(Zombie.class);
+        Entity damagee = mock(Player.class);
+        when(damager.getWorld()).thenReturn(world);
+        when(damagee.getWorld()).thenReturn(world);
+
+        // Protect visitors
+        when(iwm.getIvSettings(world)).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        // This player is a visitor
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+
+        EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
+                new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
+                new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
+        new PVPListener().onEntityDamage(e);
+        assertTrue(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}.
+     */
+    @Test
+    public void testOnEntityDamageOnVisitorByZombieVisitorProtectedWrongWorld() {
         Entity damager = mock(Zombie.class);
         Entity damagee = mock(Player.class);
         World world = mock(World.class);
@@ -322,19 +354,12 @@ public class PVPListenerTest {
         visitorProtectionList.add("ENTITY_ATTACK");
         when(iwm.getIvSettings(world)).thenReturn(visitorProtectionList);
         // This player is a visitor
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
 
-        EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
+        EntityDamageByEntityEvent e  = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
                 new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
-        new PVPListener().onEntityDamage(e);
-        assertTrue(e.isCancelled());
-        // Wrong world
-        e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
-                new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
-                new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
-        when(iwm.inWorld(any(World.class))).thenReturn(false);
-        when(iwm.inWorld(any(Location.class))).thenReturn(false);
+        wrongWorld();
         new PVPListener().onEntityDamage(e);
         assertFalse(e.isCancelled());
     }
@@ -356,7 +381,7 @@ public class PVPListenerTest {
         visitorProtectionList.add("ENTITY_ATTACK");
         when(iwm.getIvSettings(world)).thenReturn(visitorProtectionList);
         // This player is a visitor
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
         // Damage is not entity attack
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.THORNS,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
@@ -382,7 +407,7 @@ public class PVPListenerTest {
         when(damagee.getWorld()).thenReturn(world);
 
         // This player is a visitor
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
 
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
@@ -421,7 +446,7 @@ public class PVPListenerTest {
         new PVPListener().onEntityDamage(e);
         // PVP should be banned
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
 
     }
 
@@ -436,12 +461,12 @@ public class PVPListenerTest {
 
         // Enable visitor protection
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onEntityDamage(e);
         // visitor should be protected
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
     }
 
     /**
@@ -450,23 +475,23 @@ public class PVPListenerTest {
     @Test
     public void testOnEntityDamageOnPVPAllowed() {
         // PVP is allowed
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(player, player2, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
                 new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
         new PVPListener().onEntityDamage(e);
         // PVP should be allowed
         assertFalse(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
+        verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
 
         // Enable visitor protection
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onEntityDamage(e);
         // visitor should be protected
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
 
     }
 
@@ -484,17 +509,17 @@ public class PVPListenerTest {
         new PVPListener().onEntityDamage(e);
         // PVP should be banned
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
 
         // Visitor protection
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onEntityDamage(e);
         // visitor should be protected
         assertTrue(e.isCancelled());
         // PVP trumps visitor protection
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
 
     }
 
@@ -523,23 +548,23 @@ public class PVPListenerTest {
         when(p.getShooter()).thenReturn(player);
         when(p.getLocation()).thenReturn(loc);
         // PVP is allowed
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(p, player2, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
                 new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
                 new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
         new PVPListener().onEntityDamage(e);
         // PVP should be allowed
         assertFalse(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
+        verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
 
         // Enable visitor protection
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onEntityDamage(e);
         // visitor should be protected
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
 
     }
 
@@ -562,9 +587,9 @@ public class PVPListenerTest {
 
         // PVP should be banned
         assertTrue(pfe.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
         // Hook should be removed
-        Mockito.verify(hook).remove();
+        verify(hook).remove();
 
         // Wrong world
         wrongWorld();
@@ -577,7 +602,7 @@ public class PVPListenerTest {
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
 
         // Allow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
         pfe = new PlayerFishEvent(player, player2, hook, null);
         new PVPListener().onFishing(pfe);
         assertFalse(pfe.isCancelled());
@@ -600,16 +625,16 @@ public class PVPListenerTest {
         PlayerFishEvent pfe = new PlayerFishEvent(player, player2, hook, null);
 
         // Allow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
 
         // Protect visitors
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onFishing(pfe);
         // visitor should be protected
         assertTrue(pfe.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
     }
 
     /**
@@ -622,7 +647,7 @@ public class PVPListenerTest {
         // Catch a player
         PlayerFishEvent pfe = new PlayerFishEvent(player, player, hook, null);
         assertFalse(pfe.isCancelled());
-        Mockito.verify(player, Mockito.never()).sendMessage(Mockito.anyString());
+        verify(player, never()).sendMessage(Mockito.anyString());
     }
 
     /**
@@ -636,16 +661,16 @@ public class PVPListenerTest {
         PlayerFishEvent pfe = new PlayerFishEvent(player, player2, hook, null);
 
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
 
         // Protect visitors
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onFishing(pfe);
         // visitor should be protected
         assertTrue(pfe.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
     }
 
     /**
@@ -684,7 +709,7 @@ public class PVPListenerTest {
     @Test
     public void testOnSplashPotionSplash() {
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
 
         ThrownPotion tp = mock(ThrownPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -697,7 +722,7 @@ public class PVPListenerTest {
         PotionSplashEvent e = new PotionSplashEvent(tp, map);
         new PVPListener().onSplashPotionSplash(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
 
         // Wrong world
         wrongWorld();
@@ -712,7 +737,7 @@ public class PVPListenerTest {
     @Test
     public void testOnSplashPotionSplashSelfInflicted() {
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
 
         ThrownPotion tp = mock(ThrownPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -739,7 +764,7 @@ public class PVPListenerTest {
     @Test
     public void testOnSplashPotionSplashAllowPVP() {
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
 
         ThrownPotion tp = mock(ThrownPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -752,7 +777,7 @@ public class PVPListenerTest {
         PotionSplashEvent e = new PotionSplashEvent(tp, map);
         new PVPListener().onSplashPotionSplash(e);
         assertFalse(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
+        verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
     }
 
 
@@ -762,7 +787,7 @@ public class PVPListenerTest {
     @Test
     public void testOnSplashPotionSplashAllowPVPProtectVisitors() {
         // Allow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
 
         ThrownPotion tp = mock(ThrownPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -775,12 +800,12 @@ public class PVPListenerTest {
         PotionSplashEvent e = new PotionSplashEvent(tp, map);
         // Protect visitors
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
         new PVPListener().onSplashPotionSplash(e);
         // visitor should be protected
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
 
         // Wrong world
         wrongWorld();
@@ -801,10 +826,11 @@ public class PVPListenerTest {
         LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
         new PVPListener().onLingeringPotionSplash(e);
         // Verify
-        Mockito.verify(player, Mockito.times(3)).getUniqueId();
-        Mockito.verify(cloud).getEntityId();
-        Mockito.verify(tp, Mockito.times(2)).getShooter();
+        verify(player, times(3)).getUniqueId();
+        verify(cloud).getEntityId();
+        verify(tp, times(2)).getShooter();
         PowerMockito.verifyStatic(Bukkit.class);
+        Bukkit.getScheduler();
     }
 
     /**
@@ -819,9 +845,10 @@ public class PVPListenerTest {
         LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
         new PVPListener().onLingeringPotionSplash(e);
         // Verify
-        Mockito.verify(cloud, Mockito.never()).getEntityId();
-        Mockito.verify(tp).getShooter();
-        PowerMockito.verifyStatic(Bukkit.class, Mockito.never());
+        verify(cloud, never()).getEntityId();
+        verify(tp).getShooter();
+        PowerMockito.verifyStatic(Bukkit.class, never());
+        Bukkit.getScheduler();
     }
 
     /**
@@ -830,7 +857,7 @@ public class PVPListenerTest {
     @Test
     public void testOnLingeringPotionDamageNoPVP() {
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
         // Throw a potion
         LingeringPotion tp = mock(LingeringPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -850,14 +877,14 @@ public class PVPListenerTest {
         listener.onLingeringPotionDamage(ae);
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
         // Wrong world
         wrongWorld();
         listener.onLingeringPotionSplash(e);
         // No change to results
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.PVP_OVERWORLD.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.PVP_OVERWORLD.getHintReference()));
     }
 
     /**
@@ -866,7 +893,7 @@ public class PVPListenerTest {
     @Test
     public void testOnLingeringPotionDamagePVP() {
         // Allow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
         // Throw a potion
         LingeringPotion tp = mock(LingeringPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -885,12 +912,12 @@ public class PVPListenerTest {
         AreaEffectCloudApplyEvent ae = new AreaEffectCloudApplyEvent(cloud, list);
         listener.onLingeringPotionDamage(ae);
         assertEquals(4, ae.getAffectedEntities().size());
-        Mockito.verify(player, Mockito.never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
+        verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
         // Wrong world
         wrongWorld();
         listener.onLingeringPotionSplash(e);
         assertEquals(4, ae.getAffectedEntities().size());
-        Mockito.verify(player, Mockito.never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
+        verify(player, never()).sendMessage(Flags.PVP_OVERWORLD.getHintReference());
     }
 
 
@@ -900,7 +927,7 @@ public class PVPListenerTest {
     @Test
     public void testOnLingeringPotionDamageNoPVPVisitor() {
         // Disallow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(false);
+        when(island.isAllowed(any())).thenReturn(false);
         // Throw a potion
         LingeringPotion tp = mock(LingeringPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -917,21 +944,21 @@ public class PVPListenerTest {
         list.add(zombie);
         // Protect visitor
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
 
         // See who it affects
         AreaEffectCloudApplyEvent ae = new AreaEffectCloudApplyEvent(cloud, list);
         listener.onLingeringPotionDamage(ae);
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
         // Wrong world
         wrongWorld();
         listener.onLingeringPotionSplash(e);
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
     }
 
     /**
@@ -940,7 +967,7 @@ public class PVPListenerTest {
     @Test
     public void testOnLingeringPotionDamagePVPVisitor() {
         // Allow PVP
-        when(island.isAllowed(Mockito.any())).thenReturn(true);
+        when(island.isAllowed(any())).thenReturn(true);
         // Throw a potion
         LingeringPotion tp = mock(LingeringPotion.class);
         when(tp.getShooter()).thenReturn(player);
@@ -957,20 +984,20 @@ public class PVPListenerTest {
         list.add(zombie);
         // Protect visitor
         // This player is a visitor and any damage is not allowed
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
+        when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
 
         // See who it affects
         AreaEffectCloudApplyEvent ae = new AreaEffectCloudApplyEvent(cloud, list);
         listener.onLingeringPotionDamage(ae);
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
         // Wrong world
         wrongWorld();
         listener.onLingeringPotionSplash(e);
         assertEquals(3, ae.getAffectedEntities().size());
         assertFalse(ae.getAffectedEntities().contains(player2));
-        Mockito.verify(notifier).notify(Mockito.any(), Mockito.eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
+        verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java
index 0f4fa4a9f..e05ae1a0a 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ChestDamageListenerTest.java
@@ -110,6 +110,7 @@ public class ChestDamageListenerTest {
         IslandWorldManager iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
         when(plugin.getIWM()).thenReturn(iwm);
 
         // Monsters and animals
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
index c01e7992c..d35cb4147 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/CleanSuperFlatListenerTest.java
@@ -1,26 +1,35 @@
-/**
- *
- */
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.ChunkGenerator.ChunkData;
 import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.eclipse.jdt.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -31,7 +40,9 @@ import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
 import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.managers.AddonsManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.util.MyBiomeGrid;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -42,11 +53,16 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest({Bukkit.class, BentoBox.class, Util.class })
 public class CleanSuperFlatListenerTest {
 
+    @Mock
     private World world;
+    @Mock
     private Block block;
+    @Mock
     private Chunk chunk;
+    @Mock
     private IslandWorldManager iwm;
     private CleanSuperFlatListener l;
+    @Mock
     private BukkitScheduler scheduler;
 
     /**
@@ -62,37 +78,38 @@ public class CleanSuperFlatListenerTest {
         when(plugin.isLoaded()).thenReturn(true);
 
         // World
-        world = mock(World.class);
         when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
+        when(world.getName()).thenReturn("world");
 
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
 
         // World Settings
-        iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
-        when(iwm.isNetherGenerate(Mockito.any())).thenReturn(true);
-        when(iwm.isEndGenerate(Mockito.any())).thenReturn(true);
-        when(iwm.isNetherIslands(Mockito.any())).thenReturn(true);
-        when(iwm.isEndIslands(Mockito.any())).thenReturn(true);
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+        when(iwm.isNetherGenerate(any())).thenReturn(true);
+        when(iwm.isEndGenerate(any())).thenReturn(true);
+        when(iwm.isNetherIslands(any())).thenReturn(true);
+        when(iwm.isEndIslands(any())).thenReturn(true);
+        when(iwm.isUseOwnGenerator(any())).thenReturn(false);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
 
         PowerMockito.mockStatic(Bukkit.class);
         ItemFactory itemF = mock(ItemFactory.class);
         ItemMeta im = mock(ItemMeta.class);
-        when(itemF.getItemMeta(Mockito.any())).thenReturn(im);
+        when(itemF.getItemMeta(any())).thenReturn(im);
         when(Bukkit.getItemFactory()).thenReturn(itemF);
-
+        // Default is that flag is active
         Flags.CLEAN_SUPER_FLAT.setSetting(world, true);
-
-        chunk = mock(Chunk.class);
+        // Default is that chunk has bedrock
         when(chunk.getWorld()).thenReturn(world);
-        block = mock(Block.class);
-        when(block.getType()).thenReturn(Material.BEDROCK);
+        // Super flat!
+        when(block.getType()).thenReturn(Material.BEDROCK, Material.DIRT, Material.DIRT, Material.GRASS_BLOCK);
         when(chunk.getBlock(Mockito.anyInt(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(block);
 
         // Fire the ready event
@@ -100,8 +117,19 @@ public class CleanSuperFlatListenerTest {
         l.onBentoBoxReady(mock(BentoBoxReadyEvent.class));
 
         // Scheduler
-        scheduler = mock(BukkitScheduler.class);
         when(Bukkit.getScheduler()).thenReturn(scheduler);
+
+        // Addons Manager
+        AddonsManager am = mock(AddonsManager.class);
+        @Nullable
+        ChunkGenerator cg = mock(ChunkGenerator.class);
+        ChunkData cd = mock(ChunkData.class);
+        when(cg.generateChunkData(any(World.class), any(Random.class), anyInt(), anyInt(), any(MyBiomeGrid.class))).thenReturn(cd);
+        BlockData bd = mock(BlockData.class);
+        when(cd.getBlockData(anyInt(), anyInt(), anyInt())).thenReturn(bd);
+
+        when(plugin.getAddonsManager()).thenReturn(am);
+        when(am.getDefaultWorldGenerator(anyString(), anyString())).thenReturn(cg);
     }
 
     /**
@@ -114,7 +142,7 @@ public class CleanSuperFlatListenerTest {
 
         ChunkLoadEvent e = new ChunkLoadEvent(chunk, false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler, Mockito.never()).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        verify(scheduler, never()).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
     }
 
     /**
@@ -124,7 +152,7 @@ public class CleanSuperFlatListenerTest {
     public void testOnChunkLoadBedrock() {
         ChunkLoadEvent e = new ChunkLoadEvent(chunk, false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
     }
 
     /**
@@ -136,7 +164,7 @@ public class CleanSuperFlatListenerTest {
 
         ChunkLoadEvent e = new ChunkLoadEvent(chunk, false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler, Mockito.never()).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        verify(scheduler, never()).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
     }
 
     /**
@@ -147,15 +175,15 @@ public class CleanSuperFlatListenerTest {
         when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
         ChunkLoadEvent e = new ChunkLoadEvent(chunk, false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
-        when(iwm.isNetherGenerate(Mockito.any())).thenReturn(false);
-        when(iwm.isNetherIslands(Mockito.any())).thenReturn(true);
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        when(iwm.isNetherGenerate(any())).thenReturn(false);
+        when(iwm.isNetherIslands(any())).thenReturn(true);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
-        when(iwm.isNetherGenerate(Mockito.any())).thenReturn(true);
-        when(iwm.isNetherIslands(Mockito.any())).thenReturn(false);
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        when(iwm.isNetherGenerate(any())).thenReturn(true);
+        when(iwm.isNetherIslands(any())).thenReturn(false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
     }
 
     /**
@@ -166,15 +194,15 @@ public class CleanSuperFlatListenerTest {
         when(world.getEnvironment()).thenReturn(World.Environment.THE_END);
         ChunkLoadEvent e = new ChunkLoadEvent(chunk, false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
-        when(iwm.isEndGenerate(Mockito.any())).thenReturn(false);
-        when(iwm.isEndIslands(Mockito.any())).thenReturn(true);
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        when(iwm.isEndGenerate(any())).thenReturn(false);
+        when(iwm.isEndIslands(any())).thenReturn(true);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
-        when(iwm.isEndGenerate(Mockito.any())).thenReturn(true);
-        when(iwm.isEndIslands(Mockito.any())).thenReturn(false);
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        when(iwm.isEndGenerate(any())).thenReturn(true);
+        when(iwm.isEndIslands(any())).thenReturn(false);
         l.onChunkLoad(e);
-        Mockito.verify(scheduler).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
+        verify(scheduler).runTaskTimer(any(), any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
     }
 
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java
index 9ca665a83..d4061e5b6 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnderChestListenerTest.java
@@ -2,9 +2,12 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,6 +34,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
@@ -56,11 +60,17 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest({BentoBox.class, Util.class })
 public class EnderChestListenerTest {
 
+    @Mock
     private World world;
+    @Mock
     private Player player;
+    @Mock
     private IslandWorldManager iwm;
+    @Mock
     private Notifier notifier;
+    @Mock
     private ItemStack item;
+    @Mock
     private Block clickedBlock;
     private Action action;
 
@@ -70,9 +80,6 @@ public class EnderChestListenerTest {
         BentoBox plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
-        // World
-        world = mock(World.class);
-
         // Owner
         UUID uuid1 = UUID.randomUUID();
 
@@ -82,40 +89,39 @@ public class EnderChestListenerTest {
 
         IslandsManager im = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(im);
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         Location inside = mock(Location.class);
         when(inside.getWorld()).thenReturn(world);
 
         Optional<Island> opIsland = Optional.ofNullable(island);
-        when(im.getProtectedIslandAt(Mockito.eq(inside))).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(inside))).thenReturn(opIsland);
         // On island
-        when(im.locationIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(im.locationIsOnIsland(any(), any())).thenReturn(true);
 
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
 
         // World Settings
-        iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
         // By default everything is in world
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // Ender chest use is not allowed by default
         Flags.ENDER_CHEST.setSetting(world, false);
 
         // Sometimes use Mockito.withSettings().verboseLogging()
-        player = mock(Player.class);
         UUID uuid = UUID.randomUUID();
         when(player.getUniqueId()).thenReturn(uuid);
         when(player.isOp()).thenReturn(false);
         // No special perms
-        when(player.hasPermission(Mockito.anyString())).thenReturn(false);
+        when(player.hasPermission(anyString())).thenReturn(false);
         when(player.getWorld()).thenReturn(world);
         User.setPlugin(plugin);
         User.getInstance(player);
@@ -123,7 +129,7 @@ public class EnderChestListenerTest {
         // Locales - this returns the string that was requested for translation
         LocalesManager lm = mock(LocalesManager.class);
         when(plugin.getLocalesManager()).thenReturn(lm);
-        Answer<String> answer = invocation -> invocation.getArgumentAt(1, String.class);
+        Answer<String> answer = invocation -> invocation.getArgument(1, String.class);
         when(lm.get(any(), any())).thenAnswer(answer);
 
         // Placeholders
@@ -132,18 +138,15 @@ public class EnderChestListenerTest {
         when(placeholdersManager.replacePlaceholders(any(), any())).thenAnswer(answer);
 
         // Notifier
-        notifier = mock(Notifier.class);
         when(plugin.getNotifier()).thenReturn(notifier);
 
         // Action, Item and clicked block
         action = Action.RIGHT_CLICK_BLOCK;
-        item = mock(ItemStack.class);
         when(item.getType()).thenReturn(Material.ENDER_CHEST);
-        clickedBlock = mock(Block.class);
         when(clickedBlock.getLocation()).thenReturn(inside);
         when(clickedBlock.getType()).thenReturn(Material.ENDER_CHEST);
         // Addon
-        when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         Settings settings = mock(Settings.class);
         // Fake players
@@ -191,7 +194,7 @@ public class EnderChestListenerTest {
         BlockFace clickedBlockFace = BlockFace.EAST;
         PlayerInteractEvent e = new PlayerInteractEvent(player, action, item, clickedBlock, clickedBlockFace);
         // Has bypass perm
-        when(player.hasPermission(Mockito.anyString())).thenReturn(true);
+        when(player.hasPermission(anyString())).thenReturn(true);
         new BlockInteractionListener().onPlayerInteract(e);
         assertFalse(e.isCancelled());
     }
@@ -205,7 +208,7 @@ public class EnderChestListenerTest {
         BlockInteractionListener bil = new BlockInteractionListener();
         bil.onPlayerInteract(e);
         assertFalse(e.isCancelled());
-        Mockito.verify(notifier, Mockito.never()).notify(Mockito.anyObject(), Mockito.anyString());
+        verify(notifier, Mockito.never()).notify(any(), anyString());
     }
 
     @Test
@@ -216,7 +219,7 @@ public class EnderChestListenerTest {
         Flags.ENDER_CHEST.setSetting(world, false);
         new BlockInteractionListener().onPlayerInteract(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(notifier).notify(Mockito.any(User.class), Mockito.eq("protection.protected"));
+        verify(notifier).notify(any(User.class), eq("protection.world-protected"));
     }
 
     @Test
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java
index 96c292ed1..ff3f9e483 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EndermanListenerTest.java
@@ -102,6 +102,7 @@ public class EndermanListenerTest {
         iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
         when(plugin.getIWM()).thenReturn(iwm);
 
         // Monsters and animals
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
index 182cc2761..1dbf6084d 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
@@ -1,8 +1,12 @@
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +24,6 @@ import org.bukkit.util.Vector;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -123,7 +126,7 @@ public class EnterExitListenerTest {
         when(island.getProtectionRange()).thenReturn(PROTECTION_RANGE);
         when(island.getOwner()).thenReturn(uuid);
 
-        when(im.getIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(island);
+        when(im.getIsland(any(), any(UUID.class))).thenReturn(island);
 
         // Common from to's
         outside = mock(Location.class);
@@ -148,9 +151,9 @@ public class EnterExitListenerTest {
         when(inside.toVector()).thenReturn(new Vector(X + PROTECTION_RANGE -2, Y, Z));
 
         Optional<Island> opIsland = Optional.ofNullable(island);
-        when(im.getProtectedIslandAt(Mockito.eq(inside))).thenReturn(opIsland);
-        when(im.getProtectedIslandAt(Mockito.eq(inside2))).thenReturn(opIsland);
-        when(im.getProtectedIslandAt(Mockito.eq(outside))).thenReturn(Optional.empty());
+        when(im.getProtectedIslandAt(eq(inside))).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(inside2))).thenReturn(opIsland);
+        when(im.getProtectedIslandAt(eq(outside))).thenReturn(Optional.empty());
 
         // Island World Manager
         IslandWorldManager iwm = mock(IslandWorldManager.class);
@@ -160,23 +163,23 @@ public class EnterExitListenerTest {
 
         // Player's manager
         PlayersManager pm = mock(PlayersManager.class);
-        when(pm.getName(Mockito.any())).thenReturn("tastybento");
+        when(pm.getName(any())).thenReturn("tastybento");
         when(plugin.getPlayers()).thenReturn(pm);
 
         // Listener
         listener = new EnterExitListener();
 
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
 
         // World Settings
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
 
         // Addon
-        when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // Flags
         Flags.ENTER_EXIT_MESSAGES.setSetting(world, true);
@@ -190,7 +193,7 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, inside);
         listener.onMove(e);
         // Moving in the island should result in no messages to the user
-        Mockito.verify(user, Mockito.never()).sendMessage(Mockito.anyVararg());
+        verify(user, never()).sendMessage(any());
     }
 
     /**
@@ -201,7 +204,7 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), outside, outside);
         listener.onMove(e);
         // Moving outside the island should result in no messages to the user
-        Mockito.verify(user, Mockito.never()).sendMessage(Mockito.anyVararg());
+        verify(user, never()).sendMessage(any());
     }
 
     /**
@@ -213,9 +216,9 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), outside, inside);
         listener.onMove(e);
         // Moving into the island should show a message
-        Mockito.verify(lm).get(Mockito.any(), Mockito.eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
+        verify(lm).get(any(), eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
         // The island owner needs to be checked
-        Mockito.verify(island).getOwner();
+        verify(island).getOwner();
     }
 
     /**
@@ -227,10 +230,10 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), outside, inside);
         listener.onMove(e);
         // Moving into the island should show a message
-        Mockito.verify(lm).get(Mockito.any(), Mockito.eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
+        verify(lm).get(any(), eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
         // No owner check
-        Mockito.verify(island).getOwner();
-        Mockito.verify(island, Mockito.times(2)).getName();
+        verify(island).getOwner();
+        verify(island, times(2)).getName();
     }
 
     /**
@@ -242,9 +245,9 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, outside);
         listener.onMove(e);
         // Moving into the island should show a message
-        Mockito.verify(lm).get(Mockito.any(), Mockito.eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
+        verify(lm).get(any(), eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
         // The island owner needs to be checked
-        Mockito.verify(island).getOwner();
+        verify(island).getOwner();
     }
 
     /**
@@ -256,10 +259,10 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, outside);
         listener.onMove(e);
         // Moving into the island should show a message
-        Mockito.verify(lm).get(Mockito.any(), Mockito.eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
+        verify(lm).get(any(), eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
         // No owner check
-        Mockito.verify(island).getOwner();
-        Mockito.verify(island, Mockito.times(2)).getName();
+        verify(island).getOwner();
+        verify(island, times(2)).getName();
     }
 
     /**
@@ -274,6 +277,6 @@ public class EnterExitListenerTest {
         PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, outside);
         listener.onMove(e);
         // No messages should be sent
-        Mockito.verify(user, Mockito.never()).sendMessage(Mockito.anyVararg());
+        verify(user, never()).sendMessage(any());
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
index 908025628..922d253ad 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/InvincibleVisitorsListenerTest.java
@@ -2,9 +2,13 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,6 +31,8 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.util.Vector;
+import org.eclipse.jdt.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -81,9 +87,9 @@ public class InvincibleVisitorsListenerTest {
         // Island World Manager
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
-        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock");
+        when(iwm.getPermissionPrefix(Mockito.any())).thenReturn("bskyblock.");
         Optional<GameModeAddon> optionalAddon = Optional.of(addon);
-        when(iwm.getAddon(Mockito.any())).thenReturn(optionalAddon);
+        when(iwm.getAddon(any())).thenReturn(optionalAddon);
         when(plugin.getIWM()).thenReturn(iwm);
 
         listener = new InvincibleVisitorsListener();
@@ -93,65 +99,72 @@ public class InvincibleVisitorsListenerTest {
         // Sometimes use Mockito.withSettings().verboseLogging()
         when(user.inWorld()).thenReturn(true);
         when(user.getWorld()).thenReturn(mock(World.class));
+        when(player.getWorld()).thenReturn(mock(World.class));
         when(user.getLocation()).thenReturn(mock(Location.class));
+        when(player.getLocation()).thenReturn(mock(Location.class));
         when(user.getPlayer()).thenReturn(player);
         when(user.hasPermission(Mockito.anyString())).thenReturn(true);
         when(user.getTranslation(Mockito.anyString())).thenReturn("panel");
         UUID uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
+        when(player.getUniqueId()).thenReturn(uuid);
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
+        when(Util.getWorld(any())).thenReturn(mock(World.class));
 
         FlagsManager fm = mock(FlagsManager.class);
         Flag flag = mock(Flag.class);
-        when(flag.isSetForWorld(Mockito.any())).thenReturn(false);
+        when(flag.isSetForWorld(any())).thenReturn(false);
         PanelItem item = mock(PanelItem.class);
         when(item.getItem()).thenReturn(mock(ItemStack.class));
-        when(flag.toPanelItem(Mockito.any(), Mockito.eq(user), Mockito.eq(false))).thenReturn(item);
+        when(flag.toPanelItem(any(), eq(user), any(), eq(false))).thenReturn(item);
         when(fm.getFlag(Mockito.anyString())).thenReturn(Optional.of(flag));
         when(plugin.getFlagsManager()).thenReturn(fm);
 
         // Island Manager
         Island island = mock(Island.class);
         when(island.getOwner()).thenReturn(uuid);
-        when(im.getIsland(Mockito.any(World.class), Mockito.any(User.class))).thenReturn(island);
+        @Nullable
+        Location location = mock(Location.class);
+        Vector vector = mock(Vector.class);
+        when(location.toVector()).thenReturn(vector);
+        when(island.getCenter()).thenReturn(location);
+        when(im.getIsland(any(World.class), any(User.class))).thenReturn(island);
         optionalIsland = Optional.of(island);
         // Visitor
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(im.userIsOnIsland(any(), any())).thenReturn(false);
         when(plugin.getIslands()).thenReturn(im);
 
         // IV Settings
         ivSettings = new ArrayList<>();
         ivSettings.add(EntityDamageEvent.DamageCause.CRAMMING.name());
         ivSettings.add(EntityDamageEvent.DamageCause.VOID.name());
-        when(iwm.getIvSettings(Mockito.any())).thenReturn(ivSettings);
+        when(iwm.getIvSettings(any())).thenReturn(ivSettings);
 
         PowerMockito.mockStatic(Bukkit.class);
         ItemFactory itemF = mock(ItemFactory.class);
         ItemMeta imeta = mock(ItemMeta.class);
-        when(itemF.getItemMeta(Mockito.any())).thenReturn(imeta);
+        when(itemF.getItemMeta(any())).thenReturn(imeta);
         when(Bukkit.getItemFactory()).thenReturn(itemF);
 
         Inventory top = mock(Inventory.class);
         when(top.getSize()).thenReturn(9);
         when(panel.getInventory()).thenReturn(top);
 
-        when(Bukkit.createInventory(Mockito.any(), Mockito.anyInt(), Mockito.any())).thenReturn(top);
-
+        when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(top);
     }
 
     @Test
     public void testOnClickWrongWorld() {
         when(user.inWorld()).thenReturn(false);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.wrong-world");
+        verify(user).sendMessage("general.errors.wrong-world");
     }
 
     @Test
     public void testOnClickNoPermission() {
         when(user.hasPermission(Mockito.anyString())).thenReturn(false);
         listener.onClick(panel, user, ClickType.LEFT, 0);
-        Mockito.verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.admin.settings.INVINCIBLE_VISITORS");
+        verify(user).sendMessage("general.errors.no-permission", "[permission]", "bskyblock.admin.settings.INVINCIBLE_VISITORS");
     }
 
     @Test
@@ -161,8 +174,8 @@ public class InvincibleVisitorsListenerTest {
         when(panel.getName()).thenReturn("not_panel");
         listener.onClick(panel, user, clickType, slot );
         // Should open inv visitors
-        Mockito.verify(user).closeInventory();
-        Mockito.verify(player).openInventory(Mockito.any(Inventory.class));
+        verify(user).closeInventory();
+        verify(player).openInventory(any(Inventory.class));
     }
 
     @Test
@@ -179,19 +192,19 @@ public class InvincibleVisitorsListenerTest {
             // Click on the icon
             listener.onClick(panel, user, clickType, slot);
             // Should keep panel open
-            Mockito.verify(user, Mockito.never()).closeInventory();
+            verify(user, never()).closeInventory();
             // IV settings should now have the damage cause in it
             assertTrue(ivSettings.contains(dc.name()));
 
             // Click on it again
             listener.onClick(panel, user, clickType, slot );
             // Should keep panel open
-            Mockito.verify(user, Mockito.never()).closeInventory();
+            verify(user, never()).closeInventory();
             // IV settings should not have the damage cause in it anymore
             assertFalse(ivSettings.contains(dc.name()));
         }
         // The values should be saved twice because there are two clicks
-        Mockito.verify(addon, Mockito.times(DamageCause.values().length * 2)).saveWorldSettings();
+        verify(addon, times(DamageCause.values().length * 2)).saveWorldSettings();
     }
 
     @Test
@@ -223,7 +236,7 @@ public class InvincibleVisitorsListenerTest {
     @Test
     public void testOnVisitorGetDamageNotVisitor() {
         EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.CRAMMING, 0D);
-        when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(true);
+        when(im.userIsOnIsland(any(), any())).thenReturn(true);
         listener.onVisitorGetDamage(e);
         assertFalse(e.isCancelled());
     }
@@ -233,42 +246,39 @@ public class InvincibleVisitorsListenerTest {
         EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.CRAMMING, 0D);
         listener.onVisitorGetDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
+        verify(player, never()).setGameMode(eq(GameMode.SPECTATOR));
     }
 
 
     @Test
     public void testOnVisitorGetDamageVoidIslandHere() {
-        when(im.getIslandAt(Mockito.any())).thenReturn(optionalIsland);
+        when(im.getIslandAt(any())).thenReturn(optionalIsland);
         EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
         // Player should be teleported to this island
         listener.onVisitorGetDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(player).setGameMode(Mockito.eq(GameMode.SPECTATOR));
     }
 
     @Test
     public void testOnVisitorGetDamageVoidNoIslandHerePlayerHasNoIsland() {
-        when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
-        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false);
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
         EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
         // Player should die
         listener.onVisitorGetDamage(e);
         assertFalse(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
     }
 
     @Test
     public void testOnVisitorGetDamageVoidPlayerHasIsland() {
-        when(im.getIslandAt(Mockito.any())).thenReturn(Optional.empty());
-        when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
+        // No island at this location
+        when(im.getIslandAt(any())).thenReturn(Optional.empty());
+        // Player has an island
+        when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
         EntityDamageEvent e = new EntityDamageEvent(player, EntityDamageEvent.DamageCause.VOID, 0D);
         // Player should be teleported to their island
         listener.onVisitorGetDamage(e);
         assertTrue(e.isCancelled());
-        Mockito.verify(player, Mockito.never()).setGameMode(Mockito.eq(GameMode.SPECTATOR));
-        Mockito.verify(im).homeTeleport(Mockito.any(), Mockito.eq(player));
+        verify(im).homeTeleport(any(), eq(player));
     }
-
-
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
index 171c2a74c..7be460933 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import org.bukkit.Location;
@@ -29,6 +30,7 @@ import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.Settings;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.lists.Flags;
@@ -88,6 +90,9 @@ public class IslandRespawnListenerTest {
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
 
         im = mock(IslandsManager.class);
         when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(true);
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java
index 17fc0b4ca..ab2b9eadb 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/ItemFrameListenerTest.java
@@ -1,11 +1,8 @@
-/**
- *
- */
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -19,11 +16,9 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Enderman;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Hanging;
 import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
@@ -36,6 +31,7 @@ import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -60,7 +56,14 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest( {BentoBox.class, Flags.class, Util.class, Bukkit.class} )
 public class ItemFrameListenerTest {
 
-    private static Enderman enderman;
+    @Mock
+    private Enderman enderman;
+    @Mock
+    private World world;
+    @Mock
+    private ItemFrame entity;
+    @Mock
+    private Location location;
 
     @Before
     public void setUp() {
@@ -69,7 +72,6 @@ public class ItemFrameListenerTest {
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
         Server server = mock(Server.class);
-        World world = mock(World.class);
         when(server.getLogger()).thenReturn(Logger.getAnonymousLogger());
         when(server.getWorld("world")).thenReturn(world);
         when(server.getVersion()).thenReturn("BSB_Mocking");
@@ -86,8 +88,7 @@ public class ItemFrameListenerTest {
         SkullMeta skullMeta = mock(SkullMeta.class);
         when(itemFactory.getItemMeta(any())).thenReturn(skullMeta);
         when(Bukkit.getItemFactory()).thenReturn(itemFactory);
-        when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger());
-        Location location = mock(Location.class);
+        // Location
         when(location.getWorld()).thenReturn(world);
         when(location.getBlockX()).thenReturn(0);
         when(location.getBlockY()).thenReturn(0);
@@ -97,15 +98,14 @@ public class ItemFrameListenerTest {
         FlagsManager flagsManager = new FlagsManager(plugin);
         when(plugin.getFlagsManager()).thenReturn(flagsManager);
 
-
         // Worlds
         IslandWorldManager iwm = mock(IslandWorldManager.class);
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
         when(plugin.getIWM()).thenReturn(iwm);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // Monsters and animals
-        enderman = mock(Enderman.class);
         when(enderman.getLocation()).thenReturn(location);
         when(enderman.getWorld()).thenReturn(world);
         Slime slime = mock(Slime.class);
@@ -131,6 +131,11 @@ public class ItemFrameListenerTest {
 
         PowerMockito.mockStatic(Util.class);
         when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class));
+
+        // Item Frame
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getLocation()).thenReturn(location);
+
         // Not allowed to start
         Flags.ITEM_FRAME_DAMAGE.setSetting(world, false);
 
@@ -142,7 +147,6 @@ public class ItemFrameListenerTest {
     @Test
     public void testOnItemFrameDamageEntityDamageByEntityEvent() {
         ItemFrameListener ifl = new ItemFrameListener();
-        Entity entity = mock(ItemFrame.class);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
         EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(enderman, entity, cause , 0);
         ifl.onItemFrameDamage(e);
@@ -155,9 +159,10 @@ public class ItemFrameListenerTest {
     @Test
     public void testNotItemFrame() {
         ItemFrameListener ifl = new ItemFrameListener();
-        Entity entity = mock(Monster.class);
+        Creeper creeper = mock(Creeper.class);
+        when(creeper.getLocation()).thenReturn(location);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
-        EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(enderman, entity, cause , 0);
+        EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(enderman, creeper, cause , 0);
         ifl.onItemFrameDamage(e);
         assertFalse(e.isCancelled());
     }
@@ -168,7 +173,6 @@ public class ItemFrameListenerTest {
     @Test
     public void testProjectile() {
         ItemFrameListener ifl = new ItemFrameListener();
-        Entity entity = mock(ItemFrame.class);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
         Projectile p = mock(Projectile.class);
         when(p.getShooter()).thenReturn(enderman);
@@ -183,7 +187,6 @@ public class ItemFrameListenerTest {
     @Test
     public void testPlayerProjectile() {
         ItemFrameListener ifl = new ItemFrameListener();
-        Entity entity = mock(ItemFrame.class);
         DamageCause cause = DamageCause.ENTITY_ATTACK;
         Projectile p = mock(Projectile.class);
         Player player = mock(Player.class);
@@ -199,8 +202,7 @@ public class ItemFrameListenerTest {
     @Test
     public void testOnItemFrameDamageHangingBreakByEntityEvent() {
         ItemFrameListener ifl = new ItemFrameListener();
-        Hanging hanging = mock(ItemFrame.class);
-        HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(hanging, enderman);
+        HangingBreakByEntityEvent e = new HangingBreakByEntityEvent(entity, enderman);
         ifl.onItemFrameDamage(e);
         assertTrue(e.isCancelled());
     }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java
index 94f1dad72..f2665a276 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListenerTest.java
@@ -88,6 +88,7 @@ public class LiquidsFlowingOutListenerTest {
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // By default everything is in world
         when(iwm.inWorld(any(World.class))).thenReturn(true);
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
index bdb2ef901..c663dec59 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineGrowthListenerTest.java
@@ -2,10 +2,10 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -97,6 +97,7 @@ public class OfflineGrowthListenerTest {
         when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         PowerMockito.mockStatic(Bukkit.class);
     }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
index 63a9cf152..5f8ea662e 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/OfflineRedstoneListenerTest.java
@@ -1,10 +1,10 @@
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -94,6 +94,7 @@ public class OfflineRedstoneListenerTest {
         when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         PowerMockito.mockStatic(Bukkit.class);
     }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java
index d9678c404..6d8058a04 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PistonPushListenerTest.java
@@ -2,6 +2,7 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -27,6 +28,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
@@ -48,13 +50,13 @@ public class PistonPushListenerTest {
         // Set up plugin
         BentoBox plugin = mock(BentoBox.class);
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
-        
+
         // World
         world = mock(World.class);
-        
+
         // Owner
         UUID uuid = UUID.randomUUID();
-        
+
         // Island initialization
         island = mock(Island.class);
         when(island.getOwner()).thenReturn(uuid);
@@ -74,12 +76,12 @@ public class PistonPushListenerTest {
         when(block.getLocation()).thenReturn(inside);
 
         Block blockPushed = mock(Block.class);
-        
+
         when(block.getRelative(Mockito.any(BlockFace.class))).thenReturn(blockPushed);
-        
+
         // The blocks in the pushed list are all inside the island
         when(blockPushed.getLocation()).thenReturn(inside);
-        
+
         // Make a list of ten blocks
         blocks = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -88,7 +90,7 @@ public class PistonPushListenerTest {
 
         PowerMockito.mockStatic(Util.class);
         when(Util.getWorld(Mockito.any())).thenReturn(world);
-                
+
         // World Settings
         IslandWorldManager iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
@@ -96,7 +98,13 @@ public class PistonPushListenerTest {
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
-        
+        GameModeAddon gma = mock(GameModeAddon.class);
+        Optional<GameModeAddon> opGma = Optional.of(gma );
+        when(iwm.getAddon(any())).thenReturn(opGma);
+
+        // Set default on
+        Flags.PISTON_PUSH.setSetting(world, true);
+
     }
 
     @Test
@@ -104,32 +112,32 @@ public class PistonPushListenerTest {
         Flags.PISTON_PUSH.setSetting(world, false);
         BlockPistonExtendEvent e = new BlockPistonExtendEvent(block, blocks, BlockFace.EAST);
         new PistonPushListener().onPistonExtend(e);
-        
+
         // Should fail because flag is not set
         assertFalse(e.isCancelled());
     }
-    
+
     @Test
-    public void testOnPistonExtendFlagSetOnIsland() { 
-        
+    public void testOnPistonExtendFlagSetOnIsland() {
+
         // The blocks in the pushed list are all inside the island
         when(island.onIsland(Mockito.any())).thenReturn(true);
-        
+
         BlockPistonExtendEvent e = new BlockPistonExtendEvent(block, blocks, BlockFace.EAST);
         new PistonPushListener().onPistonExtend(e);
-        
+
         // Should fail because on island
         assertFalse(e.isCancelled());
     }
-    
+
     @Test
     public void testOnPistonExtendFlagSetOffIsland() {
         // The blocks in the pushed list are all outside the island
         when(island.onIsland(Mockito.any())).thenReturn(false);
-        
+
         BlockPistonExtendEvent e = new BlockPistonExtendEvent(block, blocks, BlockFace.EAST);
         new PistonPushListener().onPistonExtend(e);
-        
+
         // Should fail because on island
         assertTrue(e.isCancelled());
     }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java
index 6c0b331e8..e0334d0d9 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListenerTest.java
@@ -3,6 +3,7 @@
  */
 package world.bentobox.bentobox.listeners.flags.worldsettings;
 
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -11,13 +12,16 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.scheduler.BukkitScheduler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -37,13 +41,15 @@ import world.bentobox.bentobox.util.Util;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({BentoBox.class, Util.class })
+@PrepareForTest({BentoBox.class, Util.class, Bukkit.class })
 public class RemoveMobsListenerTest {
 
     private IslandsManager im;
     private World world;
     private Location inside;
     private Player player;
+    @Mock
+    private BukkitScheduler scheduler;
 
     /**
      * @throws java.lang.Exception
@@ -81,6 +87,7 @@ public class RemoveMobsListenerTest {
 
         // World Settings
         IslandWorldManager iwm = mock(IslandWorldManager.class);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
         when(plugin.getIWM()).thenReturn(iwm);
         WorldSettings ws = mock(WorldSettings.class);
         when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
@@ -93,6 +100,10 @@ public class RemoveMobsListenerTest {
         UUID uuid = UUID.randomUUID();
         when(player.getUniqueId()).thenReturn(uuid);
 
+        // Scheduler
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getScheduler()).thenReturn(scheduler);
+
     }
 
     /**
@@ -102,7 +113,7 @@ public class RemoveMobsListenerTest {
     public void testOnUserTeleport() {
         PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
         new RemoveMobsListener().onUserTeleport(e);
-        Mockito.verify(im).clearArea(Mockito.any());
+        Mockito.verify(scheduler).runTask(any(), any(Runnable.class));
     }
 
     /**
@@ -113,7 +124,7 @@ public class RemoveMobsListenerTest {
         Flags.REMOVE_MOBS.setSetting(world, false);
         PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
         new RemoveMobsListener().onUserTeleport(e);
-        Mockito.verify(im, Mockito.never()).clearArea(Mockito.any());
+        Mockito.verify(scheduler, Mockito.never()).runTask(any(), any(Runnable.class));
     }
 
     /**
@@ -125,7 +136,7 @@ public class RemoveMobsListenerTest {
         when(im.locationIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
         PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
         new RemoveMobsListener().onUserTeleport(e);
-        Mockito.verify(im, Mockito.never()).clearArea(Mockito.any());
+        Mockito.verify(scheduler, Mockito.never()).runTask(any(), any(Runnable.class));
     }
 
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java
index d7ccfee0f..396032552 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/TreesGrowingOutsideRangeListenerTest.java
@@ -3,8 +3,9 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -21,9 +22,9 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -46,21 +47,33 @@ import world.bentobox.bentobox.managers.IslandsManager;
 public class TreesGrowingOutsideRangeListenerTest {
 
     /* IslandWorldManager */
+    @Mock
     private IslandWorldManager iwm;
 
     /* Event */
     private StructureGrowEvent event;
 
     /* Block */
+    @Mock
     private Block sapling;
     private List<BlockState> blockStates;
 
     /* World */
+    @Mock
     private World world;
 
     /* Islands */
+    @Mock
     private IslandsManager islandsManager;
 
+    @Mock
+    private Island island;
+
+    @Mock
+    private BlockState firstBlock;
+    @Mock
+    private BlockState lastBlock;
+
     @Before
     public void setUp() throws Exception {
         // Set up plugin
@@ -68,7 +81,6 @@ public class TreesGrowingOutsideRangeListenerTest {
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
 
         /* Blocks */
-        sapling = mock(Block.class);
         when(sapling.getType()).thenReturn(Material.OAK_SAPLING);
         when(sapling.getLocation()).thenReturn(new Location(world, 2, 0, 2));
 
@@ -78,39 +90,37 @@ public class TreesGrowingOutsideRangeListenerTest {
         /* Event */
         event = new StructureGrowEvent(sapling.getLocation(), TreeType.TREE, false, null, blockStates);
 
-        /* World */
-        world = mock(World.class);
-
         /* Island World Manager */
-        iwm = mock(IslandWorldManager.class);
         when(plugin.getIWM()).thenReturn(iwm);
 
+
         // WorldSettings and World Flags
         WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
         Map<String, Boolean> worldFlags = new HashMap<>();
         when(ws.getWorldFlags()).thenReturn(worldFlags);
 
         // By default everything is in world
         when(iwm.inWorld(any(World.class))).thenReturn(true);
         when(iwm.inWorld(any(Location.class))).thenReturn(true);
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         /* Flags */
         // By default, it is not allowed
         Flags.TREES_GROWING_OUTSIDE_RANGE.setSetting(world, false);
 
         /* Islands */
-        islandsManager = mock(IslandsManager.class);
         when(plugin.getIslands()).thenReturn(islandsManager);
         // By default, there should be an island.
-        Island island = mock(Island.class);
-        when(islandsManager.getProtectedIslandAt(Mockito.any())).thenReturn(Optional.of(island));
+        when(islandsManager.getProtectedIslandAt(any())).thenReturn(Optional.of(island));
     }
 
     /**
      * Populates {@link TreesGrowingOutsideRangeListenerTest#blockStates} with a tree schema.
      */
     private void populateBlockStatesList() {
+        //when(firstBlock.getLocation()).thenReturn(new Location(world, 2, 0, 2));
+        blockStates.add(firstBlock);
         // Tree logs
         for (int i = 0; i < 3; i++) {
             BlockState logState = mock(BlockState.class);
@@ -132,6 +142,8 @@ public class TreesGrowingOutsideRangeListenerTest {
                 }
             }
         }
+        //when(lastBlock.getLocation()).thenReturn(new Location(world, 2, 0, 2));
+        blockStates.add(lastBlock);
     }
 
     /**
@@ -188,13 +200,18 @@ public class TreesGrowingOutsideRangeListenerTest {
         assertFalse(event.isCancelled());
     }
 
-    @Ignore
+    @SuppressWarnings("unchecked")
     @Test
     public void testTreePartiallyOutsideIsland() {
-        //FIXME
-
+        // Only the first few blocks are inside the island
+        when(islandsManager.getProtectedIslandAt(any())).thenReturn(Optional.of(island),
+                Optional.of(island),
+                Optional.of(island),
+                Optional.empty());
         // Run
         new TreesGrowingOutsideRangeListener().onTreeGrow(event);
         assertFalse(event.isCancelled());
+        verify(firstBlock, Mockito.never()).setType(Material.AIR);
+        verify(lastBlock).setType(Material.AIR);
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java
new file mode 100644
index 000000000..002647167
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/WitherListenerTest.java
@@ -0,0 +1,192 @@
+package world.bentobox.bentobox.listeners.flags.worldsettings;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.lists.Flags;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( {BentoBox.class, Bukkit.class} )
+public class WitherListenerTest {
+
+    private WitherListener wl;
+    @Mock
+    private Location location;
+    @Mock
+    private World world;
+    @Mock
+    private IslandWorldManager iwm;
+
+    private List<Block> blocks;
+    @Mock
+    private @Nullable WorldSettings ws;
+    private Map<String, Boolean> map;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        BentoBox plugin = mock(BentoBox.class);
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+        when(plugin.getIWM()).thenReturn(iwm);
+        map = new HashMap<>();
+        when(ws.getWorldFlags()).thenReturn(map);
+        when(iwm.getWorldSettings(any())).thenReturn(ws);
+
+        when(location.getWorld()).thenReturn(world);
+        when(location.getBlockX()).thenReturn(0);
+        when(location.getBlockY()).thenReturn(0);
+        when(location.getBlockZ()).thenReturn(0);
+
+        blocks = new ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            Block block = mock(Block.class);
+            when(block.getLocation()).thenReturn(location);
+            blocks.add(block);
+        }
+
+
+
+        wl = new WitherListener();
+
+        // Set flag
+        Flags.WITHER_DAMAGE.setSetting(world, false);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}.
+     */
+    @Test
+    public void testOnExplosionWither() {
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.WITHER);
+        EntityExplodeEvent e = new EntityExplodeEvent(entity, location, blocks, 0);
+        wl.onExplosion(e);
+        assertTrue(blocks.isEmpty());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}.
+     */
+    @Test
+    public void testOnExplosionWitherAllowed() {
+        Flags.WITHER_DAMAGE.setSetting(world, true);
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.WITHER);
+        EntityExplodeEvent e = new EntityExplodeEvent(entity, location, blocks, 0);
+        wl.onExplosion(e);
+        assertFalse(blocks.isEmpty());
+
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}.
+     */
+    @Test
+    public void testOnExplosionWitherSkull() {
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.WITHER_SKULL);
+        EntityExplodeEvent e = new EntityExplodeEvent(entity, location, blocks, 0);
+        wl.onExplosion(e);
+        assertTrue(blocks.isEmpty());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}.
+     */
+    @Test
+    public void testOnExplosionNotWither() {
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.DRAGON_FIREBALL);
+        EntityExplodeEvent e = new EntityExplodeEvent(entity, location, blocks, 0);
+        wl.onExplosion(e);
+        assertFalse(blocks.isEmpty());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#WitherChangeBlocks(org.bukkit.event.entity.EntityChangeBlockEvent)}.
+     */
+    @Test
+    public void testWitherChangeBlocks() {
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.WITHER);
+        Block block = mock(Block.class);
+        when(block.getLocation()).thenReturn(location);
+        BlockData blockData = mock(BlockData.class);
+        EntityChangeBlockEvent e = new EntityChangeBlockEvent(entity, block, blockData);
+        wl.onWitherChangeBlocks(e);
+        assertTrue(e.isCancelled());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.WitherListener#WitherChangeBlocks(org.bukkit.event.entity.EntityChangeBlockEvent)}.
+     */
+    @Test
+    public void testWitherChangeBlocksAllowed() {
+        Flags.WITHER_DAMAGE.setSetting(world, true);
+        Entity entity = mock(Entity.class);
+        when(entity.getLocation()).thenReturn(location);
+        when(entity.getWorld()).thenReturn(world);
+        when(entity.getType()).thenReturn(EntityType.WITHER);
+        Block block = mock(Block.class);
+        when(block.getLocation()).thenReturn(location);
+        BlockData blockData = mock(BlockData.class);
+        EntityChangeBlockEvent e = new EntityChangeBlockEvent(entity, block, blockData);
+        wl.onWitherChangeBlocks(e);
+        assertFalse(e.isCancelled());
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java
new file mode 100644
index 000000000..6ea762717
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintClipboardManagerTest.java
@@ -0,0 +1,382 @@
+package world.bentobox.bentobox.managers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Comparator;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.blueprints.Blueprint;
+import world.bentobox.bentobox.blueprints.BlueprintClipboard;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest( {Bukkit.class, BentoBox.class} )
+public class BlueprintClipboardManagerTest {
+
+    @Mock
+    private BentoBox plugin;
+    @Mock
+    private BlueprintClipboard clipboard;
+
+    private File blueprintFolder;
+
+    private String json = "{\n" +
+            "    \"name\": \"blueprint\",\n" +
+            "    \"attached\": {},\n" +
+            "    \"entities\": {},\n" +
+            "    \"blocks\": [\n" +
+            "        [\n" +
+            "            [3.0, -5.0, 8.0], {\n" +
+            "                \"blockData\": \"minecraft:stone\"\n" +
+            "            }\n" +
+            "        ],\n" +
+            "        [\n" +
+            "            [6.0, -13.0, -20.0], {\n" +
+            "                \"blockData\": \"minecraft:diorite\"\n" +
+            "            }\n" +
+            "        ]\n" +
+            "    ],\n" +
+            "    \"xSize\": 10,\n" +
+            "    \"ySize\": 10,\n" +
+            "    \"zSize\": 10,\n" +
+            "    \"bedrock\": [-2.0, -16.0, -1.0]\n" +
+            "}";
+
+    private String jsonNoBedrock = "{\n" +
+            "    \"name\": \"blueprint\",\n" +
+            "    \"attached\": {},\n" +
+            "    \"entities\": {},\n" +
+            "    \"blocks\": [\n" +
+            "        [\n" +
+            "            [3.0, -5.0, 8.0], {\n" +
+            "                \"blockData\": \"minecraft:stone\"\n" +
+            "            }\n" +
+            "        ],\n" +
+            "        [\n" +
+            "            [6.0, -13.0, -20.0], {\n" +
+            "                \"blockData\": \"minecraft:diorite\"\n" +
+            "            }\n" +
+            "        ]\n" +
+            "    ],\n" +
+            "    \"xSize\": 10,\n" +
+            "    \"ySize\": 10,\n" +
+            "    \"zSize\": 10\n" +
+            "}";
+
+    private void zip(File targetFile) throws IOException {
+        try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(targetFile.getAbsolutePath() + BlueprintsManager.BLUEPRINT_SUFFIX))) {
+            zipOutputStream.putNextEntry(new ZipEntry(targetFile.getName()));
+            try (FileInputStream inputStream = new FileInputStream(targetFile)) {
+                final byte[] buffer = new byte[1024];
+                int length;
+                while((length = inputStream.read(buffer)) >= 0) {
+                    zipOutputStream.write(buffer, 0, length);
+                }
+            }
+            try {
+                Files.delete(targetFile.toPath());
+            } catch (Exception e) {
+                plugin.logError(e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        blueprintFolder = new File("blueprints");
+        PowerMockito.mockStatic(Bukkit.class);
+        BlockData blockData = mock(BlockData.class);
+        when(Bukkit.createBlockData(Mockito.any(Material.class))).thenReturn(blockData);
+        when(blockData.getAsString()).thenReturn("test123");
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+        if (blueprintFolder.exists()) {
+            // Clean up file system
+            Files.walk(blueprintFolder.toPath())
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        }
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#BlueprintClipboardManager(world.bentobox.bentobox.BentoBox, java.io.File)}.
+     */
+    @Test
+    public void testBlueprintClipboardManagerBentoBoxFile() {
+        new BlueprintClipboardManager(plugin, blueprintFolder);
+        assertTrue(blueprintFolder.exists());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#BlueprintClipboardManager(world.bentobox.bentobox.BentoBox, java.io.File, world.bentobox.bentobox.blueprints.BlueprintClipboard)}.
+     */
+    @Test
+    public void testBlueprintClipboardManagerBentoBoxFileBlueprintClipboard() {
+        new BlueprintClipboardManager(plugin, blueprintFolder, clipboard);
+        assertTrue(blueprintFolder.exists());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#getClipboard()}.
+     */
+    @Test
+    public void testGetClipboard() {
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder, clipboard);
+        assertEquals(clipboard, bcm.getClipboard());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#loadBlueprint(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadBlueprintNoSuchFile() {
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        try {
+            bcm.loadBlueprint("test");
+        } catch (Exception e) {
+            assertTrue(e instanceof IOException);
+        } finally {
+            verify(plugin).logError("Could not load blueprint file - does not exist : test.blu");
+        }
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#loadBlueprint(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadBlueprintNoFileInZip() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        YamlConfiguration config = new YamlConfiguration();
+        config.set("hello", "this is a test");
+        File configFile = new File(blueprintFolder, "blueprint.blu");
+        config.save(configFile);
+        assertTrue(configFile.exists());
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        try {
+            bcm.loadBlueprint("blueprint");
+        } catch (Exception e) {
+            assertTrue(e instanceof IOException);
+        } finally {
+            verify(plugin).logError("Could not load blueprint file - does not exist : blueprint");
+        }
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#loadBlueprint(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadBlueprintFileInZipJSONError() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        YamlConfiguration config = new YamlConfiguration();
+        config.set("hello", "this is a test");
+        File configFile = new File(blueprintFolder, "blueprint");
+        config.save(configFile);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        try {
+            bcm.loadBlueprint("blueprint");
+        } catch (Exception e) {
+            assertTrue(e instanceof IOException);
+        } finally {
+            verify(plugin).logError("Blueprint has JSON error: blueprint.blu");
+        }
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#loadBlueprint(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadBlueprintFileInZipNoBedrock() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        File configFile = new File(blueprintFolder, "blueprint");
+        byte[] bytes = jsonNoBedrock.getBytes(StandardCharsets.UTF_8);
+        Files.write(configFile.toPath(), bytes, StandardOpenOption.CREATE);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        Blueprint bp = bcm.loadBlueprint("blueprint");
+        verify(plugin).logWarning("Blueprint blueprint had no bedrock block in it so one was added automatically in the center. You should check it.");
+        // Verify bedrock was placed in the center of the blueprint
+        assertEquals(5, bp.getBedrock().getBlockX());
+        assertEquals(5, bp.getBedrock().getBlockY());
+        assertEquals(5, bp.getBedrock().getBlockZ());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#loadBlueprint(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadBlueprintFileInZip() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        File configFile = new File(blueprintFolder, "blueprint");
+        byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
+        Files.write(configFile.toPath(), bytes, StandardOpenOption.CREATE);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        Blueprint bp = bcm.loadBlueprint("blueprint");
+        assertEquals(-2, bp.getBedrock().getBlockX());
+        assertEquals(-16, bp.getBedrock().getBlockY());
+        assertEquals(-1, bp.getBedrock().getBlockZ());
+        assertTrue(bp.getAttached().isEmpty());
+        assertTrue(bp.getEntities().isEmpty());
+        assertEquals(2, bp.getBlocks().size());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#load(java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadString() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        File configFile = new File(blueprintFolder, "blueprint");
+        byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
+        Files.write(configFile.toPath(), bytes, StandardOpenOption.CREATE);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        bcm.load("blueprint");
+        Blueprint bp = bcm.getClipboard().getBlueprint();
+        assertEquals(-2, bp.getBedrock().getBlockX());
+        assertEquals(-16, bp.getBedrock().getBlockY());
+        assertEquals(-1, bp.getBedrock().getBlockZ());
+        assertTrue(bp.getAttached().isEmpty());
+        assertTrue(bp.getEntities().isEmpty());
+        assertEquals(2, bp.getBlocks().size());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#load(world.bentobox.bentobox.api.user.User, java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadUserString() throws IOException {
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        File configFile = new File(blueprintFolder, "blueprint");
+        byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
+        Files.write(configFile.toPath(), bytes, StandardOpenOption.CREATE);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        User user = mock(User.class);
+        assertTrue(bcm.load(user, "blueprint"));
+        verify(user).sendMessage("general.success");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#load(world.bentobox.bentobox.api.user.User, java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testLoadUserStringFail() throws IOException {
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        User user = mock(User.class);
+        assertFalse(bcm.load(user, "blueprint"));
+        verify(user).sendMessage("commands.admin.blueprint.could-not-load");
+        verify(plugin).logError("Could not load blueprint file - does not exist : blueprint.blu");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#save(world.bentobox.bentobox.api.user.User, java.lang.String)}.
+     * @throws IOException
+     */
+    @Test
+    public void testSave() throws IOException {
+        // Load a blueprint, then save it
+        blueprintFolder.mkdirs();
+        // Make a blueprint file
+        File configFile = new File(blueprintFolder, "blueprint");
+        byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
+        Files.write(configFile.toPath(), bytes, StandardOpenOption.CREATE);
+        // Zip it
+        zip(configFile);
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        bcm.load("blueprint");
+        User user = mock(User.class);
+        assertTrue(bcm.save(user, "test1234"));
+        File bp = new File(blueprintFolder, "test1234.blu");
+        assertTrue(bp.exists());
+        verify(user).sendMessage("general.success");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#saveBlueprint(world.bentobox.bentobox.blueprints.Blueprint)}.
+     */
+    @Test
+    public void testSaveBlueprintNoName() {
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        Blueprint blueprint = mock(Blueprint.class);
+        when(blueprint.getName()).thenReturn("");
+        assertFalse(bcm.saveBlueprint(blueprint));
+        verify(plugin).logError("Blueprint name was empty - could not save it");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.BlueprintClipboardManager#saveBlueprint(world.bentobox.bentobox.blueprints.Blueprint)}.
+     */
+    @Test
+    public void testSaveBlueprintSuccess() {
+        BlueprintClipboardManager bcm = new BlueprintClipboardManager(plugin, blueprintFolder);
+        Blueprint blueprint = new Blueprint();
+        blueprint.setName("test123");
+        assertTrue(bcm.saveBlueprint(blueprint));
+        File bp = new File(blueprintFolder, "test123.blu");
+        assertTrue(bp.exists());
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java
index c956f7aa6..15a39ba69 100644
--- a/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/BlueprintsManagerTest.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -29,6 +30,8 @@ import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 import org.junit.After;
 import org.junit.Before;
@@ -36,6 +39,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -67,6 +73,8 @@ public class BlueprintsManagerTest {
     private GameModeAddon addon;
     @Mock
     private Island island;
+    @Mock
+    private BukkitScheduler scheduler;
 
     private File dataFolder;
     private File jarFile;
@@ -81,6 +89,10 @@ public class BlueprintsManagerTest {
     @Mock
     private User user;
 
+    @Mock
+    private BukkitTask task;
+
+    private int times;
     /**
      * @throws java.lang.Exception
      */
@@ -101,6 +113,9 @@ public class BlueprintsManagerTest {
         Map<Vector, BlueprintBlock> map = new HashMap<>();
         map.put(new Vector(0,0,0), new BlueprintBlock("minecraft:bedrock"));
         defaultBp.setBlocks(map);
+        // Scheduler
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getScheduler()).thenReturn(scheduler);
 
     }
 
@@ -162,6 +177,7 @@ public class BlueprintsManagerTest {
         .forEach(File::delete);
         // Delete addon.jar
         Files.deleteIfExists(jarFile.toPath());
+
     }
 
 
@@ -219,15 +235,22 @@ public class BlueprintsManagerTest {
      */
     @Test
     public void testLoadBlueprintBundlesNoBlueprintFolder() {
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
+
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+                verify(plugin).logError(eq("There is no blueprint folder for addon name"));
+                verify(plugin).logError(eq("No blueprint bundles found! Creating a default one."));
+                File blueprints = new File(dataFolder, BlueprintsManager.FOLDER_NAME);
+                File d = new File(blueprints, "default.json");
+                assertTrue(d.exists());
+                return task;
+            }});
+
         BlueprintsManager bpm = new BlueprintsManager(plugin);
         bpm.loadBlueprintBundles(addon);
-        verify(plugin).logError(eq("There is no blueprint folder for addon name"));
-        verify(plugin).logError(eq("No blueprint bundles found! Creating a default one."));
-        File blueprints = new File(dataFolder, BlueprintsManager.FOLDER_NAME);
-        File d = new File(blueprints, "default.json");
-        assertTrue(d.exists());
-        verify(plugin).log("Loaded Blueprint Bundle 'default' for name");
-        verify(plugin).log("Loaded blueprint 'bedrock' for name");
     }
 
     /**
@@ -235,12 +258,19 @@ public class BlueprintsManagerTest {
      */
     @Test
     public void testLoadBlueprintBundles() {
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
+
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+                verify(plugin).logError(eq("No blueprint bundles found! Creating a default one."));
+                return task;
+            }});
         BlueprintsManager bpm = new BlueprintsManager(plugin);
         bpm.extractDefaultBlueprints(addon);
         bpm.loadBlueprintBundles(addon);
-        verify(plugin).logError(eq("No blueprint bundles found! Creating a default one."));
-        verify(plugin).log("Loaded Blueprint Bundle 'default' for name");
-        verify(plugin).log("Loaded blueprint 'bedrock' for name");
+
     }
 
     /**
@@ -269,6 +299,14 @@ public class BlueprintsManagerTest {
      */
     @Test
     public void testLoadBlueprints() {
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
+
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+                return task;
+            }});
         BlueprintsManager bpm = new BlueprintsManager(plugin);
         // Load once (makes default files too)
         bpm.loadBlueprintBundles(addon);
@@ -317,10 +355,21 @@ public class BlueprintsManagerTest {
         bb.setDescription(Collections.singletonList(ChatColor.AQUA + "A bundle of blueprints"));
         // Save it
         File blueprints = new File(dataFolder, BlueprintsManager.FOLDER_NAME);
+
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
+
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+                File d = new File(blueprints, "bundle.json");
+                assertTrue(d.exists());
+                return task;
+            }});
+
         BlueprintsManager bpm = new BlueprintsManager(plugin);
         bpm.saveBlueprintBundle(addon, bb);
-        File d = new File(blueprints, "bundle.json");
-        assertTrue(d.exists());
+
     }
 
     /**
@@ -345,15 +394,28 @@ public class BlueprintsManagerTest {
         bb2.setDescription(Collections.singletonList(ChatColor.AQUA + "A bundle of blueprints2"));
         // Add
         bpm.addBlueprintBundle(addon, bb2);
-        // Save
-        bpm.saveBlueprintBundles();
-        // Verify
+        // check that there are 2 in there
+        assertEquals(2, bpm.getBlueprintBundles(addon).size());
         File blueprints = new File(dataFolder, BlueprintsManager.FOLDER_NAME);
         File d = new File(blueprints, "bundle.json");
-        assertTrue(d.exists());
-        d = new File(blueprints, "bundle2.json");
-        assertTrue(d.exists());
+        File d2 = new File(blueprints, "bundle2.json");
+        times = 0;
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
 
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+                // Verify
+                times++;
+                if (times > 2) {
+                    assertTrue(d.exists());
+                    assertTrue(d2.exists());
+                }
+                return task;
+            }});
+        // Save
+        bpm.saveBlueprintBundles();
     }
 
     /**
@@ -543,24 +605,38 @@ public class BlueprintsManagerTest {
 
     /**
      * Test method for {@link world.bentobox.bentobox.managers.BlueprintsManager#deleteBlueprintBundle(world.bentobox.bentobox.api.addons.GameModeAddon, world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle)}.
+     * @throws IOException
      */
     @Test
-    public void testDeleteBlueprintBundle() {
+    public void testDeleteBlueprintBundle() throws IOException {
         // Make bundle
         BlueprintBundle bb = new BlueprintBundle();
         bb.setIcon(Material.PAPER);
         bb.setUniqueId("bundle");
         bb.setDisplayName("A bundle");
         bb.setDescription(Collections.singletonList(ChatColor.AQUA + "A bundle of blueprints"));
-        // Save it
+        // Create a dummy file
         File blueprints = new File(dataFolder, BlueprintsManager.FOLDER_NAME);
-        BlueprintsManager bpm = new BlueprintsManager(plugin);
-        bpm.saveBlueprintBundle(addon, bb);
+        blueprints.mkdirs();
         File d = new File(blueprints, "bundle.json");
-        assertTrue(d.exists());
+        Files.createFile(d.toPath());
+
+        BlueprintsManager bpm = new BlueprintsManager(plugin);
+        // Set up running and verification
+        when(scheduler.runTaskAsynchronously(eq(plugin), any(Runnable.class))).thenAnswer(new Answer<BukkitTask>() {
+
+            @Override
+            public BukkitTask answer(InvocationOnMock invocation) throws Throwable {
+                invocation.getArgument(1,Runnable.class).run();
+
+                // Verify
+                assertFalse(d.exists());
+                return task;
+            }});
+
         // Delete it
         bpm.deleteBlueprintBundle(addon, bb);
-        assertFalse(d.exists());
+
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java
index 7ec4511eb..4b9fe614e 100644
--- a/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/IslandWorldManagerTest.java
@@ -402,22 +402,6 @@ public class IslandWorldManagerTest {
         assertNull(iwm.getEndWorld(null));
     }
 
-    /**
-     * Test method for {@link world.bentobox.bentobox.managers.IslandWorldManager#isNetherTrees(org.bukkit.World)}.
-     */
-    @Test
-    public void testIsNetherTrees() {
-        assertFalse(iwm.isNetherTrees(netherWorld));
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.managers.IslandWorldManager#isNetherTrees(org.bukkit.World)}.
-     */
-    @Test
-    public void testIsNetherTreesNull() {
-        assertFalse(iwm.isNetherTrees(null));
-    }
-
     /**
      * Test method for {@link world.bentobox.bentobox.managers.IslandWorldManager#isDragonSpawn(org.bukkit.World)}.
      */
@@ -493,7 +477,7 @@ public class IslandWorldManagerTest {
     @Test
     public void testGetPermissionPrefix() {
         when(ws.getPermissionPrefix()).thenReturn("bsky");
-        assertEquals("bsky", iwm.getPermissionPrefix(world));
+        assertEquals("bsky.", iwm.getPermissionPrefix(world));
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
index 3ad2a6a90..8c33d856a 100644
--- a/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
@@ -5,13 +5,22 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -37,11 +46,13 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.PufferFish;
+import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Wither;
 import org.bukkit.entity.Zombie;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -61,6 +72,7 @@ import world.bentobox.bentobox.Settings;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeleteEvent;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
@@ -100,12 +112,47 @@ public class IslandsManagerTest {
     private Island is;
     @Mock
     private PluginManager pim;
+    // Database
+    Database<Island> db;
+    @Mock
+    private Zombie zombie;
+    @Mock
+    private Slime slime;
+    @Mock
+    private Cow cow;
+    @Mock
+    private Wither wither;
+    @Mock
+    private Creeper creeper;
+    @Mock
+    private PufferFish pufferfish;
+    @Mock
+    private Skeleton skelly;
 
     /**
      * @throws java.lang.Exception
      */
+    @SuppressWarnings("unchecked")
     @Before
     public void setUp() throws Exception {
+        // Clear any lingering database
+        clear();
+        // Set up plugin
+        plugin = mock(BentoBox.class);
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+
+        // island world mgr
+        when(world.getName()).thenReturn("world");
+        when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
+        when(iwm.inWorld(any(World.class))).thenReturn(true);
+        when(iwm.inWorld(any(Location.class))).thenReturn(true);
+        when(plugin.getIWM()).thenReturn(iwm);
+
+        // Settings
+        Settings s = mock(Settings.class);
+        when(plugin.getSettings()).thenReturn(s);
+        when(s.getDatabaseType()).thenReturn(DatabaseType.JSON);
+
         // World
         when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
         // Set up plugin
@@ -114,12 +161,6 @@ public class IslandsManagerTest {
         // Command manager
         CommandsManager cm = mock(CommandsManager.class);
         when(plugin.getCommandsManager()).thenReturn(cm);
-
-        // Settings
-        Settings s = mock(Settings.class);
-        when(plugin.getSettings()).thenReturn(s);
-        when(s.getDatabaseType()).thenReturn(DatabaseType.JSON);
-
         // Player
         when(user.isOp()).thenReturn(false);
         uuid = UUID.randomUUID();
@@ -178,10 +219,10 @@ public class IslandsManagerTest {
 
         // Worlds translate to world
         PowerMockito.mockStatic(Util.class);
-        when(Util.getWorld(Mockito.any())).thenReturn(world);
+        when(Util.getWorld(any())).thenReturn(world);
 
         // Mock island cache
-        when(islandCache.getIslandAt(Mockito.any(Location.class))).thenReturn(is);
+        when(islandCache.getIslandAt(any(Location.class))).thenReturn(is);
         optionalIsland = Optional.ofNullable(is);
 
         // User location
@@ -193,13 +234,72 @@ public class IslandsManagerTest {
         when(server.getPluginManager()).thenReturn(pim);
 
         // Addon
-        when(iwm.getAddon(Mockito.any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
 
         // Cover hostile entities
-        when(Util.isHostileEntity(Mockito.any())).thenCallRealMethod();
+        when(Util.isHostileEntity(any())).thenCallRealMethod();
 
+        // Set up island entities
+        WorldSettings ws = mock(WorldSettings.class);
+        when(iwm.getWorldSettings(eq(world))).thenReturn(ws);
+        Map<String, Boolean> worldFlags = new HashMap<>();
+        when(ws.getWorldFlags()).thenReturn(worldFlags);
+
+        Flags.REMOVE_MOBS.setSetting(world, true);
+        // Default whitelist
+        Set<EntityType> whitelist = new HashSet<>();
+        whitelist.add(EntityType.ENDERMAN);
+        whitelist.add(EntityType.WITHER);
+        whitelist.add(EntityType.ZOMBIE_VILLAGER);
+        whitelist.add(EntityType.PIG_ZOMBIE);
+        when(iwm.getRemoveMobsWhitelist(any())).thenReturn(whitelist);
+
+
+        // Monsters and animals
+        when(zombie.getLocation()).thenReturn(location);
+        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
+        when(slime.getLocation()).thenReturn(location);
+        when(slime.getType()).thenReturn(EntityType.SLIME);
+        when(cow.getLocation()).thenReturn(location);
+        when(cow.getType()).thenReturn(EntityType.COW);
+        when(wither.getType()).thenReturn(EntityType.WITHER);
+        when(creeper.getType()).thenReturn(EntityType.CREEPER);
+        when(pufferfish.getType()).thenReturn(EntityType.PUFFERFISH);
+        // Named monster
+        when(skelly.getType()).thenReturn(EntityType.SKELETON);
+        when(skelly.getCustomName()).thenReturn("Skelly");
+
+        Collection<Entity> collection = new ArrayList<>();
+        collection.add(player);
+        collection.add(zombie);
+        collection.add(cow);
+        collection.add(slime);
+        collection.add(wither);
+        collection.add(creeper);
+        collection.add(pufferfish);
+        collection.add(skelly);
+        when(world
+                .getNearbyEntities(any(Location.class), Mockito.anyDouble(), Mockito.anyDouble(), Mockito.anyDouble()))
+        .thenReturn(collection);
+
+
+
+        // database must be mocked here
+        db = mock(Database.class);
     }
 
+    @After
+    public void clear() throws IOException{
+        //remove any database data
+        File file = new File("database");
+        Path pathToBeDeleted = file.toPath();
+        if (file.exists()) {
+            Files.walk(pathToBeDeleted)
+            .sorted(Comparator.reverseOrder())
+            .map(Path::toFile)
+            .forEach(File::delete);
+        }
+    }
 
     /**
      * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}.
@@ -431,9 +531,9 @@ public class IslandsManagerTest {
         IslandsManager im = new IslandsManager(plugin);
         UUID owner = UUID.randomUUID();
         Island island = im.createIsland(location, owner);
-        im.deleteIsland(island, false);
+        im.deleteIsland(island, false, owner);
         assertNull(island.getOwner());
-        Mockito.verify(pim, Mockito.times(2)).callEvent(Mockito.any(IslandDeleteEvent.class));
+        verify(pim).callEvent(any(IslandDeleteEvent.class));
     }
 
     /**
@@ -441,13 +541,13 @@ public class IslandsManagerTest {
      */
     @Test
     public void testDeleteIslandIslandBooleanRemoveBlocks() {
-        Mockito.verify(pim, Mockito.never()).callEvent(Mockito.any());
+        verify(pim, never()).callEvent(any());
         IslandsManager im = new IslandsManager(plugin);
         UUID owner = UUID.randomUUID();
         Island island = im.createIsland(location, owner);
-        im.deleteIsland(island, true);
+        im.deleteIsland(island, true, owner);
         assertNull(island.getOwner());
-        Mockito.verify(pim, Mockito.times(4)).callEvent(Mockito.any(IslandDeleteEvent.class));
+        verify(pim).callEvent(any(IslandDeleteEvent.class));
     }
 
     /**
@@ -486,7 +586,7 @@ public class IslandsManagerTest {
         assertEquals(optionalIsland, im.getIslandAt(location));
 
         // in world, wrong island
-        when(islandCache.getIslandAt(Mockito.any(Location.class))).thenReturn(null);
+        when(islandCache.getIslandAt(any(Location.class))).thenReturn(null);
         assertEquals(Optional.empty(), im.getIslandAt(new Location(world, 100000, 120, -100000)));
 
         // not in world
@@ -528,7 +628,7 @@ public class IslandsManagerTest {
         members.add(UUID.randomUUID());
         members.add(UUID.randomUUID());
         members.add(UUID.randomUUID());
-        when(islandCache.getMembers(Mockito.any(), Mockito.any(), Mockito.anyInt())).thenReturn(members);
+        when(islandCache.getMembers(any(), any(), Mockito.anyInt())).thenReturn(members);
         IslandsManager im = new IslandsManager(plugin);
         im.setIslandCache(islandCache);
         assertEquals(members, im.getMembers(world, UUID.randomUUID()));
@@ -542,7 +642,7 @@ public class IslandsManagerTest {
         // Mock island cache
         Island is = mock(Island.class);
 
-        when(islandCache.getIslandAt(Mockito.any(Location.class))).thenReturn(is);
+        when(islandCache.getIslandAt(any(Location.class))).thenReturn(is);
 
         // In world
         IslandsManager im = new IslandsManager(plugin);
@@ -550,20 +650,20 @@ public class IslandsManagerTest {
 
         Optional<Island> optionalIsland = Optional.ofNullable(is);
         // In world, correct island
-        when(is.onIsland(Mockito.any())).thenReturn(true);
+        when(is.onIsland(any())).thenReturn(true);
         assertEquals(optionalIsland, im.getProtectedIslandAt(location));
 
         // Not in protected space
-        when(is.onIsland(Mockito.any())).thenReturn(false);
+        when(is.onIsland(any())).thenReturn(false);
         assertEquals(Optional.empty(), im.getProtectedIslandAt(location));
 
         im.setSpawn(is);
         // In world, correct island
-        when(is.onIsland(Mockito.any())).thenReturn(true);
+        when(is.onIsland(any())).thenReturn(true);
         assertEquals(optionalIsland, im.getProtectedIslandAt(location));
 
         // Not in protected space
-        when(is.onIsland(Mockito.any())).thenReturn(false);
+        when(is.onIsland(any())).thenReturn(false);
         assertEquals(Optional.empty(), im.getProtectedIslandAt(location));
     }
 
@@ -573,8 +673,8 @@ public class IslandsManagerTest {
     @Test
     public void testGetSafeHomeLocation() {
         IslandsManager im = new IslandsManager(plugin);
-        when(pm.getHomeLocation(Mockito.any(), Mockito.any(User.class), Mockito.eq(0))).thenReturn(null);
-        when(pm.getHomeLocation(Mockito.any(), Mockito.any(User.class), Mockito.eq(1))).thenReturn(location);
+        when(pm.getHomeLocation(any(), any(User.class), eq(0))).thenReturn(null);
+        when(pm.getHomeLocation(any(), any(User.class), eq(1))).thenReturn(location);
         assertEquals(location, im.getSafeHomeLocation(world, user, 0));
         // Change location so that it is not safe
         // TODO
@@ -591,7 +691,7 @@ public class IslandsManagerTest {
         Island island = mock(Island.class);
         when(island.getWorld()).thenReturn(world);
         // Make a spawn position on the island
-        when(island.getSpawnPoint(Mockito.any())).thenReturn(location);
+        when(island.getSpawnPoint(any())).thenReturn(location);
         // Set the spawn island
         im.setSpawn(island);
         assertEquals(location,im.getSpawnPoint(world));
@@ -604,10 +704,10 @@ public class IslandsManagerTest {
     public void testHomeTeleportPlayerInt() {
         when(iwm.getDefaultGameMode(world)).thenReturn(GameMode.SURVIVAL);
         IslandsManager im = new IslandsManager(plugin);
-        when(pm.getHomeLocation(Mockito.any(), Mockito.any(User.class), Mockito.eq(0))).thenReturn(null);
-        when(pm.getHomeLocation(Mockito.any(), Mockito.any(User.class), Mockito.eq(1))).thenReturn(location);
+        when(pm.getHomeLocation(any(), any(User.class), eq(0))).thenReturn(null);
+        when(pm.getHomeLocation(any(), any(User.class), eq(1))).thenReturn(location);
         im.homeTeleport(world, player, 0);
-        Mockito.verify(player).teleport(location);
+        verify(player).teleport(location);
 
     }
 
@@ -620,7 +720,7 @@ public class IslandsManagerTest {
         assertFalse(im.isAtSpawn(location));
         Island island = mock(Island.class);
         when(island.getWorld()).thenReturn(world);
-        when(island.onIsland(Mockito.any())).thenReturn(true);
+        when(island.onIsland(any())).thenReturn(true);
         im.setSpawn(island);
         assertTrue(im.isAtSpawn(location));
     }
@@ -633,18 +733,18 @@ public class IslandsManagerTest {
         // Mock island cache
         Island is = mock(Island.class);
 
-        when(islandCache.getIslandAt(Mockito.any())).thenReturn(is);
+        when(islandCache.getIslandAt(any())).thenReturn(is);
 
         IslandsManager im = new IslandsManager(plugin);
         im.setIslandCache(islandCache);
 
         assertFalse(im.isOwner(world, null));
 
-        when(islandCache.hasIsland(Mockito.any(), Mockito.any())).thenReturn(false);
+        when(islandCache.hasIsland(any(), any())).thenReturn(false);
         assertFalse(im.isOwner(world, UUID.randomUUID()));
 
-        when(islandCache.hasIsland(Mockito.any(), Mockito.any())).thenReturn(true);
-        when(islandCache.get(Mockito.any(), Mockito.any(UUID.class))).thenReturn(is);
+        when(islandCache.hasIsland(any(), any())).thenReturn(true);
+        when(islandCache.get(any(), any(UUID.class))).thenReturn(is);
         UUID owner = UUID.randomUUID();
         when(is.getOwner()).thenReturn(owner);
         UUID notOwner = UUID.randomUUID();
@@ -673,10 +773,10 @@ public class IslandsManagerTest {
         // Mock island cache
         Island is = mock(Island.class);
 
-        when(islandCache.getIslandAt(Mockito.any(Location.class))).thenReturn(is);
+        when(islandCache.getIslandAt(any(Location.class))).thenReturn(is);
 
         // In world
-        when(is.onIsland(Mockito.any())).thenReturn(true);
+        when(is.onIsland(any())).thenReturn(true);
 
         Builder<UUID> members = new ImmutableSet.Builder<>();
         members.add(uuid);
@@ -698,7 +798,7 @@ public class IslandsManagerTest {
 
         // Not on island
         when(is.getMemberSet()).thenReturn(members.build());
-        when(is.onIsland(Mockito.any())).thenReturn(false);
+        when(is.onIsland(any())).thenReturn(false);
         assertFalse(im.locationIsOnIsland(player, location));
     }
 
@@ -731,7 +831,7 @@ public class IslandsManagerTest {
         when(user.isPlayer()).thenReturn(true);
 
         // The method returns true if the user's location is on an island that has them as member (rank >= MEMBER)
-        when(is.onIsland(Mockito.any())).thenReturn(true);
+        when(is.onIsland(any())).thenReturn(true);
         Map<UUID, Integer> members = new HashMap<>();
         when(is.getMembers()).thenReturn(members);
 
@@ -890,7 +990,7 @@ public class IslandsManagerTest {
         im.shutdown();
 
         assertEquals(10, members.size());
-        Mockito.verify(islandCache).clear();
+        verify(islandCache).clear();
     }
 
     /**
@@ -939,61 +1039,38 @@ public class IslandsManagerTest {
      * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#clearArea(Location)}.
      */
     @Test
-    public void testClearArea() {
-        WorldSettings ws = mock(WorldSettings.class);
-        when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws);
-        Map<String, Boolean> worldFlags = new HashMap<>();
-        when(ws.getWorldFlags()).thenReturn(worldFlags);
-
-        Flags.REMOVE_MOBS.setSetting(world, true);
-        // Default whitelist
-        Set<EntityType> whitelist = new HashSet<>();
-        whitelist.add(EntityType.ENDERMAN);
-        whitelist.add(EntityType.WITHER);
-        whitelist.add(EntityType.ZOMBIE_VILLAGER);
-        whitelist.add(EntityType.PIG_ZOMBIE);
-        when(iwm.getRemoveMobsWhitelist(Mockito.any())).thenReturn(whitelist);
-
-
-        // Monsters and animals
-        Zombie zombie = mock(Zombie.class);
-        when(zombie.getLocation()).thenReturn(location);
-        when(zombie.getType()).thenReturn(EntityType.ZOMBIE);
-        Slime slime = mock(Slime.class);
-        when(slime.getLocation()).thenReturn(location);
-        when(slime.getType()).thenReturn(EntityType.SLIME);
-        Cow cow = mock(Cow.class);
-        when(cow.getLocation()).thenReturn(location);
-        when(cow.getType()).thenReturn(EntityType.COW);
-        Wither wither = mock(Wither.class);
-        when(wither.getType()).thenReturn(EntityType.WITHER);
-        Creeper creeper = mock(Creeper.class);
-        when(creeper.getType()).thenReturn(EntityType.CREEPER);
-        PufferFish pufferfish = mock(PufferFish.class);
-        when(pufferfish.getType()).thenReturn(EntityType.PUFFERFISH);
-
-        Collection<Entity> collection = new ArrayList<>();
-        collection.add(player);
-        collection.add(zombie);
-        collection.add(cow);
-        collection.add(slime);
-        collection.add(wither);
-        collection.add(creeper);
-        collection.add(pufferfish);
-        when(world
-                .getNearbyEntities(Mockito.any(Location.class), Mockito.anyDouble(), Mockito.anyDouble(), Mockito.anyDouble()))
-        .thenReturn(collection);
-
+    public void testClearAreaWrongWorld() {
+        when(iwm.inWorld(any(Location.class))).thenReturn(false);
         IslandsManager im = new IslandsManager(plugin);
         im.clearArea(location);
+        // No entities should be cleared
+        verify(zombie, never()).remove();
+        verify(player, never()).remove();
+        verify(cow, never()).remove();
+        verify(slime, never()).remove();
+        verify(wither, never()).remove();
+        verify(creeper, never()).remove();
+        verify(pufferfish, never()).remove();
+        verify(skelly, never()).remove();
 
-        Mockito.verify(zombie).remove();
-        Mockito.verify(player, Mockito.never()).remove();
-        Mockito.verify(cow, Mockito.never()).remove();
-        Mockito.verify(slime).remove();
-        Mockito.verify(wither, Mockito.never()).remove();
-        Mockito.verify(creeper).remove();
-        Mockito.verify(pufferfish, Mockito.never()).remove();
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#clearArea(Location)}.
+     */
+    @Test
+    public void testClearArea() {
+        IslandsManager im = new IslandsManager(plugin);
+        im.clearArea(location);
+        // Only the correct entities should be cleared
+        verify(zombie).remove();
+        verify(player, never()).remove();
+        verify(cow, never()).remove();
+        verify(slime).remove();
+        verify(wither, never()).remove();
+        verify(creeper).remove();
+        verify(pufferfish, never()).remove();
+        verify(skelly, never()).remove();
     }
 
     /**
@@ -1003,7 +1080,7 @@ public class IslandsManagerTest {
     public void testGetIslandByIdString() {
         Island island = mock(Island.class);
         String uuid = UUID.randomUUID().toString();
-        when(islandCache.getIslandById(Mockito.anyString())).thenReturn(island);
+        when(islandCache.getIslandById(anyString())).thenReturn(island);
         // Test
         IslandsManager im = new IslandsManager(plugin);
         im.setIslandCache(islandCache);
diff --git a/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java
index 6bd76f619..b44eaf342 100644
--- a/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java
@@ -1,20 +1,29 @@
 package world.bentobox.bentobox.managers;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Optional;
+
 import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.addons.AddonDescription;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.hooks.Hook;
+import world.bentobox.bentobox.hooks.placeholders.MVdWPlaceholderAPIHook;
+import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
+import world.bentobox.bentobox.lists.GameModePlaceholder;
 
 /**
  * @author tastybento
@@ -28,8 +37,13 @@ public class PlaceholdersManagerTest {
     private BentoBox plugin;
     @Mock
     private GameModeAddon addon;
-    @Mock
     private PlaceholdersManager pm;
+    @Mock
+    private HooksManager hm;
+    @Mock
+    private PlaceholderAPIHook hook;
+    @Mock
+    private MVdWPlaceholderAPIHook hook2;
 
     @Before
     public void setUp() throws Exception {
@@ -40,33 +54,41 @@ public class PlaceholdersManagerTest {
 
         when(plugin.getPlaceholdersManager()).thenReturn(pm);
         // No placeholders registered yet
-        when(pm.isPlaceholder(Mockito.any(), Mockito.any())).thenReturn(false);
+        //when(pm.isPlaceholder(any(), any())).thenReturn(false);
+
+        // Hooks
+        when(plugin.getHooks()).thenReturn(hm);
+        Optional<Hook> optionalHook = Optional.of(hook);
+        when(hm.getHook(eq("PlaceholderAPI"))).thenReturn(optionalHook);
+        when(hook.isPlaceholder(any(), any())).thenReturn(false);
+        Optional<Hook> optionalHook2 = Optional.of(hook2);
+        when(hm.getHook(eq("MVdWPlaceholderAPI"))).thenReturn(optionalHook2);
+
+        // Placeholder manager
+        pm = new PlaceholdersManager(plugin);
     }
 
     /**
      * Test method for {@link world.bentobox.bentobox.managers.PlaceholdersManager#registerDefaultPlaceholders(GameModeAddon)}.
      */
     @Test
-    @Ignore("could not fix them")
     public void testRegisterGameModePlaceholdersAllDefaults() {
         pm.registerDefaultPlaceholders(addon);
-        Mockito.verify(pm, Mockito.atMost(1)).registerDefaultPlaceholders(addon);
-        // 7 registrations for this addon
-        Mockito.verify(pm, Mockito.atLeastOnce()).registerPlaceholder(Mockito.any(), Mockito.anyString(), Mockito.any());
+        verify(hook, times(GameModePlaceholder.values().length)).registerPlaceholder(any(), anyString(), any());
+        verify(hook2, times(GameModePlaceholder.values().length)).registerPlaceholder(any(), anyString(), any());
     }
 
     /**
      * Test method for {@link world.bentobox.bentobox.managers.PlaceholdersManager#registerDefaultPlaceholders(GameModeAddon)}.
      */
     @Test
-    @Ignore("could not fix them")
     public void testRegisterDefaultPlaceholdersSomePreregistered() {
         // Some duplicates
-        when(pm.isPlaceholder(Mockito.any(), Mockito.any())).thenReturn(false, true, true, false, false, true, false);
+        when(hook.isPlaceholder(any(), any())).thenReturn(false, true, true, false, false, true, false);
 
         pm.registerDefaultPlaceholders(addon);
 
-        // 3 registrations for this addon
-        Mockito.verify(pm, Mockito.atLeast(1)).registerPlaceholder(Mockito.anyString(), Mockito.any());
+        // 3 less registrations for this addon
+        verify(hook, times(GameModePlaceholder.values().length - 3)).registerPlaceholder(any(), anyString(), any());
     }
 }
diff --git a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
index f40eb80cb..518acd55e 100644
--- a/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.bentobox.managers;
 
 import static org.junit.Assert.assertEquals;
@@ -32,7 +29,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -52,7 +48,7 @@ import world.bentobox.bentobox.util.Util;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Bukkit.class, BentoBox.class, User.class, Util.class, Logger.class})
+@PrepareForTest({Bukkit.class, BentoBox.class, User.class, Util.class, Logger.class, Database.class})
 public class PlayersManagerTest {
 
     private BentoBox plugin;
@@ -62,12 +58,12 @@ public class PlayersManagerTest {
     private World world;
     private World nether;
     private World end;
-    @Mock
     private Database<Players> db;
 
     /**
      * @throws java.lang.Exception
      */
+    @SuppressWarnings("unchecked")
     @Before
     public void setUp() throws Exception {
         // Clear any lingering database
@@ -145,6 +141,8 @@ public class PlayersManagerTest {
         // Normally in world
         Util.setPlugin(plugin);
 
+        // Database
+        db = mock(Database.class);
     }
 
     @After
diff --git a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
index 2fb838983..0ca0879a6 100644
--- a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.bentobox.managers;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java
new file mode 100644
index 000000000..4e2d7a656
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java
@@ -0,0 +1,335 @@
+package world.bentobox.bentobox.managers.island;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.events.island.IslandEvent;
+import world.bentobox.bentobox.api.events.island.IslandEvent.IslandCreateEvent;
+import world.bentobox.bentobox.api.events.island.IslandEvent.IslandEventBuilder;
+import world.bentobox.bentobox.api.events.island.IslandEvent.IslandResetEvent;
+import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBundle;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.BlueprintsManager;
+import world.bentobox.bentobox.managers.IslandDeletionManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.util.Util;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Util.class, IslandEvent.class, Bukkit.class})
+public class NewIslandTest {
+
+    private static final String NAME = "name";
+    @Mock
+    private BentoBox plugin;
+    @Mock
+    private World world;
+    @Mock
+    private GameModeAddon addon;
+    @Mock
+    private User user;
+    @Mock
+    private Island oldIsland;
+    @Mock
+    private IslandsManager im;
+    @Mock
+    private Island island;
+    @Mock
+    private PlayersManager pm;
+    @Mock
+    private IslandWorldManager iwm;
+    @Mock
+    private IslandCreateEvent ice;
+    @Mock
+    private IslandResetEvent ire;
+    @Mock
+    private IslandDeletionManager idm;
+    @Mock
+    private Location location;
+    @Mock
+    private Block block;
+    @Mock
+    private BukkitScheduler scheduler;
+    @Mock
+    private IslandEventBuilder builder;
+    @Mock
+    private BlueprintBundle bpb;
+
+    private UUID uuid = UUID.randomUUID();
+    @Mock
+    private BlueprintsManager bpm;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+        // Islands manager
+        when(plugin.getIslands()).thenReturn(im);
+        when(im.createIsland(any(), any())).thenReturn(island);
+        when(im.getLast(any())).thenReturn(location);
+        when(im.getIsland(any(), any(User.class))).thenReturn(island);
+        when(island.isReserved()).thenReturn(true);
+        // Player's manager
+        when(plugin.getPlayers()).thenReturn(pm);
+        // IWM
+        when(plugin.getIWM()).thenReturn(iwm);
+        Optional<GameModeAddon> optionalAddon = Optional.of(addon);
+        when(iwm.getAddon(any())).thenReturn(optionalAddon);
+        when(iwm.isDeathsResetOnNewIsland(any())).thenReturn(true);
+        // Island deletion manager
+        when(plugin.getIslandDeletionManager()).thenReturn(idm);
+        when(idm.inDeletion(any())).thenReturn(false);
+        // blueprints Manager
+        when(bpb.getUniqueId()).thenReturn(NAME);
+        when(bpm.getBlueprintBundles(any())).thenReturn(Collections.singletonMap(NAME, bpb));
+        when(plugin.getBlueprintsManager()).thenReturn(bpm);
+
+        // User
+        when(user.getPermissionValue(Mockito.anyString(), Mockito.anyInt())).thenReturn(20);
+        when(user.getUniqueId()).thenReturn(uuid);
+        when(user.getName()).thenReturn("tastybento");
+
+        // Events
+        PowerMockito.mockStatic(IslandEvent.class);
+        when(IslandEvent.builder()).thenReturn(builder);
+        when(builder.admin(anyBoolean())).thenReturn(builder);
+        when(builder.blueprintBundle(any())).thenReturn(builder);
+        when(builder.deletedIslandInfo(any())).thenReturn(builder);
+        when(builder.involvedPlayer(any())).thenReturn(builder);
+        when(builder.island(any())).thenReturn(builder);
+        when(builder.location(any())).thenReturn(builder);
+        when(builder.reason(any())).thenReturn(builder);
+        when(builder.build()).thenReturn(ice);
+        when(ice.getBlueprintBundle()).thenReturn(bpb);
+        when(ire.getBlueprintBundle()).thenReturn(bpb);
+
+        // Location and blocks
+        when(island.getWorld()).thenReturn(world);
+        when(location.getWorld()).thenReturn(world);
+        when(world.getMaxHeight()).thenReturn(5);
+        when(location.getBlock()).thenReturn(block);
+        when(block.getType()).thenReturn(Material.AIR);
+        when(block.isEmpty()).thenReturn(true);
+        when(world.getBlockAt(anyInt(), anyInt(), anyInt())).thenReturn(block);
+        when(oldIsland.getWorld()).thenReturn(world);
+
+        // Util - return the same location
+        PowerMockito.mockStatic(Util.class);
+        when(Util.getClosestIsland(any())).thenAnswer((Answer<Location>) invocation -> invocation.getArgument(0, Location.class));
+
+        // Bukkit Scheduler
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.getScheduler()).thenReturn(scheduler);
+
+        // Addon
+        when(addon.getOverWorld()).thenReturn(world);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderNoUser(){
+        try {
+            NewIsland.builder().build();
+        } catch (IOException e) {
+            assertEquals("Insufficient parameters. Must have a user!", e.getMessage());
+        }
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilder() throws IOException {
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+        verify(island).setProtectionRange(eq(20));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderReset() throws IOException {
+        when(builder.build()).thenReturn(ire);
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.RESET).oldIsland(oldIsland).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice, never()).getBlueprintBundle();
+        verify(ire).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderNoOldIsland() throws IOException {
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderNoOldIslandPaste() throws IOException {
+        NewIsland.builder().addon(addon).name(NAME).player(user).reason(Reason.CREATE).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(bpm).paste(eq(addon), eq(island), eq(NAME), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderHasIsland() throws IOException {
+        when(im.hasIsland(any(), any(User.class))).thenReturn(true);
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+        verify(island).setProtectionRange(eq(20));
+        verify(island).setReserved(eq(false));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderHasIslandFail() throws IOException {
+        when(im.getIsland(any(), any(User.class))).thenReturn(null);
+        when(im.hasIsland(any(), any(User.class))).thenReturn(true);
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+        verify(island).setProtectionRange(eq(20));
+        verify(plugin).logError("New island for user tastybento was not reserved!");
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
+     * @throws IOException
+     */
+    @Test
+    public void testBuilderHasIslandFailnoReserve() throws IOException {
+        when(island.isReserved()).thenReturn(false);
+        when(im.hasIsland(any(), any(User.class))).thenReturn(true);
+        NewIsland.builder().addon(addon).name(NAME).player(user).noPaste().reason(Reason.CREATE).oldIsland(oldIsland).build();
+        // Verifications
+        verify(im).save(eq(island));
+        verify(island).setFlagsDefaults();
+        verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
+        verify(builder).build();
+        verify(bpb).getUniqueId();
+        verify(ice).getBlueprintBundle();
+        verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
+        verify(pm).setHomeLocation(eq(user), any(), eq(1));
+        verify(pm).clearHomeLocations(eq(world), any(UUID.class));
+        verify(island).setProtectionRange(eq(20));
+        verify(plugin).logError("New island for user tastybento was not reserved!");
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java b/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java
index 0b4501526..785989657 100644
--- a/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java
+++ b/src/test/java/world/bentobox/bentobox/panels/IslandCreationPanelTest.java
@@ -1,7 +1,8 @@
 package world.bentobox.bentobox.panels;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -99,8 +100,8 @@ public class IslandCreationPanelTest {
         UUID uuid = UUID.randomUUID();
         when(user.getUniqueId()).thenReturn(uuid);
         when(user.getPlayer()).thenReturn(player);
-        when(user.hasPermission(Mockito.anyString())).thenReturn(true);
-        when(user.getTranslation(Mockito.anyVararg())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.hasPermission(anyString())).thenReturn(true);
+        when(user.getTranslation(any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
         User.setPlugin(plugin);
         // Set up user already
         User.getInstance(player);
diff --git a/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java b/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java
new file mode 100644
index 000000000..2432200ea
--- /dev/null
+++ b/src/test/java/world/bentobox/bentobox/panels/LanguagePanelTest.java
@@ -0,0 +1,187 @@
+package world.bentobox.bentobox.panels;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.awt.Panel;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemFactory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import net.md_5.bungee.api.ChatColor;
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.localization.BentoBoxLocale;
+import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.managers.LocalesManager;
+
+/**
+ * @author tastybento
+ *
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Bukkit.class, BentoBox.class})
+public class LanguagePanelTest {
+
+    @Mock
+    private BentoBox plugin;
+    @Mock
+    private User user;
+    @Mock
+    private LocalesManager lm;
+
+    private ArrayList<Locale> localeList;
+
+    @Mock
+    private PanelBuilder pb;
+    @Mock
+    private Panel panel;
+    @Mock
+    private Inventory inv;
+    @Mock
+    private ItemMeta meta;
+
+    @Captor
+    private ArgumentCaptor<ItemStack> argument;
+
+    private Map<Locale, BentoBoxLocale> map;
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        // Set up plugin
+        Whitebox.setInternalState(BentoBox.class, "instance", plugin);
+        // Player
+        Player player = mock(Player.class);
+        when(user.isOp()).thenReturn(false);
+        when(user.isPlayer()).thenReturn(true);
+        UUID uuid = UUID.randomUUID();
+        when(user.getUniqueId()).thenReturn(uuid);
+        when(user.getPlayer()).thenReturn(player);
+        when(user.hasPermission(anyString())).thenReturn(true);
+        when(user.getTranslation(any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
+        when(user.getLocale()).thenReturn(Locale.ENGLISH);
+        User.setPlugin(plugin);
+        // Set up user already
+        User.getInstance(player);
+
+
+        // Locales Manager
+        when(plugin.getLocalesManager()).thenReturn(lm);
+        localeList = new ArrayList<>();
+        when(lm.getAvailableLocales(any(Boolean.class))).thenReturn(localeList);
+        map = new HashMap<>();
+        when(lm.getLanguages()).thenReturn(map);
+
+        // Panel
+        PowerMockito.mockStatic(Bukkit.class);
+        when(Bukkit.createInventory(any(), Mockito.anyInt(), any())).thenReturn(inv);
+
+        // Item Factory (needed for ItemStack)
+        ItemFactory itemF = mock(ItemFactory.class);
+        when(itemF.getItemMeta(Mockito.any())).thenReturn(meta);
+        when(Bukkit.getItemFactory()).thenReturn(itemF);
+
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+        User.clearUsers();
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.panels.LanguagePanel#openPanel(world.bentobox.bentobox.api.user.User)}.
+     */
+    @Test
+    public void testOpenPanelNoLocales() {
+        LanguagePanel.openPanel(user);
+        verify(plugin).getLocalesManager();
+        verify(lm).getAvailableLocales(eq(true));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.panels.LanguagePanel#openPanel(world.bentobox.bentobox.api.user.User)}.
+     */
+    @Test
+    public void testOpenPanelLocalesNullBanner() {
+        // Set up locales
+        localeList.add(Locale.CANADA);
+        localeList.add(Locale.CHINA);
+        localeList.add(Locale.ENGLISH);
+        BentoBoxLocale bbl = mock(BentoBoxLocale.class);
+        map.put(Locale.CANADA, bbl);
+        map.put(Locale.CHINA, bbl);
+        map.put(Locale.ENGLISH, bbl);
+
+        LanguagePanel.openPanel(user);
+        verify(lm, times(3)).getLanguages();
+        verify(bbl, times(3)).getBanner();
+        verify(user).getTranslation("language.panel-title");
+        // Other langs
+        verify(user, times(2)).getTranslation(eq("language.description.click-to-select"));
+        verify(user, times(3)).getTranslation(eq("language.description.authors"));
+        // Selected language
+        verify(user, Mockito.atMostOnce()).getTranslation(eq("language.description.selected"));
+
+        verify(inv).setItem(eq(0), argument.capture());
+        assertEquals(Material.WHITE_BANNER, argument.getValue().getType());
+        assertEquals(1, argument.getValue().getAmount());
+        assertEquals(meta, argument.getValue().getItemMeta());
+        verify(meta).setDisplayName(eq(ChatColor.WHITE + "Chinese (China)"));
+        verify(meta).setDisplayName(eq(ChatColor.WHITE + "English (Canada)"));
+        verify(inv).setItem(eq(1), any());
+        verify(inv).setItem(eq(2), any());
+        verify(inv, Mockito.never()).setItem(eq(3), any());
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bentobox.panels.LanguagePanel#openPanel(world.bentobox.bentobox.api.user.User)}.
+     */
+    @Test
+    public void testOpenPanelLocalesNotNullBanner() {
+        // Set up locales
+        localeList.add(Locale.CANADA);
+        BentoBoxLocale bbl = mock(BentoBoxLocale.class);
+        map.put(Locale.CANADA, bbl);
+        when(bbl.getBanner()).thenReturn(new ItemStack(Material.CYAN_BANNER));
+
+        LanguagePanel.openPanel(user);
+        verify(inv).setItem(eq(0), argument.capture());
+        assertEquals(Material.CYAN_BANNER, argument.getValue().getType());
+    }
+
+}
diff --git a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java
index 5282b29f8..38e203058 100644
--- a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java
+++ b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java
@@ -47,7 +47,7 @@ public class ItemParserTest {
          */
         bannerMeta = mock(BannerMeta.class);
         when(itemFactory.getItemMeta(Mockito.any())).thenAnswer((Answer<ItemMeta>) invocation -> {
-            switch (invocation.getArgumentAt(0, Material.class)) {
+            switch (invocation.getArgument(0, Material.class)) {
             case RED_BANNER:
             case WHITE_BANNER:
                 return bannerMeta;
diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java
index 45ee5db9c..82392d8b4 100644
--- a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java
+++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportBuilderTest.java
@@ -62,7 +62,7 @@ public class SafeSpotTeleportBuilderTest {
     public void test() throws Exception {
         sstb = new SafeSpotTeleport.Builder(plugin);
         sstb.build();
-        SafeSpotTeleport ttt = new SafeSpotTeleport(plugin, player, loc, null, false, 0, false);
+        SafeSpotTeleport ttt = new SafeSpotTeleport(plugin, player, loc, null, false, 0);
         assertEquals(sst, ttt);
     }
 
diff --git a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java
index 5b26097ce..87ac9ed70 100644
--- a/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java
+++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package world.bentobox.bentobox.util.teleport;
 
 import static org.mockito.Matchers.any;
@@ -109,14 +106,13 @@ public class SafeSpotTeleportTest {
 
         // Player
         // Return first survival and then spectator
-        when(player.getGameMode()).thenReturn(GameMode.SURVIVAL, GameMode.SPECTATOR);
+        when(player.getGameMode()).thenReturn(GameMode.SURVIVAL);
         when(loc.getWorld()).thenReturn(world);
         when(loc.getBlockX()).thenReturn(0);
         when(loc.getBlockY()).thenReturn(120);
         when(loc.getBlockZ()).thenReturn(0);
         Block block = mock(Block.class);
         when(loc.getBlock()).thenReturn(block);
-
     }
 
     /**
@@ -126,23 +122,8 @@ public class SafeSpotTeleportTest {
     public void testSafeSpotTeleportImmediateSafe() throws Exception {
         boolean portal = false;
         int homeNumber = 1;
-        new SafeSpotTeleport(plugin, player, loc, "failure message", portal, homeNumber, true);
-        Mockito.verify(player).setGameMode(GameMode.SPECTATOR);
+        new SafeSpotTeleport(plugin, player, loc, "failure message", portal, homeNumber);
         Mockito.verify(player).teleport(loc);
-        Mockito.verify(player).setGameMode(GameMode.SURVIVAL);
-    }
-
-    /**
-     * Test method for {@link world.bentobox.bentobox.util.teleport.SafeSpotTeleport#SafeSpotTeleport(world.bentobox.bentobox.BentoBox, org.bukkit.entity.Entity, org.bukkit.Location, java.lang.String, boolean, int)}.
-     */
-    @Test
-    public void testSafeSpotTeleportImmediateSafeNoOverride() throws Exception {
-        boolean portal = false;
-        int homeNumber = 1;
-        new SafeSpotTeleport(plugin, player, loc, "failure message", portal, homeNumber, false);
-        Mockito.verify(player, Mockito.never()).setGameMode(GameMode.SPECTATOR);
-        Mockito.verify(player).teleport(loc);
-        Mockito.verify(player, Mockito.never()).setGameMode(GameMode.SURVIVAL);
     }
 
     /**
@@ -153,11 +134,8 @@ public class SafeSpotTeleportTest {
         when(im.isSafeLocation(Mockito.any())).thenReturn(false);
         boolean portal = false;
         int homeNumber = 1;
-        new SafeSpotTeleport(plugin, player, loc, "failure message", portal, homeNumber, true);
-        Mockito.verify(player).setGameMode(GameMode.SPECTATOR);
+        new SafeSpotTeleport(plugin, player, loc, "failure message", portal, homeNumber);
         Mockito.verify(player, Mockito.never()).teleport(loc);
         Mockito.verify(sch).runTaskTimer(Mockito.any(), Mockito.any(Runnable.class), Mockito.eq(0L), Mockito.eq(1L));
-
     }
-
 }