Update all code formatting to use tabs for indentation.

5 files changed, 2033 insertions, 1898 deletions

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..c8a3eb3ae 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
@@ -11,195 +11,205 @@ 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.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 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 ce6db2b9b..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,843 +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>>();
-        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) {
+		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 = null;
-    		
-    		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());
-            }
-            
-            // 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());
-            }
-        	
-            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) {
+
+			/*
+			 * 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();
 	}
 
@@ -1248,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..ebacfdfac 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
@@ -26,432 +26,451 @@ 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 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 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 +478,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 +525,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;
+	}
 }