diff --git a/items/storage/ItemBasicStorageCell.java b/items/storage/ItemBasicStorageCell.java
index 488cc58e3..b2a7c7606 100644
--- a/items/storage/ItemBasicStorageCell.java
+++ b/items/storage/ItemBasicStorageCell.java
@@ -17,6 +17,8 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.items.AEBaseItem;
+import appeng.items.contents.CellConfig;
+import appeng.items.contents.CellUpgrades;
 import appeng.items.materials.MaterialType;
 import appeng.me.storage.CellInventory;
 import appeng.me.storage.CellInventoryHandler;
diff --git a/items/storage/ItemCreativeStorageCell.java b/items/storage/ItemCreativeStorageCell.java
index 697d245e0..881117cad 100644
--- a/items/storage/ItemCreativeStorageCell.java
+++ b/items/storage/ItemCreativeStorageCell.java
@@ -8,6 +8,7 @@ import appeng.api.config.FuzzyMode;
 import appeng.api.storage.ICellWorkbenchItem;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseItem;
+import appeng.items.contents.CellConfig;
 
 public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem
 {
diff --git a/items/tools/ToolNetworkTool.java b/items/tools/ToolNetworkTool.java
index 0ec4a4acc..fc75a1c16 100644
--- a/items/tools/ToolNetworkTool.java
+++ b/items/tools/ToolNetworkTool.java
@@ -14,8 +14,8 @@ import appeng.api.implementations.items.IAEWrench;
 import appeng.api.networking.IGridHost;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.GuiBridge;
-import appeng.helpers.NetworkToolViewer;
 import appeng.items.AEBaseItem;
+import appeng.items.contents.NetworkToolViewer;
 import appeng.util.Platform;
 import buildcraft.api.tools.IToolWrench;
 import cpw.mods.fml.common.Optional.Interface;
diff --git a/items/tools/powered/ToolMassCannon.java b/items/tools/powered/ToolMassCannon.java
index 0631eea9f..0b40f26c9 100644
--- a/items/tools/powered/ToolMassCannon.java
+++ b/items/tools/powered/ToolMassCannon.java
@@ -34,8 +34,8 @@ import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.sync.packets.PacketMatterCannon;
-import appeng.items.storage.CellConfig;
-import appeng.items.storage.CellUpgrades;
+import appeng.items.contents.CellConfig;
+import appeng.items.contents.CellUpgrades;
 import appeng.items.tools.powered.powersink.AEBasePoweredItem;
 import appeng.me.storage.CellInventory;
 import appeng.me.storage.CellInventoryHandler;
diff --git a/items/tools/powered/ToolPortableCell.java b/items/tools/powered/ToolPortableCell.java
index 9d990ca23..a74311528 100644
--- a/items/tools/powered/ToolPortableCell.java
+++ b/items/tools/powered/ToolPortableCell.java
@@ -20,9 +20,9 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.GuiBridge;
-import appeng.helpers.PortableCellViewer;
-import appeng.items.storage.CellConfig;
-import appeng.items.storage.CellUpgrades;
+import appeng.items.contents.CellConfig;
+import appeng.items.contents.CellUpgrades;
+import appeng.items.contents.PortableCellViewer;
 import appeng.items.tools.powered.powersink.AEBasePoweredItem;
 import appeng.me.storage.CellInventory;
 import appeng.me.storage.CellInventoryHandler;
diff --git a/me/storage/CreativeCellInventory.java b/me/storage/CreativeCellInventory.java
index 3d11dacf9..678dcccb2 100644
--- a/me/storage/CreativeCellInventory.java
+++ b/me/storage/CreativeCellInventory.java
@@ -9,7 +9,7 @@ import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import appeng.items.storage.CellConfig;
+import appeng.items.contents.CellConfig;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;
 
diff --git a/me/storage/MEInventoryHandler.java b/me/storage/MEInventoryHandler.java
index 1020c6fe3..3943bbfb0 100644
--- a/me/storage/MEInventoryHandler.java
+++ b/me/storage/MEInventoryHandler.java
@@ -45,16 +45,18 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	@Override
 	public T extractItems(T request, Actionable type, BaseActionSource src)
 	{
+		if ( !getAccess().hasPermission( AccessRestriction.READ ) )
+			return null;
+
 		return internal.extractItems( request, type, src );
 	}
 
 	@Override
 	public IItemList<T> getAvailableItems(IItemList out)
-	{/*
-	 * if ( monitor != null ) { for (T is : monitor.getStorageList()) out.add( is );
-	 * 
-	 * return out; } else
-	 */
+	{
+		if ( !getAccess().hasPermission( AccessRestriction.READ ) )
+			return out;
+
 		return internal.getAvailableItems( out );
 	}
 
@@ -81,6 +83,9 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
 	@Override
 	public boolean canAccept(T input)
 	{
+		if ( !getAccess().hasPermission( AccessRestriction.WRITE ) )
+			return false;
+
 		if ( myWhitelist == IncludeExclude.BLACKLIST && myPartitionList.isListed( input ) )
 			return false;
 		if ( myPartitionList.isEmpty() || myWhitelist == IncludeExclude.BLACKLIST )
diff --git a/me/storage/NetworkInventoryHandler.java b/me/storage/NetworkInventoryHandler.java
index 236ede8ca..4c36b1b7b 100644
--- a/me/storage/NetworkInventoryHandler.java
+++ b/me/storage/NetworkInventoryHandler.java
@@ -23,7 +23,7 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
 		@Override
 		public int compare(Integer o1, Integer o2)
 		{
-			return o1 - o2;
+			return o2 - o1;
 		}
 
 	};