diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
index 407713f..7488fd7 100644
--- a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
+++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
@@ -21,6 +21,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisCommand;
 import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisDebugGenerateTestHomesCommand;
 import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisFlagResetCommand;
 import com.majinnaibu.bukkitplugins.metropolis.commands.MetropolisHomeEvictCommand;
@@ -252,12 +253,9 @@ public class MetropolisPlugin extends JavaPlugin {
 
 		log.info(String.format("%s enabled", pdf.getFullName()));
 		
-		PluginCommand command = getCommand("metropolis-debug-generatetesthomes");
-		if(command != null){
-			command.setExecutor(new MetropolisDebugGenerateTestHomesCommand(this));
-		}else{
-			throw new RuntimeException("The metropolis-debug-generatetesthomes command does not appear to exist");
-		}
+		RegisterCommandHandler("metropolis", new MetropolisCommand(this));
+		
+		RegisterCommandHandler("metropolis-debug-generatetesthomes", new MetropolisDebugGenerateTestHomesCommand(this));
 		
 		RegisterCommandHandler("metropolis-flag-reset", new MetropolisFlagResetCommand(this));
 		
diff --git a/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java
new file mode 100644
index 0000000..4fba698
--- /dev/null
+++ b/Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisCommand.java
@@ -0,0 +1,24 @@
+package com.majinnaibu.bukkitplugins.metropolis.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
+
+public class MetropolisCommand implements CommandExecutor {
+	private MetropolisPlugin _plugin;
+	
+	public MetropolisCommand(MetropolisPlugin plugin){
+		_plugin = plugin;
+	}
+	
+	@Override
+	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		
+		sender.sendMessage("Metropolis: version "+ _plugin.pdf.getVersion());
+		
+		return true;
+	}
+
+}
diff --git a/Metropolis/src/main/resources/plugin.yml b/Metropolis/src/main/resources/plugin.yml
index 4d8c373..b2e931e 100644
--- a/Metropolis/src/main/resources/plugin.yml
+++ b/Metropolis/src/main/resources/plugin.yml
@@ -4,4 +4,7 @@ depend: [WorldGuard]
 softdepend: [WorldEdit,CommandBook]
 version: 0.5
 database: false
-commands:
  metropolis-home-generate:
   description: This command generates a home for a user as if they'd just logged in.
   permission: metropolis.home.generate
   usage: /metropolis-home-generate <playername>
  metropolis-home-list:
   description: This lists the regions managed by Metropolis
   permission: metropolis.home.list
   usage: /metropolis-home-list
  metropolis-home-evict:
   description: This unassigns a player's current home.
   permission: metropolis.home.evict
   usage: /metropolis-home-evict <playerName>
  metropolis-home-move:
   description: This command swaps a player's current home with a reserved plot.
   permission: metropolis.home.move
   usage: /metropolis-home-move <newRegionName>
  metropolis-home-go:
   description: Teleports the user or another player to his home.
   permission: metropolis.home.go
   usage: /metropolis-home-go
  metropolis-flag-reset:
   description: This command resets the WorldGuard flags for all managed regions (city and h_*).
   permission: metropolis.flag.reset
   usage: /metropolis-flag-reset
  metropolis-plot-reserve:
   description: This command reserves a plot so it won't be assigned as a home.
   permission: metropolis.plot.reserve
   usage: /metropolis-plot-reserve <name> <minX> <minY> <minZ> <maxX> <maxY> <maxZ>
  metropolis-plot-go:
   description: This command teleports the user or another player to a plot.
   permission: metropolis.plot.go
   usage: /metropolis-plot-go <plotName> [playerName]
  metropolis-debug-generatetesthomes:
   description: This command is ignored on non-debug builds.
   permission: metropolis.debug
   usage: /metropolis-debug-gentesthomes
\ No newline at end of file
+commands:
+  metropolis:
+   description: This command displays the current metropolis version.
+   usage: /metropolis
  metropolis-home-generate:
   description: This command generates a home for a user as if they'd just logged in.
   permission: metropolis.home.generate
   usage: /metropolis-home-generate <playername>
  metropolis-home-list:
   description: This lists the regions managed by Metropolis
   permission: metropolis.home.list
   usage: /metropolis-home-list
  metropolis-home-evict:
   description: This unassigns a player's current home.
   permission: metropolis.home.evict
   usage: /metropolis-home-evict <playerName>
  metropolis-home-move:
   description: This command swaps a player's current home with a reserved plot.
   permission: metropolis.home.move
   usage: /metropolis-home-move <newRegionName>
  metropolis-home-go:
   description: Teleports the user or another player to his home.
   permission: metropolis.home.go
   usage: /metropolis-home-go
  metropolis-flag-reset:
   description: This command resets the WorldGuard flags for all managed regions (city and h_*).
   permission: metropolis.flag.reset
   usage: /metropolis-flag-reset
  metropolis-plot-reserve:
   description: This command reserves a plot so it won't be assigned as a home.
   permission: metropolis.plot.reserve
   usage: /metropolis-plot-reserve <name> <minX> <minY> <minZ> <maxX> <maxY> <maxZ>
  metropolis-plot-go:
   description: This command teleports the user or another player to a plot.
   permission: metropolis.plot.go
   usage: /metropolis-plot-go <plotName> [playerName]
  metropolis-debug-generatetesthomes:
   description: This command is ignored on non-debug builds.
   permission: metropolis.debug
   usage: /metropolis-debug-gentesthomes
\ No newline at end of file