diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs b/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs
index f13df43..5a224df 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs
@@ -7,7 +7,7 @@ namespace CzokoŚmieciarka.DataModels.GeneralModels.Models
 {
     public class GarbageCollector : AGarbageCollector
     {
-        public GarbageCollector(Coords startPosition, IEnumerable<AGarbageCollectorContainer> trashContainers) : base(startPosition, trashContainers)
+        public GarbageCollector(Coords startPosition, IEnumerable<AGarbageCollectorContainer> trashContainers, int columns, int rows) : base(startPosition, trashContainers, columns, rows)
         {
         }
     }
diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj
index 63428d0..c8a4a65 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -66,4 +67,73 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+=======
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CzokoŚmieciarka.DataModels</RootNamespace>
+    <AssemblyName>CzokoŚmieciarka.DataModels</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Enums\GarbageTypes.cs" />
+    <Compile Include="Exceptions.cs" />
+    <Compile Include="Enums\Directions.cs" />
+    <Compile Include="Exceptions\OutOfGridException.cs" />
+    <Compile Include="Interfaces\GarbageCollector\AGarbageCollector.cs" />
+    <Compile Include="Interfaces\GarbageCollector\IGarbageCollector.cs" />
+    <Compile Include="Interfaces\Garbage\AGarbage.cs" />
+    <Compile Include="Interfaces\Garbage\IGarbage.cs" />
+    <Compile Include="Interfaces\TrashCans\ADump.cs" />
+    <Compile Include="Interfaces\IGarbageLocalization.cs" />
+    <Compile Include="Interfaces\ITypeOfGarbage.cs" />
+    <Compile Include="Interfaces\RoutePlanningEngine\IRoutePlanningEngine.cs" />
+    <Compile Include="Interfaces\TrashCans\AGarbageCollectorContainer.cs" />
+    <Compile Include="Interfaces\TrashCans\ATrashCan.cs" />
+    <Compile Include="Interfaces\IStep.cs" />
+    <Compile Include="Models\Coords.cs" />
+    <Compile Include="Models\Map.cs" />
+    <Compile Include="Models\Steps\CollectStep.cs" />
+    <Compile Include="Models\Steps\MoveStep.cs" />
+    <Compile Include="Models\Steps\SpillStep.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+>>>>>>> 9aaa79a5c5258bc287f1041f4b31f5a40e5cf25f
 </Project>
\ No newline at end of file
diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs
new file mode 100644
index 0000000..a0c69cc
--- /dev/null
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CzokoŚmieciarka.DataModels.Exceptions
+{
+    public class OutOfGridException : Exception
+    {
+        public OutOfGridException()
+        {
+        }
+        public OutOfGridException(string message)
+      : base(message)
+        {
+        }
+
+        public OutOfGridException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
+}
diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs
index 36581ba..b606334 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,6 +36,65 @@ namespace CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector
         public Coords MoveRight()
         {
             return new Coords(Coords.X+1, Coords.Y);
+=======
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CzokoŚmieciarka.DataModels.Exceptions;
+using CzokoŚmieciarka.DataModels.Interfaces.TrashCans;
+using CzokoŚmieciarka.DataModels.Models;
+
+namespace CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector
+{
+    public abstract class AGarbageCollector : IGarbageCollector
+    {
+        public AGarbageCollector(Coords startPosition, IEnumerable<AGarbageCollectorContainer> trashContainers, int columns, int rows)
+        {
+            this.columns = columns;
+            this.rows = rows;
+            this.Coords = startPosition;
+            this.TrashContainers = trashContainers;
+        }
+        public Coords Coords { get; set; }
+        public int columns { get; set; }
+        public int rows { get; set; }
+        public void MoveUp()
+        {
+            if(Coords.Y -1 < 0)
+            {
+                throw new OutOfGridException();
+            }
+            Coords.Y -= 1;
+        }
+
+        public void MoveDown()
+        {
+            if (Coords.Y + 1 >= rows)
+            {
+                throw new OutOfGridException();
+            }
+            Coords.Y +=1;
+        }
+
+        public void MoveLeft()
+        {
+            if (Coords.X - 1 < 0)
+            {
+                throw new OutOfGridException();
+            }
+            Coords.X -= 1;
+        }
+
+        public void MoveRight()
+        {
+            if (Coords.X + 1 >= columns)
+            {
+                throw new OutOfGridException();
+            }
+            Coords.X += 1;
+>>>>>>> 9aaa79a5c5258bc287f1041f4b31f5a40e5cf25f
         }
 
         public object Clone()
diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs
index 260a030..89bc30e 100644
--- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs
+++ b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs
@@ -11,10 +11,10 @@ namespace CzokoŚmieciarka.DataModels.Interfaces
     public interface IGarbageCollector : ICloneable
     {
         Coords Coords { get; }
-        Coords MoveUp();
-        Coords MoveDown();
-        Coords MoveLeft();
-        Coords MoveRight();
+        void MoveUp();
+        void MoveDown();
+        void MoveLeft();
+        void MoveRight();
 
         IEnumerable<AGarbageCollectorContainer> TrashContainers { get; }
     }
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Interfaces/IWPFObject.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Interfaces/IWPFObject.cs
index 29b240a..6db260b 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Interfaces/IWPFObject.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Interfaces/IWPFObject.cs
@@ -11,9 +11,7 @@ namespace CzokoŚmieciarka.WPFv2.Interfaces
 {
     public interface IWPFObject
     {
-        string ImagePath { get; set; }
-        Image Image { get; set; }
+        Image Image { get; }
         Coords Coords { get; set; }
-
     }
 }
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
index bf9c145..4523793 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
@@ -47,7 +47,8 @@ namespace CzokoŚmieciarka.WPFv2
 
             if (e.Key == Key.Space)
             {
-                routePlanningEngine.PerformStep();
+                garbageCollector.MoveLeft();
+                //routePlanningEngine.PerformStep();
             }
 
             CollectorBoard.Children.Clear();
@@ -55,12 +56,18 @@ namespace CzokoŚmieciarka.WPFv2
             Grid.SetRow(garbageCollector.Image, garbageCollector.Coords.Y);
             CollectorBoard.Children.Add(garbageCollector.Image);
             Board.Children.Clear();
-            foreach (var item in Objects)
+            for (int x=0;x<Columns;x++)
             {
-                Grid.SetColumn(item.Image, item.Coords.X);
-                Grid.SetRow(item.Image, item.Coords.Y);
-                Board.Children.Add(item.Image);
+                for (int y = 0; y < Rows; y++)
+                {
+                    var item = Objects[x, y];
+                    Grid.SetColumn(item.Image, x);
+                    Grid.SetRow(item.Image, y);
+                    Board.Children.Add(item.Image);
+                }
             }
+            
+            
 
         }
 
@@ -69,7 +76,7 @@ namespace CzokoŚmieciarka.WPFv2
         {
             ColumnDefinition column;
             RowDefinition row;
-            for (int i = 0; i < Rows; i++)
+            for (int y = 0; y < Rows; y++)
             {
                 column = new ColumnDefinition();
                 row = new RowDefinition();
@@ -79,13 +86,13 @@ namespace CzokoŚmieciarka.WPFv2
                 row = new RowDefinition();
                 CollectorBoard.ColumnDefinitions.Add(column);
                 CollectorBoard.RowDefinitions.Add(row);
-                for (int j = 0; j < Columns; j++)
+                for (int x = 0; x < Columns; x++)
                 {
                     Road road = new Road();
-                    Objects[i, j] = road;
-                    Grid.SetRow(Objects[i, j].Image, i);
-                    Grid.SetColumn(Objects[i, j].Image, j);
-                    Board.Children.Add(Objects[i, j].Image);
+                    Objects[x, y] = road;
+                    Grid.SetRow(Objects[x, y].Image, y);
+                    Grid.SetColumn(Objects[x, y].Image, x);
+                    Board.Children.Add(Objects[x, y].Image);
                 }
 
             }
@@ -114,12 +121,12 @@ namespace CzokoŚmieciarka.WPFv2
                 new GarbageCollectorContainer(new TypeOfGarbage(GarbageType.PlasticMetal, 1,1),500),
                 new GarbageCollectorContainer(new TypeOfGarbage(GarbageType.Paper, 1,1), 500)
             };
-            garbageCollector = new WPFGarbageCollector(new Coords(2, 1), GarbageCollectorContainers);
+            garbageCollector = new WPFGarbageCollector(new Coords(2, 1), GarbageCollectorContainers, Columns, Rows);
             Grid.SetRow(garbageCollector.Image, garbageCollector.Coords.Y);
             Grid.SetColumn(garbageCollector.Image, garbageCollector.Coords.X);
             CollectorBoard.Children.Add(garbageCollector.Image);
             CollectorBoard.ShowGridLines = true;
-            //CollectorInfo.ItemsSource = garbageCollector.TrashContainers;
+            //CollectorInfo.ItemsSource = garbageCollector;
             //CollectorInfo.Items.Add(garbageCollector);
             //CollectorInfo.Columns.Add(new DataGridTextColumn {Header="X", Binding = new Binding("Coords.X")});
             //CollectorInfo.Columns.Add(new DataGridTextColumn { Header = "Y", Binding = new Binding("Coords.Y") });
@@ -133,8 +140,8 @@ namespace CzokoŚmieciarka.WPFv2
 
             WPFHouse house = new WPFHouse(new Coords(1, 3), trashCans);
             Objects[1, 3] = house;
-            Grid.SetRow(Objects[1, 3].Image, 1);
-            Grid.SetColumn(Objects[1, 3].Image, 3);
+            Grid.SetRow(Objects[1, 3].Image, 3);
+            Grid.SetColumn(Objects[1, 3].Image, 1);
             Board.Children.Add(Objects[1, 3].Image);
             
 
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs
index 6ea8194..64e56d8 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/GarbageCollector.cs
@@ -18,16 +18,22 @@ namespace CzokoŚmieciarka.WPFv2.Models
 {
     class WPFGarbageCollector : AGarbageCollector, IWPFObject, INotifyPropertyChanged
     {
-        public string ImagePath { get; set; }
         public Image Image { get; set; }
+        //{
+        //    get
+        //    {
+        //        return new Image
+        //        {
+        //            Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png"))
+        //        };
+        //    }
+        //}
 
-        public WPFGarbageCollector(Coords startPosition, IEnumerable<AGarbageCollectorContainer> trashContainers) : base(startPosition, trashContainers)
+        public WPFGarbageCollector(Coords startPosition, IEnumerable<AGarbageCollectorContainer> trashContainers, int columns, int rows) : base(startPosition, trashContainers, columns, rows)
         {
-            ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png";
-            Image = new Image
+            Image = new Image()
             {
-                Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory +
-                                                 @"..\..\Images\garbageCollector.png"))
+                Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\garbageCollector.png"))
             };
         }
 
@@ -38,5 +44,8 @@ namespace CzokoŚmieciarka.WPFv2.Models
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+
+
+
     }
 }
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs
index 03cec39..eb7b999 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/House.cs
@@ -17,16 +17,20 @@ namespace CzokoŚmieciarka.WPFv2.Models
     {
         public Coords Coords { get; set; }
         public IEnumerable<ATrashCan> TrashCans { get; set; }
-        public string ImagePath { get; set; }
         public Image Image { get; set; }
+        //{ get {
+        //        return new Image
+        //        {
+        //            Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\house.png"))
+        //        };
+        //    } }
 
 
         public WPFHouse(Coords coords, IEnumerable<ATrashCan> trashCans)
         {
-            ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\house.png";
-            Image = new Image
+            Image = new Image()
             {
-                Source = new BitmapImage(new Uri(ImagePath))
+                Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\house.png"))
             };
             TrashCans = trashCans;
             Coords = coords;
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs
index ddcc2a2..d50abb3 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/Models/Road.cs
@@ -14,17 +14,26 @@ namespace CzokoŚmieciarka.WPFv2.Models
 {
     class Road : IWPFObject, IRoad
     {
-        public string ImagePath { get; set; }
         public Image Image { get; set; }
-        public Coords Coords { get; set; }
+        //{
+        //    get
+        //    {
+        //        return new Image
+        //        {
+        //            Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\intersection.png"))
+        //        };
+        //    }
+        //}
 
         public Road()
         {
-            ImagePath = AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\intersection.png";
-            Image = new Image
+            Image = new Image()
             {
-                Source = new BitmapImage(new Uri(ImagePath))
+                Source =
+                    new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + @"..\..\Images\intersection.png"))
             };
         }
+
+        public Coords Coords { get; set; }
     }
 }
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.config b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.config
new file mode 100644
index 0000000..731f6de
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml
new file mode 100644
index 0000000..d4d1f6d
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="CzokoŚmierciarka.WPF2._0.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:CzokoŚmierciarka.WPF2._0"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml.cs
new file mode 100644
index 0000000..a84f868
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace CzokoŚmierciarka.WPF2._0
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/CzokoŚmierciarka.WPF2.0.csproj b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/CzokoŚmierciarka.WPF2.0.csproj
new file mode 100644
index 0000000..74bae35
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/CzokoŚmierciarka.WPF2.0.csproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6EE3CBC0-CD10-41D8-9282-FF91DCFB9D67}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>CzokoŚmierciarka.WPF2._0</RootNamespace>
+    <AssemblyName>CzokoŚmierciarka.WPF2.0</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml
new file mode 100644
index 0000000..449d76f
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml
@@ -0,0 +1,14 @@
+<Window x:Class="CzokoŚmierciarka.WPF2._0.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CzokoŚmierciarka.WPF2._0"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="800" Width="1000">
+    <Grid>
+        <Grid x:Name="Board" Margin="0,0,200,0">
+            
+        </Grid>
+    </Grid>
+</Window>
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml.cs
new file mode 100644
index 0000000..d87befe
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/MainWindow.xaml.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CzokoŚmierciarka.WPF2._0
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+            for(int i = 0; i < 10; i++)
+            {
+                ColumnDefinition column = new ColumnDefinition();
+                RowDefinition row = new RowDefinition();
+                Board.ColumnDefinitions.Add(column);
+                Board.RowDefinitions.Add(row);
+            }
+            Board.Set
+        }
+    }
+}
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Models/House.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Models/House.cs
new file mode 100644
index 0000000..b0e0cab
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Models/House.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CzokoŚmierciarka.WPF2._0.Models
+{
+    class House
+    {
+    }
+}
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/AssemblyInfo.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..78e4e9b
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CzokoŚmierciarka.WPF2.0")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CzokoŚmierciarka.WPF2.0")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.Designer.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..bee5fca
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CzokoŚmierciarka.WPF2._0.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CzokoŚmierciarka.WPF2._0.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.resx b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.Designer.cs b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..ebdd33d
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CzokoŚmierciarka.WPF2._0.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.settings b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/Trunk/Interface/CzokoŚmierciarka.WPF2.0/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file