diff --git a/src/main/java/com/nuclearw/addquartz/AddQuartz.java b/src/main/java/com/nuclearw/addquartz/AddQuartz.java
index 73c9d29..994d5f2 100644
--- a/src/main/java/com/nuclearw/addquartz/AddQuartz.java
+++ b/src/main/java/com/nuclearw/addquartz/AddQuartz.java
@@ -7,8 +7,14 @@
 import java.util.Random;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import net.minecraft.server.v1_5_R2.WorldGenMinable;
+
+import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.BlockState;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
 import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -18,8 +24,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 
-import net.minecraft.server.v1_5_R2.WorldGenMinable;
-
 public class AddQuartz extends JavaPlugin implements Listener, Runnable {
 	private static WorldGenMinable orePopulator = new WorldGenMinable(Material.QUARTZ_ORE.getId(), 13, Material.NETHERRACK.getId());
 	private static Random random = new Random();
@@ -27,9 +31,12 @@ public class AddQuartz extends JavaPlugin implements Listener, Runnable {
 	private static LinkedBlockingQueue<ChunkLocation> chunksToProcess = new LinkedBlockingQueue<ChunkLocation>();
 	private static HashSet<String> processList = new HashSet<String>();
 	private static HashSet<String> processedList = new HashSet<String>();
+	private static HashSet<String> fullWorldList = new HashSet<String>();
 
 	private static File processedFile;
 	private static int processedCount = 0;
+	private static int totalChunksChecked = 0;
+	private static final int quartzId = Material.QUARTZ_ORE.getId();
 
 	@Override
 	public void onEnable() {
@@ -72,19 +79,52 @@ public void run() {
 		int processed = 0;
 		while(!chunksToProcess.isEmpty() && processed < 10) {
 			ChunkLocation location = chunksToProcess.poll();
-
-			int cx = location.x * 16;
-			int cz = location.z * 16;
-
-			for(int i = 0; i < 16; i++) {
-	            int x = cx + random.nextInt(16);
-	            int y = random.nextInt(108) + 10;
-	            int z = cz + random.nextInt(16);
-	            orePopulator.a(((CraftWorld) getServer().getWorld(location.world)).getHandle(), random, x, y, z);
-	        }
-
-			processedList.add(location.toString());
-			processed++;
+			
+			// Exclude chunks that were added to the queue multiple times
+			if(!processedList.contains(location.toString())) {
+			
+				World world = getServer().getWorld(location.world);
+				// check if chunk exists
+				if(world.loadChunk(location.x, location.z, false)) {
+					Chunk chunk = world.getChunkAt(location.x, location.z);
+					if(!containsQuartz(chunk)) {
+		
+						int cx = location.x * 16;
+						int cz = location.z * 16;
+			
+						for(int i = 0; i < 16; i++) {
+				            int x = cx + random.nextInt(16);
+				            int y = random.nextInt(108) + 10;
+				            int z = cz + random.nextInt(16);
+				            orePopulator.a(((CraftWorld) world).getHandle(), random, x, y, z);
+				        }
+					
+					}
+					
+					processedList.add(location.toString());
+					processed++;
+					
+					// add surrounding chunks to queue for full population of all chunks
+					if(fullWorldList.contains(location.world)) {
+						addLocationToQueue(new ChunkLocation(location.world,location.x,location.z+1));
+						addLocationToQueue(new ChunkLocation(location.world,location.x,location.z-1));
+						addLocationToQueue(new ChunkLocation(location.world,location.x+1,location.z));
+						addLocationToQueue(new ChunkLocation(location.world,location.x-1,location.z));
+					}
+					
+					if(!fullWorldList.isEmpty()) {
+						totalChunksChecked++;
+						if(totalChunksChecked%500==0) {
+							getLogger().info("AddQuartz checked "+totalChunksChecked+" chunks.");
+						}
+					}
+					
+				}
+			}
+		}
+		
+		if(chunksToProcess.isEmpty() && !fullWorldList.isEmpty()) {
+			getLogger().info("AddQuartz finished full generation.");
 		}
 
 		if(processed > 0) {
@@ -97,6 +137,13 @@ public void run() {
 		}
 	}
 
+	private void addLocationToQueue(ChunkLocation chunkLocation) {
+		final String chunkString = chunkLocation.toString();
+		if(!processedList.contains(chunkString)) {
+			chunksToProcess.add(chunkLocation);
+		}
+	}
+
 	@EventHandler
 	public void onChunkLoad(ChunkLoadEvent event) {
 		if(!event.getWorld().getEnvironment().equals(World.Environment.NETHER)) return;
@@ -105,6 +152,38 @@ public void onChunkLoad(ChunkLoadEvent event) {
 
 		chunksToProcess.add(new ChunkLocation(event.getWorld().getName(), event.getChunk().getX(), event.getChunk().getZ()));
 	}
+	
+	
+	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		if(cmd.getName().equalsIgnoreCase("addquartz")){
+			if(args.length==1) {
+				String worldName = args[0];
+				if(processList.contains(worldName)) {
+					fullWorldList.add(worldName);
+					
+					// Start populating the chunksToProcess with spawn chunk
+					Chunk chunk = getServer().getWorld(worldName).getSpawnLocation().getChunk();
+					// Clear list to ensure that the world is fully connected
+					processedList.clear();
+					chunksToProcess.add(new ChunkLocation(worldName, chunk.getX(), chunk.getZ()));
+					
+					getLogger().info("AddQuartz full generation started for "+worldName);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	private static boolean containsQuartz(Chunk chunk) {
+		BlockState[] blocks = chunk.getTileEntities();
+		for(BlockState block : blocks) {
+			if(block.getTypeId() == quartzId) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	private static void saveProcessed() {
 		try {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index f4effb1..01a0b01 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,3 +4,9 @@ version: ${project.version}
 author: NuclearW
 description: AddQuartz adds quartz ore to nether worlds
 load: startup
+commands:
+  addquartz:
+    description: This command is used for controlling AddQuartz. 
+    usage: /<command> world_name -> to add quartz to all chunks in world_name 
+    permission: <plugin name>.addquartz
+    permission-message: You don't have <permission>