diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
index 9f3fd4e6..f15a1767 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
@@ -1,27 +1,113 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Go to the AdminWorld.", usage = "/<command>")
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Go to the AdminWorld.", usage = "/<command> [guest < list | add <player> | remove <player> > | time <worldtime>]")
 public class Command_adminworld extends TFM_Command
 {
+    private enum CommandMode
+    {
+        TELEPORT, GUEST, TIME
+    }
+
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (sender_p.getWorld() == TFM_AdminWorld.getInstance().getAdminWorld())
+        CommandMode commandMode = null;
+
+        /*
+         *
+         * /adminworld
+         *
+         * /adminworld guest list
+         * /adminworld guest remove <player>
+         * /adminworld guest add <player>
+         *
+         * /adminworld time <time>
+         *
+         */
+
+        if (args.length == 0)
         {
-            playerMsg("Going to the main world.");
-            sender_p.teleport(server.getWorlds().get(0).getSpawnLocation());
+            commandMode = CommandMode.TELEPORT;
         }
-        else
+        else if (args.length >= 2)
         {
-            playerMsg("Going to the AdminWorld.");
-            TFM_AdminWorld.getInstance().sendToAdminWorld(sender_p);
+            if ("guest".equalsIgnoreCase(args[0]))
+            {
+                commandMode = CommandMode.GUEST;
+            }
+            else if ("time".equalsIgnoreCase(args[0]))
+            {
+                commandMode = CommandMode.TIME;
+            }
         }
+
+        if (commandMode == null)
+        {
+            return false;
+        }
+
+        switch (commandMode)
+        {
+            case TELEPORT:
+            {
+                if (sender_p.getWorld() == TFM_AdminWorld.getInstance().getAdminWorld())
+                {
+                    playerMsg("Going to the main world.");
+                    sender_p.teleport(server.getWorlds().get(0).getSpawnLocation());
+                }
+                else
+                {
+                    playerMsg("Going to the AdminWorld.");
+                    TFM_AdminWorld.getInstance().sendToAdminWorld(sender_p);
+                }
+
+                break;
+            }
+            case GUEST:
+            {
+                if (args.length == 2)
+                {
+                    if ("list".equalsIgnoreCase(args[1]))
+                    {
+                        //list
+                    }
+                }
+                else if (args.length == 3)
+                {
+                    if ("add".equalsIgnoreCase(args[1]))
+                    {
+                        //add args[2]
+                    }
+                    else if (TFM_Util.isRemoveCommand(args[1]))
+                    {
+                        //remove args[2]
+                    }
+                }
+
+                break;
+            }
+            case TIME:
+            {
+                if (args.length == 2)
+                {
+                    //set time = args[1]
+                }
+
+                break;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+
         return true;
     }
 }