diff --git a/OctoAwesome/OctoAwesome.Basics/OctoAwesome.Basics.csproj b/OctoAwesome/OctoAwesome.Basics/OctoAwesome.Basics.csproj
index 4621ace9..851a4a8f 100644
--- a/OctoAwesome/OctoAwesome.Basics/OctoAwesome.Basics.csproj
+++ b/OctoAwesome/OctoAwesome.Basics/OctoAwesome.Basics.csproj
@@ -186,9 +186,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\engenious.0.0.1.22\build\engenious.targets" Condition="Exists('..\packages\engenious.0.0.1.22\build\engenious.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj b/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj
index 1789c528..fa4c689d 100644
--- a/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj
+++ b/OctoAwesome/OctoAwesome.Client/OctoAwesome.Client.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -97,26 +97,23 @@
     <Compile Include="Screens\PauseScreen.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="engenious, Version=1.0.6075.22909, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\engenious.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="MonoGameUi">
       <HintPath>..\libs\MonoGameUi.dll</HintPath>
     </Reference>
-    <Reference Include="NVorbis, Version=0.8.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\NVorbis.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
+    <Reference Include="NVorbis">
+      <HintPath>..\packages\engenious.0.1.0\lib\net40\NVorbis.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenTK">
+      <HintPath>..\packages\engenious.0.1.0\lib\net40\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="engenious">
+      <HintPath>..\packages\engenious.0.1.0\lib\net40\engenious.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\Components\background.png" />
@@ -199,13 +196,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\engenious.0.0.1.22\build\engenious.targets" Condition="Exists('..\packages\engenious.0.0.1.22\build\engenious.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\engenious.0.0.1.22\build\engenious.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\engenious.0.0.1.22\build\engenious.targets'))" />
-  </Target>
+  <Import Project="..\packages\engenious.0.1.0\build\engenious.targets" Condition="Exists('..\packages\engenious.0.1.0\build\engenious.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OctoAwesome/OctoAwesome.Client/packages.config b/OctoAwesome/OctoAwesome.Client/packages.config
index 6a6f5473..6247922b 100644
--- a/OctoAwesome/OctoAwesome.Client/packages.config
+++ b/OctoAwesome/OctoAwesome.Client/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="engenious" version="0.0.1.22" targetFramework="net40" />
+  <package id="engenious" version="0.1.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/OctoAwesome/OctoAwesome.Tests/CollisionTests.cs b/OctoAwesome/OctoAwesome.Tests/CollisionTests.cs
index 29d4c4ef..8b231479 100644
--- a/OctoAwesome/OctoAwesome.Tests/CollisionTests.cs
+++ b/OctoAwesome/OctoAwesome.Tests/CollisionTests.cs
@@ -4,29 +4,26 @@
 using System.Linq;
 
 namespace OctoAwesome.Tests
-{
+{
+    using System;
     using Xunit;
 
     public class CollisionTests
     {
-        private float gap = 0.00001f;
-        private Coordinate player;
-        private float playerRadius = 0.5f;
-        private float playerHeight = 2f;
-        private Vector3 move;
-        private BlockDefinition blockDefinition = new TestBlockDefinition();
+        private float gap = 0.0000f;
+        private Player Player;
         private List<Index3> blocks = new List<Index3>();
 
         public CollisionTests()
         {
+            Player = new Player();
             blocks.Clear();
         }
 
         [Fact]
         public void CollisionFromEastToWestTest()
         {
-            player = new Coordinate();
-            player.GlobalPosition = new Vector3(10.6f, 10.5f, 10f);
+            Player.Position = new Coordinate(){GlobalPosition=new Vector3(10.6f, 10.5f, 10f)};
 
             // Wand
             blocks.Add(new Index3(7, 9, 10));
@@ -56,25 +53,25 @@ public void CollisionFromEastToWestTest()
 
 
 
-            move = new Vector3(-1, 0, -0.1f);
+            Player.Velocity = new Vector3(-1, 0, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(9.6f, 10.5f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(9.6f, 10.5f, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-1, 0.1f, -0.1f);
+            Player.Velocity = new Vector3(-1, 0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(8.6f, 10.6f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(8.6f, 10.6f, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-1, 0.1f, -0.1f);
+            Player.Velocity = new Vector3(-1, 0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(8.5f + gap, 10.7f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(8.5f + gap, 10.7f, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-0.4f, -0.1f, -0.1f);
+            Player.Velocity = new Vector3(-0.4f, -0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(8.5f + gap, 10.6f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(8.5f + gap, 10.6f, 10f + gap), Player.Position.GlobalPosition);
         }
 
         [Fact]
@@ -82,8 +79,7 @@ public void CollisionFromEastToWestIntMaxTest()
         {
             int max = int.MaxValue - 1000;
 
-            player = new Coordinate();
-            player.GlobalPosition = new Vector3(max + 10.5f, max + 10.5f, max + 10f);
+            Player.Position = new Coordinate(){GlobalPosition=new Vector3(max + 10.5f, max + 10.5f, max + 10f)};
 
             // Wand
             blocks.Add(new Index3(max + 7, max + 9, max + 10));
@@ -113,33 +109,31 @@ public void CollisionFromEastToWestIntMaxTest()
 
 
 
-            move = new Vector3(-1, 0, -0.1f);
+            Player.Velocity = new Vector3(-1, 0, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(max + 9.6f, max + 10.5f, max + 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(max + 9.6f, max + 10.5f, max + 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-1, 0.1f, -0.1f);
+            Player.Velocity = new Vector3(-1, 0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(max + 8.6f, max + 10.6f, max + 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(max + 8.6f, max + 10.6f, max + 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-1, 0.1f, -0.1f);
+            Player.Velocity = new Vector3(-1, 0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(max + 8.5f + gap, max + 10.7f, max + 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(max + 8.5f + gap, max + 10.7f, max + 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(-0.4f, -0.1f, -0.1f);
+            Player.Velocity = new Vector3(-0.4f, -0.1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(max + 8.5f + gap, max + 10.6f, max + 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(max + 8.5f + gap, max + 10.6f, max + 10f + gap), Player.Position.GlobalPosition);
         }
 
         [Fact]
         public void CollisionFrameSouthToNorthTest()
         {
-            player = new Coordinate();
-            player.GlobalPosition = new Vector3(10.5f, 10.5f, 10f);
-
+            Player.Position = new Coordinate(){GlobalPosition=new Vector3(10.5f, 10.5f, 10f)};
             // Wand
             blocks.Add(new Index3(9, 7, 10));
             blocks.Add(new Index3(10, 7, 10));
@@ -166,85 +160,114 @@ public void CollisionFrameSouthToNorthTest()
             blocks.Add(new Index3(11, 10, 9));
             blocks.Add(new Index3(11, 11, 9));
 
-            move = new Vector3(0f, -1, -0.1f);
+            Player.Velocity = new Vector3(0f, -1, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(10.5f, 9.5f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(10.5f, 9.5f, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(0f, -1f, -0.1f);
+            Player.Velocity = new Vector3(0f, -1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(10.5f, 8.5f, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(10.5f, 8.5f, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(0f, -1f, -0.1f);
+            Player.Velocity = new Vector3(0f, -1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(10.5f, 8.5f + gap, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(10.5f, 8.5f + gap, 10f + gap), Player.Position.GlobalPosition);
 
-            move = new Vector3(0f, -1f, -0.1f);
+            Player.Velocity = new Vector3(0f, -1f, -0.1f);
             Move();
-            AssertEx.Equal(Vector3.Zero, move);
-            AssertEx.Equal(new Vector3(10.5f, 8.5f + gap, 10f + gap), player.GlobalPosition);
+            AssertEx.Equal(Vector3.Zero, Player.Velocity);
+            AssertEx.Equal(new Vector3(10.5f, 8.5f + gap, 10f + gap), Player.Position.GlobalPosition);
         }
 
         private void Move()
         {
-            bool collision = false;
-            int loop = 0;
 
-            do
+            //Blocks finden die eine Kollision verursachen könnten
+            int minx = (int)Math.Floor(Math.Min(
+                Player.Position.BlockPosition.X - Player.Radius,
+                Player.Position.BlockPosition.X - Player.Radius + Player.Velocity.X));
+            int maxx = (int)Math.Ceiling(Math.Max(
+                Player.Position.BlockPosition.X + Player.Radius,
+                Player.Position.BlockPosition.X + Player.Radius + Player.Velocity.X));
+            int miny = (int)Math.Floor(Math.Min(
+                Player.Position.BlockPosition.Y - Player.Radius,
+                Player.Position.BlockPosition.Y - Player.Radius + Player.Velocity.Y));
+            int maxy = (int)Math.Ceiling(Math.Max(
+                Player.Position.BlockPosition.Y + Player.Radius,
+                Player.Position.BlockPosition.Y + Player.Radius + Player.Velocity.Y));
+            int minz = (int)Math.Floor(Math.Min(
+                Player.Position.BlockPosition.Z,
+                Player.Position.BlockPosition.Z + Player.Velocity.Z));
+            int maxz = (int)Math.Ceiling(Math.Max(
+                Player.Position.BlockPosition.Z + Player.Height,
+                Player.Position.BlockPosition.Z + Player.Height + Player.Velocity.Z));
+
+            var playerplanes = CollisionPlane.GetPlayerCollisionPlanes(Player).ToList();
+
+            bool abort = false;
+            var move = Player.Velocity;
+            for (int z = minz; z <= maxz && !abort; z++)
             {
-                BoundingBox playerBox = new BoundingBox(
-                    new Vector3(
-                        player.GlobalPosition.X - playerRadius,
-                        player.GlobalPosition.Y - playerRadius,
-                        player.GlobalPosition.Z),
-                    new Vector3(
-                        player.GlobalPosition.X + playerRadius,
-                        player.GlobalPosition.Y + playerRadius,
-                        player.GlobalPosition.Z + playerHeight));
-
-                collision = false;
-                float min = 1f;
-                Axis minAxis = Axis.None;
-
-                foreach (var pos in blocks)
+                for (int y = miny; y <= maxy && !abort; y++)
                 {
-                    Axis? localAxis;
-                    float? moveFactor = Block.Intersect(blockDefinition.GetCollisionBoxes(null, pos.X, pos.Y, pos.Z), pos, playerBox, move, out localAxis);
-
-                    if (moveFactor.HasValue && moveFactor.Value < min)
+                    for (int x = minx; x <= maxx && !abort; x++)
                     {
-                        collision = true;
-                        min = moveFactor.Value;
-                        minAxis = localAxis.Value;
-                    }
-                }
+                        move = Player.Velocity;
 
-                player += (move * min);
-                move *= (1f - min);
-                switch (minAxis)
-                {
-                    case Axis.X:
-                        player += new Vector3(move.X > 0 ? -gap : gap, 0, 0);
-                        move.X = 0f;
-                        break;
-                    case Axis.Y:
-                        player += new Vector3(0, move.Y > 0 ? -gap : gap, 0);
-                        move.Y = 0f;
-                        break;
-                    case Axis.Z:
-                        player += new Vector3(0, 0, move.Z > 0 ? -gap : gap);
-                        move.Z = 0f;
-                        break;
-                }
+                        Index3 pos = new Index3(x, y, z);
+                        Index3 blockPos = pos + Player.Position.GlobalBlockIndex;
+                        if (!blocks.Contains(blockPos))
+                            continue;
+
+
+
+                        var blockplane = CollisionPlane.GetBlockCollisionPlanes(pos, Player.Velocity).ToList();
 
-                // Koordinate normalisieren (Rundwelt)
-                // player.NormalizeChunkIndexXY(planet.Size);
+                        var planes = from pp in playerplanes
+                            from bp in blockplane
+                                where CollisionPlane.Intersect(bp, pp)
+                                                         let distance = CollisionPlane.GetDistance(bp, pp)
+                                                             where CollisionPlane.CheckDistance(distance, move)
+                                                         select new { BlockPlane = bp, PlayerPlane = pp, Distance = distance };
 
-                loop++;
+                        foreach (var plane in planes)
+                        {
+
+                            var subvelocity = (plane.Distance );
+                            var diff = Player.Velocity - subvelocity;
+
+                            float vx;
+                            float vy;
+                            float vz;
+
+                            if (plane.BlockPlane.normal.X != 0 && (Player.Velocity.X > 0 && diff.X >= 0 && subvelocity.X >= 0 || Player.Velocity.X < 0 && diff.X <= 0 && subvelocity.X <= 0))
+                                vx = subvelocity.X;
+                            else
+                                vx = Player.Velocity.X;
+
+                            if (plane.BlockPlane.normal.Y != 0 && (Player.Velocity.Y > 0 && diff.Y >= 0 && subvelocity.Y >= 0 || Player.Velocity.Y < 0 && diff.Y <= 0 && subvelocity.Y <= 0))
+                                vy = subvelocity.Y;
+                            else
+                                vy = Player.Velocity.Y;
+
+                            if (plane.BlockPlane.normal.Z != 0 && (Player.Velocity.Z > 0 && diff.Z >= 0 && subvelocity.Z >= 0 || Player.Velocity.Z < 0 && diff.Z <= 0 && subvelocity.Z <= 0))
+                                vz = subvelocity.Z;
+                            else
+                                vz = Player.Velocity.Z;
+
+                            Player.Velocity = new Vector3(vx, vy, vz);
+
+                            if (vx == 0 && vy == 0 && vz == 0)
+                            {
+                                abort = true;
+                                break;
+                            }
+                        }
+                    }
+                }
             }
-            while (collision && loop < 3);
         }
     }
 }
diff --git a/OctoAwesome/OctoAwesome.Tests/GlobalChunkCacheTest.cs b/OctoAwesome/OctoAwesome.Tests/GlobalChunkCacheTest.cs
index 4fd3e2dd..69a1d89b 100644
--- a/OctoAwesome/OctoAwesome.Tests/GlobalChunkCacheTest.cs
+++ b/OctoAwesome/OctoAwesome.Tests/GlobalChunkCacheTest.cs
@@ -53,10 +53,10 @@ public void LoadChunkTest()
 
             // Chunk unload
             cache.Release(planet, index);
-
+            System.Threading.Thread.Sleep(150);//TODO: dirty fix wait till completly cleaned up
             Assert.Equal(0, cache.LoadedChunkColumns);
             Assert.Equal(1, loadCallCounter);
-            Assert.Equal(1, saveCallCounter);
+            Assert.Equal(0, saveCallCounter);//Expected 0 cause chunk wasn't changed
         }
 
         [Fact]
@@ -131,19 +131,25 @@ public void LoadMultipleChunksTest()
             Assert.Equal(2, loadCallCounter);
             Assert.Equal(0, saveCallCounter);
 
+            //Change Chunk so that they get saved
+            result1.Chunks[0].SetBlock(Index3.Zero,0,0);
+
+
             // Unload 1
             cache.Release(planet1, index1);
-
+            System.Threading.Thread.Sleep(150);//TODO: dirty fix wait till completly cleaned up
             Assert.Equal(1, cache.LoadedChunkColumns);
             Assert.Equal(2, loadCallCounter);
             Assert.Equal(1, saveCallCounter);
 
+            result2.Chunks[0].SetBlock(Index3.Zero,0,0);
             // Unload 2
             cache.Release(planet2, index2);
-
+            System.Threading.Thread.Sleep(150);//TODO: dirty fix wait till completly cleaned up
             Assert.Equal(0, cache.LoadedChunkColumns);
             Assert.Equal(2, loadCallCounter);
             Assert.Equal(2, saveCallCounter);
+            
         }
 
         [Fact]
@@ -194,16 +200,19 @@ public void LoadChunkWithMultipleReferencesTest()
             Assert.Equal(1, loadCallCounter);
             Assert.Equal(0, saveCallCounter);
 
+
+
             // Unload 1
             cache.Release(planet, index);
-
+            System.Threading.Thread.Sleep(150);//TODO: dirty fix wait till completly cleaned up
             Assert.Equal(1, cache.LoadedChunkColumns);
             Assert.Equal(1, loadCallCounter);
             Assert.Equal(0, saveCallCounter);
 
+            x2.Chunks[0].SetBlock(Index3.Zero,0);
             // Unload 2
             cache.Release(planet, index);
-
+            System.Threading.Thread.Sleep(150);//TODO: dirty fix wait till completly cleaned up
             Assert.Equal(0, cache.LoadedChunkColumns);
             Assert.Equal(1, loadCallCounter);
             Assert.Equal(1, saveCallCounter);
diff --git a/OctoAwesome/OctoAwesome.Tests/Index2Tests.cs b/OctoAwesome/OctoAwesome.Tests/Index2Tests.cs
index 62547ab0..96d8a2fe 100644
--- a/OctoAwesome/OctoAwesome.Tests/Index2Tests.cs
+++ b/OctoAwesome/OctoAwesome.Tests/Index2Tests.cs
@@ -256,11 +256,25 @@ public void Index2DivisionTest()
             Assert.Equal(i2, i1 / 3);
             Assert.Equal(i3, i1 / -2);
         }
-
         [Fact]
         public void Index2LengthTest()
         {
-            throw new NotImplementedException();
+            int length = 2;
+            Index2 i1 = new Index2(length,0);
+            Index2 i2 = new Index2(0,length);
+
+            Assert.Equal(i1.LengthSquared(),4.0);
+            Assert.Equal(i2.LengthSquared(),4.0);
+
+            Assert.Equal(i1.Length(),2.0);
+            Assert.Equal(i2.Length(),2.0);
+
+            Index2 i3 = new Index2(3,4);
+            Index2 i4 = new Index2(4,3);
+            Assert.Equal(i3.LengthSquared(),25.0);
+            Assert.Equal(i4.LengthSquared(),25.0);
+            Assert.Equal(i3.Length(),5.0);
+            Assert.Equal(i4.Length(),5.0);
         }
 
         /// <summary>
diff --git a/OctoAwesome/OctoAwesome.Tests/Index3Tests.cs b/OctoAwesome/OctoAwesome.Tests/Index3Tests.cs
index 184aae62..00ebfb25 100644
--- a/OctoAwesome/OctoAwesome.Tests/Index3Tests.cs
+++ b/OctoAwesome/OctoAwesome.Tests/Index3Tests.cs
@@ -185,46 +185,68 @@ public void Index3AdditionTest()
         [Fact]
         public void Index3SubtraktionTest()
         {
-            throw new NotImplementedException();
-            //    Index2 i1 = new Index2(20, 15);     // Startwert
-            //    Index2 i2 = new Index2(-100, -130); // Negativ Addition
-            //    Index2 i3 = new Index2(120, 145);  // Ergebnis i1 - i2
-            //    Index2 i4 = new Index2(77, 44); // positive Addition
-            //    Index2 i5 = new Index2(-57, -29);  // Ergebnis i1 - i4
-
-            //    // Addition
-            //    Assert.Equal(i3, i1 - i2);
-            //    Assert.Equal(i5, i1 - i4);
+            Index3 i1 = new Index3(20, 15, 17);     // Startwert
+            Index2 in2 = new Index2(-100, -130); // Negativ Subtraktion (2D)
+            Index3 in3 = new Index3(-100, -130, -33); // Negativ Subtraktion (3D)
+            Index3 in2r = new Index3(120, 145, 17);  // Ergebnis i1 - in2
+            Index3 in3r = new Index3(120, 145, 50);  // Ergebnis i1 - in3
+
+            Index2 ip2 = new Index2(77, 44); // positive Subtraktion (2D)
+            Index3 ip3 = new Index3(77, 44, 54); // positive Subtraktion (3D)
+            Index3 ip2r = new Index3(-57, -29, 17);  // Ergebnis i1 + ip2
+            Index3 ip3r = new Index3(-57, -29, -37);  // Ergebnis i1 + ip3
+
+            // Addition
+            Assert.Equal(in2r, i1 - in2);
+            Assert.Equal(in3r, i1 - in3);
+            Assert.Equal(ip2r, i1 - ip2);
+            Assert.Equal(ip3r, i1 - ip3);
         }
 
         [Fact]
         public void Index3MultiplikationTest()
         {
-            throw new NotImplementedException();
-            //    Index2 i1 = new Index2(20, 15); // Startwert
-            //    Index2 i2 = new Index2(60, 45); // Multiplikation mit 3
-            //    Index2 i3 = new Index2(-40, -30); // Multi mit -2
+            Index3 i1 = new Index3(20, 15,-7); // Startwert
+            Index3 i2 = new Index3(60, 45,-21); // Multiplikation mit 3
+            Index3 i3 = new Index3(-40, -30,14); // Multi mit -2
 
-            //    Assert.Equal(i2, i1 * 3);
-            //    Assert.Equal(i3, i1 * -2);
+            Assert.Equal(i2, i1 * 3);
+            Assert.Equal(i3, i1 * -2);
         }
 
         [Fact]
         public void Index3DivisionTest()
         {
-            throw new NotImplementedException();
-            //    Index2 i1 = new Index2(20, 15); // Startwert
-            //    Index2 i2 = new Index2(6, 5); // Multiplikation mit 3
-            //    Index2 i3 = new Index2(-10, -7); // Multi mit -2
+            Index3 i1 = new Index3(42, 30,-66); // Startwert
+            Index3 i2 = new Index3(7, 5,-11); // Division mit 6
+            Index3 i3 = new Index3(-21, -15,33); // Multi mit -2
 
-            //    Assert.Equal(i2, i1 / 3);
-            //    Assert.Equal(i3, i1 / -2);
+            Assert.Equal(i2, i1 / 6);
+            Assert.Equal(i3, i1 / -2);
         }
 
         [Fact]
         public void Index3LengthTest()
         {
-            throw new NotImplementedException();
+            int length = 2;
+            Index3 i1 = new Index3(length,0,0);
+            Index3 i2 = new Index3(0,length,0);
+            Index3 i3 = new Index3(0,0,length);
+
+            Assert.Equal(i1.LengthSquared(),4.0);
+            Assert.Equal(i2.LengthSquared(),4.0);
+            Assert.Equal(i3.LengthSquared(),4.0);
+
+            Assert.Equal(i1.Length(),2.0);
+            Assert.Equal(i2.Length(),2.0);
+            Assert.Equal(i3.Length(),2.0);
+
+            Index3 i4 = new Index3(3,2,4);
+            Index3 i5 = new Index3(3,4,2);
+            Index3 i6 = new Index3(4,2,3);
+            Assert.Equal(i4.LengthSquared(),29.0);
+            Assert.Equal(i5.LengthSquared(),29.0);
+            Assert.Equal(i6.LengthSquared(),29.0);
         }
 
         /// <summary>
diff --git a/OctoAwesome/OctoAwesome.Tests/LocalChunkCacheTest.cs b/OctoAwesome/OctoAwesome.Tests/LocalChunkCacheTest.cs
index 94da2f9e..e0cee089 100644
--- a/OctoAwesome/OctoAwesome.Tests/LocalChunkCacheTest.cs
+++ b/OctoAwesome/OctoAwesome.Tests/LocalChunkCacheTest.cs
@@ -28,8 +28,8 @@ public void SimpleLoad()
             TestPlanet planet = new TestPlanet(universe, 12, new Index3(30, 30, 3));
 
             cache.SetCenter(planet, new Index2(15, 15));
-
-            Assert.Equal(27, globalCache.LoadCounter);
+            System.Threading.Thread.Sleep(150);
+            Assert.Equal(9, globalCache.LoadCounter);
             Assert.Equal(0, globalCache.SaveCounter);
 
             // Chunk im Zentrum
@@ -53,8 +53,8 @@ public void SimpleLoad()
 
             cache.Flush();
 
-            Assert.Equal(27, globalCache.LoadCounter);
-            Assert.Equal(27, globalCache.SaveCounter);
+            Assert.Equal(9, globalCache.LoadCounter);
+            Assert.Equal(9, globalCache.SaveCounter);
 
             // Chunk im Zentrum
             chunk = cache.GetChunk(15, 15, 1);
@@ -88,6 +88,7 @@ public void MovingCenter()
             // 11 --    --    --    --
 
             cache.SetCenter(planet, new Index2(15, 15)); // 15 - 1111
+            System.Threading.Thread.Sleep(150);
             Assert.Equal(9, globalCache.LoadCounter);
             Assert.Equal(0, globalCache.SaveCounter);
 
@@ -98,7 +99,8 @@ public void MovingCenter()
             // 11 16/15 --    14/15 15/15
 
             cache.SetCenter(planet, new Index2(14, 15));
-            Assert.Equal(36, globalCache.LoadCounter);
+            System.Threading.Thread.Sleep(150);
+            Assert.Equal(12, globalCache.LoadCounter);
             Assert.Equal(0, globalCache.SaveCounter);
 
             //    00    01    10    11
@@ -108,8 +110,9 @@ public void MovingCenter()
             // 11 16/15 13/15 14/15 15/15
 
             cache.SetCenter(planet, new Index2(13, 15));
-            Assert.Equal(45, globalCache.LoadCounter);
-            Assert.Equal(9, globalCache.SaveCounter);
+            System.Threading.Thread.Sleep(150);
+            Assert.Equal(15, globalCache.LoadCounter);
+            Assert.Equal(3, globalCache.SaveCounter);
 
             //    00    01    10    11
             // 00 12/16 13/16 14/16 15/16
diff --git a/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj b/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj
index 755dafd0..4e04f86c 100644
--- a/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj
+++ b/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\xunit.runner.visualstudio.2.2.0-beta3-build1187\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0-beta3-build1187\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -33,18 +33,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="engenious, Version=1.0.6075.22909, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\engenious.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NVorbis, Version=0.8.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\NVorbis.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -53,21 +41,26 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="engenious, Version=1.0.6075.22909, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\engenious.dll</HintPath>
+    </Reference>
+    <Reference Include="NVorbis, Version=0.8.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\NVorbis.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
+      <HintPath>..\packages\engenious.0.0.1.22\lib\net40\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="xunit.assert, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
       <HintPath>..\packages\xunit.assert.2.2.0-beta3-build3402\lib\netstandard1.0\xunit.assert.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="xunit.core, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
       <HintPath>..\packages\xunit.extensibility.core.2.2.0-beta3-build3402\lib\net45\xunit.core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3402, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
       <HintPath>..\packages\xunit.extensibility.execution.2.2.0-beta3-build3402\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -82,9 +75,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SettingsManagerTests.cs" />
     <Compile Include="TestBlockDefinition.cs" />
-    <Compile Include="TestChunkColumn.cs" />
     <Compile Include="TestGlobalCache.cs" />
     <Compile Include="TestPlanet.cs" />
+    <Compile Include="TestChunkColumn.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs b/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs
index 36345e8d..9b5c0d12 100644
--- a/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs
+++ b/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs
@@ -11,9 +11,7 @@ public class SettingsManagerTests
         [Fact]
         public void ReadWrite()
         {
-            Settings settings = new Settings();
-
-            settings.DEBUG = true;
+            Settings settings = new Settings(true);
 
             string[] testArray = new string[] {"foo", "bar"};
             settings.Set("foo", testArray);
@@ -67,12 +65,10 @@ public void ReadWrite()
         public void NullTest()
         {
 
-            Settings settings = new Settings();
-
-            settings.DEBUG = true;
+            Settings settings = new Settings(true);
 
             int test = settings.Get<int>("foobarnotset");
-            Console.WriteLine(test);
+            Assert.Equal(0,test);
         }
     }
 }
diff --git a/OctoAwesome/OctoAwesome.Tests/TestBlockDefinition.cs b/OctoAwesome/OctoAwesome.Tests/TestBlockDefinition.cs
index af017b42..8ec29aac 100644
--- a/OctoAwesome/OctoAwesome.Tests/TestBlockDefinition.cs
+++ b/OctoAwesome/OctoAwesome.Tests/TestBlockDefinition.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 
diff --git a/OctoAwesome/OctoAwesome.Tests/TestChunkColumn.cs b/OctoAwesome/OctoAwesome.Tests/TestChunkColumn.cs
index d1cda562..e33f9190 100644
--- a/OctoAwesome/OctoAwesome.Tests/TestChunkColumn.cs
+++ b/OctoAwesome/OctoAwesome.Tests/TestChunkColumn.cs
@@ -6,110 +6,11 @@
 
 namespace OctoAwesome.Tests
 {
-    internal class TestChunkColumn : IChunkColumn
+    internal class TestChunkColumn : ChunkColumn
     {
-        private int planet;
-        private Index2 index;
-
-        public bool Populated
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-
-            set
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public int Planet
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public Index2 Index
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public int[,] Heights
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public IChunk[] Chunks
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public TestChunkColumn(int planet, Index2 index)
+        public TestChunkColumn (int planet, Index2 pos)
+            :base(new[]{new Chunk(new Index3(pos,0),planet)},planet,pos)
         {
-            this.planet = planet;
-            this.index = index;
-        }
-
-        public ushort GetBlock(Index3 index)
-        {
-            throw new NotImplementedException();
-        }
-
-        public ushort GetBlock(int x, int y, int z)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetBlock(Index3 index, ushort block, int meta = 0)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetBlock(int x, int y, int z, ushort block, int meta = 0)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int GetBlockMeta(int x, int y, int z)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetBlockMeta(int x, int y, int z, int meta)
-        {
-            throw new NotImplementedException();
-        }
-
-        public ushort[] GetBlockResources(int x, int y, int z)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetBlockResources(int x, int y, int z, ushort[] resources)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Serialize(Stream stream, IDefinitionManager definitionManager)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Deserialize(Stream stream, IDefinitionManager definitionManager, int planetId, Index2 columnIndex)
-        {
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/OctoAwesome/OctoAwesome.Tests/TestGlobalCache.cs b/OctoAwesome/OctoAwesome.Tests/TestGlobalCache.cs
index f155275b..c2b40e0d 100644
--- a/OctoAwesome/OctoAwesome.Tests/TestGlobalCache.cs
+++ b/OctoAwesome/OctoAwesome.Tests/TestGlobalCache.cs
@@ -49,7 +49,7 @@ public void Release(int planet,Index2 position)
         public IChunkColumn Subscribe(int planet, Index2 position)
         {
             LoadCounter++;
-            return new ChunkColumn(new IChunk[] { },planet, position);
+            return new ChunkColumn(new IChunk[] {new Chunk(new Index3(position,0),planet),new Chunk(new Index3(position,1),planet),new Chunk(new Index3(position,2),planet) },planet, position);
         }
 
         public IChunkColumn Peek(int planet, Index2 position)
diff --git a/OctoAwesome/OctoAwesome/GlobalChunkCache.cs b/OctoAwesome/OctoAwesome/GlobalChunkCache.cs
index ea4e6364..2ab836bf 100644
--- a/OctoAwesome/OctoAwesome/GlobalChunkCache.cs
+++ b/OctoAwesome/OctoAwesome/GlobalChunkCache.cs
@@ -90,6 +90,8 @@ public IChunkColumn Subscribe(int planet, Index2 position)
                 {
                     cacheItem = new CacheItem()
                     {
+                        Planet=planet,
+                        Index = position,
                         References = 0,
                         ChunkColumn = null,
                     };
diff --git a/OctoAwesome/OctoAwesome/Properties/AssemblyInfo.cs b/OctoAwesome/OctoAwesome/Properties/AssemblyInfo.cs
index 13b63045..fc23b161 100644
--- a/OctoAwesome/OctoAwesome/Properties/AssemblyInfo.cs
+++ b/OctoAwesome/OctoAwesome/Properties/AssemblyInfo.cs
@@ -34,3 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly:InternalsVisibleTo("OctoAwesome.Tests")]
\ No newline at end of file
diff --git a/OctoAwesome/OctoAwesome/Settings.cs b/OctoAwesome/OctoAwesome/Settings.cs
index 5edc85d3..e00d6563 100644
--- a/OctoAwesome/OctoAwesome/Settings.cs
+++ b/OctoAwesome/OctoAwesome/Settings.cs
@@ -17,13 +17,11 @@ public class Settings : ISettings
         /// Bei UnitTests ist Assembly.GetEntryAssembly null, Gründe dazu gibts auf StackOverflow.
         /// Um Schmerzen zu vermeiden wurde eine Variable eingeführt, die unabhängig testet.
         /// </summary>
-        public bool DEBUG = false;
 
         private Configuration _config;
-
-        public Settings()
+        internal Settings(bool debug)
         {
-            if (DEBUG)
+            if (debug)
             {
                 ExeConfigurationFileMap map = new ExeConfigurationFileMap {ExeConfigFilename = "EXECONFIG_PATH"};
                 _config = ConfigurationManager.OpenMappedExeConfiguration(map,
@@ -34,6 +32,10 @@ public Settings()
                 _config = ConfigurationManager.OpenExeConfiguration(Assembly.GetEntryAssembly().Location);
             }
         }
+        public Settings()
+        {
+            _config = ConfigurationManager.OpenExeConfiguration(Assembly.GetEntryAssembly().Location);
+        }
 
         /// <summary>
         /// Gibt den Wert einer Einstellung zurück.
@@ -44,8 +46,10 @@ public T Get<T>(string key)
         {
             // var config = ConfigurationManager.OpenExeConfiguration(Assembly.GetEntryAssembly().Location);
 
-            
-            var valueConfig = _config.AppSettings.Settings[key].Value;
+            var settingElement = _config.AppSettings.Settings[key];
+            if (settingElement == null)
+                return default(T);
+            var valueConfig = settingElement.Value;
 
             return (T) Convert.ChangeType(valueConfig, typeof(T));
         }