diff --git a/StevenDimDoors/mod_pocketDim/blocks/DDoorBase.java b/StevenDimDoors/mod_pocketDim/blocks/DDoorBase.java
new file mode 100644
index 00000000..b51f08c1
--- /dev/null
+++ b/StevenDimDoors/mod_pocketDim/blocks/DDoorBase.java
@@ -0,0 +1,537 @@
+package StevenDimDoors.mod_pocketDim.blocks;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
+import StevenDimDoors.mod_pocketDim.core.DimLink;
+import StevenDimDoors.mod_pocketDim.core.LinkTypes;
+import StevenDimDoors.mod_pocketDim.core.NewDimData;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import StevenDimDoors.mod_pocketDim.schematic.BlockRotator;
+import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class DDoorBase extends BlockContainer implements IDDoorLogic
+{
+	protected static DDProperties properties = null;
+	private Icon blockIconBottom;
+	
+	public DDoorBase(int par1, Material material) 
+	{
+		super(par1, material);
+
+		if (properties == null)
+			properties = DDProperties.instance();
+	}
+
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
+		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
+	}
+
+	@Override
+	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) 
+	{
+		this.enterDimDoor(world, x, y, z, entity);
+	}
+
+	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
+	{
+
+		boolean shouldOpen=true;
+
+		//System.out.println(String.valueOf(par1World.getBlockMetadata(par2, par3, par4)));
+		if(par5EntityPlayer.inventory.getCurrentItem()!=null)
+		{
+			if(par5EntityPlayer.inventory.getCurrentItem().getItem() == mod_pocketDim.itemRiftBlade)
+			{
+				shouldOpen = false;
+				if (!par1World.isRemote && par1World.getBlockId(par2, par3-1, par4) == this.blockID)
+				{
+					int var12 = (int) (MathHelper.floor_double((double)((par5EntityPlayer.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
+
+					if (par1World.getBlockMetadata(par2, par3-1, par4) == var12)
+					{
+						var12 = BlockRotator.transformMetadata(var12, 1, this.blockID);
+					}
+					par1World.setBlockMetadataWithNotify(par2, par3-1, par4, var12, 2);
+				}
+				if (!par1World.isRemote && par1World.getBlockId(par2, par3+1, par4) == this.blockID)
+				{
+					int var12 = (int) (MathHelper.floor_double((double)((par5EntityPlayer.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
+					if(par1World.getBlockMetadata(par2, par3, par4)==var12)
+					{ 
+						var12 = BlockRotator.transformMetadata(var12, 1, this.blockID);
+					}
+					par1World.setBlockMetadataWithNotify(par2, par3, par4, var12, 2);
+				}
+				par1World.playAuxSFXAtEntity(par5EntityPlayer, 1001, par2, par3, par4, 0);
+
+				if (!shouldOpen && !par1World.isRemote)
+				{
+					par5EntityPlayer.inventory.getCurrentItem().damageItem(5, par5EntityPlayer);
+				}
+			}
+		}
+
+		if(shouldOpen)
+		{
+			int var10 = this.getFullMetadata(par1World, par2, par3, par4);
+			int var11 = var10 & 7;
+			var11 ^= 4;
+
+			if ((var10 & 8) == 0)
+			{
+				par1World.setBlockMetadataWithNotify(par2, par3, par4, var11,2);
+				par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4);
+			}
+			else
+			{
+				par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var11,2);
+				par1World.markBlockRangeForRenderUpdate(par2, par3 - 1, par4, par2, par3, par4);
+			}
+
+			par1World.playAuxSFXAtEntity(par5EntityPlayer, 1003, par2, par3, par4, 0);
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+
+	}
+
+	/**
+	 * A function to open a door.
+	 */
+	public void onPoweredBlockChange(World par1World, int par2, int par3, int par4, boolean par5)
+	{
+		int var6 = this.getFullMetadata(par1World, par2, par3, par4);
+		boolean var7 = (var6 & 4) != 0;
+
+		if (var7 != par5)
+		{
+			int var8 = var6 & 7;
+			var8 ^= 4;
+
+			if ((var6 & 8) == 0)
+			{
+				par1World.setBlockMetadataWithNotify(par2, par3, par4, var8,2);
+				par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4);
+			}
+			else
+			{
+				par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var8,2);
+				par1World.markBlockRangeForRenderUpdate(par2, par3 - 1, par4, par2, par3, par4);
+			}
+
+			par1World.playAuxSFXAtEntity((EntityPlayer)null, 1003, par2, par3, par4, 0);
+		}
+	}
+	
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) 
+	{
+		//FIXME: We need to set door generation flags on the tile entities. Ignoring that for now. ~SenseiKiwi
+		
+		this.placeDimDoor(world, x, y, z);
+		world.setBlockTileEntity(x, y, z, this.createNewTileEntity(world));
+		this.updateAttachedTile(world, x, y, z);
+	}
+
+	@SideOnly(Side.CLIENT)
+
+	/**
+	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
+	 */
+	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
+	{
+		if(par1IBlockAccess.getBlockId(par2, par3-1, par4) == this.blockID)
+		{
+			return this.blockIcon;
+		}
+		else
+		{
+			return blockIconBottom;
+		}
+	}
+
+	//Called to update the render information on the tile entity. Could probably implement a data watcher,
+	//but this works fine and is more versatile I think. 
+	public DDoorBase updateAttachedTile(World world, int x, int y, int z)
+	{
+		TileEntity tile = world.getBlockTileEntity(x, y, z);
+		if (tile instanceof TileEntityDimDoor)
+		{
+			TileEntityDimDoor dimTile = (TileEntityDimDoor) tile;
+			dimTile.openOrClosed = PocketManager.getLink(x, y, z, world.provider.dimensionId) != null;
+			dimTile.orientation = this.getFullMetadata(world, x, y, z) & 7;
+		}
+		return this;
+	}
+
+	/**
+	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
+	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
+	 */
+	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) 
+	{
+		TileEntityDimDoor tile = (TileEntityDimDoor) par1World.getBlockTileEntity(par2, par3, par4);
+		tile.openOrClosed = this.isDoorOpen( par1World,  par2,  par3,  par4);  	
+		tile.orientation = this.getFullMetadata(par1World, par2, par3, par4) & 7;
+	}
+	
+	public boolean isOpaqueCube()
+	{
+		return false;
+	}
+
+	public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		int var5 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4);
+		return (var5 & 4) != 0;
+	}
+
+	/**
+	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
+	 */
+	public boolean renderAsNormalBlock()
+	{
+		return false;
+	}
+
+	/**
+	 * The type of render function that is called for this block
+	 */
+	public int getRenderType()
+	{
+		return 7;
+	}
+
+	@SideOnly(Side.CLIENT)
+
+	/**
+	 * Returns the bounding box of the wired rectangular prism to render.
+	 */
+	public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
+	{
+		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
+		return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4);
+	}
+
+	/**
+	 * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
+	 * cleared to be reused)
+	 */
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
+	{
+		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
+		return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4);
+	}
+
+	/**
+	 * Updates the blocks bounds based on its current state. Args: world, x, y, z
+	 */
+	public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		this.setDoorRotation(this.getFullMetadata(par1IBlockAccess, par2, par3, par4));
+	}
+
+	/**
+	 * Returns 0, 1, 2 or 3 depending on where the hinge is.
+	 */
+	public int getDoorOrientation(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		return this.getFullMetadata(par1IBlockAccess, par2, par3, par4) & 3;
+	}
+
+	public boolean isDoorOpen(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		return (this.getFullMetadata(par1IBlockAccess, par2, par3, par4) & 4) != 0;
+	}
+
+	private void setDoorRotation(int par1)
+	{
+		float var2 = 0.1875F;
+		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
+		int var3 = par1 & 3;
+		boolean var4 = (par1 & 4) != 0;
+		boolean var5 = (par1 & 16) != 0;
+
+		if (var3 == 0)
+		{
+			if (var4)
+			{
+				if (!var5)
+				{
+					this.setBlockBounds(0.001F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
+				}
+				else
+				{
+					this.setBlockBounds(0.001F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
+				}
+			}
+			else
+			{
+				this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
+			}
+		}
+		else if (var3 == 1)
+		{
+			if (var4)
+			{
+				if (!var5)
+				{
+					this.setBlockBounds(1.0F - var2, 0.0F, 0.001F, 1.0F, 1.0F, 1.0F);
+				}
+				else
+				{
+					this.setBlockBounds(0.0F, 0.0F, 0.001F, var2, 1.0F, 1.0F);
+				}
+			}
+			else
+			{
+				this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
+			}
+		}
+		else if (var3 == 2)
+		{
+			if (var4)
+			{
+				if (!var5)
+				{
+					this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, .99F, 1.0F, 1.0F);
+				}
+				else
+				{
+					this.setBlockBounds(0.0F, 0.0F, 0.0F, .99F, 1.0F, var2);
+				}
+			}
+			else
+			{
+				this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+			}
+		}
+		else if (var3 == 3)
+		{
+			if (var4)
+			{
+				if (!var5)
+				{
+					this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 0.99F);
+				}
+				else
+				{
+					this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 0.99F);
+				}
+			}
+			else
+			{
+				this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
+			}
+		}
+	}
+
+	/**
+	 * Called when the block is clicked by a player. Args: x, y, z, entityPlayer
+	 */
+	public void onBlockClicked(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer)
+	{
+		//	System.out.println(this.getFullMetadata(par1World, par2, par3, par4)%4);
+	}
+
+	/**
+	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
+	 * their own) Args: x, y, z, neighbor blockID
+	 */
+	public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
+	{
+		int var6 = par1World.getBlockMetadata(par2, par3, par4);
+
+		if ((var6 & 8) == 0)
+		{
+			boolean var7 = false;
+
+			if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID)
+			{
+				par1World.setBlock(par2, par3, par4, 0);
+				var7 = true;
+			}
+
+			/**
+            if (!par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4))
+            {
+                par1World.setBlockWithNotify(par2, par3, par4, 0);
+                var7 = true;
+
+                if (par1World.getBlockId(par2, par3 + 1, par4) == this.blockID)
+                {
+                    par1World.setBlockWithNotify(par2, par3 + 1, par4, 0);
+                }
+            }
+			 **/
+
+			if (var7)
+			{
+				if (!par1World.isRemote)
+				{
+					this.dropBlockAsItem(par1World, par2, par3, par4, properties.DimensionalDoorID, 0);
+				}
+			}
+			else
+			{
+				boolean var8 = par1World.isBlockIndirectlyGettingPowered(par2, par3, par4) || par1World.isBlockIndirectlyGettingPowered(par2, par3 + 1, par4);
+
+				if ((var8 || par5 > 0 && Block.blocksList[par5].canProvidePower()) && par5 != this.blockID)
+				{
+					this.onPoweredBlockChange(par1World, par2, par3, par4, var8);
+				}
+			}
+		}
+		else
+		{
+			if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID)
+			{
+				par1World.setBlock(par2, par3, par4, 0);
+			}
+
+			if (par5 > 0 && par5 != this.blockID)
+			{
+				this.onNeighborBlockChange(par1World, par2, par3 - 1, par4, par5);
+			}
+		}
+	}
+
+	/**
+	 * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
+	 * x, y, z, startVec, endVec
+	 */
+	public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3)
+	{
+		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
+		return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
+	}
+
+	/**
+	 * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
+	 */
+	public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
+	{
+		return par3 >= 255 ? false : par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && super.canPlaceBlockAt(par1World, par2, par3, par4) && super.canPlaceBlockAt(par1World, par2, par3 + 1, par4);
+	}
+
+	/**
+	 * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility
+	 * and stop pistons
+	 */
+	public int getMobilityFlag()
+	{
+		return 2;
+	}
+
+	/**
+	 * Returns the full metadata value created by combining the metadata of both blocks the door takes up.
+	 */
+	public int getFullMetadata(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4);
+		boolean var6 = (var5 & 8) != 0;
+		int var7;
+		int var8;
+
+		if (var6)
+		{
+			var7 = par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4);
+			var8 = var5;
+		}
+		else
+		{
+			var7 = var5;
+			var8 = par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4);
+		}
+
+		boolean var9 = (var8 & 1) != 0;
+		return var7 & 7 | (var6 ? 8 : 0) | (var9 ? 16 : 0);
+	}
+
+	@SideOnly(Side.CLIENT)
+	/**
+	 * only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative)
+	 */
+	public int idPicked(World par1World, int par2, int par3, int par4)
+	{
+		return this.getDrops();
+	}
+
+	public int idDropped(int par1, Random par2Random, int par3)
+	{
+		return (par1 & 8) != 0 ? 0 : (getDrops());
+	}
+
+	/**
+	 * Called when the block is attempted to be harvested
+	 */
+	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer)
+	{
+		if (par6EntityPlayer.capabilities.isCreativeMode && (par5 & 8) != 0 && par1World.getBlockId(par2, par3 - 1, par4) == this.blockID)
+		{
+			par1World.setBlock(par2, par3 - 1, par4, 0);
+		}
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world)
+	{
+		TileEntity tile = new TileEntityDimDoor();
+		return tile;
+	}
+
+	@Override
+	public void enterDimDoor(World world, int x, int y, int z, Entity entity) 
+	{
+		int var12 = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3);
+
+		int orientation = world.getBlockMetadata(x, y - 1, z);
+		if (!world.isRemote && (orientation >= 4 && orientation <= 7) && (orientation - 4) == var12 &&
+				world.getBlockId(x, y - 1, z) == this.blockID)
+		{
+			this.onPoweredBlockChange(world, x, y, z, false);
+
+			DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId);
+			if (link != null)
+			{
+				DDTeleporter.traverseDimDoor(world, link, entity);
+			}
+		}	
+	}
+
+	@Override
+	public void placeDimDoor(World world, int x, int y, int z) 
+	{
+		// TODO Auto-generated method stub
+	}
+	@Override
+	public int getDrops()
+	{
+		return this.blockID;
+	}
+}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java b/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
index 83b64f4a..b2ba41cd 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
+++ b/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
@@ -29,144 +29,18 @@ import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class DimensionalDoor extends BlockContainer
+public class DimensionalDoor extends DDoorBase implements IDDoorLogic
 {
-	protected static DDProperties properties = null;
-	private Icon blockIconBottom;
-	
+
 	public DimensionalDoor(int par1, Material material) 
 	{
 		super(par1, material);
-
-		if (properties == null)
-			properties = DDProperties.instance();
-	}
-
-	public void registerIcons(IconRegister par1IconRegister)
-	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
+		// TODO Auto-generated constructor stub
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) 
+	public void placeDimDoor(World world, int x, int y, int z) 
 	{
-		//TODO: Would it kill us to use REASONABLE variable names? <_< ~SenseiKiwi
-		int var12 = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3);
-
-		int orientation = world.getBlockMetadata(x, y - 1, z);
-		if (!world.isRemote && (orientation >= 4 && orientation <= 7) && (orientation - 4) == var12 &&
-				world.getBlockId(x, y - 1, z) == this.blockID)
-		{
-			this.onPoweredBlockChange(world, x, y, z, false);
-
-			DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId);
-			if (link != null)
-			{
-				DDTeleporter.traverseDimDoor(world, link, entity);
-			}
-		}
-	}
-
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
-	{
-
-		boolean shouldOpen=true;
-
-		//System.out.println(String.valueOf(par1World.getBlockMetadata(par2, par3, par4)));
-		if(par5EntityPlayer.inventory.getCurrentItem()!=null)
-		{
-			if(par5EntityPlayer.inventory.getCurrentItem().getItem() == mod_pocketDim.itemRiftBlade)
-			{
-				shouldOpen = false;
-				if (!par1World.isRemote && par1World.getBlockId(par2, par3-1, par4) == this.blockID)
-				{
-					int var12 = (int) (MathHelper.floor_double((double)((par5EntityPlayer.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
-
-					if (par1World.getBlockMetadata(par2, par3-1, par4) == var12)
-					{
-						var12 = BlockRotator.transformMetadata(var12, 1, this.blockID);
-					}
-					par1World.setBlockMetadataWithNotify(par2, par3-1, par4, var12, 2);
-				}
-				if (!par1World.isRemote && par1World.getBlockId(par2, par3+1, par4) == this.blockID)
-				{
-					int var12 = (int) (MathHelper.floor_double((double)((par5EntityPlayer.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
-					if(par1World.getBlockMetadata(par2, par3, par4)==var12)
-					{ 
-						var12 = BlockRotator.transformMetadata(var12, 1, this.blockID);
-					}
-					par1World.setBlockMetadataWithNotify(par2, par3, par4, var12, 2);
-				}
-				par1World.playAuxSFXAtEntity(par5EntityPlayer, 1001, par2, par3, par4, 0);
-
-				if (!shouldOpen && !par1World.isRemote)
-				{
-					par5EntityPlayer.inventory.getCurrentItem().damageItem(5, par5EntityPlayer);
-				}
-			}
-		}
-
-		if(shouldOpen)
-		{
-			int var10 = this.getFullMetadata(par1World, par2, par3, par4);
-			int var11 = var10 & 7;
-			var11 ^= 4;
-
-			if ((var10 & 8) == 0)
-			{
-				par1World.setBlockMetadataWithNotify(par2, par3, par4, var11,2);
-				par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4);
-			}
-			else
-			{
-				par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var11,2);
-				par1World.markBlockRangeForRenderUpdate(par2, par3 - 1, par4, par2, par3, par4);
-			}
-
-			par1World.playAuxSFXAtEntity(par5EntityPlayer, 1003, par2, par3, par4, 0);
-			return true;
-		}
-		else 
-		{
-			return false;
-		}
-
-	}
-
-	/**
-	 * A function to open a door.
-	 */
-	public void onPoweredBlockChange(World par1World, int par2, int par3, int par4, boolean par5)
-	{
-		int var6 = this.getFullMetadata(par1World, par2, par3, par4);
-		boolean var7 = (var6 & 4) != 0;
-
-		if (var7 != par5)
-		{
-			int var8 = var6 & 7;
-			var8 ^= 4;
-
-			if ((var6 & 8) == 0)
-			{
-				par1World.setBlockMetadataWithNotify(par2, par3, par4, var8,2);
-				par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4);
-			}
-			else
-			{
-				par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var8,2);
-				par1World.markBlockRangeForRenderUpdate(par2, par3 - 1, par4, par2, par3, par4);
-			}
-
-			par1World.playAuxSFXAtEntity((EntityPlayer)null, 1003, par2, par3, par4, 0);
-		}
-	}
-	
-	@Override
-	public void onBlockAdded(World world, int x, int y, int z) 
-	{
-		//FIXME: We need to set door generation flags on the tile entities. Ignoring that for now. ~SenseiKiwi
-		
 		if (!world.isRemote && world.getBlockId(x, y - 1, z) == this.blockID)
 		{
 			NewDimData dimension = PocketManager.getDimensionData(world);
@@ -176,353 +50,11 @@ public class DimensionalDoor extends BlockContainer
 				dimension.createLink(x, y, z, LinkTypes.POCKET);
 			}
 		}
-		world.setBlockTileEntity(x, y, z, this.createNewTileEntity(world));
+		
 	}
-
-	@SideOnly(Side.CLIENT)
-
-	/**
-	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
-	 */
-	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
-	{
-		if(par1IBlockAccess.getBlockId(par2, par3-1, par4) == this.blockID)
-		{
-			return this.blockIcon;
-		}
-		else
-		{
-			return blockIconBottom;
-		}
-	}
-
-	//Called to update the render information on the tile entity. Could probably implement a data watcher,
-	//but this works fine and is more versatile I think. 
-	public DimensionalDoor updateAttachedTile(World world, int x, int y, int z)
-	{
-		TileEntity tile = world.getBlockTileEntity(x, y, z);
-		if (tile instanceof TileEntityDimDoor)
-		{
-			TileEntityDimDoor dimTile = (TileEntityDimDoor) tile;
-			dimTile.openOrClosed = PocketManager.getLink(x, y, z, world.provider.dimensionId) != null;
-			dimTile.orientation = this.getFullMetadata(world, x, y, z) & 7;
-		}
-		return this;
-	}
-
-	/**
-	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
-	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
-	 */
-	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) 
-	{
-		TileEntityDimDoor tile = (TileEntityDimDoor) par1World.getBlockTileEntity(par2, par3, par4);
-		tile.openOrClosed = this.isDoorOpen( par1World,  par2,  par3,  par4);  	
-		tile.orientation = this.getFullMetadata(par1World, par2, par3, par4) & 7;
-	}
-	
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
-	{
-		int var5 = this.getFullMetadata(par1IBlockAccess, par2, par3, par4);
-		return (var5 & 4) != 0;
-	}
-
-	/**
-	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
-	 */
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	/**
-	 * The type of render function that is called for this block
-	 */
-	public int getRenderType()
-	{
-		return 7;
-	}
-
-	@SideOnly(Side.CLIENT)
-
-	/**
-	 * Returns the bounding box of the wired rectangular prism to render.
-	 */
-	public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
-	{
-		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
-		return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4);
-	}
-
-	/**
-	 * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
-	 * cleared to be reused)
-	 */
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
-	{
-		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
-		return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4);
-	}
-
-	/**
-	 * Updates the blocks bounds based on its current state. Args: world, x, y, z
-	 */
-	public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
-	{
-		this.setDoorRotation(this.getFullMetadata(par1IBlockAccess, par2, par3, par4));
-	}
-
-	/**
-	 * Returns 0, 1, 2 or 3 depending on where the hinge is.
-	 */
-	public int getDoorOrientation(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
-	{
-		return this.getFullMetadata(par1IBlockAccess, par2, par3, par4) & 3;
-	}
-
-	public boolean isDoorOpen(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
-	{
-		return (this.getFullMetadata(par1IBlockAccess, par2, par3, par4) & 4) != 0;
-	}
-
-	private void setDoorRotation(int par1)
-	{
-		float var2 = 0.1875F;
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
-		int var3 = par1 & 3;
-		boolean var4 = (par1 & 4) != 0;
-		boolean var5 = (par1 & 16) != 0;
-
-		if (var3 == 0)
-		{
-			if (var4)
-			{
-				if (!var5)
-				{
-					this.setBlockBounds(0.001F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
-				}
-				else
-				{
-					this.setBlockBounds(0.001F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
-				}
-			}
-			else
-			{
-				this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 1.0F);
-			}
-		}
-		else if (var3 == 1)
-		{
-			if (var4)
-			{
-				if (!var5)
-				{
-					this.setBlockBounds(1.0F - var2, 0.0F, 0.001F, 1.0F, 1.0F, 1.0F);
-				}
-				else
-				{
-					this.setBlockBounds(0.0F, 0.0F, 0.001F, var2, 1.0F, 1.0F);
-				}
-			}
-			else
-			{
-				this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, var2);
-			}
-		}
-		else if (var3 == 2)
-		{
-			if (var4)
-			{
-				if (!var5)
-				{
-					this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, .99F, 1.0F, 1.0F);
-				}
-				else
-				{
-					this.setBlockBounds(0.0F, 0.0F, 0.0F, .99F, 1.0F, var2);
-				}
-			}
-			else
-			{
-				this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-			}
-		}
-		else if (var3 == 3)
-		{
-			if (var4)
-			{
-				if (!var5)
-				{
-					this.setBlockBounds(0.0F, 0.0F, 0.0F, var2, 1.0F, 0.99F);
-				}
-				else
-				{
-					this.setBlockBounds(1.0F - var2, 0.0F, 0.0F, 1.0F, 1.0F, 0.99F);
-				}
-			}
-			else
-			{
-				this.setBlockBounds(0.0F, 0.0F, 1.0F - var2, 1.0F, 1.0F, 1.0F);
-			}
-		}
-	}
-
-	/**
-	 * Called when the block is clicked by a player. Args: x, y, z, entityPlayer
-	 */
-	public void onBlockClicked(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer)
-	{
-		//	System.out.println(this.getFullMetadata(par1World, par2, par3, par4)%4);
-	}
-
-	/**
-	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
-	 * their own) Args: x, y, z, neighbor blockID
-	 */
-	public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
-	{
-		int var6 = par1World.getBlockMetadata(par2, par3, par4);
-
-		if ((var6 & 8) == 0)
-		{
-			boolean var7 = false;
-
-			if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID)
-			{
-				par1World.setBlock(par2, par3, par4, 0);
-				var7 = true;
-			}
-
-			/**
-            if (!par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4))
-            {
-                par1World.setBlockWithNotify(par2, par3, par4, 0);
-                var7 = true;
-
-                if (par1World.getBlockId(par2, par3 + 1, par4) == this.blockID)
-                {
-                    par1World.setBlockWithNotify(par2, par3 + 1, par4, 0);
-                }
-            }
-			 **/
-
-			if (var7)
-			{
-				if (!par1World.isRemote)
-				{
-					this.dropBlockAsItem(par1World, par2, par3, par4, properties.DimensionalDoorID, 0);
-				}
-			}
-			else
-			{
-				boolean var8 = par1World.isBlockIndirectlyGettingPowered(par2, par3, par4) || par1World.isBlockIndirectlyGettingPowered(par2, par3 + 1, par4);
-
-				if ((var8 || par5 > 0 && Block.blocksList[par5].canProvidePower()) && par5 != this.blockID)
-				{
-					this.onPoweredBlockChange(par1World, par2, par3, par4, var8);
-				}
-			}
-		}
-		else
-		{
-			if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID)
-			{
-				par1World.setBlock(par2, par3, par4, 0);
-			}
-
-			if (par5 > 0 && par5 != this.blockID)
-			{
-				this.onNeighborBlockChange(par1World, par2, par3 - 1, par4, par5);
-			}
-		}
-	}
-
-	/**
-	 * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
-	 * x, y, z, startVec, endVec
-	 */
-	public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3)
-	{
-		this.setBlockBoundsBasedOnState(par1World, par2, par3, par4);
-		return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
-	}
-
-	/**
-	 * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
-	 */
-	public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
-	{
-		return par3 >= 255 ? false : par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && super.canPlaceBlockAt(par1World, par2, par3, par4) && super.canPlaceBlockAt(par1World, par2, par3 + 1, par4);
-	}
-
-	/**
-	 * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility
-	 * and stop pistons
-	 */
-	public int getMobilityFlag()
-	{
-		return 2;
-	}
-
-	/**
-	 * Returns the full metadata value created by combining the metadata of both blocks the door takes up.
-	 */
-	public int getFullMetadata(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
-	{
-		int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4);
-		boolean var6 = (var5 & 8) != 0;
-		int var7;
-		int var8;
-
-		if (var6)
-		{
-			var7 = par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4);
-			var8 = var5;
-		}
-		else
-		{
-			var7 = var5;
-			var8 = par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4);
-		}
-
-		boolean var9 = (var8 & 1) != 0;
-		return var7 & 7 | (var6 ? 8 : 0) | (var9 ? 16 : 0);
-	}
-
-	@SideOnly(Side.CLIENT)
-	/**
-	 * only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative)
-	 */
-	public int idPicked(World par1World, int par2, int par3, int par4)
+	@Override
+	public int getDrops()
 	{
 		return Item.doorIron.itemID;
 	}
-
-	public int idDropped(int par1, Random par2Random, int par3)
-	{
-		return (par1 & 8) != 0 ? 0 : (Item.doorIron.itemID);
-	}
-
-	/**
-	 * Called when the block is attempted to be harvested
-	 */
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer)
-	{
-		if (par6EntityPlayer.capabilities.isCreativeMode && (par5 & 8) != 0 && par1World.getBlockId(par2, par3 - 1, par4) == this.blockID)
-		{
-			par1World.setBlock(par2, par3 - 1, par4, 0);
-		}
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world)
-	{
-		TileEntity tile = new TileEntityDimDoor();
-		return tile;
-	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/blocks/IDDoorLogic.java b/StevenDimDoors/mod_pocketDim/blocks/IDDoorLogic.java
new file mode 100644
index 00000000..6d459edc
--- /dev/null
+++ b/StevenDimDoors/mod_pocketDim/blocks/IDDoorLogic.java
@@ -0,0 +1,13 @@
+package StevenDimDoors.mod_pocketDim.blocks;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.world.World;
+
+public interface IDDoorLogic 
+{
+	public void enterDimDoor(World world, int x, int y, int z, Entity entity);
+	
+	public void placeDimDoor(World world, int x, int y, int z);
+	
+	public int getDrops();
+}
diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
index cc847ccf..d9b00d4a 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
+++ b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
@@ -13,49 +13,21 @@ import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
+import StevenDimDoors.mod_pocketDim.core.LinkTypes;
+import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class TransientDoor extends WarpDoor
+public class TransientDoor extends DDoorBase implements IDDoorLogic
 {
 	public TransientDoor(int blockID, Material material) 
 	{
 		super(blockID, material);
 	}
-
-	public void registerIcons(IconRegister par1IconRegister)
-	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-	}
-
-	/**
-	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
-	 */
-	@SideOnly(Side.CLIENT)
-	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
-	{
-		return this.blockIcon;
-	}
 	
-	public boolean isCollidable()
-	{
-		return false;
-	}
-
-	public void onBlockAdded(World par1World, int par2, int par3, int par4) 
-	{
-		super.onBlockAdded(par1World, par2, par3, par4);
-		this.updateAttachedTile(par1World, par2, par3, par4);
-	}
-
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
-	{
-		return null;
-	}
-
 	@Override
-	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) 
+	public void enterDimDoor(World world, int x, int y, int z, Entity entity) 
 	{
 		//TODO: Would it kill us to use REASONABLE variable names? <_< ~SenseiKiwi
 		int var12 = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3);
@@ -73,16 +45,35 @@ public class TransientDoor extends WarpDoor
 				world.setBlockToAir(x, y - 1, z);
 			}
 		}
+	}	
+
+	@Override
+	public void placeDimDoor(World world, int x, int y, int z) 
+	{
+		if (!world.isRemote && world.getBlockId(x, y - 1, z) == this.blockID)
+		{
+			NewDimData dimension = PocketManager.getDimensionData(world);
+			DimLink link = dimension.getLink(x, y, z);
+			if (link == null&&dimension.isPocketDimension())
+			{
+				dimension.createLink(x, y, z, LinkTypes.SAFE_EXIT);
+			}
+		}
+	}
+	@Override
+	public int getDrops()
+	{
+		return 0;
 	}
 	
-	public int idPicked(World par1World, int par2, int par3, int par4)
+	public boolean isCollidable()
 	{
-		return 0;
+		return false;
 	}
 
-	public int idDropped(int par1, Random par2Random, int par3)
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
 	{
-		return 0;
+		return null;
 	}
 
 	public int getRenderType()
diff --git a/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java b/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
index c4875edc..155520c6 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
+++ b/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
@@ -2,54 +2,31 @@ package StevenDimDoors.mod_pocketDim.blocks;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
 import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
+import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class UnstableDoor extends DimensionalDoor
+public class UnstableDoor extends DDoorBase implements IDDoorLogic
 {
-	private Icon blockIconBottom;
-	private static DDProperties properties = null;
-
 	public UnstableDoor(int par1, Material material) 
 	{
 		super(par1, material);
-		if (properties == null)
-			properties = DDProperties.instance();
-	}
-
-	public void registerIcons(IconRegister par1IconRegister)
-	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
-	}
-
-	@SideOnly(Side.CLIENT)
-
-	/**
-	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
-	 */
-	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
-	{
-		if (par1IBlockAccess.getBlockId(par2, par3 - 1, par4) == this.blockID)
-		{
-			return this.blockIcon;
-		}
-		else
-		{
-			return this.blockIconBottom;
-		}
 	}
 
 	@Override
-	public void onBlockAdded(World world, int x, int y, int z) 
+	public void placeDimDoor(World world, int x, int y, int z) 
 	{
 		if (!world.isRemote && world.getBlockId(x, y - 1, z) == this.blockID)
 		{
@@ -57,4 +34,9 @@ public class UnstableDoor extends DimensionalDoor
 			dimension.createLink(x, y, z, LinkTypes.RANDOM);
 		}
 	}
+	@Override
+	public int getDrops()
+	{
+		return Item.doorIron.itemID;
+	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java b/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
index 445d8d9b..960fc33d 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
+++ b/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
@@ -4,6 +4,7 @@ import java.util.Random;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
@@ -16,7 +17,7 @@ import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class WarpDoor extends DimensionalDoor
+public class WarpDoor extends DDoorBase implements IDDoorLogic
 {
 	private Icon blockIconBottom;
 
@@ -25,52 +26,25 @@ public class WarpDoor extends DimensionalDoor
 		super(blockID, material);
 	}
 
-	public void registerIcons(IconRegister par1IconRegister)
-	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
-	}
-
 	@Override
-	public void onBlockAdded(World world, int x, int y, int z) 
+	public void placeDimDoor(World world, int x, int y, int z) 
 	{
-		//FIXME: We need to set door generation flags on the tile entities. Ignoring that for now. ~SenseiKiwi
-
 		if (!world.isRemote && world.getBlockId(x, y - 1, z) == this.blockID)
 		{
 			NewDimData dimension = PocketManager.getDimensionData(world);
 			DimLink link = dimension.getLink(x, y, z);
-			if (link == null)
+			if (link == null&&dimension.isPocketDimension())
 			{
 				dimension.createLink(x, y, z, LinkTypes.SAFE_EXIT);
 			}
 		}
-		world.setBlockTileEntity(x, y, z, this.createNewTileEntity(world));
 	}
-
-	@SideOnly(Side.CLIENT)
-	/**
-	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
-	 */
-	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
-	{
-		if(par1IBlockAccess.getBlockId(par2, par3-1, par4)==this.blockID)
-		{
-			return this.blockIcon;
-		}
-		else
-		{
-			return this.blockIconBottom;
-		}
-	}
-
-	public int idPicked(World par1World, int par2, int par3, int par4)
+	
+	@Override
+	public int getDrops()
 	{
 		return Item.doorWood.itemID;
 	}
 
-	public int idDropped(int par1, Random par2Random, int par3)
-	{
-		return (par1 & 8) != 0 ? 0 : (Item.doorWood.itemID);
-	}
+	
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
index 9f27d4e9..4d49cf35 100644
--- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
+++ b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
@@ -1,7 +1,10 @@
 package StevenDimDoors.mod_pocketDim.tileentities;
 
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
 public class TileEntityDimDoor extends TileEntity
 
@@ -13,6 +16,14 @@ public class TileEntityDimDoor extends TileEntity
 	
 	
 	
+	public boolean shouldRefresh(int oldID, int newID, int oldMeta, int newMeta, World world, int x, int y, int z)
+    {
+		if(newID==0&&PocketManager.getLink(x, y, z, world)!=null)
+		{
+			world.setBlock(x, y, z, mod_pocketDim.blockRift.blockID);
+		}
+        return true;
+    }
 	
 	 public boolean canUpdate()
 	 {