Merge remote branch 'remotes/origin/groupmanager'

28 files changed, 3866 insertions, 3588 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
index 98ff075dd..0832000f2 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
@@ -13,81 +13,89 @@ import org.anjocaido.groupmanager.utils.Tasks;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class GMConfiguration {
 
-    private GroupManager plugin;
-    private File configFile;
-    private YamlConfiguration GMconfig;
-    
-    public GMConfiguration(GroupManager plugin) {
-        this.plugin = plugin;
-        load();
-    }
-
-    public void load() {
-        if (!plugin.getDataFolder().exists()) {
-            plugin.getDataFolder().mkdirs();
-        }
-        configFile = new File(plugin.getDataFolder(), "config.yml");
-
-        if (!configFile.exists()) {
-            try {
-                Tasks.copy(plugin.getResourceAsStream("config.yml"), configFile);
-            } catch (IOException ex) {
-                GroupManager.logger.log(Level.SEVERE, null, ex);
-            }
-        }
-
-        GMconfig = new YamlConfiguration();
-        
-        try {
-        	GMconfig.load(configFile);
-        } catch (Exception ex) {
-            throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + configFile.getPath(), ex);
-        }
-        
-        // Setup defaults
-        adjustLoggerLevel();
-        plugin.setValidateOnlinePlayer(isToggleValidate());
-    }
-    
-    public boolean isOpOverride() {
-    	return GMconfig.getBoolean("settings.config.opOverrides", true);
-    }
-    public boolean isToggleValidate() {
-    	return GMconfig.getBoolean("settings.config.validate_toggle", true);
-    }
-
-	public Map<String, Object> getMirrorsMap() {   
-    	// Try to fetch the old mirror path first		
+	private GroupManager plugin;
+	private File configFile;
+	private YamlConfiguration GMconfig;
+
+	public GMConfiguration(GroupManager plugin) {
+
+		this.plugin = plugin;
+		load();
+	}
+
+	public void load() {
+
+		if (!plugin.getDataFolder().exists()) {
+			plugin.getDataFolder().mkdirs();
+		}
+		configFile = new File(plugin.getDataFolder(), "config.yml");
+
+		if (!configFile.exists()) {
+			try {
+				Tasks.copy(plugin.getResourceAsStream("config.yml"), configFile);
+			} catch (IOException ex) {
+				GroupManager.logger.log(Level.SEVERE, null, ex);
+			}
+		}
+
+		GMconfig = new YamlConfiguration();
+
+		try {
+			GMconfig.load(configFile);
+		} catch (Exception ex) {
+			throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + configFile.getPath(), ex);
+		}
+
+		// Setup defaults
+		adjustLoggerLevel();
+		plugin.setValidateOnlinePlayer(isToggleValidate());
+	}
+
+	public boolean isOpOverride() {
+
+		return GMconfig.getBoolean("settings.config.opOverrides", true);
+	}
+
+	public boolean isToggleValidate() {
+
+		return GMconfig.getBoolean("settings.config.validate_toggle", true);
+	}
+
+	public Map<String, Object> getMirrorsMap() {
+
+		// Try to fetch the old mirror path first
 		if (GMconfig.isConfigurationSection("settings.permission.world.mirror")) {
 			return (Map<String, Object>) GMconfig.getConfigurationSection("settings.permission.world.mirror").getValues(false);
-		} else if (GMconfig.isConfigurationSection("settings.mirrors")){
+		} else if (GMconfig.isConfigurationSection("settings.mirrors")) {
 			return (Map<String, Object>) GMconfig.getConfigurationSection("settings.mirrors").getValues(false);
 		}
 		return null;
-		
-    }
-
-    public Integer getSaveInterval() {   	
-    	return GMconfig.getInt("settings.data.save.minutes", 10);
-    }
-    
-    public Integer getBackupDuration() {   	
-    	return GMconfig.getInt("settings.data.save.hours", 24);
-    }
-
-    public void adjustLoggerLevel() {
-    	
-    	try {
-            GroupManager.logger.setLevel(Level.parse(GMconfig.getString("settings.logging.level", "INFO")));
-            return;
-        } catch (Exception e) {
-        }
-    	
-    	GroupManager.logger.setLevel(Level.INFO);
-    }
+
+	}
+
+	public Integer getSaveInterval() {
+
+		return GMconfig.getInt("settings.data.save.minutes", 10);
+	}
+
+	public Integer getBackupDuration() {
+
+		return GMconfig.getInt("settings.data.save.hours", 24);
+	}
+
+	public void adjustLoggerLevel() {
+
+		try {
+			GroupManager.logger.setLevel(Level.parse(GMconfig.getString("settings.logging.level", "INFO")));
+			return;
+		} catch (Exception e) {
+		}
+
+		GroupManager.logger.setLevel(Level.INFO);
+	}
 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
index 6fa8b0d1d..647d729e5 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
@@ -24,8 +24,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.yaml.snakeyaml.DumperOptions;

 import org.yaml.snakeyaml.Yaml;

 

-

-

 /**

  * @author ElgarL

  * 

@@ -42,6 +40,7 @@ public class GlobalGroups {
 	protected File GlobalGroupsFile = null;

 

 	public GlobalGroups(GroupManager plugin) {

+

 		this.plugin = plugin;

 		load();

 	}

@@ -50,6 +49,7 @@ public class GlobalGroups {
 	 * @return the haveGroupsChanged

 	 */

 	public boolean haveGroupsChanged() {

+

 		if (this.haveGroupsChanged) {

 			return true;

 		}

@@ -65,20 +65,24 @@ public class GlobalGroups {
 	 * @return the timeStampGroups

 	 */

 	public long getTimeStampGroups() {

+

 		return timeStampGroups;

 	}

+

 	/**

 	 * @param timeStampGroups the timeStampGroups to set

 	 */

 	protected void setTimeStampGroups(long timeStampGroups) {

+

 		this.timeStampGroups = timeStampGroups;

 	}

-	

+

 	/**

 	 * @param haveGroupsChanged

 	 *            the haveGroupsChanged to set

 	 */

 	public void setGroupsChanged(boolean haveGroupsChanged) {

+

 		this.haveGroupsChanged = haveGroupsChanged;

 	}

 

@@ -86,7 +90,7 @@ public class GlobalGroups {
 	public void load() {

 

 		GGroups = new YamlConfiguration();

-		

+

 		GroupManager.setLoaded(false);

 

 		// READ globalGroups FILE

@@ -110,44 +114,47 @@ public class GlobalGroups {
 

 		// Clear out old groups

 		resetGlobalGroups();

-		

+

 		if (!GGroups.getKeys(false).isEmpty()) {

 			// Read all global groups

 			Map<String, Object> allGroups = new HashMap<String, Object>();

-			

+

 			try {

 				allGroups = (Map<String, Object>) GGroups.getConfigurationSection("groups").getValues(false);

 			} catch (Exception ex) {

-	            //ex.printStackTrace();

-	            throw new IllegalArgumentException("Your " + GlobalGroupsFile.getPath() + " file is invalid. See console for details.", ex);

-	        }

-	

+				// ex.printStackTrace();

+				throw new IllegalArgumentException("Your " + GlobalGroupsFile.getPath() + " file is invalid. See console for details.", ex);

+			}

+

 			// Load each groups permissions list.

 			if (allGroups != null) {

-				

+

 				Iterator<String> groupItr = allGroups.keySet().iterator();

-		    	String groupName;

-		    	Integer groupCount = 0;

-		    	

-		    	/*

-		    	 * loop each group entry

-		    	 * and read it's data.

-		    	 */

-		    	while (groupItr.hasNext()) {

-		    		try {

-		    			groupCount++;

-		    			// Attempt to fetch the next group name.

-		    			groupName = groupItr.next();

-		    		} catch (Exception ex) {

+				String groupName;

+				Integer groupCount = 0;

+

+				/*

+				 * loop each group entry

+				 * and read it's data.

+				 */

+				while (groupItr.hasNext()) {

+					try {

+						groupCount++;

+						// Attempt to fetch the next group name.

+						groupName = groupItr.next();

+					} catch (Exception ex) {

 						throw new IllegalArgumentException("Invalid group name for GlobalGroup entry (" + groupCount + ") in file: " + GlobalGroupsFile.getPath(), ex);

 					}

 

-		    		Group newGroup = new Group(groupName.toLowerCase());

+					/*

+					 * Create a new group with this name.

+					 */

+					Group newGroup = new Group(groupName.toLowerCase());

 					Object element;

-					

+

 					// Permission nodes

 					element = GGroups.get("groups." + groupName + ".permissions");

-	

+

 					if (element != null)

 						if (element instanceof List) {

 							try {

@@ -161,31 +168,31 @@ public class GlobalGroups {
 							newGroup.addPermission((String) element);

 						} else

 							throw new IllegalArgumentException("Unknown type of permission node for global group:  " + groupName);

-					

+

 					// Info nodes

 					element = GGroups.get("groups." + groupName + ".info");

-					

+

 					if (element != null)

 						if (element instanceof MemorySection) {

 							Map<String, Object> vars = new HashMap<String, Object>();

 							for (String key : ((MemorySection) element).getKeys(false)) {

-					            vars.put(key, ((MemorySection) element).get(key));

-					        }

+								vars.put(key, ((MemorySection) element).get(key));

+							}

 							newGroup.setVariables(vars);

 						} else

 							throw new IllegalArgumentException("Unknown type of info node for global group:  " + groupName);

-	

+

 					// Push a new group

 					addGroup(newGroup);

 				}

 			}

-		

+

 			removeGroupsChangedFlag();

 		}

-		

+

 		setTimeStampGroups(GlobalGroupsFile.lastModified());

 		GroupManager.setLoaded(true);

-		//GlobalGroupsFile = null;

+		// GlobalGroupsFile = null;

 	}

 

 	/**

@@ -194,33 +201,33 @@ public class GlobalGroups {
 

 	public void writeGroups(boolean overwrite) {

 

-		//File GlobalGroupsFile = new File(plugin.getDataFolder(), "globalgroups.yml");

+		// File GlobalGroupsFile = new File(plugin.getDataFolder(), "globalgroups.yml");

 

 		if (haveGroupsChanged()) {

 			if (overwrite || (!overwrite && (getTimeStampGroups() >= GlobalGroupsFile.lastModified()))) {

 				Map<String, Object> root = new HashMap<String, Object>();

-		

+

 				Map<String, Object> groupsMap = new HashMap<String, Object>();

 				root.put("groups", groupsMap);

 				for (String groupKey : groups.keySet()) {

 					Group group = groups.get(groupKey);

-		

+

 					// Group header

 					Map<String, Object> aGroupMap = new HashMap<String, Object>();

 					groupsMap.put(group.getName(), aGroupMap);

-					

+

 					// Info nodes

 					Map<String, Object> infoMap = new HashMap<String, Object>();

-		            aGroupMap.put("info", infoMap);

-		

-		            for (String infoKey : group.getVariables().getVarKeyList()) {

-		                infoMap.put(infoKey, group.getVariables().getVarObject(infoKey));

-		            }

-		

-		            // Permission nodes

+					aGroupMap.put("info", infoMap);

+

+					for (String infoKey : group.getVariables().getVarKeyList()) {

+						infoMap.put(infoKey, group.getVariables().getVarObject(infoKey));

+					}

+

+					// Permission nodes

 					aGroupMap.put("permissions", group.getPermissionList());

 				}

-		

+

 				if (!root.isEmpty()) {

 					DumperOptions opt = new DumperOptions();

 					opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

@@ -233,53 +240,55 @@ public class GlobalGroups {
 				}

 				setTimeStampGroups(GlobalGroupsFile.lastModified());

 			} else {

-         		// Newer file found.

-         		GroupManager.logger.log(Level.WARNING, "Newer GlobalGroups file found, but we have local changes!");

-         		throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");

-         	}

+				// Newer file found.

+				GroupManager.logger.log(Level.WARNING, "Newer GlobalGroups file found, but we have local changes!");

+				throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");

+			}

 			removeGroupsChangedFlag();

 		} else {

-        	//Check for newer file as no local changes.

-        	if (getTimeStampGroups() < GlobalGroupsFile.lastModified()) {

-        		System.out.print("Newer GlobalGroups file found (Loading changes)!");

-        		// Backup GlobalGroups file

-            	backupFile();

-        		load();

-        	}

-        }

+			// Check for newer file as no local changes.

+			if (getTimeStampGroups() < GlobalGroupsFile.lastModified()) {

+				System.out.print("Newer GlobalGroups file found (Loading changes)!");

+				// Backup GlobalGroups file

+				backupFile();

+				load();

+			}

+		}

 

 	}

-	

+

 	/**

-     * Backup the BlobalGroups file

-     * @param w

-     */

-    private void backupFile() {

-    	

-    	File backupFile = new File(plugin.getBackupFolder(), "bkp_ggroups_" + Tasks.getDateString() + ".yml");

-        try {

-            Tasks.copy(GlobalGroupsFile, backupFile);

-        } catch (IOException ex) {

-            GroupManager.logger.log(Level.SEVERE, null, ex);

-        }

-    }

-	

+	 * Backup the BlobalGroups file

+	 * 

+	 * @param w

+	 */

+	private void backupFile() {

+

+		File backupFile = new File(plugin.getBackupFolder(), "bkp_ggroups_" + Tasks.getDateString() + ".yml");

+		try {

+			Tasks.copy(GlobalGroupsFile, backupFile);

+		} catch (IOException ex) {

+			GroupManager.logger.log(Level.SEVERE, null, ex);

+		}

+	}

+

 	/**

 	 * Adds a group, or replaces an existing one.

 	 * 

 	 * @param groupToAdd

 	 */

 	public void addGroup(Group groupToAdd) {

+

 		// Create a new group if it already exists

 		if (hasGroup(groupToAdd.getName())) {

 			groupToAdd = groupToAdd.clone();

 			removeGroup(groupToAdd.getName());

 		}

-        

+

 		newGroup(groupToAdd);

-        haveGroupsChanged = true;

-        if (GroupManager.isLoaded())

-        	GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);

+		haveGroupsChanged = true;

+		if (GroupManager.isLoaded())

+			GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);

 	}

 

 	/**

@@ -288,6 +297,7 @@ public class GlobalGroups {
 	 * @param newGroup

 	 */

 	public Group newGroup(Group newGroup) {

+

 		// Push a new group

 		if (!groups.containsKey(newGroup.getName().toLowerCase())) {

 			groups.put(newGroup.getName().toLowerCase(), newGroup);

@@ -303,6 +313,7 @@ public class GlobalGroups {
 	 * @param groupName

 	 */

 	public boolean removeGroup(String groupName) {

+

 		// Push a new group

 		if (groups.containsKey(groupName.toLowerCase())) {

 			groups.remove(groupName.toLowerCase());

@@ -321,6 +332,7 @@ public class GlobalGroups {
 	 * @return true if the group exists

 	 */

 	public boolean hasGroup(String groupName) {

+

 		return groups.containsKey(groupName.toLowerCase());

 	}

 

@@ -376,6 +388,7 @@ public class GlobalGroups {
 	 * @return List of all group names

 	 */

 	public List<String> getGroupsPermissions(String groupName) {

+

 		if (!hasGroup(groupName))

 			return null;

 

@@ -388,6 +401,7 @@ public class GlobalGroups {
 	 * @return Set containing all group names.

 	 */

 	public Set<String> getGlobalGroups() {

+

 		return groups.keySet();

 	}

 

@@ -395,14 +409,16 @@ public class GlobalGroups {
 	 * Resets GlobalGroups.

 	 */

 	public void resetGlobalGroups() {

+

 		this.groups = new HashMap<String, Group>();

 	}

-	

+

 	/**

 	 * 

 	 * @return a collection of the groups

 	 */

 	public Collection<Group> getGroupList() {

+

 		return groups.values();

 	}

 

@@ -413,6 +429,7 @@ public class GlobalGroups {
 	 * @return Group object

 	 */

 	public Group getGroup(String groupName) {

+

 		if (!hasGroup(groupName))

 			return null;

 

@@ -424,17 +441,19 @@ public class GlobalGroups {
 	 * @return the globalGroupsFile

 	 */

 	public File getGlobalGroupsFile() {

+

 		return GlobalGroupsFile;

 	}

-	

+

 	/**

     *

     */

-   public void removeGroupsChangedFlag() {

-	   setGroupsChanged(false);

-       for (Group g : groups.values()) {

-           g.flagAsSaved();

-       }

-   }

+	public void removeGroupsChangedFlag() {

+

+		setGroupsChanged(false);

+		for (Group g : groups.values()) {

+			g.flagAsSaved();

+		}

+	}

 

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 1c4011ff8..df46b70d0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -12,7 +12,6 @@ import org.anjocaido.groupmanager.data.Variables;
 import org.anjocaido.groupmanager.data.User;
 import org.anjocaido.groupmanager.data.Group;
 import org.anjocaido.groupmanager.dataholder.OverloadedWorldHolder;
-import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +28,6 @@ import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
 import org.anjocaido.groupmanager.events.GMSystemEvent;
 import org.anjocaido.groupmanager.events.GMWorldListener;
 import org.anjocaido.groupmanager.events.GroupManagerEventHandler;
-import org.anjocaido.groupmanager.events.GMGroupEvent.Action;
 import org.anjocaido.groupmanager.utils.GMLoggerHandler;
 import org.anjocaido.groupmanager.utils.PermissionCheckResult;
 import org.anjocaido.groupmanager.utils.Tasks;
@@ -40,20 +38,17 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
 
-@SuppressWarnings("unused")
 /**
  *
- * @author gabrielcouto
+ * @author gabrielcouto, ElgarL
  */
 public class GroupManager extends JavaPlugin {
 
-	// private File configFile;
 	private File backupFolder;
 	private Runnable commiter;
 	private ScheduledThreadPoolExecutor scheduler;
@@ -61,13 +56,14 @@ public class GroupManager extends JavaPlugin {
 	private Map<CommandSender, String> selectedWorlds = new HashMap<CommandSender, String>();
 	private WorldsHolder worldsHolder;
 	private boolean validateOnlinePlayer = true;
-	
+
 	private String lastError = "";
-	
+
 	/**
 	 * @return the validateOnlinePlayer
 	 */
 	public boolean isValidateOnlinePlayer() {
+
 		return validateOnlinePlayer;
 	}
 
@@ -75,10 +71,10 @@ public class GroupManager extends JavaPlugin {
 	 * @param validateOnlinePlayer the validateOnlinePlayer to set
 	 */
 	public void setValidateOnlinePlayer(boolean validateOnlinePlayer) {
+
 		this.validateOnlinePlayer = validateOnlinePlayer;
 	}
 
-	private boolean isReady = false;
 	private static boolean isLoaded = false;
 	protected GMConfiguration config;
 
@@ -90,14 +86,15 @@ public class GroupManager extends JavaPlugin {
 	public static final Logger logger = Logger.getLogger(GroupManager.class.getName());
 
 	// PERMISSIONS FOR COMMAND BEING LOADED
-	OverloadedWorldHolder dataHolder = null;
-	AnjoPermissionsHandler permissionHandler = null;
+	private OverloadedWorldHolder dataHolder = null;
+	private AnjoPermissionsHandler permissionHandler = null;
 
 	@Override
 	public void onDisable() {
+
 		setLoaded(false);
-		
-		// Un-register this service.
+
+		// Unregister this service.
 		this.getServer().getServicesManager().unregister(this.worldsHolder);
 
 		disableScheduler(); // Shutdown before we save, so it doesn't interfere.
@@ -109,32 +106,32 @@ public class GroupManager extends JavaPlugin {
 			}
 		}
 
-		WorldEvents = null;
-		
+		if (WorldEvents != null)
+			WorldEvents = null;
+
 		// Remove all attachments before clearing
 		if (BukkitPermissions != null) {
 			BukkitPermissions.removeAllAttachments();
 			BukkitPermissions = null;
 		}
 
-		// EXAMPLE: Custom code, here we just output some info so we can check that
-		// all is well
+		// EXAMPLE: Custom code, here we just output some info so we can check that all is well
 		PluginDescriptionFile pdfFile = this.getDescription();
 		System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
 		GroupManager.logger.removeHandler(ch);
 	}
 
-	//@Override
+	@Override
 	public void onEnable() {
-		
+
 		try {
 			lastError = "";
-			
+
 			GroupManager.logger.setUseParentHandlers(false);
 			ch = new GMLoggerHandler();
 			GroupManager.logger.addHandler(ch);
 			logger.setLevel(Level.ALL);
-	
+
 			// Create the backup folder, if it doesn't exist.
 			prepareFileFields();
 			// Load the config.yml
@@ -142,41 +139,39 @@ public class GroupManager extends JavaPlugin {
 			// Load the global groups
 			globalGroups = new GlobalGroups(this);
 			worldsHolder = new WorldsHolder(this);
-	
-	
+
 			PluginDescriptionFile pdfFile = this.getDescription();
 			if (worldsHolder == null) {
 				GroupManager.logger.severe("Can't enable " + pdfFile.getName() + " version " + pdfFile.getVersion() + ", bad loading!");
 				this.getServer().getPluginManager().disablePlugin(this);
 				throw new IllegalStateException("An error ocurred while loading GroupManager");
 			}
-	
+
 			// Set a few defaults (reloads)
 			setLoaded(false);
-			
-			// Initialize the world listener and bukkit permissions to handle
-			// events.
+
+			// Initialize the world listener and bukkit permissions to handle events.
 			WorldEvents = new GMWorldListener(this);
 			BukkitPermissions = new BukkitPermissions(this);
-	
+
 			enableScheduler();
-	
+
 			/*
-			 * Schedule a Bukiit Permissions update for 1 tick later. All plugins
-			 * will be loaded by then
+			 * Schedule a Bukkit Permissions update for 1 tick later.
+			 * All plugins will be loaded by then
 			 */
-	
+
 			if (getServer().getScheduler().scheduleSyncDelayedTask(this, new BukkitPermsUpdateTask(), 1) == -1) {
 				GroupManager.logger.severe("Could not schedule superperms Update.");
 				setLoaded(true);
 			}
-	
+
 			System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
-			
+
 			// Register as a service
 			this.getServer().getServicesManager().register(WorldsHolder.class, this.worldsHolder, this, ServicePriority.Lowest);
 		} catch (Exception ex) {
-			
+
 			/*
 			 * Store the error and write to the log.
 			 */
@@ -185,41 +180,41 @@ public class GroupManager extends JavaPlugin {
 			/*
 			 * Throw an error so Bukkit knows about it.
 			 */
-			throw new IllegalArgumentException(ex.getMessage(),ex);
+			throw new IllegalArgumentException(ex.getMessage(), ex);
 
 		}
 	}
-	
+
 	/**
 	 * Write an error.log
 	 * 
 	 * @param ex
 	 */
 	private void saveErrorLog(Exception ex) {
-		
+
 		if (!getDataFolder().exists()) {
-            getDataFolder().mkdirs();
-        }
-		
+			getDataFolder().mkdirs();
+		}
+
 		lastError = ex.getMessage();
-		
+
 		GroupManager.logger.severe("===================================================");
 		GroupManager.logger.severe("= ERROR REPORT START =");
 		GroupManager.logger.severe("===================================================");
 		GroupManager.logger.severe("=== PLEASE COPY AND PASTE THE ERROR.LOG FROM THE ==");
 		GroupManager.logger.severe("= GROUPMANAGER FOLDER TO AN ESSENTIALS  DEVELOPER =");
 		GroupManager.logger.severe("===================================================");
-		GroupManager.logger.severe(lastError);			
+		GroupManager.logger.severe(lastError);
 		GroupManager.logger.severe("===================================================");
 		GroupManager.logger.severe("= ERROR REPORT ENDED =");
 		GroupManager.logger.severe("===================================================");
 
 		// Append this error to the error log.
-        try {
-        	String error = "=============================== GM ERROR LOG ===============================\n\n";
-        	error += Tasks.getStackTraceAsString(ex);
-        	error += "\n============================================================================\n";
-        	
+		try {
+			String error = "=============================== GM ERROR LOG ===============================\n\n";
+			error += Tasks.getStackTraceAsString(ex);
+			error += "\n============================================================================\n";
+
 			Tasks.appendStringToFile(error, (getDataFolder() + System.getProperty("file.separator") + "ERROR.LOG"));
 		} catch (IOException e) {
 			// Failed to write file.
@@ -229,19 +224,22 @@ public class GroupManager extends JavaPlugin {
 	}
 
 	public static boolean isLoaded() {
+
 		return isLoaded;
 	}
 
 	public static void setLoaded(boolean isLoaded) {
+
 		GroupManager.isLoaded = isLoaded;
 	}
 
 	public InputStream getResourceAsStream(String fileName) {
+
 		return this.getClassLoader().getResourceAsStream(fileName);
 	}
 
 	private void prepareFileFields() {
-		// configFile = new File(this.getDataFolder(), "config.yml");
+
 		backupFolder = new File(this.getDataFolder(), "backup");
 		if (!backupFolder.exists()) {
 			getBackupFolder().mkdirs();
@@ -249,16 +247,19 @@ public class GroupManager extends JavaPlugin {
 	}
 
 	private void prepareConfig() {
+
 		config = new GMConfiguration(this);
 	}
 
 	public void enableScheduler() {
+
 		if (worldsHolder != null) {
 			disableScheduler();
 			commiter = new Runnable() {
 
 				@Override
 				public void run() {
+
 					try {
 						worldsHolder.saveChanges(false);
 						GroupManager.logger.log(Level.INFO, " Data files refreshed.");
@@ -268,18 +269,19 @@ public class GroupManager extends JavaPlugin {
 				}
 			};
 			scheduler = new ScheduledThreadPoolExecutor(1);
-			long minutes = (long)getGMConfig().getSaveInterval();
+			long minutes = (long) getGMConfig().getSaveInterval();
 			if (minutes > 0) {
-			scheduler.scheduleAtFixedRate(commiter, minutes, minutes, TimeUnit.MINUTES);
+				scheduler.scheduleAtFixedRate(commiter, minutes, minutes, TimeUnit.MINUTES);
 				GroupManager.logger.info("Scheduled Data Saving is set for every " + minutes + " minutes!");
 			} else
 				GroupManager.logger.info("Scheduled Data Saving is Disabled!");
-			
+
 			GroupManager.logger.info("Backups will be retained for " + getGMConfig().getBackupDuration() + " hours!");
 		}
 	}
 
 	public void disableScheduler() {
+
 		if (scheduler != null) {
 			try {
 				scheduler.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
@@ -292,57 +294,9 @@ public class GroupManager extends JavaPlugin {
 		}
 	}
 
-	/**
-	 * Use the WorldsHolder saveChanges directly instead Saves the data on file
-	 */
-	@Deprecated
-	public void commit() {
-		if (worldsHolder != null) {
-			worldsHolder.saveChanges();
-		}
-	}
-
-	/**
-	 * Use worlds holder to reload a specific world Reloads the data
-	 */
-	@Deprecated
-	public void reload() {
-		worldsHolder.reloadAll();
-	}
-
 	public WorldsHolder getWorldsHolder() {
-		return worldsHolder;
-	}
-
-	/**
-	 * The handler in the interface created by AnjoCaido
-	 * 
-	 * @return AnjoPermissionsHandler
-	 */
-	@Deprecated
-	public AnjoPermissionsHandler getPermissionHandler() {
-		return worldsHolder.getDefaultWorld().getPermissionsHandler();
-	}
-
-	/**
-	 * A simple interface, for ones that don't want to mess with overloading.
-	 * Yet it is affected by overloading. But seamless.
-	 * 
-	 * @return the dataholder with all information
-	 */
-	@Deprecated
-	public WorldDataHolder getData() {
-		return worldsHolder.getDefaultWorld();
-	}
 
-	/**
-	 * Use this if you want to play with overloading.
-	 * 
-	 * @return a dataholder with overloading interface
-	 */
-	@Deprecated
-	public OverloadedWorldHolder getOverloadedClassData() {
-		return worldsHolder.getDefaultWorld();
+		return worldsHolder;
 	}
 
 	/**
@@ -352,26 +306,25 @@ public class GroupManager extends JavaPlugin {
 	 * @param cmd
 	 * @param args
 	 */
-	@SuppressWarnings({ "deprecation" })
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
+
 		boolean playerCanDo = false;
 		boolean isConsole = false;
 		Player senderPlayer = null, targetPlayer = null;
 		Group senderGroup = null;
 		User senderUser = null;
 		boolean isOpOverride = config.isOpOverride();
-			
 
 		// DETERMINING PLAYER INFORMATION
 		if (sender instanceof Player) {
 			senderPlayer = (Player) sender;
-			
+
 			if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
 				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
 				return true;
 			}
-			
+
 			senderUser = worldsHolder.getWorldData(senderPlayer).getUser(senderPlayer.getName());
 			senderGroup = senderUser.getGroup();
 			isOpOverride = (isOpOverride && (senderPlayer.isOp() || worldsHolder.getWorldPermissions(senderPlayer).has(senderPlayer, "groupmanager.op")));
@@ -381,12 +334,12 @@ public class GroupManager extends JavaPlugin {
 				playerCanDo = true;
 			}
 		} else if (sender instanceof ConsoleCommandSender) {
-			
+
 			if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
 				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
 				return true;
 			}
-			
+
 			isConsole = true;
 		}
 
@@ -451,29 +404,29 @@ public class GroupManager extends JavaPlugin {
 		if (isConsole || playerCanDo) {
 			switch (execCmd) {
 			case manuadd:
-				
+
 				// Validating arguments
 				if ((args.length != 2) && (args.length != 3)) {
 					sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <group> | optional [world])");
 					return false;
 				}
-				
+
 				// Select the relevant world (if specified)
 				if (args.length == 3) {
 					dataHolder = worldsHolder.getWorldData(args[2]);
 					permissionHandler = dataHolder.getPermissionsHandler();
 				}
-				
+
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
 					if (!setDefaultWorldHandler(sender))
 						return true;
 				}
-				
+
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -509,7 +462,7 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.YELLOW + "You changed player '" + auxUser.getName() + "' group to '" + auxGroup.getName() + "' in world '" + dataHolder.getName() + "'.");
 
 				return true;
-				
+
 			case manudel:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -522,9 +475,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -545,7 +498,7 @@ public class GroupManager extends JavaPlugin {
 					BukkitPermissions.updatePermissions(targetPlayer);
 
 				return true;
-				
+
 			case manuaddsub:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -561,9 +514,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -586,7 +539,7 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.RED + "The subgroup '" + auxGroup.getName() + "' is already available to '" + auxUser.getName() + "'.");
 
 				return true;
-				
+
 			case manudelsub:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -599,9 +552,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -622,12 +575,12 @@ public class GroupManager extends JavaPlugin {
 				auxUser.removeSubGroup(auxGroup);
 				sender.sendMessage(ChatColor.YELLOW + "You removed subgroup '" + auxGroup.getName() + "' from player '" + auxUser.getName() + "' list.");
 
-				//targetPlayer = this.getServer().getPlayer(auxUser.getName());
-				//if (targetPlayer != null)
-				//	BukkitPermissions.updatePermissions(targetPlayer);
+				// targetPlayer = this.getServer().getPlayer(auxUser.getName());
+				// if (targetPlayer != null)
+				// BukkitPermissions.updatePermissions(targetPlayer);
 
 				return true;
-				
+
 			case mangadd:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -649,7 +602,7 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "You created a group named: " + auxGroup.getName());
 
 				return true;
-				
+
 			case mangdel:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -673,7 +626,7 @@ public class GroupManager extends JavaPlugin {
 				BukkitPermissions.updateAllPlayers();
 
 				return true;
-				
+
 			case manuaddp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -686,9 +639,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -738,7 +691,7 @@ public class GroupManager extends JavaPlugin {
 					BukkitPermissions.updatePermissions(targetPlayer);
 
 				return true;
-				
+
 			case manudelp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -751,9 +704,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -789,7 +742,7 @@ public class GroupManager extends JavaPlugin {
 					BukkitPermissions.updatePermissions(targetPlayer);
 
 				return true;
-				
+
 			case manulistp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -801,11 +754,11 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> (+))");
 					return false;
 				}
-				
+
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -854,7 +807,7 @@ public class GroupManager extends JavaPlugin {
 				}
 
 				return true;
-								
+
 			case manucheckp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -868,9 +821,9 @@ public class GroupManager extends JavaPlugin {
 				}
 
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -881,9 +834,9 @@ public class GroupManager extends JavaPlugin {
 				permissionResult = permissionHandler.checkFullGMPermission(auxUser, args[1], false);
 
 				if (permissionResult.resultType.equals(PermissionCheckResult.Type.NOTFOUND)) {
-					//No permissions found in GM so fall through and check Bukkit.
+					// No permissions found in GM so fall through and check Bukkit.
 					sender.sendMessage(ChatColor.RED + "The player doesn't have access to that permission");
-					
+
 				} else {
 					// This permission was found in groupmanager.
 					if (permissionResult.owner instanceof User) {
@@ -909,7 +862,7 @@ public class GroupManager extends JavaPlugin {
 				}
 
 				return true;
-				
+
 			case mangaddp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -964,7 +917,7 @@ public class GroupManager extends JavaPlugin {
 				BukkitPermissions.updateAllPlayers();
 
 				return true;
-				
+
 			case mangdelp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1005,7 +958,7 @@ public class GroupManager extends JavaPlugin {
 				BukkitPermissions.updateAllPlayers();
 
 				return true;
-				
+
 			case manglistp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1054,7 +1007,7 @@ public class GroupManager extends JavaPlugin {
 
 				}
 				return true;
-				
+
 			case mangcheckp:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1078,8 +1031,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				// Seems OK
-				// auxString =
-				// permissionHandler.checkUserOnlyPermission(auxUser, args[1]);
+				// auxString = permissionHandler.checkUserOnlyPermission(auxUser, args[1]);
 				if (permissionResult.owner instanceof Group) {
 					if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
 						sender.sendMessage(ChatColor.RED + "The group inherits the a negation permission from group: " + permissionResult.owner.getName());
@@ -1090,7 +1042,7 @@ public class GroupManager extends JavaPlugin {
 
 				}
 				return true;
-				
+
 			case mangaddi:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1116,9 +1068,9 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.RED + "GlobalGroups do NOT support inheritance.");
 					return false;
 				}
-				
+
 				// Validating permission
-				if (permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) {
+				if (permissionHandler.hasGroupInInheritance(auxGroup, auxGroup2.getName())) {
 					sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " already inherits " + auxGroup2.getName() + " (might not be directly)");
 					return false;
 				}
@@ -1129,7 +1081,7 @@ public class GroupManager extends JavaPlugin {
 				BukkitPermissions.updateAllPlayers();
 
 				return true;
-				
+
 			case mangdeli:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1155,9 +1107,9 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.RED + "GlobalGroups do NOT support inheritance.");
 					return false;
 				}
-				
+
 				// Validating permission
-				if (!permissionHandler.searchGroupInInheritance(auxGroup, auxGroup2.getName(), null)) {
+				if (!permissionHandler.hasGroupInInheritance(auxGroup, auxGroup2.getName())) {
 					sender.sendMessage(ChatColor.RED + "Group " + auxGroup.getName() + " does not inherits " + auxGroup2.getName() + ".");
 					return false;
 				}
@@ -1172,7 +1124,7 @@ public class GroupManager extends JavaPlugin {
 				BukkitPermissions.updateAllPlayers();
 
 				return true;
-				
+
 			case manuaddv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1185,9 +1137,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -1204,9 +1156,9 @@ public class GroupManager extends JavaPlugin {
 				}
 				auxUser.getVariables().addVar(args[1], Variables.parseVariableValue(auxString));
 				sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + ":'" + ChatColor.GREEN + auxString + ChatColor.YELLOW + "' added to the user " + auxUser.getName());
-				
+
 				return true;
-				
+
 			case manudelv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1219,9 +1171,9 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
-				
+
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
 				} else {
@@ -1234,9 +1186,9 @@ public class GroupManager extends JavaPlugin {
 				// Seems OK
 				auxUser.getVariables().removeVar(args[1]);
 				sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + " removed from the user " + ChatColor.GREEN + auxUser.getName());
-				
+
 				return true;
-				
+
 			case manulistv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1249,7 +1201,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1269,9 +1221,9 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "Variables of user " + auxUser.getName() + ": ");
 				sender.sendMessage(auxString + ".");
 				sender.sendMessage(ChatColor.YELLOW + "Plus all variables from group: " + auxUser.getGroupName());
-				
+
 				return true;
-				
+
 			case manucheckv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1284,7 +1236,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1300,7 +1252,8 @@ public class GroupManager extends JavaPlugin {
 					if (!auxUser.isSubGroupsEmpty() && auxGroup2 == null)
 						for (Group subGroup : auxUser.subGroupListCopy()) {
 							auxGroup2 = permissionHandler.nextGroupWithVariable(subGroup, args[1]);
-							if (auxGroup2 != null) continue;
+							if (auxGroup2 != null)
+								continue;
 						}
 					if (auxGroup2 == null) {
 						sender.sendMessage(ChatColor.RED + "The user doesn't have access to that variable!");
@@ -1316,9 +1269,9 @@ public class GroupManager extends JavaPlugin {
 				if (!auxGroup.equals(auxGroup2)) {
 					sender.sendMessage(ChatColor.YELLOW + "And the value was inherited from group: " + ChatColor.GREEN + auxGroup2.getName());
 				}
-				
+
 				return true;
-				
+
 			case mangaddv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1352,7 +1305,7 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + ":'" + ChatColor.GREEN + auxString + ChatColor.YELLOW + "' added to the group " + auxGroup.getName());
 
 				return true;
-				
+
 			case mangdelv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1382,7 +1335,7 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + " removed from the group " + ChatColor.GREEN + auxGroup.getName());
 
 				return true;
-				
+
 			case manglistv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1423,9 +1376,9 @@ public class GroupManager extends JavaPlugin {
 					auxString = auxString.substring(0, auxString.lastIndexOf(","));
 					sender.sendMessage(ChatColor.YELLOW + "Plus all variables from groups: " + auxString);
 				}
-				
+
 				return true;
-				
+
 			case mangcheckv:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1447,7 +1400,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				// Validating permission
-				auxGroup2 = permissionHandler.nextGroupWithVariable(auxGroup, args[1], null);
+				auxGroup2 = permissionHandler.nextGroupWithVariable(auxGroup, args[1]);
 				if (auxGroup2 == null) {
 					sender.sendMessage(ChatColor.RED + "The group doesn't have access to that variable!");
 				}
@@ -1456,9 +1409,9 @@ public class GroupManager extends JavaPlugin {
 				if (!auxGroup.equals(auxGroup2)) {
 					sender.sendMessage(ChatColor.YELLOW + "And the value was inherited from group: " + ChatColor.GREEN + auxGroup2.getName());
 				}
-				
+
 				return true;
-				
+
 			case manwhois:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1471,7 +1424,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1490,7 +1443,7 @@ public class GroupManager extends JavaPlugin {
 					auxString = auxString.substring(0, auxString.lastIndexOf(","));
 					sender.sendMessage(ChatColor.YELLOW + "subgroups: " + auxString);
 				}
-				
+
 				sender.sendMessage(ChatColor.YELLOW + "Overloaded: " + ChatColor.GREEN + dataHolder.isOverloaded(auxUser.getName()));
 				auxGroup = dataHolder.surpassOverload(auxUser.getName()).getGroup();
 				if (!auxGroup.equals(auxUser.getGroup())) {
@@ -1498,7 +1451,7 @@ public class GroupManager extends JavaPlugin {
 				}
 				// victim.permissions.add(args[1]);
 				return true;
-				
+
 			case tempadd:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1511,7 +1464,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1532,7 +1485,7 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "Player overloaded!");
 
 				return true;
-				
+
 			case tempdel:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1545,7 +1498,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1568,7 +1521,7 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + "You removed that player's overload. He's back to normal!");
 
 				return true;
-				
+
 			case templist:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1597,9 +1550,9 @@ public class GroupManager extends JavaPlugin {
 				}
 				overloadedUsers.get(dataHolder.getName().toLowerCase()).removeAll(removeList);
 				sender.sendMessage(ChatColor.YELLOW + " " + count + " Users in overload mode: " + ChatColor.WHITE + auxString);
-				
+
 				return true;
-				
+
 			case tempdelall:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1626,14 +1579,14 @@ public class GroupManager extends JavaPlugin {
 				sender.sendMessage(ChatColor.YELLOW + " " + count + "All users in overload mode are now normal again.");
 
 				return true;
-				
+
 			case mansave:
-				
+
 				boolean forced = false;
-				
+
 				if ((args.length == 1) && (args[0].equalsIgnoreCase("force")))
 					forced = true;
-				
+
 				try {
 					worldsHolder.saveChanges(forced);
 					sender.sendMessage(ChatColor.YELLOW + " All changes were saved.");
@@ -1643,17 +1596,17 @@ public class GroupManager extends JavaPlugin {
 				return true;
 
 			case manload:
-				
+
 				/**
 				 * Attempt to reload a specific world
 				 */
 				if (args.length > 0) {
-					
+
 					if (!lastError.isEmpty()) {
 						sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
 						return true;
 					}
-					
+
 					auxString = "";
 					for (int i = 0; i < args.length; i++) {
 						auxString += args[i];
@@ -1666,7 +1619,7 @@ public class GroupManager extends JavaPlugin {
 
 					globalGroups.load();
 					worldsHolder.loadWorld(auxString);
-					
+
 					sender.sendMessage("The request to reload world '" + auxString + "' was attempted.");
 
 					isLoaded = true;
@@ -1674,29 +1627,29 @@ public class GroupManager extends JavaPlugin {
 					BukkitPermissions.updateAllPlayers();
 
 				} else {
-				
+
 					/**
 					 * Reload all settings and data as no world was specified.
 					 */
-					
+
 					/*
 					 * Reset the last error as we are attempting a fresh load.
 					 */
 					lastError = "";
 					onDisable();
 					onEnable();
-					
+
 					sender.sendMessage("All settings and worlds were reloaded!");
 				}
-				
+
 				/**
 				 * Fire an event as none will have been triggered in the reload.
 				 */
 				if (GroupManager.isLoaded())
-		        	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
+					GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
 
 				return true;
-				
+
 			case listgroups:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1715,9 +1668,9 @@ public class GroupManager extends JavaPlugin {
 					auxString = auxString.substring(0, auxString.lastIndexOf(","));
 				}
 				sender.sendMessage(ChatColor.YELLOW + " Groups Available: " + ChatColor.WHITE + auxString);
-				
+
 				return true;
-				
+
 			case manpromote:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1730,7 +1683,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1773,7 +1726,7 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.YELLOW + "You changed " + auxUser.getName() + " group to " + auxGroup.getName() + ".");
 
 				return true;
-				
+
 			case mandemote:
 				// Validating state of sender
 				if (dataHolder == null || permissionHandler == null) {
@@ -1786,7 +1739,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
-						return false;
+					return false;
 				}
 				if (match != null) {
 					auxUser = dataHolder.getUser(match.get(0));
@@ -1829,7 +1782,7 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.YELLOW + "You changed " + auxUser.getName() + " group to " + auxGroup.getName() + ".");
 
 				return true;
-				
+
 			case mantogglevalidate:
 				validateOnlinePlayer = !validateOnlinePlayer;
 				sender.sendMessage(ChatColor.YELLOW + "Validade if player is online, now set to: " + Boolean.toString(validateOnlinePlayer));
@@ -1860,9 +1813,9 @@ public class GroupManager extends JavaPlugin {
 						sender.sendMessage(ChatColor.YELLOW + "Your world now uses permissions of world name: '" + dataHolder.getName() + "' ");
 					}
 				}
-				
+
 				return true;
-				
+
 			case manselect:
 				if (args.length < 1) {
 					sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <world>)");
@@ -1893,9 +1846,9 @@ public class GroupManager extends JavaPlugin {
 				permissionHandler = dataHolder.getPermissionsHandler();
 				selectedWorlds.put(sender, dataHolder.getName());
 				sender.sendMessage(ChatColor.YELLOW + "You have selected world '" + dataHolder.getName() + "'.");
-				
+
 				return true;
-				
+
 			case manclear:
 				if (args.length != 0) {
 					sender.sendMessage(ChatColor.RED + "Review your arguments count!");
@@ -1903,9 +1856,9 @@ public class GroupManager extends JavaPlugin {
 				}
 				selectedWorlds.remove(sender);
 				sender.sendMessage(ChatColor.YELLOW + "You have removed your world selection. Working with current world(if possible).");
-				
+
 				return true;
-				
+
 			default:
 				break;
 			}
@@ -1955,7 +1908,7 @@ public class GroupManager extends JavaPlugin {
 		}
 
 	}
-	
+
 	/**
 	 * Load a List of players matching the name given. If none online, check
 	 * Offline.
@@ -1974,7 +1927,7 @@ public class GroupManager extends JavaPlugin {
 			if (Arrays.asList(this.getServer().getOfflinePlayers()).contains(Bukkit.getOfflinePlayer(playerName))) {
 				match.add(playerName);
 			} else {
-				//look for partial matches
+				// look for partial matches
 				for (OfflinePlayer offline : this.getServer().getOfflinePlayers()) {
 					if (offline.getName().toLowerCase().startsWith(playerName.toLowerCase()))
 						match.add(offline.getName());
@@ -1994,7 +1947,7 @@ public class GroupManager extends JavaPlugin {
 			sender.sendMessage(ChatColor.RED + "Too many matches found! (" + match.toString() + ")");
 			return null;
 		}
-		
+
 		return match;
 
 	}
@@ -2003,6 +1956,7 @@ public class GroupManager extends JavaPlugin {
 	 * @return the config
 	 */
 	public GMConfiguration getGMConfig() {
+
 		return config;
 	}
 
@@ -2010,10 +1964,12 @@ public class GroupManager extends JavaPlugin {
 	 * @return the backupFolder
 	 */
 	public File getBackupFolder() {
+
 		return backupFolder;
 	}
 
 	public static GlobalGroups getGlobalGroups() {
+
 		return globalGroups;
 
 	}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/Tasks/BukkitPermsUpdateTask.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/Tasks/BukkitPermsUpdateTask.java
index f4b805c35..1a0fc2369 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/Tasks/BukkitPermsUpdateTask.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/Tasks/BukkitPermsUpdateTask.java
@@ -5,24 +5,25 @@ import org.anjocaido.groupmanager.GroupManager;
 /*

  * 

  * Created by ElgarL

- * 

  */

 

 public class BukkitPermsUpdateTask implements Runnable {

-	

+

 	public BukkitPermsUpdateTask() {

-        super();

+

+		super();

 	}

-	

+

 	@Override

 	public void run() {

+

 		// Signal loaded and update BukkitPermissions.

 		GroupManager.setLoaded(true);

 		GroupManager.BukkitPermissions.collectPermissions();

 		GroupManager.BukkitPermissions.updateAllPlayers();

-		

+

 		GroupManager.logger.info("Bukkit Permissions Updated!");

-		

+

 	}

-	

+

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index e3250a1c1..bb04fa3d7 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -13,151 +13,169 @@ import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.utils.StringPermissionComparator;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public abstract class DataUnit {
 
-    private WorldDataHolder dataSource;
-    private String name;
-    private boolean changed, sorted = false;
-    private ArrayList<String> permissions = new ArrayList<String>();
+	private WorldDataHolder dataSource;
+	private String name;
+	private boolean changed, sorted = false;
+	private ArrayList<String> permissions = new ArrayList<String>();
 
-    public DataUnit(WorldDataHolder dataSource, String name) {
-        this.dataSource = dataSource;
-        this.name = name;
-    }
+	public DataUnit(WorldDataHolder dataSource, String name) {
 
-    public DataUnit(String name) {
-    	this.name = name;
+		this.dataSource = dataSource;
+		this.name = name;
+	}
+
+	public DataUnit(String name) {
+
+		this.name = name;
+	}
+
+	/**
+	 * Every group is matched only by their names and DataSources names.
+	 * 
+	 * @param o
+	 * @return true if they are equal. false if not.
+	 */
+	@Override
+	public boolean equals(Object o) {
+
+		if (o instanceof DataUnit) {
+			DataUnit go = (DataUnit) o;
+			if (this.getName().equalsIgnoreCase(go.getName())) {
+				// Global Group match.
+				if (this.dataSource == null && go.getDataSource() == null)
+					return true;
+				// This is a global group, the object to test isn't.
+				if (this.dataSource == null && go.getDataSource() != null)
+					return false;
+				// This is not a global group, but the object to test is.
+				if (this.dataSource != null && go.getDataSource() == null)
+					return false;
+				// Match on group name and world name.
+				if (this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName()))
+					return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+
+		int hash = 5;
+		hash = 71 * hash + (this.name != null ? this.name.toLowerCase().hashCode() : 0);
+		return hash;
+	}
+
+	/**
+	 * Set the data source to point to a different worldDataHolder
+	 * 
+	 * @param source
+	 */
+	public void setDataSource(WorldDataHolder source) {
+
+		this.dataSource = source;
+	}
+
+	/**
+	 * Get the current worldDataHolder this object is pointing to
+	 * 
+	 * @return the dataSource
+	 */
+	public WorldDataHolder getDataSource() {
+
+		return dataSource;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+
+		return name;
+	}
+
+	public void flagAsChanged() {
+
+		WorldDataHolder testSource = getDataSource();
+		String source = "";
+
+		if (testSource == null)
+			source = "GlobalGroups";
+		else
+			source = testSource.getName();
+
+		GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as changed!");
+		// for(StackTraceElement st: Thread.currentThread().getStackTrace()){
+		// GroupManager.logger.finest(st.toString());
+		// }
+		sorted = false;
+		changed = true;
+	}
+
+	public boolean isChanged() {
+
+		return changed;
+	}
+
+	public void flagAsSaved() {
+
+		WorldDataHolder testSource = getDataSource();
+		String source = "";
+
+		if (testSource == null)
+			source = "GlobalGroups";
+		else
+			source = testSource.getName();
+
+		GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as saved!");
+		changed = false;
+	}
+
+	public boolean hasSamePermissionNode(String permission) {
+
+		return permissions.contains(permission);
+	}
+
+	public void addPermission(String permission) {
+
+		if (!hasSamePermissionNode(permission)) {
+			permissions.add(permission);
+		}
+		flagAsChanged();
+	}
+
+	public boolean removePermission(String permission) {
+
+		flagAsChanged();
+		return permissions.remove(permission);
 	}
 
 	/**
-     * Every group is matched only by their names and DataSources names.
-     * @param o
-     * @return true if they are equal. false if not.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof DataUnit) {
-            DataUnit go = (DataUnit) o;
-            if (this.getName().equalsIgnoreCase(go.getName())) {
-            	// Global Group match.
-            	if (this.dataSource == null && go.getDataSource() == null)
-            		return true;
-            	// This is a global group, the object to test isn't.
-            	if (this.dataSource == null && go.getDataSource() != null)
-            		return false;
-            	// This is not a global group, but the object to test is.
-            	if (this.dataSource != null && go.getDataSource() == null)
-            		return false;
-            	// Match on group name and world name.
-            	if (this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName()))
-            		return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 71 * hash + (this.name != null ? this.name.toLowerCase().hashCode() : 0);
-        return hash;
-    }
-    
-    /**
-     * Set the data source to point to a different worldDataHolder
-     * 
-     * @param source
-     */
-    public void setDataSource(WorldDataHolder source) {
-    	this.dataSource = source;
-    }
-
-    /**
-     * Get the current worldDataHolder this object is pointing to
-     * 
-     * @return the dataSource
-     */
-    public WorldDataHolder getDataSource() {
-        return dataSource;
-    }
-
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void flagAsChanged() {
-    	WorldDataHolder testSource = getDataSource();
-    	String source = "";
-    	
-    	if (testSource == null)
-    		source = "GlobalGroups";
-    	else
-    		source = testSource.getName();
-    	
-        GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as changed!");
-// for(StackTraceElement st: Thread.currentThread().getStackTrace()){
-// GroupManager.logger.finest(st.toString());
-// }
-        sorted = false;
-        changed = true;
-    }
-
-    public boolean isChanged() {
-        return changed;
-    }
-
-    public void flagAsSaved() {
-    	WorldDataHolder testSource = getDataSource();
-    	String source = "";
-    	
-    	if (testSource == null)
-    		source = "GlobalGroups";
-    	else
-    		source = testSource.getName();
-    	
-        GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as saved!");
-        changed = false;
-    }
-
-    public boolean hasSamePermissionNode(String permission) {
-        return permissions.contains(permission);
-    }
-
-    public void addPermission(String permission) {
-        if (!hasSamePermissionNode(permission)) {
-            permissions.add(permission);
-        }
-        flagAsChanged();
-    }
-
-    public boolean removePermission(String permission) {
-        flagAsChanged();
-        return permissions.remove(permission);
-    }
-
-    /**
-     * Use this only to list permissions.
-     * You can't edit the permissions using the returned ArrayList instance
-     * @return a copy of the permission list
-     */
-    public List<String> getPermissionList() {
-        return Collections.unmodifiableList(permissions);
-    }
-    
-    public boolean isSorted() {
-    	return this.sorted;
-    }
-
-    public void sortPermissions() {
-        if (!isSorted()) {
-        	Collections.sort(permissions, StringPermissionComparator.getInstance());
-        	sorted = true;
-        }
-    }
+	 * Use this only to list permissions.
+	 * You can't edit the permissions using the returned ArrayList instance
+	 * 
+	 * @return a copy of the permission list
+	 */
+	public List<String> getPermissionList() {
+
+		return Collections.unmodifiableList(permissions);
+	}
+
+	public boolean isSorted() {
+
+		return this.sorted;
+	}
+
+	public void sortPermissions() {
+
+		if (!isSorted()) {
+			Collections.sort(permissions, StringPermissionComparator.getInstance());
+			sorted = true;
+		}
+	}
 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index 56ef7e870..751dc8fd6 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -15,160 +15,173 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
+ * 
  * @author gabrielcouto/ElgarL
  */
 public class Group extends DataUnit implements Cloneable {
 
-    /**
-     * The group it inherits DIRECTLY!
-     */
-    private ArrayList<String> inherits = new ArrayList<String>();
-    /**
-     *This one holds the fields in INFO node.
-     * like prefix = 'c'
-     * or build = false
-     */
-    private GroupVariables variables = new GroupVariables(this);
-
-    /**
-     * Constructor for individual World Groups.
-     *
-     * @param name
-     */
-    public Group(WorldDataHolder source, String name) {
-        super(source, name);
-    }
-    
-    /**
-     *  Constructor for Global Groups.
-     *  
-     * @param name
-     */
-    public Group(String name) {
-        super(name);
-    }
-    
-    /**
-     * Is this a GlobalGroup
-     * 
-     * @return true if this is a global group
-     */
-    public boolean isGlobal() {
-    	return (getDataSource() == null);
-    }
-	
-    /**
-     * Clone this group
-     * @return a clone of this group
-     */
-    @Override
-    public Group clone() {
-    	Group clone;
-    	
-    	if (isGlobal()) {
-    		clone = new Group(this.getName());
-    	} else {
-    		clone = new Group(getDataSource(), this.getName());
-    		clone.inherits = new ArrayList<String>(this.getInherits());
-    	}
-    	
-        for (String perm : this.getPermissionList()) {
-            clone.addPermission(perm);
-        }
-        clone.variables = ((GroupVariables) variables).clone(clone);
-        //clone.flagAsChanged();
-        return clone;
-    }
-
-    /**
-     * Use this to deliver a group from a different dataSource to another
-     * @param dataSource
-     * @return Null or Clone
-     */
-    public Group clone(WorldDataHolder dataSource) {
-        if (dataSource.groupExists(this.getName())) {
-            return null;
-        }
-        
-        Group clone = dataSource.createGroup(this.getName());
-        
-        // Don't add inheritance for GlobalGroups
-        if (!isGlobal()) {
-    		clone.inherits = new ArrayList<String>(this.getInherits());
-    	}
-        for (String perm : this.getPermissionList()) {
-            clone.addPermission(perm);
-        }
-        clone.variables = variables.clone(clone);
-        clone.flagAsChanged(); //use this to make the new dataSource save the new group
-        return clone;
-    }
-
-    /**
-     * an unmodifiable list of inherits list
-     * You can't manage the list by here
-     * Lol... version 0.6 had a problem because this.
-     * @return the inherits
-     */
-    public List<String> getInherits() {
-        return Collections.unmodifiableList(inherits);
-    }
-
-    /**
-     * @param inherit the inherits to set
-     */
-    public void addInherits(Group inherit) {
-    	if (!isGlobal()) {
-	        if (!this.getDataSource().groupExists(inherit.getName())) {
-	            getDataSource().addGroup(inherit);
-	        }
-	        if (!inherits.contains(inherit.getName().toLowerCase())) {
-	            inherits.add(inherit.getName().toLowerCase());
-	        }
-	        flagAsChanged();
-	        if (GroupManager.isLoaded()) {
-	        	GroupManager.BukkitPermissions.updateAllPlayers();
-	        	GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
-	        }
-    	}
-    }
-
-    public boolean removeInherits(String inherit) {
-    	if (!isGlobal()) {
-	        if (this.inherits.contains(inherit.toLowerCase())) {
-	            this.inherits.remove(inherit.toLowerCase());
-	            flagAsChanged();
-	            GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
-	            return true;
-	        }
-    	}
-        return false;
-    }
-
-    /**
-     * @return the variables
-     */
-    public GroupVariables getVariables() {
-        return variables;
-    }
-
-    /**
-     *
-     * @param varList
-     */
-    public void setVariables(Map<String, Object> varList) {
-    	if (!isGlobal()) {
-	        GroupVariables temp = new GroupVariables(this, varList);
-	        variables.clearVars();
-	        for (String key : temp.getVarKeyList()) {
-	            variables.addVar(key, temp.getVarObject(key));
-	        }
-	        flagAsChanged();
-	        if (GroupManager.isLoaded()) {
-	        	GroupManager.BukkitPermissions.updateAllPlayers();
-	        	GroupManagerEventHandler.callEvent(this, Action.GROUP_INFO_CHANGED);
-	        }
-    	}
-    }
+	/**
+	 * The group it inherits DIRECTLY!
+	 */
+	private ArrayList<String> inherits = new ArrayList<String>();
+	/**
+	 * This one holds the fields in INFO node.
+	 * like prefix = 'c'
+	 * or build = false
+	 */
+	private GroupVariables variables = new GroupVariables(this);
+
+	/**
+	 * Constructor for individual World Groups.
+	 * 
+	 * @param name
+	 */
+	public Group(WorldDataHolder source, String name) {
+
+		super(source, name);
+	}
+
+	/**
+	 * Constructor for Global Groups.
+	 * 
+	 * @param name
+	 */
+	public Group(String name) {
+
+		super(name);
+	}
+
+	/**
+	 * Is this a GlobalGroup
+	 * 
+	 * @return true if this is a global group
+	 */
+	public boolean isGlobal() {
+
+		return (getDataSource() == null);
+	}
+
+	/**
+	 * Clone this group
+	 * 
+	 * @return a clone of this group
+	 */
+	@Override
+	public Group clone() {
+
+		Group clone;
+
+		if (isGlobal()) {
+			clone = new Group(this.getName());
+		} else {
+			clone = new Group(getDataSource(), this.getName());
+			clone.inherits = new ArrayList<String>(this.getInherits());
+		}
+
+		for (String perm : this.getPermissionList()) {
+			clone.addPermission(perm);
+		}
+		clone.variables = ((GroupVariables) variables).clone(clone);
+		//clone.flagAsChanged();
+		return clone;
+	}
+
+	/**
+	 * Use this to deliver a group from a different dataSource to another
+	 * 
+	 * @param dataSource
+	 * @return Null or Clone
+	 */
+	public Group clone(WorldDataHolder dataSource) {
+
+		if (dataSource.groupExists(this.getName())) {
+			return null;
+		}
+
+		Group clone = dataSource.createGroup(this.getName());
+
+		// Don't add inheritance for GlobalGroups
+		if (!isGlobal()) {
+			clone.inherits = new ArrayList<String>(this.getInherits());
+		}
+		for (String perm : this.getPermissionList()) {
+			clone.addPermission(perm);
+		}
+		clone.variables = variables.clone(clone);
+		clone.flagAsChanged(); //use this to make the new dataSource save the new group
+		return clone;
+	}
+
+	/**
+	 * an unmodifiable list of inherits list
+	 * You can't manage the list by here
+	 * Lol... version 0.6 had a problem because this.
+	 * 
+	 * @return the inherits
+	 */
+	public List<String> getInherits() {
+
+		return Collections.unmodifiableList(inherits);
+	}
+
+	/**
+	 * @param inherit the inherits to set
+	 */
+	public void addInherits(Group inherit) {
+
+		if (!isGlobal()) {
+			if (!this.getDataSource().groupExists(inherit.getName())) {
+				getDataSource().addGroup(inherit);
+			}
+			if (!inherits.contains(inherit.getName().toLowerCase())) {
+				inherits.add(inherit.getName().toLowerCase());
+			}
+			flagAsChanged();
+			if (GroupManager.isLoaded()) {
+				GroupManager.BukkitPermissions.updateAllPlayers();
+				GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
+			}
+		}
+	}
+
+	public boolean removeInherits(String inherit) {
+
+		if (!isGlobal()) {
+			if (this.inherits.contains(inherit.toLowerCase())) {
+				this.inherits.remove(inherit.toLowerCase());
+				flagAsChanged();
+				GroupManagerEventHandler.callEvent(this, Action.GROUP_INHERITANCE_CHANGED);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return the variables
+	 */
+	public GroupVariables getVariables() {
+
+		return variables;
+	}
+
+	/**
+	 * 
+	 * @param varList
+	 */
+	public void setVariables(Map<String, Object> varList) {
+
+		if (!isGlobal()) {
+			GroupVariables temp = new GroupVariables(this, varList);
+			variables.clearVars();
+			for (String key : temp.getVarKeyList()) {
+				variables.addVar(key, temp.getVarObject(key));
+			}
+			flagAsChanged();
+			if (GroupManager.isLoaded()) {
+				GroupManager.BukkitPermissions.updateAllPlayers();
+				GroupManagerEventHandler.callEvent(this, Action.GROUP_INFO_CHANGED);
+			}
+		}
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
index 19db58851..e08d1db7d 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
@@ -7,81 +7,88 @@ package org.anjocaido.groupmanager.data;
 import java.util.Map;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class GroupVariables extends Variables implements Cloneable {
 
-    private Group owner;
+	private Group owner;
 
-    public GroupVariables(Group owner) {
-        super(owner);
-        this.owner = owner;
-        addVar("prefix", "");
-        addVar("suffix", "");
-        addVar("build", false);
-    }
+	public GroupVariables(Group owner) {
 
-    public GroupVariables(Group owner, Map<String, Object> varList) {
-        super(owner);
-        variables = varList;
-        if (variables.get("prefix") == null) {
-            variables.put("prefix", "");
-            owner.flagAsChanged();
-        }
-        //thisGrp.prefix = infoNode.get("prefix").toString();
+		super(owner);
+		this.owner = owner;
+		addVar("prefix", "");
+		addVar("suffix", "");
+		addVar("build", false);
+	}
 
-        if (variables.get("suffix") == null) {
-            variables.put("suffix", "");
-            owner.flagAsChanged();
-        }
-        //thisGrp.suffix = infoNode.get("suffix").toString();
+	public GroupVariables(Group owner, Map<String, Object> varList) {
 
-        if (variables.get("build") == null) {
-            variables.put("build", false);
-            owner.flagAsChanged();
-        }
-        this.owner = owner;
-    }
+		super(owner);
+		variables = varList;
+		if (variables.get("prefix") == null) {
+			variables.put("prefix", "");
+			owner.flagAsChanged();
+		}
+		//thisGrp.prefix = infoNode.get("prefix").toString();
 
-    /**
-     * A clone of all vars here.
-     * @return GroupVariables clone
-     */
-    protected GroupVariables clone(Group newOwner) {
-        GroupVariables clone = new GroupVariables(newOwner);
-        for (String key : variables.keySet()) {
-            clone.variables.put(key, variables.get(key));
-        }
-        newOwner.flagAsChanged();
-        return clone;
-    }
+		if (variables.get("suffix") == null) {
+			variables.put("suffix", "");
+			owner.flagAsChanged();
+		}
+		//thisGrp.suffix = infoNode.get("suffix").toString();
 
-    /**
-     * Remove a var from the list
-     * @param name
-     */
-    @Override
-    public void removeVar(String name) {
-        try {
-            this.variables.remove(name);
-        } catch (Exception e) {
-        }
-        if (name.equals("prefix")) {
-            addVar("prefix", "");
-        } else if (name.equals("suffix")) {
-            addVar("suffix", "");
-        } else if (name.equals("build")) {
-            addVar("build", false);
-        }
-        owner.flagAsChanged();
-    }
+		if (variables.get("build") == null) {
+			variables.put("build", false);
+			owner.flagAsChanged();
+		}
+		this.owner = owner;
+	}
 
-    /**
-     * @return the owner
-     */
-    @Override
-    public Group getOwner() {
-        return owner;
-    }
+	/**
+	 * A clone of all vars here.
+	 * 
+	 * @return GroupVariables clone
+	 */
+	protected GroupVariables clone(Group newOwner) {
+
+		GroupVariables clone = new GroupVariables(newOwner);
+		for (String key : variables.keySet()) {
+			clone.variables.put(key, variables.get(key));
+		}
+		newOwner.flagAsChanged();
+		return clone;
+	}
+
+	/**
+	 * Remove a var from the list
+	 * 
+	 * @param name
+	 */
+	@Override
+	public void removeVar(String name) {
+
+		try {
+			this.variables.remove(name);
+		} catch (Exception e) {
+		}
+		if (name.equals("prefix")) {
+			addVar("prefix", "");
+		} else if (name.equals("suffix")) {
+			addVar("suffix", "");
+		} else if (name.equals("build")) {
+			addVar("build", false);
+		}
+		owner.flagAsChanged();
+	}
+
+	/**
+	 * @return the owner
+	 */
+	@Override
+	public Group getOwner() {
+
+		return owner;
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
index 217ab904e..c10658fb0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
@@ -16,7 +16,6 @@ import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-
 /**
  * 
  * @author gabrielcouto/ElgarL
@@ -40,6 +39,7 @@ public class User extends DataUnit implements Cloneable {
 	 * @param name
 	 */
 	public User(WorldDataHolder source, String name) {
+
 		super(source, name);
 		this.group = source.getDefaultGroup().getName();
 	}
@@ -50,6 +50,7 @@ public class User extends DataUnit implements Cloneable {
 	 */
 	@Override
 	public User clone() {
+
 		User clone = new User(getDataSource(), this.getName());
 		clone.group = this.group;
 		for (String perm : this.getPermissionList()) {
@@ -67,6 +68,7 @@ public class User extends DataUnit implements Cloneable {
 	 * @return null if given dataSource already contains the same user
 	 */
 	public User clone(WorldDataHolder dataSource) {
+
 		if (dataSource.isUserDeclared(this.getName())) {
 			return null;
 		}
@@ -85,6 +87,7 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	public Group getGroup() {
+
 		Group result = getDataSource().getGroup(group);
 		if (result == null) {
 			this.setGroup(getDataSource().getDefaultGroup());
@@ -97,6 +100,7 @@ public class User extends DataUnit implements Cloneable {
 	 * @return the group
 	 */
 	public String getGroupName() {
+
 		Group result = getDataSource().getGroup(group);
 		if (result == null) {
 			group = getDataSource().getDefaultGroup().getName();
@@ -104,33 +108,23 @@ public class User extends DataUnit implements Cloneable {
 		return group;
 	}
 
-	/**
-	 * @param group
-	 *            the group to set
-	 */
-	@Deprecated
-	public void setGroup(String group) {
-		this.group = group;
-		flagAsChanged();
-		if (GroupManager.isLoaded())
-			if (!GroupManager.BukkitPermissions.isPlayer_join())
-				GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
-	}
 
 	/**
 	 * @param group
 	 *            the group to set
 	 */
 	public void setGroup(Group group) {
+
 		setGroup(group, true);
 	}
-		
+
 	/**
 	 * @param group the group to set
 	 * @param updatePerms if we are to trigger a superperms update.
-	 *            
+	 * 
 	 */
 	public void setGroup(Group group, Boolean updatePerms) {
+
 		if (!this.getDataSource().groupExists(group.getName())) {
 			getDataSource().addGroup(group);
 		}
@@ -151,12 +145,13 @@ public class User extends DataUnit implements Cloneable {
 
 			if (notify)
 				GroupManager.notify(this.getName(), String.format(" moved to the group %s.", group.getName()));
-			
+
 			GroupManagerEventHandler.callEvent(this, Action.USER_GROUP_CHANGED);
 		}
 	}
 
 	public boolean addSubGroup(Group subGroup) {
+
 		// Don't allow adding a subgroup if it's already set as the primary.
 		if (this.group.equalsIgnoreCase(subGroup.getName())) {
 			return false;
@@ -164,12 +159,12 @@ public class User extends DataUnit implements Cloneable {
 		// User already has this subgroup
 		if (containsSubGroup(subGroup))
 			return false;
-		
+
 		// If the group doesn't exists add it
 		if (!this.getDataSource().groupExists(subGroup.getName())) {
 			getDataSource().addGroup(subGroup);
 		}
-		
+
 		subGroups.add(subGroup.getName());
 		flagAsChanged();
 		if (GroupManager.isLoaded()) {
@@ -178,25 +173,29 @@ public class User extends DataUnit implements Cloneable {
 			GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED);
 		}
 		return true;
-			
+
 		//subGroup = getDataSource().getGroup(subGroup.getName());
 		//removeSubGroup(subGroup);
 		//subGroups.add(subGroup.getName());
 	}
 
 	public int subGroupsSize() {
+
 		return subGroups.size();
 	}
 
 	public boolean isSubGroupsEmpty() {
+
 		return subGroups.isEmpty();
 	}
 
 	public boolean containsSubGroup(Group subGroup) {
+
 		return subGroups.contains(subGroup.getName());
 	}
 
 	public boolean removeSubGroup(Group subGroup) {
+
 		try {
 			if (subGroups.remove(subGroup.getName())) {
 				flagAsChanged();
@@ -212,6 +211,7 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	public ArrayList<Group> subGroupListCopy() {
+
 		ArrayList<Group> val = new ArrayList<Group>();
 		for (String gstr : subGroups) {
 			Group g = getDataSource().getGroup(gstr);
@@ -225,6 +225,7 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	public ArrayList<String> subGroupListStringCopy() {
+
 		return new ArrayList<String>(subGroups);
 	}
 
@@ -232,6 +233,7 @@ public class User extends DataUnit implements Cloneable {
 	 * @return the variables
 	 */
 	public UserVariables getVariables() {
+
 		return variables;
 	}
 
@@ -240,6 +242,7 @@ public class User extends DataUnit implements Cloneable {
 	 * @param varList
 	 */
 	public void setVariables(Map<String, Object> varList) {
+
 		//UserVariables temp = new UserVariables(this, varList);
 		variables.clearVars();
 		for (String key : varList.keySet()) {
@@ -254,6 +257,7 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	public User updatePlayer(Player player) {
+
 		if (player != null) {
 			bukkitPlayer = player;
 		}
@@ -261,6 +265,7 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	public Player getBukkitPlayer() {
+
 		if (bukkitPlayer == null) {
 			bukkitPlayer = Bukkit.getPlayer(this.getName());
 		}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
index 0b3948cab..f994595c1 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
@@ -7,42 +7,47 @@ package org.anjocaido.groupmanager.data;
 import java.util.Map;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class UserVariables extends Variables {
 
-    private User owner;
-
-    public UserVariables(User owner) {
-        super(owner);
-        this.owner = owner;
-    }
-
-    public UserVariables(User owner, Map<String, Object> varList) {
-        super(owner);
-        this.variables = varList;
-        this.owner = owner;
-    }
-
-    /**
-     * A clone of all vars here.
-     * @return UserVariables clone
-     */
-    protected UserVariables clone(User newOwner) {
-        UserVariables clone = new UserVariables(newOwner);
-        for (String key : variables.keySet()) {
-            clone.variables.put(key, variables.get(key));
-        }
-        newOwner.flagAsChanged();
-        return clone;
-    }
-
-    /**
-     * @return the owner
-     */
-    @Override
-    public User getOwner() {
-        return owner;
-    }
+	private User owner;
+
+	public UserVariables(User owner) {
+
+		super(owner);
+		this.owner = owner;
+	}
+
+	public UserVariables(User owner, Map<String, Object> varList) {
+
+		super(owner);
+		this.variables = varList;
+		this.owner = owner;
+	}
+
+	/**
+	 * A clone of all vars here.
+	 * 
+	 * @return UserVariables clone
+	 */
+	protected UserVariables clone(User newOwner) {
+
+		UserVariables clone = new UserVariables(newOwner);
+		for (String key : variables.keySet()) {
+			clone.variables.put(key, variables.get(key));
+		}
+		newOwner.flagAsChanged();
+		return clone;
+	}
+
+	/**
+	 * @return the owner
+	 */
+	@Override
+	public User getOwner() {
+
+		return owner;
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
index 140d6626a..42ceba7e4 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
@@ -9,178 +9,200 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- *A class that holds variables of a user/group.
+ * A class that holds variables of a user/group.
  * In groups, it holds the contents of INFO node.
  * Like:
  * prefix
  * suffix
  * build
- *
+ * 
  * @author gabrielcouto
  */
 public abstract class Variables implements Cloneable {
 
-    private DataUnit owner;
-    protected Map<String, Object> variables = new HashMap<String, Object>();
-
-    public Variables(DataUnit owner) {
-        this.owner = owner;
-    }
-
-    /**
-     * Add var to the the INFO node.
-     * examples:
-     * addVar("build",true);
-     * addVar("prefix","c");
-     * @param name key name of the var
-     * @param o the object value of the var
-     */
-    public void addVar(String name, Object o) {
-        if (o == null) {
-            return;
-        }
-        if (variables.containsKey(name)) {
-            variables.remove(name);
-        }
-        variables.put(name, o);
-        owner.flagAsChanged();
-    }
-
-    /**
-     * Returns the object inside the var
-     * @param name
-     * @return a Object if exists. null if doesn't exists
-     */
-    public Object getVarObject(String name) {
-        return variables.get(name);
-    }
-
-    /**
-     * Get the String value for the given var name
-     * @param name the var key name
-     * @return "" if null. or the toString() value of object
-     */
-    public String getVarString(String name) {
-        Object o = variables.get(name);
-        try {
-            return o == null ? "" : o.toString();
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
-    /**
-     *
-     * @param name
-     * @return false if null. or a Boolean.parseBoolean of the string
-     */
-    public Boolean getVarBoolean(String name) {
-        Object o = variables.get(name);
-        try {
-            return o == null ? false : Boolean.parseBoolean(o.toString());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     *
-     * @param name
-     * @return -1 if null. or a parseInt of the string
-     */
-    public Integer getVarInteger(String name) {
-        Object o = variables.get(name);
-        try {
-            return o == null ? -1 : Integer.parseInt(o.toString());
-        } catch (Exception e) {
-            return -1;
-        }
-    }
-
-    /**
-     *
-     * @param name
-     * @return -1 if null. or a parseDouble of the string
-     */
-    public Double getVarDouble(String name) {
-        Object o = variables.get(name);
-        try {
-            return o == null ? -1.0D : Double.parseDouble(o.toString());
-        } catch (Exception e) {
-            return -1.0D;
-        }
-    }
-
-    /**
-     * All variable keys this is holding
-     * @return Set of all variable names.
-     */
-    public Set<String> getVarKeyList() {
-        return variables.keySet();
-    }
-
-    /**
-     * verify is a var exists
-     * @param name the key name of the var
-     * @return true if that var exists
-     */
-    public boolean hasVar(String name) {
-        return variables.containsKey(name);
-    }
-
-    /**
-     * Returns the quantity of vars this is holding
-     * @return the number of vars
-     */
-    public int getSize() {
-        return variables.size();
-    }
-
-    /**
-     * Remove a var from the list
-     * @param name
-     */
-    public void removeVar(String name) {
-        try {
-            variables.remove(name);
-        } catch (Exception e) {
-        }
-        owner.flagAsChanged();
-    }
-
-    public static Object parseVariableValue(String value) {
-        try {
-            Integer i = Integer.parseInt(value);
-            return i;
-        } catch (NumberFormatException e) {
-        }
-        try {
-            Double d = Double.parseDouble(value);
-            return d;
-        } catch (NumberFormatException e) {
-        }
-        if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("yes") || value.equalsIgnoreCase("on")) {
-            return true;
-        } else if (value.equalsIgnoreCase("false") || value.equalsIgnoreCase("no") || value.equalsIgnoreCase("off")) {
-            return false;
-        }
-        return value;
-
-    }
-
-    public void clearVars() {
-        variables.clear();
-        owner.flagAsChanged();
-    }
-
-    /**
-     * @return the owner
-     */
-    public DataUnit getOwner() {
-        return owner;
-    }
-
-    public boolean isEmpty() {
-        return variables.isEmpty();
-    }
+	private DataUnit owner;
+	protected Map<String, Object> variables = new HashMap<String, Object>();
+
+	public Variables(DataUnit owner) {
+
+		this.owner = owner;
+	}
+
+	/**
+	 * Add var to the the INFO node.
+	 * examples:
+	 * addVar("build",true);
+	 * addVar("prefix","c");
+	 * 
+	 * @param name key name of the var
+	 * @param o the object value of the var
+	 */
+	public void addVar(String name, Object o) {
+
+		if (o == null) {
+			return;
+		}
+		if (variables.containsKey(name)) {
+			variables.remove(name);
+		}
+		variables.put(name, o);
+		owner.flagAsChanged();
+	}
+
+	/**
+	 * Returns the object inside the var
+	 * 
+	 * @param name
+	 * @return a Object if exists. null if doesn't exists
+	 */
+	public Object getVarObject(String name) {
+
+		return variables.get(name);
+	}
+
+	/**
+	 * Get the String value for the given var name
+	 * 
+	 * @param name the var key name
+	 * @return "" if null. or the toString() value of object
+	 */
+	public String getVarString(String name) {
+
+		Object o = variables.get(name);
+		try {
+			return o == null ? "" : o.toString();
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	/**
+	 * 
+	 * @param name
+	 * @return false if null. or a Boolean.parseBoolean of the string
+	 */
+	public Boolean getVarBoolean(String name) {
+
+		Object o = variables.get(name);
+		try {
+			return o == null ? false : Boolean.parseBoolean(o.toString());
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	/**
+	 * 
+	 * @param name
+	 * @return -1 if null. or a parseInt of the string
+	 */
+	public Integer getVarInteger(String name) {
+
+		Object o = variables.get(name);
+		try {
+			return o == null ? -1 : Integer.parseInt(o.toString());
+		} catch (Exception e) {
+			return -1;
+		}
+	}
+
+	/**
+	 * 
+	 * @param name
+	 * @return -1 if null. or a parseDouble of the string
+	 */
+	public Double getVarDouble(String name) {
+
+		Object o = variables.get(name);
+		try {
+			return o == null ? -1.0D : Double.parseDouble(o.toString());
+		} catch (Exception e) {
+			return -1.0D;
+		}
+	}
+
+	/**
+	 * All variable keys this is holding
+	 * 
+	 * @return Set of all variable names.
+	 */
+	public Set<String> getVarKeyList() {
+
+		return variables.keySet();
+	}
+
+	/**
+	 * verify is a var exists
+	 * 
+	 * @param name the key name of the var
+	 * @return true if that var exists
+	 */
+	public boolean hasVar(String name) {
+
+		return variables.containsKey(name);
+	}
+
+	/**
+	 * Returns the quantity of vars this is holding
+	 * 
+	 * @return the number of vars
+	 */
+	public int getSize() {
+
+		return variables.size();
+	}
+
+	/**
+	 * Remove a var from the list
+	 * 
+	 * @param name
+	 */
+	public void removeVar(String name) {
+
+		try {
+			variables.remove(name);
+		} catch (Exception e) {
+		}
+		owner.flagAsChanged();
+	}
+
+	public static Object parseVariableValue(String value) {
+
+		try {
+			Integer i = Integer.parseInt(value);
+			return i;
+		} catch (NumberFormatException e) {
+		}
+		try {
+			Double d = Double.parseDouble(value);
+			return d;
+		} catch (NumberFormatException e) {
+		}
+		if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("yes") || value.equalsIgnoreCase("on")) {
+			return true;
+		} else if (value.equalsIgnoreCase("false") || value.equalsIgnoreCase("no") || value.equalsIgnoreCase("off")) {
+			return false;
+		}
+		return value;
+
+	}
+
+	public void clearVars() {
+
+		variables.clear();
+		owner.flagAsChanged();
+	}
+
+	/**
+	 * @return the owner
+	 */
+	public DataUnit getOwner() {
+
+		return owner;
+	}
+
+	public boolean isEmpty() {
+
+		return variables.isEmpty();
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
index 5d681013e..eaaaace74 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
@@ -6,8 +6,6 @@ import java.util.Map;
 

 import org.anjocaido.groupmanager.data.Group;

 

-

-

 /**

  * This container holds all Groups loaded from the relevant groupsFile.

  * 

@@ -31,9 +29,11 @@ public class GroupsDataHolder {
 	 * Constructor

 	 */

 	protected GroupsDataHolder() {

+

 	}

-	

+

 	public void setDataSource(WorldDataHolder dataSource) {

+

 		this.dataSource = dataSource;

 		//push this data source to the users, so they pull the correct groups data.

 		for (Group group : groups.values())

@@ -44,6 +44,7 @@ public class GroupsDataHolder {
 	 * @return the defaultGroup

 	 */

 	public Group getDefaultGroup() {

+

 		return defaultGroup;

 	}

 

@@ -51,6 +52,7 @@ public class GroupsDataHolder {
 	 * @param defaultGroup the defaultGroup to set

 	 */

 	public void setDefaultGroup(Group defaultGroup) {

+

 		this.defaultGroup = defaultGroup;

 	}

 

@@ -58,20 +60,23 @@ public class GroupsDataHolder {
 	 * @return the groups

 	 */

 	public Map<String, Group> getGroups() {

+

 		return groups;

 	}

-	

+

 	/**

 	 * @param groups the groups to set

 	 */

 	public void setGroups(Map<String, Group> groups) {

+

 		this.groups = groups;

 	}

-	

+

 	/**

 	 * @return the groupsFile

 	 */

 	public File getGroupsFile() {

+

 		return groupsFile;

 	}

 

@@ -79,6 +84,7 @@ public class GroupsDataHolder {
 	 * @param groupsFile the groupsFile to set

 	 */

 	public void setGroupsFile(File groupsFile) {

+

 		this.groupsFile = groupsFile;

 	}

 

@@ -86,6 +92,7 @@ public class GroupsDataHolder {
 	 * @return the haveGroupsChanged

 	 */

 	public boolean HaveGroupsChanged() {

+

 		return haveGroupsChanged;

 	}

 

@@ -93,6 +100,7 @@ public class GroupsDataHolder {
 	 * @param haveGroupsChanged the haveGroupsChanged to set

 	 */

 	public void setGroupsChanged(boolean haveGroupsChanged) {

+

 		this.haveGroupsChanged = haveGroupsChanged;

 	}

 

@@ -100,6 +108,7 @@ public class GroupsDataHolder {
 	 * @return the timeStampGroups

 	 */

 	public long getTimeStampGroups() {

+

 		return timeStampGroups;

 	}

 

@@ -107,6 +116,7 @@ public class GroupsDataHolder {
 	 * @param timeStampGroups the timeStampGroups to set

 	 */

 	public void setTimeStampGroups(long timeStampGroups) {

+

 		this.timeStampGroups = timeStampGroups;

 	}

 

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
index b37c55e51..84561b6e5 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
@@ -11,195 +11,204 @@ import java.util.Map;
 import org.anjocaido.groupmanager.data.User;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class OverloadedWorldHolder extends WorldDataHolder {
 
-    /**
+	/**
      *
      */
-    protected Map<String, User> overloadedUsers = new HashMap<String, User>();
+	protected Map<String, User> overloadedUsers = new HashMap<String, User>();
 
-    /**
-     *
-     * @param ph
-     */
-    public OverloadedWorldHolder(WorldDataHolder ph) {
-        super(ph.getName());
-        this.setGroupsFile(ph.getGroupsFile());
-        this.setUsersFile(ph.getUsersFile());
-        //this.setDefaultGroup(ph.getDefaultGroup());
-        this.groups = ph.groups;
-        this.users = ph.users;
-    }
-
-    /**
-     *
-     * @param userName
-     * @return user object or a new user if none exists.
-     */
-    @Override
-    public User getUser(String userName) {
-        //OVERLOADED CODE
-    	String userNameLowered = userName.toLowerCase();
-    	if (overloadedUsers.containsKey(userNameLowered)) {
-    		return overloadedUsers.get(userNameLowered);
-        }
-        //END CODE
-        if (getUsers().containsKey(userNameLowered)) {
-            return getUsers().get(userNameLowered);
-        }
-        User newUser = createUser(userName);
-        setUsersChanged(true);
-        return newUser;
-    }
-
-    /**
-     *
-     * @param theUser
-     */
-    @Override
-    public void addUser(User theUser) {
-        if (theUser.getDataSource() != this) {
-            theUser = theUser.clone(this);
-        }
-        if (theUser == null) {
-            return;
-        }
-        if ((theUser.getGroup() == null) || (!getGroups().containsKey(theUser.getGroupName().toLowerCase()))) {
-            theUser.setGroup(getDefaultGroup());
-        }
-        //OVERLOADED CODE
-        if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) {
-            overloadedUsers.remove(theUser.getName().toLowerCase());
-            overloadedUsers.put(theUser.getName().toLowerCase(), theUser);
-            return;
-        }
-        //END CODE
-        removeUser(theUser.getName());
-        getUsers().put(theUser.getName().toLowerCase(), theUser);
-        setUsersChanged(true);
-    }
-
-    /**
-     *
-     * @param userName
-     * @return true if removed/false if not found.
-     */
-    @Override
-    public boolean removeUser(String userName) {
-        //OVERLOADED CODE
-        if (overloadedUsers.containsKey(userName.toLowerCase())) {
-            overloadedUsers.remove(userName.toLowerCase());
-            return true;
-        }
-        //END CODE
-        if (getUsers().containsKey(userName.toLowerCase())) {
-        	getUsers().remove(userName.toLowerCase());
-            setUsersChanged(true);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean removeGroup(String groupName) {
-        if (groupName.equals(getDefaultGroup())) {
-            return false;
-        }
-        for (String key : getGroups().keySet()) {
-            if (groupName.equalsIgnoreCase(key)) {
-            	getGroups().remove(key);
-                for (String userKey : getUsers().keySet()) {
-                    User user = getUsers().get(userKey);
-                    if (user.getGroupName().equalsIgnoreCase(key)) {
-                        user.setGroup(getDefaultGroup());
-                    }
-
-                }
-                //OVERLOADED CODE
-                for (String userKey : overloadedUsers.keySet()) {
-                    User user = overloadedUsers.get(userKey);
-                    if (user.getGroupName().equalsIgnoreCase(key)) {
-                        user.setGroup(getDefaultGroup());
-                    }
-
-                }
-                //END OVERLOAD
-                setGroupsChanged(true);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *
-     * @return Collection of all users
-     */
-    @Override
-    public Collection<User> getUserList() {
-        Collection<User> overloadedList = new ArrayList<User>();
-        Collection<User> normalList = getUsers().values();
-        for (User u : normalList) {
-            if (overloadedUsers.containsKey(u.getName().toLowerCase())) {
-                overloadedList.add(overloadedUsers.get(u.getName().toLowerCase()));
-            } else {
-                overloadedList.add(u);
-            }
-        }
-        return overloadedList;
-    }
-
-    /**
-     *
-     * @param userName
-     * @return true if user is overloaded.
-     */
-    public boolean isOverloaded(String userName) {
-        return overloadedUsers.containsKey(userName.toLowerCase());
-    }
+	/**
+	 * 
+	 * @param ph
+	 */
+	public OverloadedWorldHolder(WorldDataHolder ph) {
 
-    /**
-     *
-     * @param userName
-     */
-    public void overloadUser(String userName) {
-        if (!isOverloaded(userName)) {
-            User theUser = getUser(userName);
-            theUser = theUser.clone();
-            if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) {
-                overloadedUsers.remove(theUser.getName().toLowerCase());
-            }
-            overloadedUsers.put(theUser.getName().toLowerCase(), theUser);
-        }
-    }
-
-    /**
-     *
-     * @param userName
-     */
-    public void removeOverload(String userName) {
-        overloadedUsers.remove(userName.toLowerCase());
-    }
-
-    /**
-     * Gets the user in normal state. Surpassing the overload state.
-     * It doesn't affect permissions. But it enables plugins change the
-     * actual user permissions even in overload mode.
-     * 
-     * @param userName
-     * @return user object
-     */
-    public User surpassOverload(String userName) {
-        if (!isOverloaded(userName)) {
-            return getUser(userName);
-        }
-        if (getUsers().containsKey(userName.toLowerCase())) {
-            return getUsers().get(userName.toLowerCase());
-        }
-        User newUser = createUser(userName);
-        return newUser;
-    }
+		super(ph.getName());
+		this.setGroupsFile(ph.getGroupsFile());
+		this.setUsersFile(ph.getUsersFile());
+		this.groups = ph.groups;
+		this.users = ph.users;
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 * @return user object or a new user if none exists.
+	 */
+	@Override
+	public User getUser(String userName) {
+
+		//OVERLOADED CODE
+		String userNameLowered = userName.toLowerCase();
+		if (overloadedUsers.containsKey(userNameLowered)) {
+			return overloadedUsers.get(userNameLowered);
+		}
+		//END CODE
+		if (getUsers().containsKey(userNameLowered)) {
+			return getUsers().get(userNameLowered);
+		}
+		User newUser = createUser(userName);
+		setUsersChanged(true);
+		return newUser;
+	}
+
+	/**
+	 * 
+	 * @param theUser
+	 */
+	@Override
+	public void addUser(User theUser) {
+
+		if (theUser.getDataSource() != this) {
+			theUser = theUser.clone(this);
+		}
+		if (theUser == null) {
+			return;
+		}
+		if ((theUser.getGroup() == null) || (!getGroups().containsKey(theUser.getGroupName().toLowerCase()))) {
+			theUser.setGroup(getDefaultGroup());
+		}
+		//OVERLOADED CODE
+		if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) {
+			overloadedUsers.remove(theUser.getName().toLowerCase());
+			overloadedUsers.put(theUser.getName().toLowerCase(), theUser);
+			return;
+		}
+		//END CODE
+		removeUser(theUser.getName());
+		getUsers().put(theUser.getName().toLowerCase(), theUser);
+		setUsersChanged(true);
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 * @return true if removed/false if not found.
+	 */
+	@Override
+	public boolean removeUser(String userName) {
+
+		//OVERLOADED CODE
+		if (overloadedUsers.containsKey(userName.toLowerCase())) {
+			overloadedUsers.remove(userName.toLowerCase());
+			return true;
+		}
+		//END CODE
+		if (getUsers().containsKey(userName.toLowerCase())) {
+			getUsers().remove(userName.toLowerCase());
+			setUsersChanged(true);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean removeGroup(String groupName) {
+
+		if (groupName.equals(getDefaultGroup())) {
+			return false;
+		}
+		for (String key : getGroups().keySet()) {
+			if (groupName.equalsIgnoreCase(key)) {
+				getGroups().remove(key);
+				for (String userKey : getUsers().keySet()) {
+					User user = getUsers().get(userKey);
+					if (user.getGroupName().equalsIgnoreCase(key)) {
+						user.setGroup(getDefaultGroup());
+					}
+
+				}
+				//OVERLOADED CODE
+				for (String userKey : overloadedUsers.keySet()) {
+					User user = overloadedUsers.get(userKey);
+					if (user.getGroupName().equalsIgnoreCase(key)) {
+						user.setGroup(getDefaultGroup());
+					}
+
+				}
+				//END OVERLOAD
+				setGroupsChanged(true);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * 
+	 * @return Collection of all users
+	 */
+	@Override
+	public Collection<User> getUserList() {
+
+		Collection<User> overloadedList = new ArrayList<User>();
+		Collection<User> normalList = getUsers().values();
+		for (User u : normalList) {
+			if (overloadedUsers.containsKey(u.getName().toLowerCase())) {
+				overloadedList.add(overloadedUsers.get(u.getName().toLowerCase()));
+			} else {
+				overloadedList.add(u);
+			}
+		}
+		return overloadedList;
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 * @return true if user is overloaded.
+	 */
+	public boolean isOverloaded(String userName) {
+
+		return overloadedUsers.containsKey(userName.toLowerCase());
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 */
+	public void overloadUser(String userName) {
+
+		if (!isOverloaded(userName)) {
+			User theUser = getUser(userName);
+			theUser = theUser.clone();
+			if (overloadedUsers.containsKey(theUser.getName().toLowerCase())) {
+				overloadedUsers.remove(theUser.getName().toLowerCase());
+			}
+			overloadedUsers.put(theUser.getName().toLowerCase(), theUser);
+		}
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 */
+	public void removeOverload(String userName) {
+
+		overloadedUsers.remove(userName.toLowerCase());
+	}
+
+	/**
+	 * Gets the user in normal state. Surpassing the overload state.
+	 * It doesn't affect permissions. But it enables plugins change the
+	 * actual user permissions even in overload mode.
+	 * 
+	 * @param userName
+	 * @return user object
+	 */
+	public User surpassOverload(String userName) {
+
+		if (!isOverloaded(userName)) {
+			return getUser(userName);
+		}
+		if (getUsers().containsKey(userName.toLowerCase())) {
+			return getUsers().get(userName.toLowerCase());
+		}
+		User newUser = createUser(userName);
+		return newUser;
+	}
 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
index fa2ccaf84..665fe227d 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
@@ -6,8 +6,6 @@ import java.util.Map;
 

 import org.anjocaido.groupmanager.data.User;

 

-

-

 /**

  * This container holds all Users loaded from the relevant usersFile.

  * 

@@ -30,27 +28,31 @@ public class UsersDataHolder {
 	 * Constructor

 	 */

 	protected UsersDataHolder() {

+

 	}

-	

+

 	public void setDataSource(WorldDataHolder dataSource) {

+

 		this.dataSource = dataSource;

 		//push this data source to the users, so they pull the correct groups data.

 		for (User user : users.values())

 			user.setDataSource(this.dataSource);

-		

+

 	}

 

 	/**

 	 * @return the users

 	 */

 	public Map<String, User> getUsers() {

+

 		return users;

 	}

-	

+

 	/**

 	 * @param users the users to set

 	 */

 	public void setUsers(Map<String, User> users) {

+

 		this.users = users;

 	}

 

@@ -58,6 +60,7 @@ public class UsersDataHolder {
 	 * @return the usersFile

 	 */

 	public File getUsersFile() {

+

 		return usersFile;

 	}

 

@@ -65,6 +68,7 @@ public class UsersDataHolder {
 	 * @param usersFile the usersFile to set

 	 */

 	public void setUsersFile(File usersFile) {

+

 		this.usersFile = usersFile;

 	}

 

@@ -72,6 +76,7 @@ public class UsersDataHolder {
 	 * @return the haveUsersChanged

 	 */

 	public boolean HaveUsersChanged() {

+

 		return haveUsersChanged;

 	}

 

@@ -79,6 +84,7 @@ public class UsersDataHolder {
 	 * @param haveUsersChanged the haveUsersChanged to set

 	 */

 	public void setUsersChanged(boolean haveUsersChanged) {

+

 		this.haveUsersChanged = haveUsersChanged;

 	}

 

@@ -86,6 +92,7 @@ public class UsersDataHolder {
 	 * @return the timeStampUsers

 	 */

 	public long getTimeStampUsers() {

+

 		return timeStampUsers;

 	}

 

@@ -93,6 +100,7 @@ public class UsersDataHolder {
 	 * @param timeStampUsers the timeStampUsers to set

 	 */

 	public void setTimeStampUsers(long timeStampUsers) {

+

 		this.timeStampUsers = timeStampUsers;

 	}

 

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 6b5958f4b..fefc698f9 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -45,339 +45,371 @@ import org.yaml.snakeyaml.reader.UnicodeReader;
  */
 public class WorldDataHolder {
 
-    /**
-     * World name
-     */
-    protected String name;
-    /**
-     * The actual groups holder
-     */
-    protected GroupsDataHolder groups = new GroupsDataHolder();
 	/**
-     * The actual users holder
-     */
-    protected UsersDataHolder users = new UsersDataHolder();    
-    /**
+	 * World name
+	 */
+	protected String name;
+	/**
+	 * The actual groups holder
+	 */
+	protected GroupsDataHolder groups = new GroupsDataHolder();
+	/**
+	 * The actual users holder
+	 */
+	protected UsersDataHolder users = new UsersDataHolder();
+	/**
      *
      */
-    protected AnjoPermissionsHandler permissionsHandler;
+	protected AnjoPermissionsHandler permissionsHandler;
 
-    
 	/**
-     * Prevent direct instantiation
-     * @param worldName
-     */
-    public WorldDataHolder(String worldName) {
-        name = worldName;
-    }
-
-    /**
-     * The main constructor for a new WorldDataHolder
-     * @param worldName
-     * @param groups
-     * @param users
-     */
-    public WorldDataHolder(String worldName, GroupsDataHolder groups, UsersDataHolder users) {
-        this.name = worldName;
-        this.groups = groups;
-        this.users = users;
-        
-        //this.defaultGroup = defaultGroup;
-    }
-    
-    /**
-     * update the dataSource to point to this object.
-     * 
-     * This should be called whenever a set of world data is fetched.
-     */
-    public void updateDataSource() {
-    	this.groups.setDataSource(this);
-    	this.users.setDataSource(this);
-    }
-
-    /**
-     * Search for a user. If it doesn't exist, create a new one with
-     * default group.
-     *
-     * @param userName the name of the user
-     * @return class that manage that user permission
-     */
-    public User getUser(String userName) {
-        if (getUsers().containsKey(userName.toLowerCase())) {
-            return getUsers().get(userName.toLowerCase());
-        }
-        User newUser = createUser(userName);
-        return newUser;
-    }
-
-    /**
-     * Add a user to the list. If it already exists, overwrite the old.
-     * @param theUser the user you want to add to the permission list
-     */
-    public void addUser(User theUser) {
-        if (theUser.getDataSource() != this) {
-            theUser = theUser.clone(this);
-        }
-        if (theUser == null) {
-            return;
-        }
-        if ((theUser.getGroup() == null)) {
-            theUser.setGroup(groups.getDefaultGroup());
-        }
-        removeUser(theUser.getName());
-        getUsers().put(theUser.getName().toLowerCase(), theUser);
-        setUsersChanged(true);
-        if (GroupManager.isLoaded())
-        	GroupManagerEventHandler.callEvent(theUser, Action.USER_ADDED);
-    }
-
-    /**
-     * Removes the user from the list. (he might become a default user)
-     * @param userName the username from the user to remove
-     * @return true if it had something to remove
-     */
-    public boolean removeUser(String userName) {
-        if (getUsers().containsKey(userName.toLowerCase())) {
-        	getUsers().remove(userName.toLowerCase());
-        	setUsersChanged(true);
-            if (GroupManager.isLoaded())
-            	GroupManagerEventHandler.callEvent(userName, GMUserEvent.Action.USER_REMOVED);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *
-     * @param userName
-     * @return true if we have data for this player.
-     */
-    public boolean isUserDeclared(String userName) {
-        return getUsers().containsKey(userName.toLowerCase());
-    }
+	 * Prevent direct instantiation
+	 * 
+	 * @param worldName
+	 */
+	public WorldDataHolder(String worldName) {
 
-    /**
-     * Change the default group of the file.
-     * @param group the group you want make default.
-     */
-    public void setDefaultGroup(Group group) {
-        if (!getGroups().containsKey(group.getName().toLowerCase()) || (group.getDataSource() != this)) {
-            addGroup(group);
-        }
-        groups.setDefaultGroup(getGroup(group.getName()));
-        setGroupsChanged(true);
-        if (GroupManager.isLoaded())
-        	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.DEFAULT_GROUP_CHANGED);
-    }
-
-    /**
-     * Returns the default group of the file
-     * @return the default group
-     */
-    public Group getDefaultGroup() {
-        return groups.getDefaultGroup();
-    }
-
-    /**
-     * Returns a group of the given name
-     * @param groupName the name of the group
-     * @return a group if it is found. null if not found.
-     */
-    public Group getGroup(String groupName) {
-    	if (groupName.toLowerCase().startsWith("g:"))
-    		return GroupManager.getGlobalGroups().getGroup(groupName);
-    	else
-    		return getGroups().get(groupName.toLowerCase());
-    }
-
-    /**
-     * Check if a group exists.
-     * Its the same of getGroup, but check if it is null.
-     * @param groupName the name of the group
-     * @return true if exists. false if not.
-     */
-    public boolean groupExists(String groupName) {
-    	if (groupName.toLowerCase().startsWith("g:"))
-    		return GroupManager.getGlobalGroups().hasGroup(groupName);
-    	else
-    		return getGroups().containsKey(groupName.toLowerCase());
-    }
-
-    /**
-     * Add a group to the list
-     * @param groupToAdd
-     */
-    public void addGroup(Group groupToAdd) {
-    	if (groupToAdd.getName().toLowerCase().startsWith("g:")) {
-    		GroupManager.getGlobalGroups().addGroup(groupToAdd);
-    		GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
-        	return;
-        }
-    	
-        if (groupToAdd.getDataSource() != this) {
-            groupToAdd = groupToAdd.clone(this);
-        }
-        removeGroup(groupToAdd.getName());
-        getGroups().put(groupToAdd.getName().toLowerCase(), groupToAdd);
-        setGroupsChanged(true);
-        if (GroupManager.isLoaded())
-        	GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
-    }
-
-    /**
-     * Remove the group from the list
-     * @param groupName
-     * @return true if had something to remove. false the group was default or non-existant
-     */
-    public boolean removeGroup(String groupName) {
-    	if (groupName.toLowerCase().startsWith("g:")) {
-        	return GroupManager.getGlobalGroups().removeGroup(groupName);
-        }
-    	
-        if (getDefaultGroup() != null && groupName.equalsIgnoreCase(getDefaultGroup().getName())) {
-            return false;
-        }
-        if (getGroups().containsKey(groupName.toLowerCase())) {
-            getGroups().remove(groupName.toLowerCase());
-            setGroupsChanged(true);
-            if (GroupManager.isLoaded())
-            	GroupManagerEventHandler.callEvent(groupName.toLowerCase(), GMGroupEvent.Action.GROUP_REMOVED);
-            return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * Creates a new User with the given name
-     * and adds it to this holder.
-     * @param userName the username you want
-     * @return null if user already exists. or new User
-     */
-    public User createUser(String userName) {
-        if (getUsers().containsKey(userName.toLowerCase())) {
-            return null;
-        }
-        User newUser = new User(this, userName);
-        newUser.setGroup(groups.getDefaultGroup(), false);
-        addUser(newUser);
-        setUsersChanged(true);
-        return newUser;
-    }
-
-    /**
-     * Creates a new Group with the given name
-     * and adds it to this holder
-     * @param groupName the groupname you want
-     * @return null if group already exists. or new Group
-     */
-    public Group createGroup(String groupName) {
-    	if (groupName.toLowerCase().startsWith("g:")) {
-        	Group newGroup = new Group(groupName);
-        	return GroupManager.getGlobalGroups().newGroup(newGroup);
-        }
-    	
-    	if (getGroups().containsKey(groupName.toLowerCase())) {
-            return null;
-        }
-        
-    	Group newGroup = new Group(this, groupName);
-        addGroup(newGroup);
-        setGroupsChanged(true);
-        return newGroup;
-    }
-
-    /**
-     *
-     * @return a collection of the groups
-     */
-    public Collection<Group> getGroupList() {
-        return getGroups().values();
-    }
+		name = worldName;
+	}
 
-    /**
-     *
-     * @return a collection of the users
-     */
-    public Collection<User> getUserList() {
-        return getUsers().values();
-    }
+	/**
+	 * The main constructor for a new WorldDataHolder
+	 * 
+	 * @param worldName
+	 * @param groups
+	 * @param users
+	 */
+	public WorldDataHolder(String worldName, GroupsDataHolder groups, UsersDataHolder users) {
 
-    /**
-     * reads the file again
-     */
-    public void reload() {
-        try {
-        	reloadGroups();
-        	reloadUsers();
-        } catch (Exception ex) {
-            Logger.getLogger(WorldDataHolder.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-    
-    /**
-     * Refresh Group data from file
-     */
-    public void reloadGroups() {
-    	GroupManager.setLoaded(false);
-    	try {
-    		// temporary holder in case the load fails.
-    		WorldDataHolder ph = new WorldDataHolder(this.getName());
-
-    		loadGroups(ph, getGroupsFile());
-    		// transfer new data
-    		resetGroups();
-    		for (Group tempGroup : ph.getGroupList()) {
-    			tempGroup.clone(this);
-    		}
-    		this.setDefaultGroup(getGroup(ph.getDefaultGroup().getName()));
-    		this.removeGroupsChangedFlag();
-    		this.setTimeStampGroups(getGroupsFile().lastModified());
-    		
-    		ph = null;
-    	} catch (Exception ex) {
-            Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
-        }
-    	GroupManager.setLoaded(true);
-    	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
-    }
-    
-    /**
-     * Refresh Users data from file
-     */
-    public void reloadUsers() {
-    	GroupManager.setLoaded(false);
-    	try {
-    		// temporary holder in case the load fails.
-    		WorldDataHolder ph = new WorldDataHolder(this.getName());
-    		// copy groups for reference
-    		for (Group tempGroup : this.getGroupList()) {
-    			tempGroup.clone(ph);
-    		}
-    		// setup the default group before loading user data.
-    		ph.setDefaultGroup(ph.getGroup(getDefaultGroup().getName()));
-    		loadUsers(ph, getUsersFile());
-    		// transfer new data
-    		resetUsers();
-    		for (User tempUser : ph.getUserList()) {
-    			tempUser.clone(this);
-    		}
-    		this.removeUsersChangedFlag();
-    		this.setTimeStampUsers(getUsersFile().lastModified());
-    		
-    		ph = null;
-    	} catch (Exception ex) {
-            Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
-        } 
-    	GroupManager.setLoaded(true);
-    	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
-    }
-
-    public void loadGroups(File groupsFile) {
-
-    	GroupManager.setLoaded(false);
-    	try {
-    		setGroupsFile(groupsFile);
+		this.name = worldName;
+		this.groups = groups;
+		this.users = users;
+
+		// this.defaultGroup = defaultGroup;
+	}
+
+	/**
+	 * update the dataSource to point to this object.
+	 * 
+	 * This should be called whenever a set of world data is fetched.
+	 */
+	public void updateDataSource() {
+
+		this.groups.setDataSource(this);
+		this.users.setDataSource(this);
+	}
+
+	/**
+	 * Search for a user. If it doesn't exist, create a new one with
+	 * default group.
+	 * 
+	 * @param userName the name of the user
+	 * @return class that manage that user permission
+	 */
+	public User getUser(String userName) {
+
+		if (getUsers().containsKey(userName.toLowerCase())) {
+			return getUsers().get(userName.toLowerCase());
+		}
+		User newUser = createUser(userName);
+		return newUser;
+	}
+
+	/**
+	 * Add a user to the list. If it already exists, overwrite the old.
+	 * 
+	 * @param theUser the user you want to add to the permission list
+	 */
+	public void addUser(User theUser) {
+
+		if (theUser.getDataSource() != this) {
+			theUser = theUser.clone(this);
+		}
+		if (theUser == null) {
+			return;
+		}
+		if ((theUser.getGroup() == null)) {
+			theUser.setGroup(groups.getDefaultGroup());
+		}
+		removeUser(theUser.getName());
+		getUsers().put(theUser.getName().toLowerCase(), theUser);
+		setUsersChanged(true);
+		if (GroupManager.isLoaded())
+			GroupManagerEventHandler.callEvent(theUser, Action.USER_ADDED);
+	}
+
+	/**
+	 * Removes the user from the list. (he might become a default user)
+	 * 
+	 * @param userName the username from the user to remove
+	 * @return true if it had something to remove
+	 */
+	public boolean removeUser(String userName) {
+
+		if (getUsers().containsKey(userName.toLowerCase())) {
+			getUsers().remove(userName.toLowerCase());
+			setUsersChanged(true);
+			if (GroupManager.isLoaded())
+				GroupManagerEventHandler.callEvent(userName, GMUserEvent.Action.USER_REMOVED);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 
+	 * @param userName
+	 * @return true if we have data for this player.
+	 */
+	public boolean isUserDeclared(String userName) {
+
+		return getUsers().containsKey(userName.toLowerCase());
+	}
+
+	/**
+	 * Change the default group of the file.
+	 * 
+	 * @param group the group you want make default.
+	 */
+	public void setDefaultGroup(Group group) {
+
+		if (!getGroups().containsKey(group.getName().toLowerCase()) || (group.getDataSource() != this)) {
+			addGroup(group);
+		}
+		groups.setDefaultGroup(getGroup(group.getName()));
+		setGroupsChanged(true);
+		if (GroupManager.isLoaded())
+			GroupManagerEventHandler.callEvent(GMSystemEvent.Action.DEFAULT_GROUP_CHANGED);
+	}
+
+	/**
+	 * Returns the default group of the file
+	 * 
+	 * @return the default group
+	 */
+	public Group getDefaultGroup() {
+
+		return groups.getDefaultGroup();
+	}
+
+	/**
+	 * Returns a group of the given name
+	 * 
+	 * @param groupName the name of the group
+	 * @return a group if it is found. null if not found.
+	 */
+	public Group getGroup(String groupName) {
+
+		if (groupName.toLowerCase().startsWith("g:"))
+			return GroupManager.getGlobalGroups().getGroup(groupName);
+		else
+			return getGroups().get(groupName.toLowerCase());
+	}
+
+	/**
+	 * Check if a group exists.
+	 * Its the same of getGroup, but check if it is null.
+	 * 
+	 * @param groupName the name of the group
+	 * @return true if exists. false if not.
+	 */
+	public boolean groupExists(String groupName) {
+
+		if (groupName.toLowerCase().startsWith("g:"))
+			return GroupManager.getGlobalGroups().hasGroup(groupName);
+		else
+			return getGroups().containsKey(groupName.toLowerCase());
+	}
+
+	/**
+	 * Add a group to the list
+	 * 
+	 * @param groupToAdd
+	 */
+	public void addGroup(Group groupToAdd) {
+
+		if (groupToAdd.getName().toLowerCase().startsWith("g:")) {
+			GroupManager.getGlobalGroups().addGroup(groupToAdd);
+			GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
+			return;
+		}
+
+		if (groupToAdd.getDataSource() != this) {
+			groupToAdd = groupToAdd.clone(this);
+		}
+		removeGroup(groupToAdd.getName());
+		getGroups().put(groupToAdd.getName().toLowerCase(), groupToAdd);
+		setGroupsChanged(true);
+		if (GroupManager.isLoaded())
+			GroupManagerEventHandler.callEvent(groupToAdd, GMGroupEvent.Action.GROUP_ADDED);
+	}
+
+	/**
+	 * Remove the group from the list
+	 * 
+	 * @param groupName
+	 * @return true if had something to remove. false the group was default or
+	 *         non-existant
+	 */
+	public boolean removeGroup(String groupName) {
+
+		if (groupName.toLowerCase().startsWith("g:")) {
+			return GroupManager.getGlobalGroups().removeGroup(groupName);
+		}
+
+		if (getDefaultGroup() != null && groupName.equalsIgnoreCase(getDefaultGroup().getName())) {
+			return false;
+		}
+		if (getGroups().containsKey(groupName.toLowerCase())) {
+			getGroups().remove(groupName.toLowerCase());
+			setGroupsChanged(true);
+			if (GroupManager.isLoaded())
+				GroupManagerEventHandler.callEvent(groupName.toLowerCase(), GMGroupEvent.Action.GROUP_REMOVED);
+			return true;
+		}
+		return false;
+
+	}
+
+	/**
+	 * Creates a new User with the given name
+	 * and adds it to this holder.
+	 * 
+	 * @param userName the username you want
+	 * @return null if user already exists. or new User
+	 */
+	public User createUser(String userName) {
+
+		if (getUsers().containsKey(userName.toLowerCase())) {
+			return null;
+		}
+		User newUser = new User(this, userName);
+		newUser.setGroup(groups.getDefaultGroup(), false);
+		addUser(newUser);
+		setUsersChanged(true);
+		return newUser;
+	}
+
+	/**
+	 * Creates a new Group with the given name
+	 * and adds it to this holder
+	 * 
+	 * @param groupName the groupname you want
+	 * @return null if group already exists. or new Group
+	 */
+	public Group createGroup(String groupName) {
+
+		if (groupName.toLowerCase().startsWith("g:")) {
+			Group newGroup = new Group(groupName);
+			return GroupManager.getGlobalGroups().newGroup(newGroup);
+		}
+
+		if (getGroups().containsKey(groupName.toLowerCase())) {
+			return null;
+		}
+
+		Group newGroup = new Group(this, groupName);
+		addGroup(newGroup);
+		setGroupsChanged(true);
+		return newGroup;
+	}
+
+	/**
+	 * 
+	 * @return a collection of the groups
+	 */
+	public Collection<Group> getGroupList() {
+
+		return getGroups().values();
+	}
+
+	/**
+	 * 
+	 * @return a collection of the users
+	 */
+	public Collection<User> getUserList() {
+
+		return getUsers().values();
+	}
+
+	/**
+	 * reads the file again
+	 */
+	public void reload() {
+
+		try {
+			reloadGroups();
+			reloadUsers();
+		} catch (Exception ex) {
+			Logger.getLogger(WorldDataHolder.class.getName()).log(Level.SEVERE, null, ex);
+		}
+	}
+
+	/**
+	 * Refresh Group data from file
+	 */
+	public void reloadGroups() {
+
+		GroupManager.setLoaded(false);
+		try {
+			// temporary holder in case the load fails.
+			WorldDataHolder ph = new WorldDataHolder(this.getName());
+
+			loadGroups(ph, getGroupsFile());
+			// transfer new data
+			resetGroups();
+			for (Group tempGroup : ph.getGroupList()) {
+				tempGroup.clone(this);
+			}
+			this.setDefaultGroup(getGroup(ph.getDefaultGroup().getName()));
+			this.removeGroupsChangedFlag();
+			this.setTimeStampGroups(getGroupsFile().lastModified());
+
+			ph = null;
+		} catch (Exception ex) {
+			Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
+		}
+		GroupManager.setLoaded(true);
+		GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
+	}
+
+	/**
+	 * Refresh Users data from file
+	 */
+	public void reloadUsers() {
+
+		GroupManager.setLoaded(false);
+		try {
+			// temporary holder in case the load fails.
+			WorldDataHolder ph = new WorldDataHolder(this.getName());
+			// copy groups for reference
+			for (Group tempGroup : this.getGroupList()) {
+				tempGroup.clone(ph);
+			}
+			// setup the default group before loading user data.
+			ph.setDefaultGroup(ph.getGroup(getDefaultGroup().getName()));
+			loadUsers(ph, getUsersFile());
+			// transfer new data
+			resetUsers();
+			for (User tempUser : ph.getUserList()) {
+				tempUser.clone(this);
+			}
+			this.removeUsersChangedFlag();
+			this.setTimeStampUsers(getUsersFile().lastModified());
+
+			ph = null;
+		} catch (Exception ex) {
+			Logger.getLogger(WorldDataHolder.class.getName()).log(Level.WARNING, null, ex);
+		}
+		GroupManager.setLoaded(true);
+		GroupManagerEventHandler.callEvent(GMSystemEvent.Action.RELOADED);
+	}
+
+	public void loadGroups(File groupsFile) {
+
+		GroupManager.setLoaded(false);
+		try {
+			setGroupsFile(groupsFile);
 			loadGroups(this, groupsFile);
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
@@ -387,14 +419,14 @@ public class WorldDataHolder {
 			throw new IllegalArgumentException("Error access the groups file!\n" + groupsFile.getPath());
 		}
 
-    	GroupManager.setLoaded(true);
-    }
-    
-    public void loadUsers(File usersFile) {
+		GroupManager.setLoaded(true);
+	}
+
+	public void loadUsers(File usersFile) {
 
-    	GroupManager.setLoaded(false);
-    	try {
-    		setUsersFile(usersFile);
+		GroupManager.setLoaded(false);
+		try {
+			setUsersFile(usersFile);
 			loadUsers(this, usersFile);
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
@@ -404,755 +436,888 @@ public class WorldDataHolder {
 			throw new IllegalArgumentException("Error access the users file!\n" + usersFile.getPath());
 		}
 
-    	GroupManager.setLoaded(true);
-    }
-    /**
-     * Returns a NEW data holder containing data read from the files
-     * 
-     * @param worldName
-     * @param groupsFile
-     * @param usersFile
-     * 
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public static WorldDataHolder load(String worldName, File groupsFile, File usersFile) throws FileNotFoundException, IOException {
-    	WorldDataHolder ph = new WorldDataHolder(worldName);
-    	
-    	GroupManager.setLoaded(false);
-    	if (groupsFile != null) loadGroups(ph, groupsFile);
-    	if (usersFile != null) loadUsers(ph, usersFile);
-    	GroupManager.setLoaded(true);
-    	
-    	return ph;
-    }
-    
-    /**
-     * Updates the WorldDataHolder from the Groups file
-     * 
-     * @param ph
-     * @param groupsFile
-     * 
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected static void loadGroups(WorldDataHolder ph, File groupsFile) throws FileNotFoundException, IOException {
-
-        //READ GROUPS FILE
-        Yaml yamlGroups = new Yaml(new SafeConstructor());
-        Map<String, Object> groupsRootDataNode;
-        if (!groupsFile.exists()) {
-            throw new IllegalArgumentException("The file which should contain groups does not exist!\n" + groupsFile.getPath());
-        }
-        FileInputStream groupsInputStream = new FileInputStream(groupsFile);
-        try {
-            groupsRootDataNode = (Map<String, Object>) yamlGroups.load(new UnicodeReader(groupsInputStream));
-            if (groupsRootDataNode == null) {
-                throw new NullPointerException();
-            }
-        } catch (Exception ex) {
-            throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + groupsFile.getPath(), ex);
-        } finally {
-            groupsInputStream.close();
-        }
-
-        //PROCESS GROUPS FILE
-        Map<String, List<String>> inheritance = new HashMap<String, List<String>>();
-
-        /*
-    	 * Fetch all child nodes under the 'groups' entry.
-    	 */
-        Map<String, Object> allGroupsNode = new HashMap<String, Object>();
-        
-        try {
-        	allGroupsNode = (Map<String, Object>) groupsRootDataNode.get("groups");
-        } catch (Exception ex) {
-            //ex.printStackTrace();
-            throw new IllegalArgumentException("Your " + groupsFile.getPath() + " file is invalid. See console for details.", ex);
-        }
-        
-        
-        Iterator<String> groupItr = allGroupsNode.keySet().iterator();
-    	String groupKey;
-    	Integer groupCount = 0;
-    	
-    	/*
-    	 * loop each group entry
-    	 * and read it's data.
-    	 */
-    	while (groupItr.hasNext()) {
-    		try {
-    			groupCount++;
-    			// Attempt to fetch the next group name.
-    			groupKey = groupItr.next();
-    		} catch (Exception ex) {
+		GroupManager.setLoaded(true);
+	}
+
+	/**
+	 * Returns a NEW data holder containing data read from the files
+	 * 
+	 * @param worldName
+	 * @param groupsFile
+	 * @param usersFile
+	 * 
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	public static WorldDataHolder load(String worldName, File groupsFile, File usersFile) throws FileNotFoundException, IOException {
+
+		WorldDataHolder ph = new WorldDataHolder(worldName);
+
+		GroupManager.setLoaded(false);
+		if (groupsFile != null)
+			loadGroups(ph, groupsFile);
+		if (usersFile != null)
+			loadUsers(ph, usersFile);
+		GroupManager.setLoaded(true);
+
+		return ph;
+	}
+
+	/**
+	 * Updates the WorldDataHolder from the Groups file
+	 * 
+	 * @param ph
+	 * @param groupsFile
+	 * 
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected static void loadGroups(WorldDataHolder ph, File groupsFile) throws FileNotFoundException, IOException {
+
+		// READ GROUPS FILE
+
+		Yaml yamlGroups = new Yaml(new SafeConstructor());
+		Map<String, Object> groupsRootDataNode;
+
+		if (!groupsFile.exists()) {
+			throw new IllegalArgumentException("The file which should contain groups does not exist!\n" + groupsFile.getPath());
+		}
+		FileInputStream groupsInputStream = new FileInputStream(groupsFile);
+		try {
+			groupsRootDataNode = (Map<String, Object>) yamlGroups.load(new UnicodeReader(groupsInputStream));
+			if (groupsRootDataNode == null) {
+				throw new NullPointerException();
+			}
+		} catch (Exception ex) {
+			throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + groupsFile.getPath(), ex);
+		} finally {
+			groupsInputStream.close();
+		}
+
+		// PROCESS GROUPS FILE
+
+		Map<String, List<String>> inheritance = new HashMap<String, List<String>>();
+		Map<String, Object> allGroupsNode = null;
+
+		/*
+		 * Fetch all groups under the 'groups' entry.
+		 */
+		try {
+			allGroupsNode = (Map<String, Object>) groupsRootDataNode.get("groups");
+		} catch (Exception ex) {
+			throw new IllegalArgumentException("Your " + groupsFile.getPath() + " file is invalid. See console for details.", ex);
+		}
+
+		Iterator<String> groupItr = allGroupsNode.keySet().iterator();
+		String groupKey;
+		Integer groupCount = 0;
+
+		/*
+		 * loop each group entry
+		 * and process it's data.
+		 */
+		while (groupItr.hasNext()) {
+
+			try {
+				groupCount++;
+				// Attempt to fetch the next group name.
+				groupKey = groupItr.next();
+			} catch (Exception ex) {
 				throw new IllegalArgumentException("Invalid group name for group entry (" + groupCount + ") in file: " + groupsFile.getPath(), ex);
 			}
-    		
-    		/*
-    		 * Fetch this groups child nodes
-    		 */
-    		Map<String, Object> thisGroupNode = new HashMap<String, Object>();
-    		
-    		try {
-    			thisGroupNode = (Map<String, Object>) allGroupsNode.get(groupKey);
-    		} catch (Exception ex) {
+
+			/*
+			 * Fetch this groups child nodes
+			 */
+			Map<String, Object> thisGroupNode = null;
+
+			try {
+				thisGroupNode = (Map<String, Object>) allGroupsNode.get(groupKey);
+			} catch (Exception ex) {
 				throw new IllegalArgumentException("Invalid child nodes for group '" + groupKey + "' in file: " + groupsFile.getPath(), ex);
 			}
-    		
-    		/*
-    		 * Create a new group with this name
-    		 * in the assigned data source.
-    		 */
-            Group thisGrp = ph.createGroup(groupKey);
-            
-            if (thisGrp == null) {
-                throw new IllegalArgumentException("I think this Group was declared more than once: " + groupKey + " in file: " + groupsFile.getPath());
-            }
-            
-            /*
-             * If no default node is found set it as false.
-             */
-            if (thisGroupNode.get("default") == null) {
-                thisGroupNode.put("default", false);
-            } else if ((Boolean.parseBoolean(thisGroupNode.get("default").toString()))) {
-            	/*
-            	 * Set this as the default group.
-            	 * Warn if some other group has already claimed that position.
-            	 */
-                if (ph.getDefaultGroup() != null) {
-                    GroupManager.logger.warning("The group " + thisGrp.getName() + " is claiming to be default where" + ph.getDefaultGroup().getName() + " already was.");
-                    GroupManager.logger.warning("Overriding first request for file: " + groupsFile.getPath());
-                }
-                ph.setDefaultGroup(thisGrp);
-            }
-
-            //PERMISSIONS NODE
-
-            /*
-        	 * If no permissions node is found, or it's empty
-        	 * set an empty permission list
-        	 */
-            if (thisGroupNode.get("permissions") == null) {
-                thisGroupNode.put("permissions", new ArrayList<String>());
-            } else {
-            	/*
-            	 * There is a permission list Which seems to hold some data
-            	 */
-                if (thisGroupNode.get("permissions") instanceof List) {
-                	/*
-                	 * Check each entry and add it as a new permission.
-                	 */
-                    for (Object o : ((List) thisGroupNode.get("permissions"))) {
-                    	try {
-                    		/*
-                    		 * Only add this permission if it's not empty.
-                    		 */
-                    		if (!thisGroupNode.get("permissions").toString().isEmpty())
-                    			thisGrp.addPermission(o.toString());
-                    		
-                    	} catch (NullPointerException ex) {
-                    		// Ignore this entry as it's null. It can be safely dropped
-                    	} catch (Exception ex) {
-                        	throw new IllegalArgumentException("Invalid formatting found in permissions section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
-                        }
-                    }
-                } else if (thisGroupNode.get("permissions") instanceof String) {
-                	/*
-                	 * Only add this permission if it's not empty.
-                	 */
-                	if (!thisGroupNode.get("permissions").toString().isEmpty())
-                		thisGrp.addPermission((String) thisGroupNode.get("permissions"));
-                	
-                } else {
-                    throw new IllegalArgumentException("Unknown type of permissions node(Should be String or List<String>) for group:  " + thisGrp.getName() + " in file: " + groupsFile.getPath());
-                }
-                /*
-                 * Sort all permissions so they are in the correct order for checking.
-                 */
-                thisGrp.sortPermissions();
-            }
-
-            //INFO NODE
-            try {
-                if (thisGroupNode.get("info") instanceof Map) {
-	                Map<String, Object> infoNode = (Map<String, Object>) thisGroupNode.get("info");
-	                if (infoNode != null) {
-	                    thisGrp.setVariables(infoNode);
-	                }
-                } else
-                	throw new IllegalArgumentException("Unknown entry found in Info section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath());
-            } catch (Exception ex) {
-            	throw new IllegalArgumentException("Invalid formatting found in info section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
-            }
-            	
-            //END INFO NODE
-
-            try {
-                if (thisGroupNode.get("inheritance") == null || thisGroupNode.get("inheritance") instanceof List) {
-	                Object inheritNode = thisGroupNode.get("inheritance");
-	                if (inheritNode == null) {
-	                    thisGroupNode.put("inheritance", new ArrayList<String>());
-	                } else if (inheritNode instanceof List) {
-	                    List<String> groupsInh = (List<String>) inheritNode;
-	                    for (String grp : groupsInh) {
-	                        if (inheritance.get(groupKey) == null) {
-	                            List<String> thisInherits = new ArrayList<String>();
-	                            inheritance.put(groupKey, thisInherits);
-	                        }
-	                        inheritance.get(groupKey).add(grp);
-	
-	                    }
-	                }
-                }else
-                	throw new IllegalArgumentException("Unknown entry found in inheritance section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath());
-            } catch (Exception ex) {
-            	throw new IllegalArgumentException("Invalid formatting found in inheritance section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
-            }
-        }
-
-        
-        if (ph.getDefaultGroup() == null) {
-            throw new IllegalArgumentException("There was no Default Group declared in file: " + groupsFile.getPath());
-        }
-        
-        /*
-         * Build the inheritance map and recored any errors
-         */
-        for (String group : inheritance.keySet()) {
-            List<String> inheritedList = inheritance.get(group);
-            Group thisGroup = ph.getGroup(group);
-            if (thisGroup != null)
-	            for (String inheritedKey : inheritedList) {
-	            	if (inheritedKey != null) {
-		                Group inheritedGroup = ph.getGroup(inheritedKey);
-		                if (inheritedGroup != null) {
-		                    thisGroup.addInherits(inheritedGroup);
-		                } else
-		                	GroupManager.logger.warning("Inherited group '" + inheritedKey + "' not found for group " + thisGroup.getName() + ". Ignoring entry in file: " + groupsFile.getPath());
-	            	}
-	            }
-        }
-        
-        ph.removeGroupsChangedFlag();
-        // Update the LastModified time.
-        ph.setGroupsFile(groupsFile);
-        ph.setTimeStampGroups(groupsFile.lastModified());
-
-        //return ph;
-    }
-    
-    /**
-     * Updates the WorldDataHolder from the Users file
-     * 
-     * @param ph
-     * @param usersFile
-     * 
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected static void loadUsers(WorldDataHolder ph, File usersFile) throws FileNotFoundException, IOException {
-    	
-        //READ USERS FILE
-        Yaml yamlUsers = new Yaml(new SafeConstructor());
-        Map<String, Object> usersRootDataNode;
-        if (!usersFile.exists()) {
-            throw new IllegalArgumentException("The file which should contain users does not exist!\n" + usersFile.getPath());
-        }
-        FileInputStream usersInputStream = new FileInputStream(usersFile);
-        try {
-            usersRootDataNode = (Map<String, Object>) yamlUsers.load(new UnicodeReader(usersInputStream));
-            if (usersRootDataNode == null) {
-                throw new NullPointerException();
-            }
-        } catch (Exception ex) {
-            throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + usersFile.getPath(), ex);
-        } finally {
-            usersInputStream.close();
-        }
-
-        // PROCESS USERS FILE
-        Map<String, Object> allUsersNode = new HashMap<String, Object>();
-        
-        /*
-    	 * Fetch all child nodes under the 'users' entry.
-    	 */
-        try {
-        	allUsersNode = (Map<String, Object>) usersRootDataNode.get("users");
-        } catch (Exception ex) {
-            //ex.printStackTrace();
-            throw new IllegalArgumentException("Your " + usersFile.getPath() + " file is invalid. See console for details.", ex);
-        }
-        
-        // Load users if the file is NOT empty
-        if (allUsersNode != null) {
-        	
-        	Iterator<String> usersItr = allUsersNode.keySet().iterator();
-        	String usersKey;
-        	Integer userCount = 0;
-        	
-        	while (usersItr.hasNext()) {
-        		try {
-        			userCount++;
-        			// Attempt to fetch the next user name.
-        			usersKey = usersItr.next();
-        		} catch (Exception ex) {
-    				throw new IllegalArgumentException("Invalid node type for user entry (" + userCount + ") in file: " + usersFile.getPath(), ex);
-    			}
-
-        		Map<String, Object> thisUserNode = null;
-	        	try {
-	        		thisUserNode = (Map<String, Object>) allUsersNode.get(usersKey);
-	        	} catch (Exception ex) {
-	        		throw new IllegalArgumentException("Bad format found in file: " + usersFile.getPath());
-	            }
-	            User thisUser = ph.createUser(usersKey);
-	            if (thisUser == null) {
-	                throw new IllegalArgumentException("I think this user was declared more than once: " + usersKey + " in file: " + usersFile.getPath());
-	            }
-	            if (thisUserNode.get("permissions") == null) {
-	                thisUserNode.put("permissions", new ArrayList<String>());
-	            } else {
-		            if (thisUserNode.get("permissions") instanceof List) {
-		                for (Object o : ((List) thisUserNode.get("permissions"))) {
-		                	/*
-		            		 * Only add this permission if it's not empty
-		            		 */
-		            		if (!o.toString().isEmpty())
-		            			thisUser.addPermission(o.toString());
-		                }
-		            } else if (thisUserNode.get("permissions") instanceof String) {
-		            	try {
-		            		/*
-		            		 * Only add this permission if it's not empty
-		            		 */
-		            		if (!thisUserNode.get("permissions").toString().isEmpty())
-		            			thisUser.addPermission(thisUserNode.get("permissions").toString());
-		            	} catch (NullPointerException e) {
-		            		// Ignore this entry as it's null.
-		            	}
-		            }
-		            thisUser.sortPermissions();
-	            }
-	
-	            //SUBGROUPS LOADING
-	            if (thisUserNode.get("subgroups") == null) {
-	                thisUserNode.put("subgroups", new ArrayList<String>());
-	            }
-	            if (thisUserNode.get("subgroups") instanceof List) {
-	                for (Object o : ((List) thisUserNode.get("subgroups"))) {
-	                    Group subGrp = ph.getGroup(o.toString());
-	                    if (subGrp != null) {
-	                        thisUser.addSubGroup(subGrp);
-	                    } else {
-	                        GroupManager.logger.warning("Subgroup " + o.toString() + " not found for user " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath());
-	                    }
-	                }
-	            } else if (thisUserNode.get("subgroups") instanceof String) {
-	                Group subGrp = ph.getGroup(thisUserNode.get("subgroups").toString());
-	                if (subGrp != null) {
-	                    thisUser.addSubGroup(subGrp);
-	                } else {
-	                    GroupManager.logger.warning("Subgroup " + thisUserNode.get("subgroups").toString() + " not found for user " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath());
-	                }
-	            }
-	
-	
-	            //USER INFO NODE
-	            
-	            //INFO NODE
-                if (thisUserNode.get("info") instanceof Map) {
-	                Map<String, Object> infoNode = (Map<String, Object>) thisUserNode.get("info");
-	                if (infoNode != null) {
-	                	thisUser.setVariables(infoNode);
-	                }
-                } else if (thisUserNode.get("info") != null)
-                	throw new IllegalArgumentException("Unknown entry found in Info section for user: " + thisUser.getName() + " in file: " + usersFile.getPath());
-                	
-                //END INFO NODE
-	
-	
-	            if (thisUserNode.get("group") != null) {
-	                Group hisGroup = ph.getGroup(thisUserNode.get("group").toString());
-	                if (hisGroup == null) {
-	                	GroupManager.logger.warning("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName() + ": Set to '" + ph.getDefaultGroup().getName() + "' for file: " + usersFile.getPath());
-	                	hisGroup = ph.getDefaultGroup();
-	                    //throw new IllegalArgumentException("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName());
-	                }
-	                thisUser.setGroup(hisGroup);
-	            } else {
-	                thisUser.setGroup(ph.getDefaultGroup());
-	            }
-	        }
-    	}
-        
-        ph.removeUsersChangedFlag();
-        // Update the LastModified time.
-        ph.setUsersFile(usersFile);
-        ph.setTimeStampUsers(usersFile.lastModified());
-    }
-
-    /**
-     * Write a dataHolder in a specified file
-     * @param ph
-     * @param groupsFile
-     */
-    public static void writeGroups(WorldDataHolder ph, File groupsFile) {
-        Map<String, Object> root = new HashMap<String, Object>();
-
-        Map<String, Object> groupsMap = new HashMap<String, Object>();
-
-        root.put("groups", groupsMap);
-        for (String groupKey : ph.getGroups().keySet()) {
-            Group group = ph.getGroups().get(groupKey);
-
-            Map<String, Object> aGroupMap = new HashMap<String, Object>();
-            groupsMap.put(group.getName(), aGroupMap);
-
-            if (ph.getDefaultGroup() == null) {
-                GroupManager.logger.severe("There is no default group for world: " + ph.getName());
-            }
-            aGroupMap.put("default", group.equals(ph.getDefaultGroup()));
-
-            Map<String, Object> infoMap = new HashMap<String, Object>();
-            aGroupMap.put("info", infoMap);
-
-            for (String infoKey : group.getVariables().getVarKeyList()) {
-                infoMap.put(infoKey, group.getVariables().getVarObject(infoKey));
-            }
-
-            aGroupMap.put("inheritance", group.getInherits());
-
-            aGroupMap.put("permissions", group.getPermissionList());
-        }
-
-        if (!root.isEmpty()) {
-	        DumperOptions opt = new DumperOptions();
-	        opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-	        final Yaml yaml = new Yaml(opt);
-	        try {
-	        	OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(groupsFile), "UTF-8");
-	        	
-	        	String newLine = System.getProperty("line.separator");
-	        	
-	        	out.write("# Group inheritance" + newLine);
-	        	out.write("#" + newLine);
-	        	out.write("# Any inherited groups prefixed with a g: are global groups" + newLine);
-	        	out.write("# and are inherited from the GlobalGroups.yml." + newLine);
-	        	out.write("#" + newLine);
-	        	out.write("# Groups without the g: prefix are groups local to this world" + newLine);
-	        	out.write("# and are defined in the this groups.yml file." + newLine);
-	        	out.write("#" + newLine);
-	        	out.write("# Local group inheritances define your promotion tree when using 'manpromote/mandemote'" + newLine);
-	        	out.write(newLine);
-	        	
-	            yaml.dump(root, out);
-	            out.close();
-	        } catch (UnsupportedEncodingException ex) {
-	        } catch (FileNotFoundException ex) {
-	        } catch (IOException e) {
+
+			/*
+			 * Create a new group with this name
+			 * in the assigned data source.
+			 */
+			Group thisGrp = ph.createGroup(groupKey);
+
+			if (thisGrp == null) {
+				throw new IllegalArgumentException("I think this Group was declared more than once: " + groupKey + " in file: " + groupsFile.getPath());
 			}
-        }
-        
-        // Update the LastModified time.
-        ph.setGroupsFile(groupsFile);
-        ph.setTimeStampGroups(groupsFile.lastModified());
-        ph.removeGroupsChangedFlag();
-        
-        if (GroupManager.isLoaded())
-        	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED);
-
-        /*FileWriter tx = null;
-        try {
-        tx = new FileWriter(groupsFile, false);
-        tx.write(yaml.dump(root));
-        tx.flush();
-        } catch (Exception e) {
-        } finally {
-        try {
-        tx.close();
-        } catch (IOException ex) {
-        }
-        }*/
-    }
-
-    /**
-     * Write a dataHolder in a specified file
-     * @param ph
-     * @param usersFile
-     */
-    public static void writeUsers(WorldDataHolder ph, File usersFile) {
-        Map<String, Object> root = new HashMap<String, Object>();
-
-        Map<String, Object> usersMap = new HashMap<String, Object>();
-        root.put("users", usersMap);
-        for (String userKey : ph.getUsers().keySet()) {
-            User user = ph.getUsers().get(userKey);
-            if ((user.getGroup() == null || user.getGroup().equals(ph.getDefaultGroup())) && user.getPermissionList().isEmpty() && user.getVariables().isEmpty() && user.isSubGroupsEmpty()) {
-                continue;
-            }
-
-            Map<String, Object> aUserMap = new HashMap<String, Object>();
-            usersMap.put(user.getName(), aUserMap);
-
-            if (user.getGroup() == null) {
-                aUserMap.put("group", ph.getDefaultGroup().getName());
-            } else {
-                aUserMap.put("group", user.getGroup().getName());
-            }
-            //USER INFO NODE - BETA
-            if (user.getVariables().getSize() > 0) {
-                Map<String, Object> infoMap = new HashMap<String, Object>();
-                aUserMap.put("info", infoMap);
-                for (String infoKey : user.getVariables().getVarKeyList()) {
-                    infoMap.put(infoKey, user.getVariables().getVarObject(infoKey));
-                }
-            }
-            //END USER INFO NODE - BETA
-            aUserMap.put("permissions", user.getPermissionList());
-
-            //SUBGROUPS NODE - BETA
-            aUserMap.put("subgroups", user.subGroupListStringCopy());
-            //END SUBGROUPS NODE - BETA
-        }
-        
-        if (!root.isEmpty()) {
-	        DumperOptions opt = new DumperOptions();
-	        opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-	        final Yaml yaml = new Yaml(opt);
-	        try {
-	        	OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8");
-	            yaml.dump(root, out);
-	            out.close();
-	        } catch (UnsupportedEncodingException ex) {
-	        } catch (FileNotFoundException ex) {
-	        } catch (IOException e) {
+
+			// DEFAULT NODE
+
+			Object nodeData = null;
+			try {
+				nodeData = thisGroupNode.get("default");
+			} catch (Exception ex) {
+				throw new IllegalArgumentException("Bad format found in 'permissions' for group: " + groupKey + " in file: " + groupsFile.getPath());
 			}
-        }
-        
-        // Update the LastModified time.
-        ph.setUsersFile(usersFile);
-        ph.setTimeStampUsers(usersFile.lastModified());
-        ph.removeUsersChangedFlag();
-        
-        if (GroupManager.isLoaded())
-        	GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED);
-        
-        /*FileWriter tx = null;
-        try {
-        tx = new FileWriter(usersFile, false);
-        tx.write(yaml.dump(root));
-        tx.flush();
-        } catch (Exception e) {
-        } finally {
-        try {
-        tx.close();
-        } catch (IOException ex) {
-        }
-        }*/
-    }
-
-    /**
-     * Don't use this. Unless you want to make this plugin to interact with original Nijikokun Permissions
-     * This method is supposed to make the original one reload the file, and propagate the changes made here.
-     *
-     * Prefer to use the AnjoCaido's fake version of Nijikokun's Permission plugin.
-     * The AnjoCaido's Permission can propagate the changes made on this plugin instantly,
-     * without need to save the file.
-     *
-     * @param server the server that holds the plugin
-     * @deprecated it is not used anymore... unless if you use original Permissions
-     */
-    @Deprecated
-    public static void reloadOldPlugins(Server server) {
-        // Only reload permissions
-        PluginManager pm = server.getPluginManager();
-        Plugin[] plugins = pm.getPlugins();
-        for (int i = 0; i < plugins.length; i++) {
-            //plugins[i].getConfiguration().load();
-            try {
-                plugins[i].getClass().getMethod("setupPermissions").invoke(plugins[i]);
-            } catch (Exception ex) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * @return the permissionsHandler
-     */
-    public AnjoPermissionsHandler getPermissionsHandler() {
-        if (permissionsHandler == null) {
-            permissionsHandler = new AnjoPermissionsHandler(this);
-        }
-        return permissionsHandler;
-    }
-    
-    /**
+
+			if (nodeData == null) {
+				/*
+				 * If no 'default' node is found do nothing.
+				 */
+			} else if ((Boolean.parseBoolean(nodeData.toString()))) {
+				/*
+				 * Set this as the default group.
+				 * Warn if some other group has already claimed that position.
+				 */
+				if (ph.getDefaultGroup() != null) {
+					GroupManager.logger.warning("The group '" + thisGrp.getName() + "' is claiming to be default where '" + ph.getDefaultGroup().getName() + "' already was.");
+					GroupManager.logger.warning("Overriding first default request in file: " + groupsFile.getPath());
+				}
+				ph.setDefaultGroup(thisGrp);
+			}
+
+			// PERMISSIONS NODE
+
+			nodeData = null;
+			try {
+				nodeData = thisGroupNode.get("permissions");
+			} catch (Exception ex) {
+				throw new IllegalArgumentException("Bad format found in 'permissions' for '" + groupKey + "' in file: " + groupsFile.getPath());
+			}
+
+			if (nodeData == null) {
+				/*
+				 * If no permissions node is found, or it's empty
+				 * do nothing.
+				 */
+			} else {
+				/*
+				 * There is a permission list Which seems to hold some data
+				 */
+				if (nodeData instanceof List) {
+					/*
+					 * Check each entry and add it as a new permission.
+					 */
+					try {
+						for (Object o : ((List) nodeData)) {
+							try {
+								/*
+								 * Only add this permission if it's not empty.
+								 */
+								if (!o.toString().isEmpty())
+									thisGrp.addPermission(o.toString());
+
+							} catch (NullPointerException ex) {
+								// Ignore this entry as it's null. It can be
+								// safely dropped
+							}
+						}
+					} catch (Exception ex) {
+						throw new IllegalArgumentException("Invalid formatting found in 'permissions' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
+					}
+
+				} else if (nodeData instanceof String) {
+					/*
+					 * Only add this permission if it's not empty.
+					 */
+					if (!nodeData.toString().isEmpty())
+						thisGrp.addPermission((String) nodeData);
+
+				} else {
+					throw new IllegalArgumentException("Unknown type of 'permissions' node(Should be String or List<String>) for group:  " + thisGrp.getName() + " in file: " + groupsFile.getPath());
+				}
+				/*
+				 * Sort all permissions so they are in the correct order for
+				 * checking.
+				 */
+				thisGrp.sortPermissions();
+			}
+
+			// INFO NODE
+
+			nodeData = null;
+			try {
+				nodeData = thisGroupNode.get("info");
+			} catch (Exception ex) {
+				throw new IllegalArgumentException("Bad format found in 'info' section for group: " + groupKey + " in file: " + groupsFile.getPath());
+			}
+
+			if (nodeData == null) {
+				/*
+				 * No info section was found, so leave all variables as
+				 * defaults.
+				 */
+				GroupManager.logger.warning("The group '" + thisGrp.getName() + "' has no 'info' section!");
+				GroupManager.logger.warning("Using default values: " + groupsFile.getPath());
+
+			} else if (nodeData instanceof Map) {
+				try {
+					if (nodeData != null) {
+						thisGrp.setVariables((Map<String, Object>) nodeData);
+					}
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Invalid formatting found in 'info' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
+				}
+
+			} else
+				throw new IllegalArgumentException("Unknown entry found in 'info' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath());
+
+			// INHERITANCE NODE
+
+			nodeData = null;
+			try {
+				nodeData = thisGroupNode.get("inheritance");
+			} catch (Exception ex) {
+				throw new IllegalArgumentException("Bad format found in 'inheritance' section for group: " + groupKey + " in file: " + groupsFile.getPath());
+			}
+
+			if (nodeData == null || nodeData instanceof List) {
+				if (nodeData == null) {
+					/*
+					 * If no inheritance node is found, or it's empty
+					 * do nothing.
+					 */
+				} else if (nodeData instanceof List) {
+
+					try {
+						for (String grp : (List<String>) nodeData) {
+							if (inheritance.get(groupKey) == null) {
+								inheritance.put(groupKey, new ArrayList<String>());
+							}
+							inheritance.get(groupKey).add(grp);
+						}
+
+					} catch (Exception ex) {
+						throw new IllegalArgumentException("Invalid formatting found in 'inheritance' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath(), ex);
+					}
+
+				}
+			} else
+				throw new IllegalArgumentException("Unknown entry found in 'inheritance' section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath());
+
+			// END GROUP
+
+		}
+
+		if (ph.getDefaultGroup() == null) {
+			throw new IllegalArgumentException("There was no Default Group declared in file: " + groupsFile.getPath());
+		}
+
+		/*
+		 * Build the inheritance map and recored any errors
+		 */
+		for (String group : inheritance.keySet()) {
+			List<String> inheritedList = inheritance.get(group);
+			Group thisGroup = ph.getGroup(group);
+			if (thisGroup != null)
+				for (String inheritedKey : inheritedList) {
+					if (inheritedKey != null) {
+						Group inheritedGroup = ph.getGroup(inheritedKey);
+						if (inheritedGroup != null) {
+							thisGroup.addInherits(inheritedGroup);
+						} else
+							GroupManager.logger.warning("Inherited group '" + inheritedKey + "' not found for group " + thisGroup.getName() + ". Ignoring entry in file: " + groupsFile.getPath());
+					}
+				}
+		}
+
+		ph.removeGroupsChangedFlag();
+		// Update the LastModified time.
+		ph.setGroupsFile(groupsFile);
+		ph.setTimeStampGroups(groupsFile.lastModified());
+
+		// return ph;
+	}
+
+	/**
+	 * Updates the WorldDataHolder from the Users file
+	 * 
+	 * @param ph
+	 * @param usersFile
+	 * 
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected static void loadUsers(WorldDataHolder ph, File usersFile) throws FileNotFoundException, IOException {
+
+		// READ USERS FILE
+		Yaml yamlUsers = new Yaml(new SafeConstructor());
+		Map<String, Object> usersRootDataNode;
+		if (!usersFile.exists()) {
+			throw new IllegalArgumentException("The file which should contain users does not exist!\n" + usersFile.getPath());
+		}
+		FileInputStream usersInputStream = new FileInputStream(usersFile);
+		try {
+			usersRootDataNode = (Map<String, Object>) yamlUsers.load(new UnicodeReader(usersInputStream));
+			if (usersRootDataNode == null) {
+				throw new NullPointerException();
+			}
+		} catch (Exception ex) {
+			throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + usersFile.getPath(), ex);
+		} finally {
+			usersInputStream.close();
+		}
+
+		// PROCESS USERS FILE
+
+		Map<String, Object> allUsersNode = null;
+
+		/*
+		 * Fetch all child nodes under the 'users' entry.
+		 */
+		try {
+			allUsersNode = (Map<String, Object>) usersRootDataNode.get("users");
+		} catch (Exception ex) {
+			throw new IllegalArgumentException("Your " + usersFile.getPath() + " file is invalid. See console for details.", ex);
+		}
+
+		// Load users if the file is NOT empty
+
+		if (allUsersNode != null) {
+
+			Iterator<String> usersItr = allUsersNode.keySet().iterator();
+			String usersKey;
+			Integer userCount = 0;
+
+			while (usersItr.hasNext()) {
+				try {
+					userCount++;
+					// Attempt to fetch the next user name.
+					usersKey = usersItr.next();
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Invalid node type for user entry (" + userCount + ") in file: " + usersFile.getPath(), ex);
+				}
+
+				Map<String, Object> thisUserNode = null;
+				try {
+					thisUserNode = (Map<String, Object>) allUsersNode.get(usersKey);
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Bad format found for user: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				User thisUser = ph.createUser(usersKey);
+				if (thisUser == null) {
+					throw new IllegalArgumentException("I think this user was declared more than once: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				// USER PERMISSIONS NODES
+
+				Object nodeData = null;
+				try {
+					nodeData = thisUserNode.get("permissions");
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Bad format found in 'permissions' for user: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				if (nodeData == null) {
+					/*
+					 * If no permissions node is found, or it's empty
+					 * do nothing.
+					 */
+				} else {
+					if (nodeData instanceof List) {
+						for (Object o : ((List) nodeData)) {
+							/*
+							 * Only add this permission if it's not empty
+							 */
+							if (!o.toString().isEmpty())
+								thisUser.addPermission(o.toString());
+						}
+					} else if (nodeData instanceof String) {
+						try {
+							/*
+							 * Only add this permission if it's not empty
+							 */
+							if (!nodeData.toString().isEmpty())
+								thisUser.addPermission(nodeData.toString());
+						} catch (NullPointerException e) {
+							// Ignore this entry as it's null.
+						}
+					}
+					thisUser.sortPermissions();
+				}
+
+				// SUBGROUPS NODES
+
+				nodeData = null;
+				try {
+					nodeData = thisUserNode.get("subgroups");
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Bad format found in 'subgroups' for user: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				if (nodeData == null) {
+					/*
+					 * If no subgroups node is found, or it's empty
+					 * do nothing.
+					 */
+				} else if (nodeData instanceof List) {
+					for (Object o : ((List) nodeData)) {
+						Group subGrp = ph.getGroup(o.toString());
+						if (subGrp != null) {
+							thisUser.addSubGroup(subGrp);
+						} else {
+							GroupManager.logger.warning("Subgroup '" + o.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath());
+						}
+					}
+				} else if (nodeData instanceof String) {
+					Group subGrp = ph.getGroup(nodeData.toString());
+					if (subGrp != null) {
+						thisUser.addSubGroup(subGrp);
+					} else {
+						GroupManager.logger.warning("Subgroup '" + nodeData.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath());
+					}
+				}
+
+				// USER INFO NODE
+
+				nodeData = null;
+				try {
+					nodeData = thisUserNode.get("info");
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Bad format found in 'info' section for user: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				if (nodeData == null) {
+					/*
+					 * If no info node is found, or it's empty
+					 * do nothing.
+					 */
+				} else if (nodeData instanceof Map) {
+					thisUser.setVariables((Map<String, Object>) nodeData);
+
+				} else
+					throw new IllegalArgumentException("Unknown entry found in 'info' section for user: " + thisUser.getName() + " in file: " + usersFile.getPath());
+
+				// END INFO NODE
+
+				// PRIMARY GROUP
+
+				nodeData = null;
+				try {
+					nodeData = thisUserNode.get("group");
+				} catch (Exception ex) {
+					throw new IllegalArgumentException("Bad format found in 'group' section for user: " + usersKey + " in file: " + usersFile.getPath());
+				}
+
+				if (nodeData != null) {
+					Group hisGroup = ph.getGroup(nodeData.toString());
+					if (hisGroup == null) {
+						GroupManager.logger.warning("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName() + ": Set to '" + ph.getDefaultGroup().getName() + "' for file: " + usersFile.getPath());
+						hisGroup = ph.getDefaultGroup();
+					}
+					thisUser.setGroup(hisGroup);
+				} else {
+					thisUser.setGroup(ph.getDefaultGroup());
+				}
+			}
+		}
+
+		ph.removeUsersChangedFlag();
+		// Update the LastModified time.
+		ph.setUsersFile(usersFile);
+		ph.setTimeStampUsers(usersFile.lastModified());
+	}
+
+	/**
+	 * Write a dataHolder in a specified file
+	 * 
+	 * @param ph
+	 * @param groupsFile
+	 */
+	public static void writeGroups(WorldDataHolder ph, File groupsFile) {
+
+		Map<String, Object> root = new HashMap<String, Object>();
+
+		Map<String, Object> groupsMap = new HashMap<String, Object>();
+
+		root.put("groups", groupsMap);
+		for (String groupKey : ph.getGroups().keySet()) {
+			Group group = ph.getGroups().get(groupKey);
+
+			Map<String, Object> aGroupMap = new HashMap<String, Object>();
+			groupsMap.put(group.getName(), aGroupMap);
+
+			if (ph.getDefaultGroup() == null) {
+				GroupManager.logger.severe("There is no default group for world: " + ph.getName());
+			}
+			aGroupMap.put("default", group.equals(ph.getDefaultGroup()));
+
+			Map<String, Object> infoMap = new HashMap<String, Object>();
+			aGroupMap.put("info", infoMap);
+
+			for (String infoKey : group.getVariables().getVarKeyList()) {
+				infoMap.put(infoKey, group.getVariables().getVarObject(infoKey));
+			}
+
+			aGroupMap.put("inheritance", group.getInherits());
+
+			aGroupMap.put("permissions", group.getPermissionList());
+		}
+
+		if (!root.isEmpty()) {
+			DumperOptions opt = new DumperOptions();
+			opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+			final Yaml yaml = new Yaml(opt);
+			try {
+				OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(groupsFile), "UTF-8");
+
+				String newLine = System.getProperty("line.separator");
+
+				out.write("# Group inheritance" + newLine);
+				out.write("#" + newLine);
+				out.write("# Any inherited groups prefixed with a g: are global groups" + newLine);
+				out.write("# and are inherited from the GlobalGroups.yml." + newLine);
+				out.write("#" + newLine);
+				out.write("# Groups without the g: prefix are groups local to this world" + newLine);
+				out.write("# and are defined in the this groups.yml file." + newLine);
+				out.write("#" + newLine);
+				out.write("# Local group inheritances define your promotion tree when using 'manpromote/mandemote'" + newLine);
+				out.write(newLine);
+
+				yaml.dump(root, out);
+				out.close();
+			} catch (UnsupportedEncodingException ex) {
+			} catch (FileNotFoundException ex) {
+			} catch (IOException e) {
+			}
+		}
+
+		// Update the LastModified time.
+		ph.setGroupsFile(groupsFile);
+		ph.setTimeStampGroups(groupsFile.lastModified());
+		ph.removeGroupsChangedFlag();
+
+		if (GroupManager.isLoaded())
+			GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED);
+
+		/*
+		 * FileWriter tx = null;
+		 * try {
+		 * tx = new FileWriter(groupsFile, false);
+		 * tx.write(yaml.dump(root));
+		 * tx.flush();
+		 * } catch (Exception e) {
+		 * } finally {
+		 * try {
+		 * tx.close();
+		 * } catch (IOException ex) {
+		 * }
+		 * }
+		 */
+	}
+
+	/**
+	 * Write a dataHolder in a specified file
+	 * 
+	 * @param ph
+	 * @param usersFile
+	 */
+	public static void writeUsers(WorldDataHolder ph, File usersFile) {
+
+		Map<String, Object> root = new HashMap<String, Object>();
+
+		Map<String, Object> usersMap = new HashMap<String, Object>();
+		root.put("users", usersMap);
+		for (String userKey : ph.getUsers().keySet()) {
+			User user = ph.getUsers().get(userKey);
+			if ((user.getGroup() == null || user.getGroup().equals(ph.getDefaultGroup())) && user.getPermissionList().isEmpty() && user.getVariables().isEmpty() && user.isSubGroupsEmpty()) {
+				continue;
+			}
+
+			Map<String, Object> aUserMap = new HashMap<String, Object>();
+			usersMap.put(user.getName(), aUserMap);
+
+			if (user.getGroup() == null) {
+				aUserMap.put("group", ph.getDefaultGroup().getName());
+			} else {
+				aUserMap.put("group", user.getGroup().getName());
+			}
+			// USER INFO NODE - BETA
+			if (user.getVariables().getSize() > 0) {
+				Map<String, Object> infoMap = new HashMap<String, Object>();
+				aUserMap.put("info", infoMap);
+				for (String infoKey : user.getVariables().getVarKeyList()) {
+					infoMap.put(infoKey, user.getVariables().getVarObject(infoKey));
+				}
+			}
+			// END USER INFO NODE - BETA
+			aUserMap.put("permissions", user.getPermissionList());
+
+			// SUBGROUPS NODE - BETA
+			aUserMap.put("subgroups", user.subGroupListStringCopy());
+			// END SUBGROUPS NODE - BETA
+		}
+
+		if (!root.isEmpty()) {
+			DumperOptions opt = new DumperOptions();
+			opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+			final Yaml yaml = new Yaml(opt);
+			try {
+				OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8");
+				yaml.dump(root, out);
+				out.close();
+			} catch (UnsupportedEncodingException ex) {
+			} catch (FileNotFoundException ex) {
+			} catch (IOException e) {
+			}
+		}
+
+		// Update the LastModified time.
+		ph.setUsersFile(usersFile);
+		ph.setTimeStampUsers(usersFile.lastModified());
+		ph.removeUsersChangedFlag();
+
+		if (GroupManager.isLoaded())
+			GroupManagerEventHandler.callEvent(GMSystemEvent.Action.SAVED);
+
+		/*
+		 * FileWriter tx = null;
+		 * try {
+		 * tx = new FileWriter(usersFile, false);
+		 * tx.write(yaml.dump(root));
+		 * tx.flush();
+		 * } catch (Exception e) {
+		 * } finally {
+		 * try {
+		 * tx.close();
+		 * } catch (IOException ex) {
+		 * }
+		 * }
+		 */
+	}
+
+	/**
+	 * Don't use this. Unless you want to make this plugin to interact with
+	 * original Nijikokun Permissions
+	 * This method is supposed to make the original one reload the file, and
+	 * propagate the changes made here.
+	 * 
+	 * Prefer to use the AnjoCaido's fake version of Nijikokun's Permission
+	 * plugin.
+	 * The AnjoCaido's Permission can propagate the changes made on this plugin
+	 * instantly,
+	 * without need to save the file.
+	 * 
+	 * @param server the server that holds the plugin
+	 * @deprecated it is not used anymore... unless if you use original
+	 *             Permissions
+	 */
+	@Deprecated
+	public static void reloadOldPlugins(Server server) {
+
+		// Only reload permissions
+		PluginManager pm = server.getPluginManager();
+		Plugin[] plugins = pm.getPlugins();
+		for (int i = 0; i < plugins.length; i++) {
+			// plugins[i].getConfiguration().load();
+			try {
+				plugins[i].getClass().getMethod("setupPermissions").invoke(plugins[i]);
+			} catch (Exception ex) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * @return the permissionsHandler
+	 */
+	public AnjoPermissionsHandler getPermissionsHandler() {
+
+		if (permissionsHandler == null) {
+			permissionsHandler = new AnjoPermissionsHandler(this);
+		}
+		return permissionsHandler;
+	}
+
+	/**
 	 * @param haveUsersChanged the haveUsersChanged to set
 	 */
 	public void setUsersChanged(boolean haveUsersChanged) {
+
 		users.setUsersChanged(haveUsersChanged);
 	}
 
-    /**
-     *
-     * @return true if any user data has changed
-     */
-    public boolean haveUsersChanged() {
-        if (users.HaveUsersChanged()) {
-            return true;
-        }
-        for (User u : users.getUsers().values()) {
-            if (u.isChanged()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
+	/**
+	 * 
+	 * @return true if any user data has changed
+	 */
+	public boolean haveUsersChanged() {
+
+		if (users.HaveUsersChanged()) {
+			return true;
+		}
+		for (User u : users.getUsers().values()) {
+			if (u.isChanged()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
 	 * @param setGroupsChanged the haveGroupsChanged to set
 	 */
 	public void setGroupsChanged(boolean setGroupsChanged) {
+
 		groups.setGroupsChanged(setGroupsChanged);
 	}
-	
-    /**
-     *
-     * @return true if any group data has changed.
-     */
-    public boolean haveGroupsChanged() {
-        if (groups.HaveGroupsChanged()) {
-            return true;
-        }
-        for (Group g : groups.getGroups().values()) {
-            if (g.isChanged()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
+
+	/**
+	 * 
+	 * @return true if any group data has changed.
+	 */
+	public boolean haveGroupsChanged() {
+
+		if (groups.HaveGroupsChanged()) {
+			return true;
+		}
+		for (Group g : groups.getGroups().values()) {
+			if (g.isChanged()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
      *
      */
-    public void removeUsersChangedFlag() {
-    	setUsersChanged(false);
-        for (User u : getUsers().values()) {
-            u.flagAsSaved();
-        }
-    }
-
-    /**
+	public void removeUsersChangedFlag() {
+
+		setUsersChanged(false);
+		for (User u : getUsers().values()) {
+			u.flagAsSaved();
+		}
+	}
+
+	/**
      *
      */
-    public void removeGroupsChangedFlag() {
-        setGroupsChanged(false);
-        for (Group g : getGroups().values()) {
-            g.flagAsSaved();
-        }
-    }
-
-    /**
-     * @return the usersFile
-     */
-    public File getUsersFile() {
-        return users.getUsersFile();
-    }
-    
-    /**
-     * @param file the usersFile to set
-     */
-    public void setUsersFile(File file) {
-        users.setUsersFile(file);
-    }
+	public void removeGroupsChangedFlag() {
 
-    /**
-     * @return the groupsFile
-     */
-    public File getGroupsFile() {
-        return groups.getGroupsFile();
-    }
-    
-    /**
-     * @param file the groupsFile to set
-     */
-    public void setGroupsFile(File file) {
-        groups.setGroupsFile(file);
-    }
+		setGroupsChanged(false);
+		for (Group g : getGroups().values()) {
+			g.flagAsSaved();
+		}
+	}
 
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-    
-    /**
+	/**
+	 * @return the usersFile
+	 */
+	public File getUsersFile() {
+
+		return users.getUsersFile();
+	}
+
+	/**
+	 * @param file the usersFile to set
+	 */
+	public void setUsersFile(File file) {
+
+		users.setUsersFile(file);
+	}
+
+	/**
+	 * @return the groupsFile
+	 */
+	public File getGroupsFile() {
+
+		return groups.getGroupsFile();
+	}
+
+	/**
+	 * @param file the groupsFile to set
+	 */
+	public void setGroupsFile(File file) {
+
+		groups.setGroupsFile(file);
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+
+		return name;
+	}
+
+	/**
 	 * Resets Groups.
 	 */
 	public void resetGroups() {
-		//setDefaultGroup(null);
+
+		// setDefaultGroup(null);
 		groups.setGroups(new HashMap<String, Group>());
 	}
-    /**
+
+	/**
 	 * Resets Users
 	 */
 	public void resetUsers() {
+
 		users.setUsers(new HashMap<String, User>());
 	}
-    
-    /**
+
+	/**
 	 * @return the groups
 	 */
 	public Map<String, Group> getGroups() {
+
 		return groups.getGroups();
 	}
-    /**
+
+	/**
 	 * @return the users
 	 */
 	public Map<String, User> getUsers() {
+
 		return users.getUsers();
 	}
-	
+
 	/**
 	 * @return the groups
 	 */
 	public GroupsDataHolder getGroupsObject() {
+
 		return groups;
 	}
+
 	/**
 	 * @param groupsDataHolder the GroupsDataHolder to set
 	 */
 	public void setGroupsObject(GroupsDataHolder groupsDataHolder) {
+
 		groups = groupsDataHolder;
 	}
-    /**
+
+	/**
 	 * @return the users
 	 */
 	public UsersDataHolder getUsersObject() {
+
 		return users;
 	}
+
 	/**
 	 * @param usersDataHolder the UsersDataHolder to set
 	 */
 	public void setUsersObject(UsersDataHolder usersDataHolder) {
+
 		users = usersDataHolder;
 	}
-    
-    /**
+
+	/**
 	 * @return the timeStampGroups
 	 */
 	public long getTimeStampGroups() {
+
 		return groups.getTimeStampGroups();
 	}
-    /**
+
+	/**
 	 * @return the timeStampUsers
 	 */
 	public long getTimeStampUsers() {
+
 		return users.getTimeStampUsers();
 	}
 
@@ -1160,20 +1325,24 @@ public class WorldDataHolder {
 	 * @param timeStampGroups the timeStampGroups to set
 	 */
 	protected void setTimeStampGroups(long timeStampGroups) {
+
 		groups.setTimeStampGroups(timeStampGroups);
 	}
-    /**
+
+	/**
 	 * @param timeStampUsers the timeStampUsers to set
 	 */
 	protected void setTimeStampUsers(long timeStampUsers) {
+
 		users.setTimeStampUsers(timeStampUsers);
 	}
-	
+
 	public void setTimeStamps() {
+
 		if (getGroupsFile() != null)
 			setTimeStampGroups(getGroupsFile().lastModified());
 		if (getUsersFile() != null)
 			setTimeStampUsers(getUsersFile().lastModified());
-	}	
-	
+	}
+
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
index bfa7d5cd2..37d0a8430 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
@@ -26,432 +26,450 @@ import org.bukkit.configuration.MemorySection;
 import org.bukkit.entity.Player;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class WorldsHolder {
 
-    /**
-     * Map with instances of loaded worlds.
-     */
-    private Map<String, OverloadedWorldHolder> worldsData = new HashMap<String, OverloadedWorldHolder>();
-    
-    /**
-     * Map of mirrors: <nonExistingWorldName, existingAndLoadedWorldName>
-     * The key is the mirror.
-     * The object is the mirrored.
-     *
-     * Mirror shows the same data of mirrored.
-     */
-    private Map<String, String> mirrorsGroup = new HashMap<String, String>();
-    private Map<String, String> mirrorsUser = new HashMap<String, String>();
-    
-    //private OverloadedWorldHolder defaultWorld;
-    private String serverDefaultWorldName;
-    private GroupManager plugin;
-    private File worldsFolder;
-
-    /**
-     *
-     * @param plugin
-     */
-    public WorldsHolder(GroupManager plugin) {
-        this.plugin = plugin;
-        // Setup folders and check files exist for the primary world
-        verifyFirstRun();
-        initialLoad();
-        if (serverDefaultWorldName == null) {
-            throw new IllegalStateException("There is no default group! OMG!");
-        }
-    }
-
-    private void initialLoad() {
-    	// load the initial world
-        initialWorldLoading();
-        // Configure and load any mirrors and additional worlds as defined in config.yml
-        mirrorSetUp();
-        // search the worlds folder for any manually created worlds (not listed in config.yml)
-        loadAllSearchedWorlds();
-    }
-
-    private void initialWorldLoading() {
-        //Load the default world
-        loadWorld(serverDefaultWorldName);
-        //defaultWorld = getUpdatedWorldData(serverDefaultWorldName);
-    }
-    
-    private void loadAllSearchedWorlds() {
-    	
-    	/*
-    	 *  Read all known worlds from Bukkit
-    	 *  Create the data files if they don't already exist,
-    	 *  and they are not mirrored.
-    	 */
-    	for (World world: plugin.getServer().getWorlds())
-    		if ((!worldsData.containsKey(world.getName().toLowerCase()))
-    				&& ((!mirrorsGroup.containsKey(world.getName().toLowerCase())) || (!mirrorsUser.containsKey(world.getName().toLowerCase()))))
-    			setupWorldFolder(world.getName());
-    	/*
-    	 * Loop over all folders within the worlds folder
-    	 * and attempt to load the world data
-    	 */
-        for (File folder : worldsFolder.listFiles()) {
-        	if (folder.isDirectory()) {
-        		GroupManager.logger.info("World Found: " + folder.getName());
-        	
-        		/*
-        		 * don't load any worlds which are already loaded
-        		 * or fully mirrored worlds that don't need data.
-        		 */
-	        	if (!worldsData.containsKey(folder.getName().toLowerCase())
-	        			&& ((!mirrorsGroup.containsKey(folder.getName().toLowerCase()))
-	        			|| (!mirrorsUser.containsKey(folder.getName().toLowerCase())))) {
-	        		/*
-	        		 * Call setupWorldFolder to check case sensitivity
-	        		 * and convert to lower case, before we attempt to load this world.
-	        		 */
-	        		setupWorldFolder(folder.getName());
-	        		loadWorld(folder.getName().toLowerCase());
-	            }
-	            
-            }
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    public void mirrorSetUp() {
-    	mirrorsGroup.clear();
-    	mirrorsUser.clear();
-    	Map<String, Object> mirrorsMap = plugin.getGMConfig().getMirrorsMap();
-    	
-    	HashSet<String> mirroredWorlds = new HashSet<String>();
-        
-        if (mirrorsMap != null) {
-            for (String source : mirrorsMap.keySet()) {
-            	// Make sure all non mirrored worlds have a set of data files.
-            	setupWorldFolder(source);
-            	// Load the world data
-            	if (!worldsData.containsKey(source.toLowerCase()))
-            		loadWorld(source);
-            	
-                if (mirrorsMap.get(source) instanceof ArrayList) {
-                    ArrayList mirrorList = (ArrayList) mirrorsMap.get(source);
-                    
-                    // These worlds fully mirror their parent
-                    for (Object o : mirrorList) {
-                    	String world = o.toString().toLowerCase();
-                    	if (world != serverDefaultWorldName) {
-	                        try {
-	                            mirrorsGroup.remove(world);
-	                            mirrorsUser.remove(world);
-	                        } catch (Exception e) {
-	                        }
-	                        mirrorsGroup.put(world, getWorldData(source).getName());
-	                        mirrorsUser.put(world, getWorldData(source).getName());
-	                        
-	                        // Track this world so we can create a datasource for it later
-	                        mirroredWorlds.add(o.toString());	                        
-	                        
-                    	} else
-                    		GroupManager.logger.log(Level.WARNING, "Mirroring error with " + o.toString() + ". Recursive loop detected!");
-                    }
-                } else if (mirrorsMap.get(source) instanceof MemorySection) {
-                	MemorySection subSection = (MemorySection) mirrorsMap.get(source);
-                	
-                	for (String key : subSection.getKeys(true)) {
-                		
-                		if (key.toLowerCase() != serverDefaultWorldName) {
-                		
-	                		if (subSection.get(key) instanceof ArrayList) {
-	                			ArrayList mirrorList = (ArrayList) subSection.get(key);
-	                			
-	                			// These worlds have defined mirroring
-	                			for (Object o : mirrorList) {
-	                				String type = o.toString().toLowerCase();
-	                                try {
-	                                	if (type.equals("groups"))
-	                                		mirrorsGroup.remove(key.toLowerCase());
-	                                	
-	                                	if (type.equals("users"))
-	                                		mirrorsUser.remove(key.toLowerCase());
-	                                	
-	                                } catch (Exception e) {
-	                                }
-	                                if (type.equals("groups"))
-	                                	mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName());
-	                                
-	                                if (type.equals("users"))
-	                                	mirrorsUser.put(key.toLowerCase(), getWorldData(source).getName());
-	                            }
-	                			
-	                			// Track this world so we can create a datasource for it later
-	                			mirroredWorlds.add(key);
-	                			
-                		} else
-                    		GroupManager.logger.log(Level.WARNING, "Mirroring error with " + key + ". Recursive loop detected!");
-                			
-                		} else {
-                			throw new IllegalStateException("Unknown mirroring format for " + key);
-                		}
-                		
-                	}
-                }
-            }
-            
-            // Create a datasource for any worlds not already loaded
-            for (String world : mirroredWorlds){
-            	if (!worldsData.containsKey(world.toLowerCase())) {
-            		setupWorldFolder(world);
-            		loadWorld(world, true);
-            	}	
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    public void reloadAll() {
-    	// Load global groups
-        GroupManager.getGlobalGroups().load();
-        
-        ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
-        for (WorldDataHolder w : worldsData.values()) {
-            if (alreadyDone.contains(w)) {
-                continue;
-            }
-            if (!mirrorsGroup.containsKey(w.getName().toLowerCase()))
-            	w.reloadGroups();
-            if (!mirrorsUser.containsKey(w.getName().toLowerCase()))
-            	w.reloadUsers();
-            
-            alreadyDone.add(w);
-        }
-        
-    }
-
-    /**
-     *
-     * @param worldName
-     */
-    public void reloadWorld(String worldName) {
-    	if (!mirrorsGroup.containsKey(worldName.toLowerCase()))
-    		getWorldData(worldName).reloadGroups();
-        if (!mirrorsUser.containsKey(worldName.toLowerCase()))
-        	getWorldData(worldName).reloadUsers();
-    }
-    
-    /**
-     * Wrapper to retain backwards compatibility
-     * (call this function to auto overwrite files)
-     */
-    public void saveChanges() {
-    	saveChanges(true);
-    }
+	/**
+	 * Map with instances of loaded worlds.
+	 */
+	private Map<String, OverloadedWorldHolder> worldsData = new HashMap<String, OverloadedWorldHolder>();
+
+	/**
+	 * Map of mirrors: <nonExistingWorldName, existingAndLoadedWorldName>
+	 * The key is the mirror.
+	 * The object is the mirrored.
+	 * 
+	 * Mirror shows the same data of mirrored.
+	 */
+	private Map<String, String> mirrorsGroup = new HashMap<String, String>();
+	private Map<String, String> mirrorsUser = new HashMap<String, String>();
+
+	private String serverDefaultWorldName;
+	private GroupManager plugin;
+	private File worldsFolder;
+
+	/**
+	 * 
+	 * @param plugin
+	 */
+	public WorldsHolder(GroupManager plugin) {
+
+		this.plugin = plugin;
+		// Setup folders and check files exist for the primary world
+		verifyFirstRun();
+		initialLoad();
+		if (serverDefaultWorldName == null) {
+			throw new IllegalStateException("There is no default group! OMG!");
+		}
+	}
+
+	private void initialLoad() {
+
+		// load the initial world
+		initialWorldLoading();
+		// Configure and load any mirrors and additional worlds as defined in config.yml
+		mirrorSetUp();
+		// search the worlds folder for any manually created worlds (not listed in config.yml)
+		loadAllSearchedWorlds();
+	}
+
+	private void initialWorldLoading() {
+
+		//Load the default world
+		loadWorld(serverDefaultWorldName);
+		//defaultWorld = getUpdatedWorldData(serverDefaultWorldName);
+	}
+
+	private void loadAllSearchedWorlds() {
+
+		/*
+		 * Read all known worlds from Bukkit
+		 * Create the data files if they don't already exist,
+		 * and they are not mirrored.
+		 */
+		for (World world : plugin.getServer().getWorlds())
+			if ((!worldsData.containsKey(world.getName().toLowerCase())) && ((!mirrorsGroup.containsKey(world.getName().toLowerCase())) || (!mirrorsUser.containsKey(world.getName().toLowerCase()))))
+				setupWorldFolder(world.getName());
+		/*
+		 * Loop over all folders within the worlds folder
+		 * and attempt to load the world data
+		 */
+		for (File folder : worldsFolder.listFiles()) {
+			if (folder.isDirectory()) {
+				GroupManager.logger.info("World Found: " + folder.getName());
+
+				/*
+				 * don't load any worlds which are already loaded
+				 * or fully mirrored worlds that don't need data.
+				 */
+				if (!worldsData.containsKey(folder.getName().toLowerCase()) && ((!mirrorsGroup.containsKey(folder.getName().toLowerCase())) || (!mirrorsUser.containsKey(folder.getName().toLowerCase())))) {
+					/*
+					 * Call setupWorldFolder to check case sensitivity
+					 * and convert to lower case, before we attempt to load this
+					 * world.
+					 */
+					setupWorldFolder(folder.getName());
+					loadWorld(folder.getName().toLowerCase());
+				}
 
-    /**
+			}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void mirrorSetUp() {
+
+		mirrorsGroup.clear();
+		mirrorsUser.clear();
+		Map<String, Object> mirrorsMap = plugin.getGMConfig().getMirrorsMap();
+
+		HashSet<String> mirroredWorlds = new HashSet<String>();
+
+		if (mirrorsMap != null) {
+			for (String source : mirrorsMap.keySet()) {
+				// Make sure all non mirrored worlds have a set of data files.
+				setupWorldFolder(source);
+				// Load the world data
+				if (!worldsData.containsKey(source.toLowerCase()))
+					loadWorld(source);
+
+				if (mirrorsMap.get(source) instanceof ArrayList) {
+					ArrayList mirrorList = (ArrayList) mirrorsMap.get(source);
+
+					// These worlds fully mirror their parent
+					for (Object o : mirrorList) {
+						String world = o.toString().toLowerCase();
+						if (world != serverDefaultWorldName) {
+							try {
+								mirrorsGroup.remove(world);
+								mirrorsUser.remove(world);
+							} catch (Exception e) {
+							}
+							mirrorsGroup.put(world, getWorldData(source).getName());
+							mirrorsUser.put(world, getWorldData(source).getName());
+
+							// Track this world so we can create a datasource for it later
+							mirroredWorlds.add(o.toString());
+
+						} else
+							GroupManager.logger.log(Level.WARNING, "Mirroring error with " + o.toString() + ". Recursive loop detected!");
+					}
+				} else if (mirrorsMap.get(source) instanceof MemorySection) {
+					MemorySection subSection = (MemorySection) mirrorsMap.get(source);
+
+					for (String key : subSection.getKeys(true)) {
+
+						if (key.toLowerCase() != serverDefaultWorldName) {
+
+							if (subSection.get(key) instanceof ArrayList) {
+								ArrayList mirrorList = (ArrayList) subSection.get(key);
+
+								// These worlds have defined mirroring
+								for (Object o : mirrorList) {
+									String type = o.toString().toLowerCase();
+									try {
+										if (type.equals("groups"))
+											mirrorsGroup.remove(key.toLowerCase());
+
+										if (type.equals("users"))
+											mirrorsUser.remove(key.toLowerCase());
+
+									} catch (Exception e) {
+									}
+									if (type.equals("groups"))
+										mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName());
+
+									if (type.equals("users"))
+										mirrorsUser.put(key.toLowerCase(), getWorldData(source).getName());
+								}
+
+								// Track this world so we can create a datasource for it later
+								mirroredWorlds.add(key);
+
+							} else
+								GroupManager.logger.log(Level.WARNING, "Mirroring error with " + key + ". Recursive loop detected!");
+
+						} else {
+							throw new IllegalStateException("Unknown mirroring format for " + key);
+						}
+
+					}
+				}
+			}
+
+			// Create a datasource for any worlds not already loaded
+			for (String world : mirroredWorlds) {
+				if (!worldsData.containsKey(world.toLowerCase())) {
+					setupWorldFolder(world);
+					loadWorld(world, true);
+				}
+			}
+		}
+	}
+
+	/**
      *
      */
-    public void saveChanges(boolean overwrite) {
-        ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
-        Tasks.removeOldFiles(plugin, plugin.getBackupFolder());
-        
-        // Write Global Groups
-        if (GroupManager.getGlobalGroups().haveGroupsChanged()) {
-        	GroupManager.getGlobalGroups().writeGroups(overwrite);
-        } else {
-        	if (GroupManager.getGlobalGroups().getTimeStampGroups() < GroupManager.getGlobalGroups().getGlobalGroupsFile().lastModified()) {
-        		System.out.print("Newer GlobalGroups file found (Loading changes)!");
-        		GroupManager.getGlobalGroups().load();
-        	}
-        }
-        
-        for (OverloadedWorldHolder w : worldsData.values()) {
-            if (alreadyDone.contains(w)) {
-                continue;
-            }
-            if (w == null) {
-                GroupManager.logger.severe("WHAT HAPPENED?");
-                continue;
-            }
-            if (!mirrorsGroup.containsKey(w.getName().toLowerCase()))
-	            if (w.haveGroupsChanged()) {
-	            	if (overwrite || (!overwrite && (w.getTimeStampGroups() >= w.getGroupsFile().lastModified()))) {
-		                // Backup Groups file
-	            		backupFile(w,true);
-	            		
-		                WorldDataHolder.writeGroups(w, w.getGroupsFile());
-		                //w.removeGroupsChangedFlag();
-	            	} else {
-	            		// Newer file found.
-	            		GroupManager.logger.log(Level.WARNING, "Newer Groups file found for " + w.getName() + ", but we have local changes!");
-	            		throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");
-	            	}
-	            } else {
-	            	//Check for newer file as no local changes.
-	            	if (w.getTimeStampGroups() < w.getGroupsFile().lastModified()) {
-	            		System.out.print("Newer Groups file found (Loading changes)!");
-	            		// Backup Groups file
-		            	backupFile(w,true);
-	            		w.reloadGroups();
-	            	}
-	            }
-            if (!mirrorsUser.containsKey(w.getName().toLowerCase()))
-	            if (w.haveUsersChanged()) {
-	            	if (overwrite || (!overwrite && (w.getTimeStampUsers() >= w.getUsersFile().lastModified()))) {
-		            	// Backup Users file
-		            	backupFile(w,false);
-		            	
-		                WorldDataHolder.writeUsers(w, w.getUsersFile());
-		                //w.removeUsersChangedFlag();
-	            	} else {
-	            		// Newer file found.
-	            		GroupManager.logger.log(Level.WARNING, "Newer Users file found for " + w.getName() + ", but we have local changes!");
-	            		throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");
-	            	}
-	            } else {
-	            	//Check for newer file as no local changes.
-	            	if (w.getTimeStampUsers() < w.getUsersFile().lastModified()) {
-	            		System.out.print("Newer Users file found (Loading changes)!");
-	            		// Backup Users file
-		            	backupFile(w,false);
-	            		w.reloadUsers();
-	            	}
-	            }
-            alreadyDone.add(w);
-        }
-    }
-    
-    /**
-     * Backup the Groups/Users file
-     * @param w
-     * @param groups
-     */
-    private void backupFile(OverloadedWorldHolder w, Boolean groups) {
-    	
-    	File backupFile = new File(plugin.getBackupFolder(), "bkp_" + w.getName() + (groups ? "_g_" : "_u_") + Tasks.getDateString() + ".yml");
-        try {
-            Tasks.copy((groups ? w.getGroupsFile() : w.getUsersFile()), backupFile);
-        } catch (IOException ex) {
-            GroupManager.logger.log(Level.SEVERE, null, ex);
-        }
-    }
-
-    /**
-     * Returns the dataHolder for the given world.
-     * If the world is not on the worlds list, returns the default world
-     * holder.
-     *
-     * Mirrors return their parent world data.
-     * If no mirroring data it returns the default world.
+	public void reloadAll() {
+
+		// Load global groups
+		GroupManager.getGlobalGroups().load();
+
+		ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
+		for (WorldDataHolder w : worldsData.values()) {
+			if (alreadyDone.contains(w)) {
+				continue;
+			}
+			if (!mirrorsGroup.containsKey(w.getName().toLowerCase()))
+				w.reloadGroups();
+			if (!mirrorsUser.containsKey(w.getName().toLowerCase()))
+				w.reloadUsers();
+
+			alreadyDone.add(w);
+		}
+
+	}
+
+	/**
+	 * 
+	 * @param worldName
+	 */
+	public void reloadWorld(String worldName) {
+
+		if (!mirrorsGroup.containsKey(worldName.toLowerCase()))
+			getWorldData(worldName).reloadGroups();
+		if (!mirrorsUser.containsKey(worldName.toLowerCase()))
+			getWorldData(worldName).reloadUsers();
+	}
+
+	/**
+	 * Wrapper to retain backwards compatibility
+	 * (call this function to auto overwrite files)
+	 */
+	public void saveChanges() {
+
+		saveChanges(true);
+	}
+
+	/**
      *
-     * @param worldName
-     * @return OverloadedWorldHolder
-     */
-    public OverloadedWorldHolder getWorldData(String worldName) {
-    	String worldNameLowered = worldName.toLowerCase();
-    	
-    	// Find this worlds data
-    	if (worldsData.containsKey(worldNameLowered))
-    		return getUpdatedWorldData(worldNameLowered);
-    	
-    	// Oddly no data source was found for this world so return the default.
-        GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world...");
-        return getDefaultWorld();
-    }
-    
-    /**
-     * Get the requested world data and update it's dataSource to be relevant for this world
-     * 
-     * @param worldName
-     * @return updated world holder
-     */
-    private OverloadedWorldHolder getUpdatedWorldData(String worldName) {
-    	String worldNameLowered = worldName.toLowerCase();
-    	
-    	if (worldsData.containsKey(worldNameLowered)) {
-    		OverloadedWorldHolder data = worldsData.get(worldNameLowered);
-    		data.updateDataSource();
-    		return data;
-    	}
-    	return null;
-    	
-    }
-
-    /**
-     * Do a matching of playerName, if its found only one player, do
-     * getWorldData(player)
-     * 
-     * @param playerName
-     * @return null if matching returned no player, or more than one.
      */
-    public OverloadedWorldHolder getWorldDataByPlayerName(String playerName) {
-        List<Player> matchPlayer = plugin.getServer().matchPlayer(playerName);
-        if (matchPlayer.size() == 1) {
-            return getWorldData(matchPlayer.get(0));
-        }
-        return null;
-    }
-
-    /**
-     * Retrieves the field player.getWorld().getName() and do
-     * getWorld(worldName)
-     * 
-     * @param player
-     * @return OverloadedWorldHolder
-     */
-    public OverloadedWorldHolder getWorldData(Player player) {
-        return getWorldData(player.getWorld().getName());
-    }
-
-    /**
-     * It does getWorld(worldName).getPermissionsHandler()
-     * @param worldName
-     * @return AnjoPermissionsHandler
-     */
-    public AnjoPermissionsHandler getWorldPermissions(String worldName) {
-        return getWorldData(worldName).getPermissionsHandler();
-    }
-
-    /**
-     * Returns the PermissionsHandler for this player data
-     * @param player
-     * @return AnjoPermissionsHandler
-     */
-    public AnjoPermissionsHandler getWorldPermissions(Player player) {
-        return getWorldData(player).getPermissionsHandler();
-    }
-
-    /**
-     * Id does getWorldDataByPlayerName(playerName).
-     * If it doesnt return null, it will return result.getPermissionsHandler()
-     * @param playerName
-     * @return null if the player matching gone wrong.
-     */
-    public AnjoPermissionsHandler getWorldPermissionsByPlayerName(String playerName) {
-        WorldDataHolder dh = getWorldDataByPlayerName(playerName);
-        if (dh != null) {
-            return dh.getPermissionsHandler();
-        }
-        return null;
-    }
-
-    private void verifyFirstRun() {
-        
-        Properties server = new Properties();
-        try {
-            server.load(new FileInputStream(new File("server.properties")));
-            serverDefaultWorldName = server.getProperty("level-name").toLowerCase();
-            setupWorldFolder(serverDefaultWorldName);
-        } catch (IOException ex) {
-            GroupManager.logger.log(Level.SEVERE, null, ex);
-        }
-        
-    }
-        
+	public void saveChanges(boolean overwrite) {
+
+		ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
+		Tasks.removeOldFiles(plugin, plugin.getBackupFolder());
+
+		// Write Global Groups
+		if (GroupManager.getGlobalGroups().haveGroupsChanged()) {
+			GroupManager.getGlobalGroups().writeGroups(overwrite);
+		} else {
+			if (GroupManager.getGlobalGroups().getTimeStampGroups() < GroupManager.getGlobalGroups().getGlobalGroupsFile().lastModified()) {
+				System.out.print("Newer GlobalGroups file found (Loading changes)!");
+				GroupManager.getGlobalGroups().load();
+			}
+		}
+
+		for (OverloadedWorldHolder w : worldsData.values()) {
+			if (alreadyDone.contains(w)) {
+				continue;
+			}
+			if (w == null) {
+				GroupManager.logger.severe("WHAT HAPPENED?");
+				continue;
+			}
+			if (!mirrorsGroup.containsKey(w.getName().toLowerCase()))
+				if (w.haveGroupsChanged()) {
+					if (overwrite || (!overwrite && (w.getTimeStampGroups() >= w.getGroupsFile().lastModified()))) {
+						// Backup Groups file
+						backupFile(w, true);
+
+						WorldDataHolder.writeGroups(w, w.getGroupsFile());
+						//w.removeGroupsChangedFlag();
+					} else {
+						// Newer file found.
+						GroupManager.logger.log(Level.WARNING, "Newer Groups file found for " + w.getName() + ", but we have local changes!");
+						throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");
+					}
+				} else {
+					//Check for newer file as no local changes.
+					if (w.getTimeStampGroups() < w.getGroupsFile().lastModified()) {
+						System.out.print("Newer Groups file found (Loading changes)!");
+						// Backup Groups file
+						backupFile(w, true);
+						w.reloadGroups();
+					}
+				}
+			if (!mirrorsUser.containsKey(w.getName().toLowerCase()))
+				if (w.haveUsersChanged()) {
+					if (overwrite || (!overwrite && (w.getTimeStampUsers() >= w.getUsersFile().lastModified()))) {
+						// Backup Users file
+						backupFile(w, false);
+
+						WorldDataHolder.writeUsers(w, w.getUsersFile());
+						//w.removeUsersChangedFlag();
+					} else {
+						// Newer file found.
+						GroupManager.logger.log(Level.WARNING, "Newer Users file found for " + w.getName() + ", but we have local changes!");
+						throw new IllegalStateException("Unable to save unless you issue a '/mansave force'");
+					}
+				} else {
+					//Check for newer file as no local changes.
+					if (w.getTimeStampUsers() < w.getUsersFile().lastModified()) {
+						System.out.print("Newer Users file found (Loading changes)!");
+						// Backup Users file
+						backupFile(w, false);
+						w.reloadUsers();
+					}
+				}
+			alreadyDone.add(w);
+		}
+	}
+
+	/**
+	 * Backup the Groups/Users file
+	 * 
+	 * @param w
+	 * @param groups
+	 */
+	private void backupFile(OverloadedWorldHolder w, Boolean groups) {
+
+		File backupFile = new File(plugin.getBackupFolder(), "bkp_" + w.getName() + (groups ? "_g_" : "_u_") + Tasks.getDateString() + ".yml");
+		try {
+			Tasks.copy((groups ? w.getGroupsFile() : w.getUsersFile()), backupFile);
+		} catch (IOException ex) {
+			GroupManager.logger.log(Level.SEVERE, null, ex);
+		}
+	}
+
+	/**
+	 * Returns the dataHolder for the given world.
+	 * If the world is not on the worlds list, returns the default world
+	 * holder.
+	 * 
+	 * Mirrors return their parent world data.
+	 * If no mirroring data it returns the default world.
+	 * 
+	 * @param worldName
+	 * @return OverloadedWorldHolder
+	 */
+	public OverloadedWorldHolder getWorldData(String worldName) {
+
+		String worldNameLowered = worldName.toLowerCase();
+
+		// Find this worlds data
+		if (worldsData.containsKey(worldNameLowered))
+			return getUpdatedWorldData(worldNameLowered);
+
+		// Oddly no data source was found for this world so return the default.
+		GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world...");
+		return getDefaultWorld();
+	}
+
+	/**
+	 * Get the requested world data and update it's dataSource to be relevant
+	 * for this world
+	 * 
+	 * @param worldName
+	 * @return updated world holder
+	 */
+	private OverloadedWorldHolder getUpdatedWorldData(String worldName) {
+
+		String worldNameLowered = worldName.toLowerCase();
+
+		if (worldsData.containsKey(worldNameLowered)) {
+			OverloadedWorldHolder data = worldsData.get(worldNameLowered);
+			data.updateDataSource();
+			return data;
+		}
+		return null;
+
+	}
+
+	/**
+	 * Do a matching of playerName, if its found only one player, do
+	 * getWorldData(player)
+	 * 
+	 * @param playerName
+	 * @return null if matching returned no player, or more than one.
+	 */
+	public OverloadedWorldHolder getWorldDataByPlayerName(String playerName) {
+
+		List<Player> matchPlayer = plugin.getServer().matchPlayer(playerName);
+		if (matchPlayer.size() == 1) {
+			return getWorldData(matchPlayer.get(0));
+		}
+		return null;
+	}
+
+	/**
+	 * Retrieves the field player.getWorld().getName() and do
+	 * getWorld(worldName)
+	 * 
+	 * @param player
+	 * @return OverloadedWorldHolder
+	 */
+	public OverloadedWorldHolder getWorldData(Player player) {
+
+		return getWorldData(player.getWorld().getName());
+	}
+
+	/**
+	 * It does getWorld(worldName).getPermissionsHandler()
+	 * 
+	 * @param worldName
+	 * @return AnjoPermissionsHandler
+	 */
+	public AnjoPermissionsHandler getWorldPermissions(String worldName) {
+
+		return getWorldData(worldName).getPermissionsHandler();
+	}
+
+	/**
+	 * Returns the PermissionsHandler for this player data
+	 * 
+	 * @param player
+	 * @return AnjoPermissionsHandler
+	 */
+	public AnjoPermissionsHandler getWorldPermissions(Player player) {
+
+		return getWorldData(player).getPermissionsHandler();
+	}
+
+	/**
+	 * Id does getWorldDataByPlayerName(playerName).
+	 * If it doesnt return null, it will return result.getPermissionsHandler()
+	 * 
+	 * @param playerName
+	 * @return null if the player matching gone wrong.
+	 */
+	public AnjoPermissionsHandler getWorldPermissionsByPlayerName(String playerName) {
+
+		WorldDataHolder dh = getWorldDataByPlayerName(playerName);
+		if (dh != null) {
+			return dh.getPermissionsHandler();
+		}
+		return null;
+	}
+
+	private void verifyFirstRun() {
+
+		Properties server = new Properties();
+		try {
+			server.load(new FileInputStream(new File("server.properties")));
+			serverDefaultWorldName = server.getProperty("level-name").toLowerCase();
+			setupWorldFolder(serverDefaultWorldName);
+		} catch (IOException ex) {
+			GroupManager.logger.log(Level.SEVERE, null, ex);
+		}
+
+	}
+
 	public void setupWorldFolder(String worldName) {
+
 		String worldNameLowered = worldName.toLowerCase();
-		
+
 		worldsFolder = new File(plugin.getDataFolder(), "worlds");
 		if (!worldsFolder.exists()) {
 			worldsFolder.mkdirs();
@@ -459,22 +477,22 @@ public class WorldsHolder {
 
 		File defaultWorldFolder = new File(worldsFolder, worldNameLowered);
 		if ((!defaultWorldFolder.exists()) && ((!mirrorsGroup.containsKey(worldNameLowered))) || (!mirrorsUser.containsKey(worldNameLowered))) {
-			
+
 			/*
-    		 * check and convert all old case sensitive folders to lower case
-    		 */
+			 * check and convert all old case sensitive folders to lower case
+			 */
 			File casedWorldFolder = new File(worldsFolder, worldName);
-    		if ((casedWorldFolder.exists()) && (casedWorldFolder.getName().toLowerCase().equals(worldNameLowered))) {
-    			/*
-    			 * Rename the old folder to the new lower cased format
-    			 */
-    			casedWorldFolder.renameTo(new File(worldsFolder, worldNameLowered));
-    		} else {
-    			/*
-    			 *  Else we just create the folder
-    			 */
-    			defaultWorldFolder.mkdirs();
-    		}
+			if ((casedWorldFolder.exists()) && (casedWorldFolder.getName().toLowerCase().equals(worldNameLowered))) {
+				/*
+				 * Rename the old folder to the new lower cased format
+				 */
+				casedWorldFolder.renameTo(new File(worldsFolder, worldNameLowered));
+			} else {
+				/*
+				 * Else we just create the folder
+				 */
+				defaultWorldFolder.mkdirs();
+			}
 		}
 		if (defaultWorldFolder.exists()) {
 			if (!mirrorsGroup.containsKey(worldNameLowered)) {
@@ -506,181 +524,188 @@ public class WorldsHolder {
 		}
 	}
 
-    /**
-     * Copies the specified world data to another world
-     * 
-     * @param fromWorld
-     * @param toWorld
-     * @return true if successfully copied.
-     */
-    public boolean cloneWorld(String fromWorld, String toWorld) {
-
-        File fromWorldFolder = new File(worldsFolder, fromWorld.toLowerCase());
-        File toWorldFolder = new File(worldsFolder, toWorld.toLowerCase());
-        if (toWorldFolder.exists() || !fromWorldFolder.exists()) {
-            return false;
-        }
-        File fromWorldGroups = new File(fromWorldFolder, "groups.yml");
-        File fromWorldUsers = new File(fromWorldFolder, "users.yml");
-        if (!fromWorldGroups.exists() || !fromWorldUsers.exists()) {
-            return false;
-        }
-        File toWorldGroups = new File(toWorldFolder, "groups.yml");
-        File toWorldUsers = new File(toWorldFolder, "users.yml");
-        toWorldFolder.mkdirs();
-        try {
-            Tasks.copy(fromWorldGroups, toWorldGroups);
-            Tasks.copy(fromWorldUsers, toWorldUsers);
-        } catch (IOException ex) {
-            Logger.getLogger(WorldsHolder.class.getName()).log(Level.SEVERE, null, ex);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Wrapper for LoadWorld(String,Boolean) for backwards compatibility
-     * 
-     * Load a world from file.
-     * If it already been loaded, summon reload method from dataHolder.
-     * @param worldName
-     */
-    public void loadWorld(String worldName) {
-    	loadWorld(worldName, false);
-    }
-    
-    /**
-     * Load a world from file.
-     * If it already been loaded, summon reload method from dataHolder.
-     * @param worldName
-     */
-    public void loadWorld(String worldName, Boolean isMirror) {
-    	
-    	String worldNameLowered = worldName.toLowerCase();
-    	
-        if (worldsData.containsKey(worldNameLowered)) {
-            worldsData.get(worldNameLowered).reload();
-            return;
-        }
-        GroupManager.logger.finest("Trying to load world " + worldName + "...");
-        File thisWorldFolder = new File(worldsFolder, worldNameLowered);
-        if ((isMirror) || (thisWorldFolder.exists() && thisWorldFolder.isDirectory())) {
-        	
-        	// Setup file handles, if not mirrored
-            File groupsFile = (mirrorsGroup.containsKey(worldNameLowered))? null : new File(thisWorldFolder, "groups.yml");
-            File usersFile = (mirrorsUser.containsKey(worldNameLowered))? null : new File(thisWorldFolder, "users.yml");
-            
-            if ((groupsFile != null) && (!groupsFile.exists())) {
-                throw new IllegalArgumentException("Groups file for world '" + worldName + "' doesnt exist: " + groupsFile.getPath());
-            }
-            if ((usersFile != null) && (!usersFile.exists())) {
-                throw new IllegalArgumentException("Users file for world '" + worldName + "' doesnt exist: " + usersFile.getPath());
-            }
-
-            	WorldDataHolder tempHolder = new WorldDataHolder(worldName);
-            	
-            	// Map the group object for any mirror
-            	if (mirrorsGroup.containsKey(worldNameLowered))
-            		tempHolder.setGroupsObject(this.getWorldData(mirrorsGroup.get(worldNameLowered)).getGroupsObject());
-            	else
-            		tempHolder.loadGroups(groupsFile);
-            	
-            	// Map the user object for any mirror
-            	if (mirrorsUser.containsKey(worldNameLowered))
-            		tempHolder.setUsersObject(this.getWorldData(mirrorsUser.get(worldNameLowered)).getUsersObject());
-            	else
-            		tempHolder.loadUsers(usersFile);
-            	
-                OverloadedWorldHolder thisWorldData = new OverloadedWorldHolder(tempHolder);
-                
-                // null the object so we don't keep file handles open where we shouldn't
-                tempHolder = null;
-                
-                // Set the file TimeStamps as it will be default from the initial load.
-                thisWorldData.setTimeStamps();
-                
-                if (thisWorldData != null) {
-                    GroupManager.logger.finest("Successful load of world " + worldName + "...");
-                    worldsData.put(worldNameLowered, thisWorldData);
-                    return;
-                }
-
-            //GroupManager.logger.severe("Failed to load world " + worldName + "...");
-        }
-    }
-
-    /**
-     * Tells if the such world has been mapped.
-     *
-     * It will return true if world is a mirror.
-     *
-     * @param worldName
-     * @return true if world is loaded or mirrored. false if not listed
-     */
-    public boolean isInList(String worldName) {
-        if (worldsData.containsKey(worldName.toLowerCase()) || mirrorsGroup.containsKey(worldName.toLowerCase()) || mirrorsUser.containsKey(worldName.toLowerCase())) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Verify if world has it's own file permissions.
-     *
-     * @param worldName
-     * @return true if it has its own holder. false if not.
-     */
-    public boolean hasOwnData(String worldName) {
-        if (worldsData.containsKey(worldName.toLowerCase()) && (!mirrorsGroup.containsKey(worldName.toLowerCase()) || !mirrorsUser.containsKey(worldName.toLowerCase()))) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return the defaultWorld
-     */
-    public OverloadedWorldHolder getDefaultWorld() {
-        return getUpdatedWorldData(serverDefaultWorldName);
-    }
-
-    /**
-     * Returns all physically loaded worlds which have at least
-     * one of their own data sets for users or groups.
-     * 
-     * @return ArrayList<OverloadedWorldHolder> of all loaded worlds
-     */
-    public ArrayList<OverloadedWorldHolder> allWorldsDataList() {
-        ArrayList<OverloadedWorldHolder> list = new ArrayList<OverloadedWorldHolder>();
-        for (OverloadedWorldHolder data : worldsData.values()) {
-            if ((!list.contains(data)) && (!mirrorsGroup.containsKey(data.getName().toLowerCase()) || !mirrorsUser.containsKey(data.getName().toLowerCase()))) {
-            	
-            	String worldNameLowered = data.getName().toLowerCase();
-            	String usersMirror = mirrorsUser.get(worldNameLowered);
-            	String groupsMirror = mirrorsGroup.get(worldNameLowered);
-        		
-            	// is users mirrored?
-        		if (usersMirror != null) {
-        			
-        			// If both are mirrored
-        			if (groupsMirror != null) {
-        				
-        				// if the data sources are the same, return the parent
-        				if (usersMirror == groupsMirror) {
-        					if (!list.contains(usersMirror.toLowerCase()))
-        							list.add(worldsData.get(usersMirror.toLowerCase()));
-        					continue;
-        				}
-        				// Both data sources are mirrors, but they are from different parents
-            			// so fall through to add the actual data object.
-        			}
-        			// Groups isn't a mirror so fall through to add this this worlds data source
-        		}
-        		
-        		// users isn't mirrored so we need to add this worlds data source
-                list.add(data);
-            }
-        }
-        return list;
-    }
+	/**
+	 * Copies the specified world data to another world
+	 * 
+	 * @param fromWorld
+	 * @param toWorld
+	 * @return true if successfully copied.
+	 */
+	public boolean cloneWorld(String fromWorld, String toWorld) {
+
+		File fromWorldFolder = new File(worldsFolder, fromWorld.toLowerCase());
+		File toWorldFolder = new File(worldsFolder, toWorld.toLowerCase());
+		if (toWorldFolder.exists() || !fromWorldFolder.exists()) {
+			return false;
+		}
+		File fromWorldGroups = new File(fromWorldFolder, "groups.yml");
+		File fromWorldUsers = new File(fromWorldFolder, "users.yml");
+		if (!fromWorldGroups.exists() || !fromWorldUsers.exists()) {
+			return false;
+		}
+		File toWorldGroups = new File(toWorldFolder, "groups.yml");
+		File toWorldUsers = new File(toWorldFolder, "users.yml");
+		toWorldFolder.mkdirs();
+		try {
+			Tasks.copy(fromWorldGroups, toWorldGroups);
+			Tasks.copy(fromWorldUsers, toWorldUsers);
+		} catch (IOException ex) {
+			Logger.getLogger(WorldsHolder.class.getName()).log(Level.SEVERE, null, ex);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Wrapper for LoadWorld(String,Boolean) for backwards compatibility
+	 * 
+	 * Load a world from file.
+	 * If it already been loaded, summon reload method from dataHolder.
+	 * 
+	 * @param worldName
+	 */
+	public void loadWorld(String worldName) {
+
+		loadWorld(worldName, false);
+	}
+
+	/**
+	 * Load a world from file.
+	 * If it already been loaded, summon reload method from dataHolder.
+	 * 
+	 * @param worldName
+	 */
+	public void loadWorld(String worldName, Boolean isMirror) {
+
+		String worldNameLowered = worldName.toLowerCase();
+
+		if (worldsData.containsKey(worldNameLowered)) {
+			worldsData.get(worldNameLowered).reload();
+			return;
+		}
+		GroupManager.logger.finest("Trying to load world " + worldName + "...");
+		File thisWorldFolder = new File(worldsFolder, worldNameLowered);
+		if ((isMirror) || (thisWorldFolder.exists() && thisWorldFolder.isDirectory())) {
+
+			// Setup file handles, if not mirrored
+			File groupsFile = (mirrorsGroup.containsKey(worldNameLowered)) ? null : new File(thisWorldFolder, "groups.yml");
+			File usersFile = (mirrorsUser.containsKey(worldNameLowered)) ? null : new File(thisWorldFolder, "users.yml");
+
+			if ((groupsFile != null) && (!groupsFile.exists())) {
+				throw new IllegalArgumentException("Groups file for world '" + worldName + "' doesnt exist: " + groupsFile.getPath());
+			}
+			if ((usersFile != null) && (!usersFile.exists())) {
+				throw new IllegalArgumentException("Users file for world '" + worldName + "' doesnt exist: " + usersFile.getPath());
+			}
+
+			WorldDataHolder tempHolder = new WorldDataHolder(worldName);
+
+			// Map the group object for any mirror
+			if (mirrorsGroup.containsKey(worldNameLowered))
+				tempHolder.setGroupsObject(this.getWorldData(mirrorsGroup.get(worldNameLowered)).getGroupsObject());
+			else
+				tempHolder.loadGroups(groupsFile);
+
+			// Map the user object for any mirror
+			if (mirrorsUser.containsKey(worldNameLowered))
+				tempHolder.setUsersObject(this.getWorldData(mirrorsUser.get(worldNameLowered)).getUsersObject());
+			else
+				tempHolder.loadUsers(usersFile);
+
+			OverloadedWorldHolder thisWorldData = new OverloadedWorldHolder(tempHolder);
+
+			// null the object so we don't keep file handles open where we shouldn't
+			tempHolder = null;
+
+			// Set the file TimeStamps as it will be default from the initial load.
+			thisWorldData.setTimeStamps();
+
+			if (thisWorldData != null) {
+				GroupManager.logger.finest("Successful load of world " + worldName + "...");
+				worldsData.put(worldNameLowered, thisWorldData);
+				return;
+			}
+
+			//GroupManager.logger.severe("Failed to load world " + worldName + "...");
+		}
+	}
+
+	/**
+	 * Tells if the such world has been mapped.
+	 * 
+	 * It will return true if world is a mirror.
+	 * 
+	 * @param worldName
+	 * @return true if world is loaded or mirrored. false if not listed
+	 */
+	public boolean isInList(String worldName) {
+
+		if (worldsData.containsKey(worldName.toLowerCase()) || mirrorsGroup.containsKey(worldName.toLowerCase()) || mirrorsUser.containsKey(worldName.toLowerCase())) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Verify if world has it's own file permissions.
+	 * 
+	 * @param worldName
+	 * @return true if it has its own holder. false if not.
+	 */
+	public boolean hasOwnData(String worldName) {
+
+		if (worldsData.containsKey(worldName.toLowerCase()) && (!mirrorsGroup.containsKey(worldName.toLowerCase()) || !mirrorsUser.containsKey(worldName.toLowerCase()))) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @return the defaultWorld
+	 */
+	public OverloadedWorldHolder getDefaultWorld() {
+
+		return getUpdatedWorldData(serverDefaultWorldName);
+	}
+
+	/**
+	 * Returns all physically loaded worlds which have at least
+	 * one of their own data sets for users or groups.
+	 * 
+	 * @return ArrayList<OverloadedWorldHolder> of all loaded worlds
+	 */
+	public ArrayList<OverloadedWorldHolder> allWorldsDataList() {
+
+		ArrayList<OverloadedWorldHolder> list = new ArrayList<OverloadedWorldHolder>();
+		for (OverloadedWorldHolder data : worldsData.values()) {
+			if ((!list.contains(data)) && (!mirrorsGroup.containsKey(data.getName().toLowerCase()) || !mirrorsUser.containsKey(data.getName().toLowerCase()))) {
+
+				String worldNameLowered = data.getName().toLowerCase();
+				String usersMirror = mirrorsUser.get(worldNameLowered);
+				String groupsMirror = mirrorsGroup.get(worldNameLowered);
+
+				// is users mirrored?
+				if (usersMirror != null) {
+
+					// If both are mirrored
+					if (groupsMirror != null) {
+
+						// if the data sources are the same, return the parent
+						if (usersMirror == groupsMirror) {
+							if (!list.contains(usersMirror.toLowerCase()))
+								list.add(worldsData.get(usersMirror.toLowerCase()));
+							continue;
+						}
+						// Both data sources are mirrors, but they are from different parents
+						// so fall through to add the actual data object.
+					}
+					// Groups isn't a mirror so fall through to add this this worlds data source
+				}
+
+				// users isn't mirrored so we need to add this worlds data source
+				list.add(data);
+			}
+		}
+		return list;
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java
index fc9b8433b..af3fb6135 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java
@@ -6,79 +6,82 @@ import org.bukkit.Bukkit;
 import org.bukkit.event.Event;

 import org.bukkit.event.HandlerList;

 

-

 /**

  * @author ElgarL

- *

+ * 

  */

 public class GMGroupEvent extends Event {

 

-    /**

+	/**

 	 * 

 	 */

 	private static final HandlerList handlers = new HandlerList();

 

 	@Override

 	public HandlerList getHandlers() {

-        return handlers;

-    }

- 

-    public static HandlerList getHandlerList() {

-        return handlers;

-    }

 

-    //////////////////////////////

+		return handlers;

+	}

+

+	public static HandlerList getHandlerList() {

+

+		return handlers;

+	}

+

+	//////////////////////////////

 

 	protected Group group;

-	

+

 	protected String groupName;

-    

-    protected Action action;

-

-    public GMGroupEvent(Group group, Action action) {

-        super();

-

-        this.group = group;

-        this.action = action;

-        this.groupName = group.getName();

-    }

-    

-    public GMGroupEvent(String groupName, Action action) {

-        super();

-

-        this.groupName = groupName;

-        this.action = action;

-    }

-    

-    public Action getAction(){

-        return this.action;

-    }

-

-    public Group getGroup() {

-        return group;

-    }

-    

-    public String getGroupName() {

-        return groupName;

-    }

-    

-    public enum Action {

-        GROUP_PERMISSIONS_CHANGED,

-        GROUP_INHERITANCE_CHANGED,

-        GROUP_INFO_CHANGED,

-        GROUP_ADDED,

-        GROUP_REMOVED,

-    }

-    

-    public void schedule(final GMGroupEvent event) {

+

+	protected Action action;

+

+	public GMGroupEvent(Group group, Action action) {

+

+		super();

+

+		this.group = group;

+		this.action = action;

+		this.groupName = group.getName();

+	}

+

+	public GMGroupEvent(String groupName, Action action) {

+

+		super();

+

+		this.groupName = groupName;

+		this.action = action;

+	}

+

+	public Action getAction() {

+

+		return this.action;

+	}

+

+	public Group getGroup() {

+

+		return group;

+	}

+

+	public String getGroupName() {

+

+		return groupName;

+	}

+

+	public enum Action {

+		GROUP_PERMISSIONS_CHANGED, GROUP_INHERITANCE_CHANGED, GROUP_INFO_CHANGED, GROUP_ADDED, GROUP_REMOVED,

+	}

+

+	public void schedule(final GMGroupEvent event) {

 

 		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {

 

 			@Override

 			public void run() {

+

 				Bukkit.getServer().getPluginManager().callEvent(event);

 			}

 		}, 1) == -1)

 			GroupManager.logger.warning("Could not schedule GM Event.");

-    }

+	}

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java
index 210960876..d11581356 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java
@@ -5,57 +5,58 @@ import org.bukkit.Bukkit;
 import org.bukkit.event.Event;

 import org.bukkit.event.HandlerList;

 

-

 /**

  * @author ElgarL

- *

+ * 

  */

 public class GMSystemEvent extends Event {

 

-    /**

+	/**

 	 * 

 	 */

 	private static final HandlerList handlers = new HandlerList();

 

 	@Override

 	public HandlerList getHandlers() {

-        return handlers;

-    }

- 

-    public static HandlerList getHandlerList() {

-        return handlers;

-    }

-

-    //////////////////////////////

-    

+

+		return handlers;

+	}

+

+	public static HandlerList getHandlerList() {

+

+		return handlers;

+	}

+

+	//////////////////////////////

+

 	protected Action action;

-    

-    public GMSystemEvent(Action action) {

-        super();

-        

-        this.action = action;

-    }

-    

-    public Action getAction(){

-        return this.action;

-    }

-    

-    public enum Action {

-        RELOADED,

-        SAVED,

-        DEFAULT_GROUP_CHANGED,

-        VALIDATE_TOGGLE,

-    }

-    

-    public void schedule(final GMSystemEvent event) {

+

+	public GMSystemEvent(Action action) {

+

+		super();

+

+		this.action = action;

+	}

+

+	public Action getAction() {

+

+		return this.action;

+	}

+

+	public enum Action {

+		RELOADED, SAVED, DEFAULT_GROUP_CHANGED, VALIDATE_TOGGLE,

+	}

+

+	public void schedule(final GMSystemEvent event) {

 

 		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {

 

 			@Override

 			public void run() {

+

 				Bukkit.getServer().getPluginManager().callEvent(event);

 			}

 		}, 1) == -1)

 			GroupManager.logger.warning("Could not schedule GM Event.");

-    }

+	}

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java
index 206de8c86..361e7d4cc 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java
@@ -6,81 +6,82 @@ import org.bukkit.Bukkit;
 import org.bukkit.event.Event;

 import org.bukkit.event.HandlerList;

 

-

 /**

  * @author ElgarL

- *

+ * 

  */

 public class GMUserEvent extends Event {

 

-    /**

+	/**

 	 * 

 	 */

 	private static final HandlerList handlers = new HandlerList();

 

 	@Override

 	public HandlerList getHandlers() {

-        return handlers;

-    }

- 

-    public static HandlerList getHandlerList() {

-        return handlers;

-    }

 

-    //////////////////////////////

+		return handlers;

+	}

+

+	public static HandlerList getHandlerList() {

+

+		return handlers;

+	}

+

+	//////////////////////////////

 

 	protected User user;

-	

+

 	protected String userName;

-    

-    protected Action action;

-

-    public GMUserEvent(User user, Action action) {

-        super();

-

-        this.user = user;

-        this.action = action;

-        this.userName = user.getName();

-    }

-    

-    public GMUserEvent(String userName, Action action) {

-        super();

-

-        this.userName = userName;

-        this.action = action;

-    }

-    

-    public Action getAction(){

-        return this.action;

-    }

-

-    public User getUser() {

-        return user;

-    }

-    

-    public String getUserName() {

-        return userName;

-    }

-    

-    public enum Action {

-        USER_PERMISSIONS_CHANGED,

-        USER_INHERITANCE_CHANGED,

-        USER_INFO_CHANGED,

-        USER_GROUP_CHANGED,

-        USER_SUBGROUP_CHANGED,

-        USER_ADDED,

-        USER_REMOVED,

-    }

-    

-    public void schedule(final GMUserEvent event) {

+

+	protected Action action;

+

+	public GMUserEvent(User user, Action action) {

+

+		super();

+

+		this.user = user;

+		this.action = action;

+		this.userName = user.getName();

+	}

+

+	public GMUserEvent(String userName, Action action) {

+

+		super();

+

+		this.userName = userName;

+		this.action = action;

+	}

+

+	public Action getAction() {

+

+		return this.action;

+	}

+

+	public User getUser() {

+

+		return user;

+	}

+

+	public String getUserName() {

+

+		return userName;

+	}

+

+	public enum Action {

+		USER_PERMISSIONS_CHANGED, USER_INHERITANCE_CHANGED, USER_INFO_CHANGED, USER_GROUP_CHANGED, USER_SUBGROUP_CHANGED, USER_ADDED, USER_REMOVED,

+	}

+

+	public void schedule(final GMUserEvent event) {

 

 		if (Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("GroupManager"), new Runnable() {

 

 			@Override

 			public void run() {

+

 				Bukkit.getServer().getPluginManager().callEvent(event);

 			}

 		}, 1) == -1)

 			GroupManager.logger.warning("Could not schedule GM Event.");

-    }

+	}

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java
index fd1a9d7ff..f7a7109ab 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java
@@ -6,31 +6,33 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

 import org.bukkit.event.world.WorldInitEvent;

 

-

 /**

  * @author ElgarL

  * 

- * Handle new world creation from other plugins

- *

+ *         Handle new world creation from other plugins

+ * 

  */

 public class GMWorldListener implements Listener {

-	

+

 	private final GroupManager plugin;

 

 	public GMWorldListener(GroupManager instance) {

+

 		plugin = instance;

 		registerEvents();

 	}

-	

+

 	private void registerEvents() {

-    	plugin.getServer().getPluginManager().registerEvents(this, plugin);

-    }

-	

+

+		plugin.getServer().getPluginManager().registerEvents(this, plugin);

+	}

+

 	@EventHandler(priority = EventPriority.LOWEST)

 	public void onWorldInit(WorldInitEvent event) {

-		String worldName =  event.getWorld().getName();

-		

-		if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) {	

+

+		String worldName = event.getWorld().getName();

+

+		if (GroupManager.isLoaded() && !plugin.getWorldsHolder().isInList(worldName)) {

 			GroupManager.logger.info("New world detected...");

 			GroupManager.logger.info("Creating data for: " + worldName);

 			plugin.getWorldsHolder().setupWorldFolder(worldName);

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
index 3a4d8d266..5fc555cc4 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GroupManagerEventHandler.java
@@ -3,40 +3,51 @@ package org.anjocaido.groupmanager.events;
 import org.anjocaido.groupmanager.data.Group;

 import org.anjocaido.groupmanager.data.User;

 

-

 /**

  * @author ElgarL

  * 

- * Handles all Event generation.

- *

+ *         Handles all Event generation.

+ * 

  */

 public class GroupManagerEventHandler {

-	

+

 	protected static void callEvent(GMGroupEvent event) {

+

 		event.schedule(event);

 	}

+

 	protected static void callEvent(GMUserEvent event) {

+

 		event.schedule(event);

 	}

+

 	protected static void callEvent(GMSystemEvent event) {

+

 		event.schedule(event);

 	}

 

 	public static void callEvent(Group group, GMGroupEvent.Action action) {

+

 		callEvent(new GMGroupEvent(group, action));

 	}

+

 	public static void callEvent(String groupName, GMGroupEvent.Action action) {

+

 		callEvent(new GMGroupEvent(groupName, action));

 	}

-	

+

 	public static void callEvent(User user, GMUserEvent.Action action) {

+

 		callEvent(new GMUserEvent(user, action));

 	}

+

 	public static void callEvent(String userName, GMUserEvent.Action action) {

+

 		callEvent(new GMUserEvent(userName, action));

 	}

-	

+

 	public static void callEvent(GMSystemEvent.Action action) {

+

 		callEvent(new GMSystemEvent(action));

 	}

 }
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
index b40694bb0..efad11df4 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
@@ -16,7 +16,6 @@ import org.anjocaido.groupmanager.data.Group;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.data.User;
 import org.anjocaido.groupmanager.utils.PermissionCheckResult;
-import org.anjocaido.groupmanager.utils.PermissionCheckResult.Type;
 import org.bukkit.entity.Player;
 
 /**
@@ -27,7 +26,7 @@ import org.bukkit.entity.Player;
  * 
  * It holds permissions only for one single world.
  * 
- * @author gabrielcouto
+ * @author gabrielcouto, ElgarL
  */
 public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
@@ -39,6 +38,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @param holder
 	 */
 	public AnjoPermissionsHandler(WorldDataHolder holder) {
+
 		ph = holder;
 	}
 
@@ -51,6 +51,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean has(Player player, String permission) {
+
 		return permission(player, permission);
 	}
 
@@ -63,6 +64,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean permission(Player player, String permission) {
+
 		return checkUserPermission(ph.getUser(player.getName()).updatePlayer(player), permission);
 	}
 
@@ -74,6 +76,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return true if the player has the permission
 	 */
 	public boolean permission(String playerName, String permission) {
+
 		return checkUserPermission(ph.getUser(playerName), permission);
 	}
 
@@ -85,6 +88,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getGroup(String userName) {
+
 		return ph.getUser(userName).getGroup().getName();
 	}
 
@@ -97,10 +101,11 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public List<String> getAllPlayersPermissions(String userName) {
+
 		List<String> perms = new ArrayList<String>();
-		
+
 		perms.addAll(getAllPlayersPermissions(userName, true));
-		
+
 		return perms;
 	}
 
@@ -118,33 +123,32 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 		// Add the players own permissions.
 		playerPermArray.addAll(populatePerms(ph.getUser(userName).getPermissionList(), includeChildren));
-		
+
 		ArrayList<String> alreadyProcessed = new ArrayList<String>();
-		
+
 		// fetch all group permissions
 		for (String group : getGroups(userName)) {
 			// Don't process a group more than once.
 			if (!alreadyProcessed.contains(group)) {
 				alreadyProcessed.add(group);
-				
+
 				Set<String> groupPermArray = new HashSet<String>();
-				
+
 				if (group.startsWith("g:") && GroupManager.getGlobalGroups().hasGroup(group)) {
 					// GlobalGroups
 					groupPermArray = populatePerms(GroupManager.getGlobalGroups().getGroupsPermissions(group), includeChildren);
-					
+
 				} else {
 					// World Groups
 					groupPermArray = populatePerms(ph.getGroup(group).getPermissionList(), includeChildren);
 				}
-				
+
 				// Add all group permissions, unless negated by earlier permissions.
 				for (String perm : groupPermArray) {
 					boolean negated = (perm.startsWith("-"));
 					// Perm doesn't already exists and there is no negation for it
 					// or It's a negated perm where a normal perm doesn't exists (don't allow inheritance to negate higher perms)
-					if ((!negated && !playerPermArray.contains(perm) && !playerPermArray.contains("-" + perm))
-						|| (negated && !playerPermArray.contains(perm.substring(1)) && !playerPermArray.contains("-" + perm)))
+					if ((!negated && !playerPermArray.contains(perm) && !playerPermArray.contains("-" + perm)) || (negated && !playerPermArray.contains(perm.substring(1)) && !playerPermArray.contains("-" + perm)))
 						playerPermArray.add(perm);
 				}
 			}
@@ -154,68 +158,69 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 		return playerPermArray;
 	}
-	
-	private Set<String> populatePerms (List<String>  permsList, boolean includeChildren) {
-		
+
+	private Set<String> populatePerms(List<String> permsList, boolean includeChildren) {
+
 		// Create a new array so it's modifiable.
 		List<String> perms = new ArrayList<String>(permsList);
 		Set<String> permArray = new HashSet<String>();
 		Boolean allPerms = false;
-		
+
 		// Allow * node to populate ALL permissions to Bukkit.
 		if (perms.contains("*")) {
 			permArray.addAll(GroupManager.BukkitPermissions.getAllRegisteredPermissions(includeChildren));
 			allPerms = true;
 			perms.remove("*");
 		}
-			
+
 		for (String perm : perms) {
-	
+
+			/**
+			 * all permission sets are passed here pre-sorted, alphabetically.
+			 * This means negated nodes will be processed before all permissions
+			 * other than *.
+			 */
+			boolean negated = perm.startsWith("-");
+
+			if (!permArray.contains(perm)) {
+				permArray.add(perm);
+
+				if ((negated) && (permArray.contains(perm.substring(1))))
+					permArray.remove(perm.substring(1));
+
 				/**
-				 * all permission sets are passed here pre-sorted, alphabetically.
-				 * This means negated nodes will be processed before all permissions
-				 * other than *.
+				 * Process child nodes if required,
+				 * or this is a negated node AND we used * to include all
+				 * permissions,
+				 * in which case we need to remove all children of that node.
 				 */
-				boolean negated = perm.startsWith("-");
-				
-				if (!permArray.contains(perm)) {
-					permArray.add(perm);
-					
-					if ((negated) && (permArray.contains(perm.substring(1))))
-						permArray.remove(perm.substring(1));
-	
-					/**
-					 * Process child nodes if required,
-					 * or this is a negated node AND we used * to include all permissions,
-					 * in which case we need to remove all children of that node.
-					 */
-					if ((includeChildren) || (negated && allPerms)) {
-	
-						Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren((negated ? perm.substring(1) : perm), new HashSet<String>());
-	
-						if (children != null) {
-							if (negated)
-								if (allPerms) {
-	
-									// Remove children of negated nodes
-									for (String child : children.keySet())
-										if (children.get(child))
-											if (permArray.contains(child))
-												permArray.remove(child);
-	
+				if ((includeChildren) || (negated && allPerms)) {
+
+					Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren((negated ? perm.substring(1) : perm), new HashSet<String>());
+
+					if (children != null) {
+						if (negated)
+							if (allPerms) {
+
+								// Remove children of negated nodes
+								for (String child : children.keySet())
+									if (children.get(child))
+										if (permArray.contains(child))
+											permArray.remove(child);
+
 							} else {
-	
+
 								// Add child nodes
 								for (String child : children.keySet())
 									if (children.get(child))
 										if ((!permArray.contains(child)) && (!permArray.contains("-" + child)))
 											permArray.add(child);
 							}
-						}
 					}
 				}
+			}
 		}
-		
+
 		return permArray;
 	}
 
@@ -236,6 +241,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean inGroup(String name, String group) {
+
 		if (hasGroupInInheritance(ph.getUser(name).getGroup(), group)) {
 			return true;
 		}
@@ -326,6 +332,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getGroupPrefix(String groupName) {
+
 		Group g = ph.getGroup(groupName);
 		if (g == null) {
 			return "";
@@ -341,6 +348,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getGroupSuffix(String groupName) {
+
 		Group g = ph.getGroup(groupName);
 		if (g == null) {
 			return "";
@@ -357,6 +365,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean canGroupBuild(String groupName) {
+
 		Group g = ph.getGroup(groupName);
 		if (g == null) {
 			return false;
@@ -374,6 +383,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getGroupPermissionString(String groupName, String variable) {
+
 		Group start = ph.getGroup(groupName);
 		if (start == null) {
 			return null;
@@ -395,6 +405,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public int getGroupPermissionInteger(String groupName, String variable) {
+
 		Group start = ph.getGroup(groupName);
 		if (start == null) {
 			return -1;
@@ -416,6 +427,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean getGroupPermissionBoolean(String group, String variable) {
+
 		Group start = ph.getGroup(group);
 		if (start == null) {
 			return false;
@@ -437,6 +449,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public double getGroupPermissionDouble(String group, String variable) {
+
 		Group start = ph.getGroup(group);
 		if (start == null) {
 			return -1;
@@ -457,6 +470,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getUserPermissionString(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return "";
@@ -473,6 +487,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public int getUserPermissionInteger(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return -1;
@@ -489,6 +504,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean getUserPermissionBoolean(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return false;
@@ -505,6 +521,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public double getUserPermissionDouble(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return -1;
@@ -523,6 +540,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String getPermissionString(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return "";
@@ -562,6 +580,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public int getPermissionInteger(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return -1;
@@ -601,6 +620,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean getPermissionBoolean(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return false;
@@ -640,6 +660,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public double getPermissionDouble(String user, String variable) {
+
 		User auser = ph.getUser(user);
 		if (auser == null) {
 			return -1.0D;
@@ -676,6 +697,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return PermissionCheckResult
 	 */
 	public PermissionCheckResult checkUserOnlyPermission(User user, String permission) {
+
 		user.sortPermissions();
 		PermissionCheckResult result = new PermissionCheckResult();
 		result.askedPermission = permission;
@@ -699,6 +721,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return the node if permission is found. if not found, return null
 	 */
 	public PermissionCheckResult checkGroupOnlyPermission(Group group, String permission) {
+
 		group.sortPermissions();
 		PermissionCheckResult result = new PermissionCheckResult();
 		result.owner = group;
@@ -721,6 +744,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return true if permission was found. false if not, or was negated.
 	 */
 	public boolean checkUserPermission(User user, String permission) {
+
 		PermissionCheckResult result = checkFullGMPermission(user, permission, true);
 		if (result.resultType == PermissionCheckResult.Type.EXCEPTION || result.resultType == PermissionCheckResult.Type.FOUND) {
 			return true;
@@ -752,6 +776,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return PermissionCheckResult
 	 */
 	public PermissionCheckResult checkFullGMPermission(User user, String targetPermission, Boolean checkBukkit) {
+
 		PermissionCheckResult result = new PermissionCheckResult();
 		result.accessLevel = targetPermission;
 		result.resultType = PermissionCheckResult.Type.NOTFOUND;
@@ -799,36 +824,17 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	}
 
 	/**
-	 * Verifies if a given group has a variable. Including it's inheritance.
-	 * 
-	 * it redirects to the other method now. This one was deprecated, and will
-	 * be gone in a future release.
-	 * 
-	 * @param start
-	 * @param variable
-	 * @param alreadyChecked
-	 * @return returns the closest inherited group with the variable.
-	 * @deprecated use now nextGroupWithVariable(Group start, String
-	 *             targetVariable)
-	 */
-	@Deprecated
-	public Group nextGroupWithVariable(Group start, String variable, List<Group> alreadyChecked) {
-		return nextGroupWithVariable(start, variable);
-	}
-
-	/**
 	 * Returns the next group, including inheritance, which contains that
 	 * variable name.
 	 * 
 	 * It does Breadth-first search
 	 * 
-	 * @param start
-	 *            the starting group to look for
-	 * @param targetVariable
-	 *            the variable name
+	 * @param start the starting group to look for
+	 * @param targetVariable the variable name
 	 * @return The group if found. Null if not.
 	 */
 	public Group nextGroupWithVariable(Group start, String targetVariable) {
+
 		if (start == null || targetVariable == null) {
 			return null;
 		}
@@ -852,39 +858,18 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 		return null;
 	}
 
-	/**
-	 * Check if given group inherits another group.
-	 * 
-	 * redirected to the other method. this is deprecated now. and will be gone
-	 * in the future releases.
-	 * 
-	 * @param start
-	 *            The group to start the search.
-	 * @param askedGroup
-	 *            Name of the group you're looking for
-	 * @param alreadyChecked
-	 *            groups to ignore(pass null on it, please)
-	 * @return true if it inherits the group.
-	 * @deprecated prefer using hasGroupInInheritance(Group start, String
-	 *             askedGroup)
-	 */
-	@Deprecated
-	public boolean searchGroupInInheritance(Group start, String askedGroup, List<Group> alreadyChecked) {
-		return hasGroupInInheritance(start, askedGroup);
-	}
 
 	/**
 	 * Check if given group inherits another group.
 	 * 
 	 * It does Breadth-first search
 	 * 
-	 * @param start
-	 *            The group to start the search.
-	 * @param askedGroup
-	 *            Name of the group you're looking for
+	 * @param start The group to start the search.
+	 * @param askedGroup Name of the group you're looking for
 	 * @return true if it inherits the group.
 	 */
 	public boolean hasGroupInInheritance(Group start, String askedGroup) {
+
 		if (start == null || askedGroup == null) {
 			return false;
 		}
@@ -909,25 +894,6 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	}
 
 	/**
-	 * Check if the group has given permission. Including it's inheritance
-	 * 
-	 * @param start
-	 * @param permission
-	 * @param alreadyChecked
-	 * @return true if PermissionCheckResult is EXCEPTION or FOUND
-	 * @deprecated use the other checkGroupPermissionWithInheritance for
-	 *             everything
-	 */
-	@Deprecated
-	public boolean checkGroupPermissionWithInheritance(Group start, String permission, List<Group> alreadyChecked) {
-		PermissionCheckResult result = checkGroupPermissionWithInheritance(start, permission);
-		if (result.resultType.equals(Type.EXCEPTION) || result.resultType.equals(Type.FOUND)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
 	 * Returns the result of permission check. Including inheritance. If found
 	 * anything, the PermissionCheckResult that retuns will include the Group
 	 * name, and the result type. Result types will be EXCEPTION, NEGATION,
@@ -942,6 +908,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return PermissionCheckResult
 	 */
 	public PermissionCheckResult checkGroupPermissionWithInheritance(Group start, String targetPermission) {
+
 		if (start == null || targetPermission == null) {
 			return null;
 		}
@@ -971,42 +938,6 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	}
 
 	/**
-	 * It uses checkGroupPermissionWithInheritance and cast the owner to Group
-	 * type if result type was EXCEPTION or FOUND.
-	 * 
-	 * @param start
-	 * @param permission
-	 * @param alreadyChecked
-	 * @return the group that passed on test. null if no group passed.
-	 * @deprecated use checkGroupPermissionWithInheritance for everything now.
-	 */
-	@Deprecated
-	public Group nextGroupWithPermission(Group start, String permission, List<Group> alreadyChecked) {
-		PermissionCheckResult result = checkGroupPermissionWithInheritance(start, permission);
-		if (result.resultType.equals(Type.EXCEPTION) || result.resultType.equals(Type.FOUND)) {
-			return (Group) checkGroupPermissionWithInheritance(start, permission).owner;
-		}
-		return null;
-	}
-
-	/**
-	 * Return whole list of names of groups in a inheritance chain. Including a
-	 * starting group.
-	 * 
-	 * it now redirects to the other method. but get away from this one, it will
-	 * disappear in a future release.
-	 * 
-	 * @param start
-	 * @param alreadyChecked
-	 * @return the group that passed on test. null if no group passed.
-	 * @deprecated use the other method with same name, instead
-	 */
-	@Deprecated
-	public ArrayList<String> listAllGroupsInherited(Group start, ArrayList<String> alreadyChecked) {
-		return listAllGroupsInherited(start);
-	}
-
-	/**
 	 * Return whole list of names of groups in a inheritance chain. Including a
 	 * starting group.
 	 * 
@@ -1016,6 +947,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return the group that passed on test. null if no group passed.
 	 */
 	public ArrayList<String> listAllGroupsInherited(Group start) {
+
 		if (start == null) {
 			return null;
 		}
@@ -1055,6 +987,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return PermissionCheckResult.Type
 	 */
 	public PermissionCheckResult.Type comparePermissionString(String userAccessLevel, String fullPermissionName) {
+
 		int userAccessLevelLength;
 		if (userAccessLevel == null || fullPermissionName == null || fullPermissionName.length() == 0 || (userAccessLevelLength = userAccessLevel.length()) == 0) {
 			return PermissionCheckResult.Type.NOTFOUND;
@@ -1080,12 +1013,9 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 		}
 
 		if (userAccessLevel.charAt(userAccessLevel.length() - 1) == '*') {
-			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset, userAccessLevelLength - userAccessLevelOffset - 1) ?
-					result : PermissionCheckResult.Type.NOTFOUND;
+			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset, userAccessLevelLength - userAccessLevelOffset - 1) ? result : PermissionCheckResult.Type.NOTFOUND;
 		} else {
-			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset,
-					Math.max(userAccessLevelLength - userAccessLevelOffset, fullPermissionName.length() - fullPermissionNameOffset)) ?
-							result : PermissionCheckResult.Type.NOTFOUND;
+			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset, Math.max(userAccessLevelLength - userAccessLevelOffset, fullPermissionName.length() - fullPermissionNameOffset)) ? result : PermissionCheckResult.Type.NOTFOUND;
 		}
 	}
 
@@ -1099,6 +1029,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public String[] getGroups(String userName) {
+
 		ArrayList<String> allGroups = listAllGroupsInherited(ph.getUser(userName).getGroup());
 		for (Group subg : ph.getUser(userName).subGroupListCopy()) {
 			allGroups.addAll(listAllGroupsInherited(subg));
@@ -1120,6 +1051,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@SuppressWarnings("unused")
 	private Group breadthFirstSearch(Group start, String targerPermission) {
+
 		if (start == null || targerPermission == null) {
 			return null;
 		}
@@ -1149,11 +1081,13 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 	@Override
 	public Group getDefaultGroup() {
+
 		return ph.getDefaultGroup();
 	}
 
 	@Override
 	public String getInfoString(String entryName, String path, boolean isGroup) {
+
 		if (isGroup) {
 			Group data = ph.getGroup(entryName);
 			if (data == null) {
@@ -1171,6 +1105,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 	@Override
 	public int getInfoInteger(String entryName, String path, boolean isGroup) {
+
 		if (isGroup) {
 			Group data = ph.getGroup(entryName);
 			if (data == null) {
@@ -1188,6 +1123,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 	@Override
 	public double getInfoDouble(String entryName, String path, boolean isGroup) {
+
 		if (isGroup) {
 			Group data = ph.getGroup(entryName);
 			if (data == null) {
@@ -1206,6 +1142,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 	@Override
 	public boolean getInfoBoolean(String entryName, String path, boolean isGroup) {
+
 		if (isGroup) {
 			Group data = ph.getGroup(entryName);
 			if (data == null) {
@@ -1223,21 +1160,25 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 
 	@Override
 	public void addUserInfo(String name, String path, Object data) {
+
 		ph.getUser(name).getVariables().addVar(path, data);
 	}
 
 	@Override
 	public void removeUserInfo(String name, String path) {
+
 		ph.getUser(name).getVariables().removeVar(path);
 	}
 
 	@Override
 	public void addGroupInfo(String name, String path, Object data) {
+
 		ph.getGroup(name).getVariables().addVar(path, data);
 	}
 
 	@Override
 	public void removeGroupInfo(String name, String path) {
+
 		ph.getGroup(name).getVariables().removeVar(path);
 	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 516679544..c366b65bf 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -1,18 +1,19 @@
 /*

-* This program is free software; you can redistribute it and/or

-* modify it under the terms of the GNU General Public License

-* as published by the Free Software Foundation; either version 2

-* of the License, or (at your option) any later version.

-*

-* This program is distributed in the hope that it will be useful,

-* but WITHOUT ANY WARRANTY; without even the implied warranty of

-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-* GNU General Public License for more details.

-*

-* You should have received a copy of the GNU General Public License

-* along with this program; if not, write to the Free Software

-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-*/

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * as published by the Free Software Foundation; either version 2

+ * of the License, or (at your option) any later version.

+ * 

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ * 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,

+ * USA.

+ */

 

 package org.anjocaido.groupmanager.permissions;

 

@@ -47,7 +48,6 @@ import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;

 import org.bukkit.plugin.PluginManager;

 

-

 /**

  * 

  * BukkitPermissions overrides to force GM reponses to Superperms

@@ -62,11 +62,12 @@ public class BukkitPermissions {
 	protected boolean dumpAllPermissions = true;

 	protected boolean dumpMatchedPermissions = true;

 	private boolean player_join = false;

-	

+

 	/**

 	 * @return the player_join

 	 */

 	public boolean isPlayer_join() {

+

 		return player_join;

 	}

 

@@ -74,6 +75,7 @@ public class BukkitPermissions {
 	 * @param player_join the player_join to set

 	 */

 	public void setPlayer_join(boolean player_join) {

+

 		this.player_join = player_join;

 	}

 

@@ -92,6 +94,7 @@ public class BukkitPermissions {
 	}

 

 	public BukkitPermissions(GroupManager plugin) {

+

 		this.plugin = plugin;

 		this.collectPermissions();

 		this.registerEvents();

@@ -101,35 +104,38 @@ public class BukkitPermissions {
 	}

 

 	private void registerEvents() {

+

 		PluginManager manager = plugin.getServer().getPluginManager();

 

 		manager.registerEvents(new PlayerEvents(), plugin);

 		manager.registerEvents(new BukkitEvents(), plugin);

 	}

 

-	

 	public void collectPermissions() {

+

 		registeredPermissions.clear();

 

 		for (Permission perm : Bukkit.getPluginManager().getPermissions()) {

-				registeredPermissions.put(perm.getName().toLowerCase(), perm);

+			registeredPermissions.put(perm.getName().toLowerCase(), perm);

 		}

-		

+

 	}

 

 	public void updatePermissions(Player player) {

+

 		this.updatePermissions(player, null);

 	}

 

-

 	/**

-	 * Push all permissions which are registered with GM for this player, on this world to Bukkit

+	 * Push all permissions which are registered with GM for this player, on

+	 * this world to Bukkit

 	 * and make it update for the child nodes.

 	 * 

 	 * @param player

 	 * @param world

 	 */

 	public void updatePermissions(Player player, String world) {

+

 		if (player == null || !GroupManager.isLoaded()) {

 			return;

 		}

@@ -155,17 +161,18 @@ public class BukkitPermissions {
 

 		// Sort the perm list by parent/child, so it will push to superperms correctly.

 		playerPermArray = sort(playerPermArray);

-		

+

 		Boolean value = false;

-		for (String permission : playerPermArray) {			

+		for (String permission : playerPermArray) {

 			value = (!permission.startsWith("-"));

-			newPerms.put((value? permission : permission.substring(1)), value);

+			newPerms.put((value ? permission : permission.substring(1)), value);

 		}

 

 		/**

-		* This is put in place until such a time as Bukkit pull 466 is implemented

-		* https://github.com/Bukkit/Bukkit/pull/466

-		*/

+		 * This is put in place until such a time as Bukkit pull 466 is

+		 * implemented

+		 * https://github.com/Bukkit/Bukkit/pull/466

+		 */

 		try { // Codename_B source

 			@SuppressWarnings("unchecked")

 			Map<String, Boolean> orig = (Map<String, Boolean>) permissions.get(attachment);

@@ -182,7 +189,7 @@ public class BukkitPermissions {
 			e.printStackTrace();

 		}

 	}

-	

+

 	/**

 	 * Sort a permission node list by parent/child

 	 * 

@@ -190,20 +197,20 @@ public class BukkitPermissions {
 	 * @return List sorted for priority

 	 */

 	private List<String> sort(List<String> permList) {

-		

+

 		List<String> result = new ArrayList<String>();

-		

+

 		for (String key : permList) {

-			String a = key.charAt(0) == '-'? key.substring(1):key;

+			String a = key.charAt(0) == '-' ? key.substring(1) : key;

 			Map<String, Boolean> allchildren = GroupManager.BukkitPermissions.getAllChildren(a, new HashSet<String>());

 			if (allchildren != null) {

 

 				ListIterator<String> itr = result.listIterator();

-				

-				while (itr.hasNext()){

+

+				while (itr.hasNext()) {

 					String node = (String) itr.next();

-					String b = node.charAt(0) == '-'? node.substring(1):node;

-					

+					String b = node.charAt(0) == '-' ? node.substring(1) : node;

+

 					// Insert the parent node before the child

 					if (allchildren.containsKey(b)) {

 						itr.set(key);

@@ -215,11 +222,10 @@ public class BukkitPermissions {
 			if (!result.contains(key))

 				result.add(key);

 		}

-		

+

 		return result;

 	}

 

-	

 	/**

 	 * Fetch all permissions which are registered with superperms.

 	 * {can include child nodes)

@@ -228,13 +234,13 @@ public class BukkitPermissions {
 	 * @return List of all permission nodes

 	 */

 	public List<String> getAllRegisteredPermissions(boolean includeChildren) {

-		

+

 		List<String> perms = new ArrayList<String>();

-		

+

 		for (String key : registeredPermissions.keySet()) {

 			if (!perms.contains(key)) {

 				perms.add(key);

-				

+

 				if (includeChildren) {

 					Map<String, Boolean> children = getAllChildren(key, new HashSet<String>());

 					if (children != null) {

@@ -244,32 +250,33 @@ public class BukkitPermissions {
 					}

 				}

 			}

-			

+

 		}

 		return perms;

 	}

-	

+

 	/**

 	 * Returns a map of ALL child permissions registered with bukkit

 	 * null is empty

 	 * 

 	 * @param node

-	 * @param playerPermArray current list of perms to check against for negations

+	 * @param playerPermArray current list of perms to check against for

+	 *            negations

 	 * @return Map of child permissions

 	 */

 	public Map<String, Boolean> getAllChildren(String node, Set<String> playerPermArray) {

-		

+

 		LinkedList<String> stack = new LinkedList<String>();

 		Map<String, Boolean> alreadyVisited = new HashMap<String, Boolean>();

 		stack.push(node);

 		alreadyVisited.put(node, true);

-		

+

 		while (!stack.isEmpty()) {

 			String now = stack.pop();

-			

+

 			Map<String, Boolean> children = getChildren(now);

-			

-			if ((children != null) && (!playerPermArray.contains("-"+now))) {

+

+			if ((children != null) && (!playerPermArray.contains("-" + now))) {

 				for (String childName : children.keySet()) {

 					if (!alreadyVisited.containsKey(childName)) {

 						stack.push(childName);

@@ -279,24 +286,26 @@ public class BukkitPermissions {
 			}

 		}

 		alreadyVisited.remove(node);

-		if (!alreadyVisited.isEmpty()) return alreadyVisited;

-		

+		if (!alreadyVisited.isEmpty())

+			return alreadyVisited;

+

 		return null;

 	}

-		

+

 	/**

-	 * Returns a map of the child permissions (1 node deep) as registered with Bukkit.

+	 * Returns a map of the child permissions (1 node deep) as registered with

+	 * Bukkit.

 	 * null is empty

 	 * 

 	 * @param node

 	 * @return Map of child permissions

 	 */

 	public Map<String, Boolean> getChildren(String node) {

-		

+

 		Permission perm = registeredPermissions.get(node.toLowerCase());

 		if (perm == null)

 			return null;

-		

+

 		return perm.getChildren();

 

 	}

@@ -308,6 +317,7 @@ public class BukkitPermissions {
 	 * @return List<String> of permissions

 	 */

 	public List<String> listPerms(Player player) {

+

 		List<String> perms = new ArrayList<String>();

 

 		/*

@@ -332,25 +342,28 @@ public class BukkitPermissions {
 	 * force Bukkit to update every OnlinePlayers permissions.

 	 */

 	public void updateAllPlayers() {

+

 		for (Player player : Bukkit.getServer().getOnlinePlayers()) {

 			updatePermissions(player);

 		}

 	}

-	

+

 	/**

 	 * force Bukkit to update this Players permissions.

 	 */

 	public void updatePlayer(Player player) {

+

 		if (player != null)

 			this.updatePermissions(player, null);

 	}

-	

+

 	/**

 	 * Force remove any attachments

 	 * 

 	 * @param player

 	 */

 	private void removeAttachment(Player player) {

+

 		if (attachments.containsKey(player)) {

 			try {

 				player.removeAttachment(attachments.get(player));

@@ -363,15 +376,15 @@ public class BukkitPermissions {
 			attachments.remove(player);

 		}

 	}

-	

+

 	/**

 	 * Remove all attachments in case of a restart or reload.

 	 */

 	public void removeAllAttachments() {

-		

+

 		Iterator<Player> itr = attachments.keySet().iterator();

-		

-		while (itr.hasNext()){

+

+		while (itr.hasNext()) {

 			Player player = itr.next();

 			try {

 				player.removeAttachment(attachments.get(player));

@@ -389,20 +402,21 @@ public class BukkitPermissions {
 	 * Player events tracked to cause Superperms updates

 	 * 

 	 * @author ElgarL

-	 *

+	 * 

 	 */

 	protected class PlayerEvents implements Listener {

 

 		@EventHandler(priority = EventPriority.LOWEST)

 		public void onPlayerJoin(PlayerJoinEvent event) {

+

 			setPlayer_join(true);

 			Player player = event.getPlayer();

-			

+

 			/*

 			 * Tidy up any lose ends

 			 */

 			removeAttachment(player);

-			

+

 			// force GM to create the player if they are not already listed.

 			if (plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {

 				setPlayer_join(false);

@@ -410,29 +424,32 @@ public class BukkitPermissions {
 			}

 			setPlayer_join(false);

 		}

-		

+

 		@EventHandler(priority = EventPriority.LOWEST)

 		public void onPlayerChangeWorld(PlayerChangedWorldEvent event) { // has changed worlds

+

 			updatePermissions(event.getPlayer(), event.getPlayer().getWorld().getName());

 		}

 

 		@EventHandler(priority = EventPriority.LOWEST)

 		public void onPlayerKick(PlayerKickEvent event) {

+

 			Player player = event.getPlayer();

-			

+

 			/*

 			 * force remove any attachments as bukkit may not

 			 */

 			removeAttachment(player);

 		}

-		

+

 		@EventHandler(priority = EventPriority.LOWEST)

 		public void onPlayerQuit(PlayerQuitEvent event) {

+

 			if (!GroupManager.isLoaded())

 				return;

 

 			Player player = event.getPlayer();

-			

+

 			/*

 			 * force remove any attachments as bukkit may not

 			 */

@@ -444,6 +461,7 @@ public class BukkitPermissions {
 

 		@EventHandler(priority = EventPriority.NORMAL)

 		public void onPluginEnable(PluginEnableEvent event) {

+

 			if (!GroupManager.isLoaded())

 				return;

 

@@ -453,6 +471,7 @@ public class BukkitPermissions {
 

 		@EventHandler(priority = EventPriority.NORMAL)

 		public void onPluginDisable(PluginDisableEvent event) {

+

 			collectPermissions();

 			// updateAllPlayers();

 		}

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java
index 3f49757e2..69f098949 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java
@@ -12,227 +12,239 @@ import org.bukkit.entity.Player;
 
 /**
  * Made by Nijikokun. Changed by Gabriel Couto
- *
+ * 
  * This class is intended to *read* permissions from a single world.
- *
+ * 
  * @author Nijikokun
  * @author Gabriel Couto
  * @author ElgarL
  */
 public abstract class PermissionsReaderInterface {
 
-    /**
-     *
-     * @param player
-     * @param string
-     * @return true if has permission
-     */
-    public abstract boolean has(Player player, String string);
-
-    /**
-     *
-     * @param player
-     * @param string
-     * @return true if has permission
-     */
-    public abstract boolean permission(Player player, String string);
-
-    /**
-     *
-     * @param userName
-     * @return group name for this player.
-     */
-    public abstract String getGroup(String userName);
-
-    /**
-     *
-     * @param userName
-     * @param groupName
-     * @return true if in group
-     */
-    public abstract boolean inGroup(String userName, String groupName);
-
-    /**
-     *
-     * @param groupName
-     * @return String of prefix
-     */
-    public abstract String getGroupPrefix(String groupName);
-
-    /**
-     *
-     * @param groupName
-     * @return String of suffix
-     */
-    public abstract String getGroupSuffix(String groupName);
-
-    /**
-     *
-     * @param groupName
-     * @return true if can build
-     */
-    public abstract boolean canGroupBuild(String groupName);
-
-    /**
-     *
-     * @param groupName
-     * @param node
-     * @return String value
-     */
-    public abstract String getGroupPermissionString(String groupName, String node);
-
-    /**
-     *
-     * @param groupName
-     * @param node
-     * @return integer value
-     */
-    public abstract int getGroupPermissionInteger(String groupName, String node);
-
-    /**
-     *
-     * @param groupName
-     * @param node
-     * @return boolean value
-     */
-    public abstract boolean getGroupPermissionBoolean(String groupName, String node);
-
-    /**
-     *
-     * @param groupName
-     * @param node
-     * @return double value
-     */
-    public abstract double getGroupPermissionDouble(String groupName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return String value
-     */
-    public abstract String getUserPermissionString(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return integer value
-     */
-    public abstract int getUserPermissionInteger(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return boolean value
-     */
-    public abstract boolean getUserPermissionBoolean(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return double value
-     */
-    public abstract double getUserPermissionDouble(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return String value
-     */
-    public abstract String getPermissionString(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return integer value
-     */
-    public abstract int getPermissionInteger(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return boolean value
-     */
-    public abstract boolean getPermissionBoolean(String userName, String node);
-
-    /**
-     *
-     * @param userName
-     * @param node
-     * @return double value
-     */
-    public abstract double getPermissionDouble(String userName, String node);
-
-/////////////////////////////
-    /**
-     * Gets the appropriate prefix for the user.
-     * This method is a utility method for chat plugins to get the user's prefix
-     * without having to look at every one of the user's ancestors.
-     * Returns an empty string if user has no parent groups.
-     * 
-     * @param user Player's name
-     * @return Player's prefix
-     */
-    public abstract String getUserPrefix(String user);
-
-    /**
-     * Gets the appropriate suffix for the user.
-     * This method is a utility method for chat plugins to get the user's suffix
-     * without having to look at every one of the user's ancestors.
-     * Returns an empty string if user has no parent groups.
-     * 
-     * @param user Player's name
-     * @return Player's suffix
-     */
-    public abstract String getUserSuffix(String user);
-
-    /**
-     * Returns the group object representing the default group of the given world.
-     * This method will return null if the object does not exist or the world has no default group.
-     * @return Group object representing default world, or null if it doesn't exist or is not defined.
-     */
-    public abstract Group getDefaultGroup();
-
-    /**
-     * Gets a array of the names of all parent groups in the same world.
-     * @param name Target user's name
-     * @return An array containing the names of all parent groups (including ancestors) that are in the same world
-     */
-    public abstract String[] getGroups(String name);
-
-    public abstract String getInfoString(String entryName, String path, boolean isGroup);
-    //public abstract String getInfoString(String entryName, String path, boolean isGroup, Comparator<String> comparator);
-
-    public abstract int getInfoInteger(String entryName, String path, boolean isGroup);
-    //public abstract int getInfoInteger(String entryName, String path, boolean isGroup, Comparator<Integer> comparator);
-
-    /**
-     * Gets a double from the Info node without inheritance.
-     * @param entryName
-     * @param path
-     * @param isGroup
-     * @return -1 if not found
-     */
-    public abstract double getInfoDouble(String entryName, String path, boolean isGroup);
-    //public abstract double getInfoDouble(String entryName, String path, boolean isGroup, Comparator<Double> comparator);
-
-    public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup);
-    //public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup, Comparator<Boolean> comparator);
-
-    public abstract void addUserInfo(String name, String path, Object data);
-
-    public abstract void removeUserInfo(String name, String path);
-
-    public abstract void addGroupInfo(String name, String path, Object data);
-
-    public abstract void removeGroupInfo(String name, String path);
-//////////////////////////////
+	/**
+	 * 
+	 * @param player
+	 * @param string
+	 * @return true if has permission
+	 */
+	public abstract boolean has(Player player, String string);
+
+	/**
+	 * 
+	 * @param player
+	 * @param string
+	 * @return true if has permission
+	 */
+	public abstract boolean permission(Player player, String string);
+
+	/**
+	 * 
+	 * @param userName
+	 * @return group name for this player.
+	 */
+	public abstract String getGroup(String userName);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param groupName
+	 * @return true if in group
+	 */
+	public abstract boolean inGroup(String userName, String groupName);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @return String of prefix
+	 */
+	public abstract String getGroupPrefix(String groupName);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @return String of suffix
+	 */
+	public abstract String getGroupSuffix(String groupName);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @return true if can build
+	 */
+	public abstract boolean canGroupBuild(String groupName);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @param node
+	 * @return String value
+	 */
+	public abstract String getGroupPermissionString(String groupName, String node);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @param node
+	 * @return integer value
+	 */
+	public abstract int getGroupPermissionInteger(String groupName, String node);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @param node
+	 * @return boolean value
+	 */
+	public abstract boolean getGroupPermissionBoolean(String groupName, String node);
+
+	/**
+	 * 
+	 * @param groupName
+	 * @param node
+	 * @return double value
+	 */
+	public abstract double getGroupPermissionDouble(String groupName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return String value
+	 */
+	public abstract String getUserPermissionString(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return integer value
+	 */
+	public abstract int getUserPermissionInteger(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return boolean value
+	 */
+	public abstract boolean getUserPermissionBoolean(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return double value
+	 */
+	public abstract double getUserPermissionDouble(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return String value
+	 */
+	public abstract String getPermissionString(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return integer value
+	 */
+	public abstract int getPermissionInteger(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return boolean value
+	 */
+	public abstract boolean getPermissionBoolean(String userName, String node);
+
+	/**
+	 * 
+	 * @param userName
+	 * @param node
+	 * @return double value
+	 */
+	public abstract double getPermissionDouble(String userName, String node);
+
+	/////////////////////////////
+	/**
+	 * Gets the appropriate prefix for the user.
+	 * This method is a utility method for chat plugins to get the user's prefix
+	 * without having to look at every one of the user's ancestors.
+	 * Returns an empty string if user has no parent groups.
+	 * 
+	 * @param user Player's name
+	 * @return Player's prefix
+	 */
+	public abstract String getUserPrefix(String user);
+
+	/**
+	 * Gets the appropriate suffix for the user.
+	 * This method is a utility method for chat plugins to get the user's suffix
+	 * without having to look at every one of the user's ancestors.
+	 * Returns an empty string if user has no parent groups.
+	 * 
+	 * @param user Player's name
+	 * @return Player's suffix
+	 */
+	public abstract String getUserSuffix(String user);
+
+	/**
+	 * Returns the group object representing the default group of the given
+	 * world.
+	 * This method will return null if the object does not exist or the world
+	 * has no default group.
+	 * 
+	 * @return Group object representing default world, or null if it doesn't
+	 *         exist or is not defined.
+	 */
+	public abstract Group getDefaultGroup();
+
+	/**
+	 * Gets a array of the names of all parent groups in the same world.
+	 * 
+	 * @param name Target user's name
+	 * @return An array containing the names of all parent groups (including
+	 *         ancestors) that are in the same world
+	 */
+	public abstract String[] getGroups(String name);
+
+	public abstract String getInfoString(String entryName, String path, boolean isGroup);
+
+	//public abstract String getInfoString(String entryName, String path, boolean isGroup, Comparator<String> comparator);
+
+	public abstract int getInfoInteger(String entryName, String path, boolean isGroup);
+
+	//public abstract int getInfoInteger(String entryName, String path, boolean isGroup, Comparator<Integer> comparator);
+
+	/**
+	 * Gets a double from the Info node without inheritance.
+	 * 
+	 * @param entryName
+	 * @param path
+	 * @param isGroup
+	 * @return -1 if not found
+	 */
+	public abstract double getInfoDouble(String entryName, String path, boolean isGroup);
+
+	//public abstract double getInfoDouble(String entryName, String path, boolean isGroup, Comparator<Double> comparator);
+
+	public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup);
+
+	//public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup, Comparator<Boolean> comparator);
+
+	public abstract void addUserInfo(String name, String path, Object data);
+
+	public abstract void removeUserInfo(String name, String path);
+
+	public abstract void addGroupInfo(String name, String path, Object data);
+
+	public abstract void removeGroupInfo(String name, String path);
+
+	//////////////////////////////
 
 	public abstract List<String> getAllPlayersPermissions(String userName);
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GMLoggerHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GMLoggerHandler.java
index 87b6806ab..de5348b17 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GMLoggerHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GMLoggerHandler.java
@@ -9,18 +9,19 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class GMLoggerHandler extends ConsoleHandler {
 
-    @Override
-    public void publish(LogRecord record) {
-        String message = "GroupManager - " + record.getLevel() + " - " + record.getMessage();
-        if (record.getLevel().equals(Level.SEVERE) || record.getLevel().equals(Level.WARNING)) {
-            System.err.println(message);
-        } else {
-            System.out.println(message);
-        }
-    }
+	@Override
+	public void publish(LogRecord record) {
+
+		String message = "GroupManager - " + record.getLevel() + " - " + record.getMessage();
+		if (record.getLevel().equals(Level.SEVERE) || record.getLevel().equals(Level.WARNING)) {
+			System.err.println(message);
+		} else {
+			System.out.println(message);
+		}
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java
index 0262bb33e..4a7298b9c 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java
@@ -6,47 +6,48 @@ package org.anjocaido.groupmanager.utils;
 
 /**
  * Just a list of commands for this plugin
+ * 
  * @author gabrielcouto
  */
 public enum GroupManagerPermissions {
 
-    manuadd,
-    manudel,
-    manuaddsub,
-    manudelsub,
-    mangadd,
-    mangdel,
-    manuaddp,
-    manudelp,
-    manulistp,
-    manucheckp,
-    mangaddp,
-    mangdelp,
-    manglistp,
-    mangcheckp,
-    mangaddi,
-    mangdeli,
-    manuaddv,
-    manudelv,
-    manulistv,
-    manucheckv,
-    mangaddv,
-    mangdelv,
-    manglistv,
-    mangcheckv,
-    manwhois,
-    tempadd,
-    tempdel,
-    templist,
-    tempdelall,
-    mansave,
-    manload,
-    listgroups,
-    manpromote,
-    mandemote,
-    mantogglevalidate,
-    mantogglesave,
-    manworld,
-    manselect,
-    manclear
+	manuadd,
+	manudel,
+	manuaddsub,
+	manudelsub,
+	mangadd,
+	mangdel,
+	manuaddp,
+	manudelp,
+	manulistp,
+	manucheckp,
+	mangaddp,
+	mangdelp,
+	manglistp,
+	mangcheckp,
+	mangaddi,
+	mangdeli,
+	manuaddv,
+	manudelv,
+	manulistv,
+	manucheckv,
+	mangaddv,
+	mangdelv,
+	manglistv,
+	mangcheckv,
+	manwhois,
+	tempadd,
+	tempdel,
+	templist,
+	tempdelall,
+	mansave,
+	manload,
+	listgroups,
+	manpromote,
+	mandemote,
+	mantogglevalidate,
+	mantogglesave,
+	manworld,
+	manselect,
+	manclear
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/PermissionCheckResult.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/PermissionCheckResult.java
index 88ac48427..eb6633863 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/PermissionCheckResult.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/PermissionCheckResult.java
@@ -7,61 +7,61 @@ package org.anjocaido.groupmanager.utils;
 import org.anjocaido.groupmanager.data.DataUnit;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class PermissionCheckResult {
 
-    /**
-     * It should be the owner of the access level found.
-     *
-     * Use instanceof to find the owner type
-     */
-    public DataUnit owner;
-    /**
-     * The permission node found in the DataUnit.
-     */
-    public String accessLevel;
-    /**
-     * The full name of the permission you are looking for
-     */
-    public String askedPermission;
-    /**
-     * The result conclusion of the search.
-     * It determines if the owner can do, or not.
-     *
-     * It even determines if it has an owner.
-     */
-    public Type resultType = Type.NOTFOUND;
+	/**
+	 * It should be the owner of the access level found.
+	 * 
+	 * Use instanceof to find the owner type
+	 */
+	public DataUnit owner;
+	/**
+	 * The permission node found in the DataUnit.
+	 */
+	public String accessLevel;
+	/**
+	 * The full name of the permission you are looking for
+	 */
+	public String askedPermission;
+	/**
+	 * The result conclusion of the search.
+	 * It determines if the owner can do, or not.
+	 * 
+	 * It even determines if it has an owner.
+	 */
+	public Type resultType = Type.NOTFOUND;
 
-    /**
-     * The type of result the search can give.
-     */
-    public enum Type {
+	/**
+	 * The type of result the search can give.
+	 */
+	public enum Type {
 
-        /**
-         * If found a matching node starting with '+'.
-         * It means the user CAN do the permission.
-         */
-        EXCEPTION,
-        /**
-         * If found a matching node starting with '-'.
-         * It means the user CANNOT do the permission.
-         */
-        NEGATION,
-        /**
-         * If just found a common matching node.
-         * IT means the user CAN do the permission.
-         */
-        FOUND,
-        /**
-         * If no matchin node was found.
-         * It means the user CANNOT do the permission.
-         *
-         * owner field and accessLevel field should not be considered,
-         * when type is
-         * NOTFOUND
-         */
-        NOTFOUND
-    }
+		/**
+		 * If found a matching node starting with '+'.
+		 * It means the user CAN do the permission.
+		 */
+		EXCEPTION,
+		/**
+		 * If found a matching node starting with '-'.
+		 * It means the user CANNOT do the permission.
+		 */
+		NEGATION,
+		/**
+		 * If just found a common matching node.
+		 * IT means the user CAN do the permission.
+		 */
+		FOUND,
+		/**
+		 * If no matchin node was found.
+		 * It means the user CANNOT do the permission.
+		 * 
+		 * owner field and accessLevel field should not be considered,
+		 * when type is
+		 * NOTFOUND
+		 */
+		NOTFOUND
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
index ab2fd605b..5a56cd9fc 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
@@ -7,43 +7,46 @@ package org.anjocaido.groupmanager.utils;
 import java.util.Comparator;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class StringPermissionComparator implements Comparator<String> {
 
-    @Override
-    public int compare(String permA, String permB) {
-        boolean ap = permA.startsWith("+");
-        boolean bp = permB.startsWith("+");
-        boolean am = permA.startsWith("-");
-        boolean bm = permB.startsWith("-");
-        if (ap && bp) {
-            return 0;
-        }
-        if (ap && !bp) {
-            return -1;
-        }
-        if (!ap && bp) {
-            return 1;
-        }
-        if (am && bm) {
-            return 0;
-        }
-        if (am && !bm) {
-            return -1;
-        }
-        if (!am && bm) {
-            return 1;
-        }
-        return permA.compareToIgnoreCase(permB);
-    }
-    private static StringPermissionComparator instance;
+	@Override
+	public int compare(String permA, String permB) {
 
-    public static StringPermissionComparator getInstance() {
-        if (instance == null) {
-            instance = new StringPermissionComparator();
-        }
-        return instance;
-    }
+		boolean ap = permA.startsWith("+");
+		boolean bp = permB.startsWith("+");
+		boolean am = permA.startsWith("-");
+		boolean bm = permB.startsWith("-");
+		if (ap && bp) {
+			return 0;
+		}
+		if (ap && !bp) {
+			return -1;
+		}
+		if (!ap && bp) {
+			return 1;
+		}
+		if (am && bm) {
+			return 0;
+		}
+		if (am && !bm) {
+			return -1;
+		}
+		if (!am && bm) {
+			return 1;
+		}
+		return permA.compareToIgnoreCase(permB);
+	}
+
+	private static StringPermissionComparator instance;
+
+	public static StringPermissionComparator getInstance() {
+
+		if (instance == null) {
+			instance = new StringPermissionComparator();
+		}
+		return instance;
+	}
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/Tasks.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/Tasks.java
index 663da1123..d75737c66 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/Tasks.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/Tasks.java
@@ -22,13 +22,12 @@ import java.util.List;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.data.Group;
 
-
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public abstract class Tasks {
-	
+
 	/**
 	 * Gets the exception stack trace as a string.
 	 * 
@@ -36,35 +35,38 @@ public abstract class Tasks {
 	 * @return stack trace as a string
 	 */
 	public static String getStackTraceAsString(Exception exception) {
+
 		StringWriter sw = new StringWriter();
 		PrintWriter pw = new PrintWriter(sw);
 		exception.printStackTrace(pw);
 		return sw.toString();
 	}
 
-    public static void copy(InputStream src, File dst) throws IOException {
-        InputStream in = src;
-        OutputStream out = new FileOutputStream(dst);
-
-        // Transfer bytes from in to out
-        byte[] buf = new byte[1024];
-        int len;
-        while ((len = in.read(buf)) > 0) {
-            out.write(buf, 0, len);
-        }
-        out.close();
-        try {
-            in.close();
-        } catch (Exception e) {
-        }
-    }
-
-    public static void copy(File src, File dst) throws IOException {
-        InputStream in = new FileInputStream(src);
-        copy(in, dst);
-    }
-    
-    /**
+	public static void copy(InputStream src, File dst) throws IOException {
+
+		InputStream in = src;
+		OutputStream out = new FileOutputStream(dst);
+
+		// Transfer bytes from in to out
+		byte[] buf = new byte[1024];
+		int len;
+		while ((len = in.read(buf)) > 0) {
+			out.write(buf, 0, len);
+		}
+		out.close();
+		try {
+			in.close();
+		} catch (Exception e) {
+		}
+	}
+
+	public static void copy(File src, File dst) throws IOException {
+
+		InputStream in = new FileInputStream(src);
+		copy(in, dst);
+	}
+
+	/**
 	 * Appends a string to a file
 	 * 
 	 * @param data
@@ -82,86 +84,92 @@ public abstract class Tasks {
 		out.append(System.getProperty("line.separator"));
 		out.append(data);
 		out.append(System.getProperty("line.separator"));
-		
+
 		out.close();
 	}
 
-    public static void removeOldFiles(GroupManager gm, File folder) {
-        if (folder.isDirectory()) {
-            long oldTime = System.currentTimeMillis() - (((long)gm.getGMConfig().getBackupDuration()*60*60)*1000);
-            for (File olds : folder.listFiles()) {
-                if (olds.isFile()) {
-                    if (olds.lastModified() < oldTime) {
-                        try {
-                            olds.delete();
-                        } catch (Exception e) {
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public static String getDateString() {
-        GregorianCalendar now = new GregorianCalendar();
-        String date = "";
-        date += now.get(Calendar.DAY_OF_MONTH);
-        date += "-";
-        date += now.get(Calendar.HOUR);
-        date += "-";
-        date += now.get(Calendar.MINUTE);
-        return date;
-    }
-
-    public static String getStringListInString(List<String> list) {
-        if (list == null) {
-            return "";
-        }
-        String result = "";
-        for (int i = 0; i < list.size(); i++) {
-            result += list.get(i);
-            if (i < list.size() - 1) {
-                result += ", ";
-            }
-        }
-        return result;
-    }
-
-    public static String getStringArrayInString(String[] list) {
-        if (list == null) {
-            return "";
-        }
-        String result = "";
-        for (int i = 0; i < list.length; i++) {
-            result += list[i];
-            if (i < ((list.length) - 1)) {
-                result += ", ";
-            }
-        }
-        return result;
-    }
-
-    public static String getGroupListInString(List<Group> list) {
-        if (list == null) {
-            return "";
-        }
-        String result = "";
-        for (int i = 0; i < list.size(); i++) {
-            result += list.get(i).getName();
-            if (i < list.size() - 1) {
-                result += ", ";
-            }
-        }
-        return result;
-    }
-    
-    public static String join(String[] arr, String separator) {
-    	if (arr.length == 0)
-            return "";
-    	String out = arr[0].toString();
-    	for (int i = 1; i < arr.length; i++)
-            out += separator + arr[i];
-    return out;
-    }
+	public static void removeOldFiles(GroupManager gm, File folder) {
+
+		if (folder.isDirectory()) {
+			long oldTime = System.currentTimeMillis() - (((long) gm.getGMConfig().getBackupDuration() * 60 * 60) * 1000);
+			for (File olds : folder.listFiles()) {
+				if (olds.isFile()) {
+					if (olds.lastModified() < oldTime) {
+						try {
+							olds.delete();
+						} catch (Exception e) {
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public static String getDateString() {
+
+		GregorianCalendar now = new GregorianCalendar();
+		String date = "";
+		date += now.get(Calendar.DAY_OF_MONTH);
+		date += "-";
+		date += now.get(Calendar.HOUR);
+		date += "-";
+		date += now.get(Calendar.MINUTE);
+		return date;
+	}
+
+	public static String getStringListInString(List<String> list) {
+
+		if (list == null) {
+			return "";
+		}
+		String result = "";
+		for (int i = 0; i < list.size(); i++) {
+			result += list.get(i);
+			if (i < list.size() - 1) {
+				result += ", ";
+			}
+		}
+		return result;
+	}
+
+	public static String getStringArrayInString(String[] list) {
+
+		if (list == null) {
+			return "";
+		}
+		String result = "";
+		for (int i = 0; i < list.length; i++) {
+			result += list[i];
+			if (i < ((list.length) - 1)) {
+				result += ", ";
+			}
+		}
+		return result;
+	}
+
+	public static String getGroupListInString(List<Group> list) {
+
+		if (list == null) {
+			return "";
+		}
+		String result = "";
+		for (int i = 0; i < list.size(); i++) {
+			result += list.get(i).getName();
+			if (i < list.size() - 1) {
+				result += ", ";
+			}
+		}
+		return result;
+	}
+
+	public static String join(String[] arr, String separator) {
+
+		if (arr.length == 0)
+			return "";
+		String out = arr[0].toString();
+		for (int i = 1; i < arr.length; i++)
+			out += separator + arr[i];
+		return out;
+	}
 
 }