diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzz.Logic.csproj b/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzz.Logic.csproj
new file mode 100644
index 0000000..8dffc1a
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzz.Logic.csproj
@@ -0,0 +1,47 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FizzBuzz.Logic</RootNamespace>
+    <AssemblyName>FizzBuzz.Logic</AssemblyName>
+  </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.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FizzBuzzResolver.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzzResolver.cs b/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzzResolver.cs
new file mode 100644
index 0000000..4698278
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Logic/FizzBuzzResolver.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FizzBuzz.Logic
+{
+    public class FizzBuzzResolver
+    {
+        public string GetFizzBuzz(int number)
+        {
+            string result = "";
+            if (number % 3 == 0 || number.ToString().Contains("3"))
+                result += "Fizz";
+            if (number % 5 == 0 || number.ToString().Contains("5"))
+                result += "Buzz";
+
+            if (result == "")
+                result = number.ToString();
+
+            return result;
+            
+        }
+    }
+}
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/Properties/AssemblyInfo.cs b/eltoby/FizzBuzz/FizzBuzz.Logic/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3c56093
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Logic/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("FizzBuzz.Logic")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("FizzBuzz.Logic")]
+[assembly: AssemblyCopyright("Copyright ©  2011")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3f980cfa-b119-41fe-86eb-f86509d3dfe2")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.dll b/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.dll
new file mode 100644
index 0000000..d725b44
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.dll differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.pdb b/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.pdb
new file mode 100644
index 0000000..e2e4e65
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Logic/bin/Debug/FizzBuzz.Logic.pdb differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.dll b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.dll
new file mode 100644
index 0000000..d725b44
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.dll differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.pdb b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.pdb
new file mode 100644
index 0000000..e2e4e65
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/Debug/FizzBuzz.Logic.pdb differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Logic/obj/FizzBuzz.Logic.csproj.FileListAbsolute.txt b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/FizzBuzz.Logic.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..8c20232
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Logic/obj/FizzBuzz.Logic.csproj.FileListAbsolute.txt
@@ -0,0 +1,5 @@
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Logic\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Logic\bin\Debug\FizzBuzz.Logic.dll
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Logic\bin\Debug\FizzBuzz.Logic.pdb
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Logic\obj\Debug\FizzBuzz.Logic.dll
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Logic\obj\Debug\FizzBuzz.Logic.pdb
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/FizzBuzz.Test.csproj b/eltoby/FizzBuzz/FizzBuzz.Test/FizzBuzz.Test.csproj
new file mode 100644
index 0000000..6f34293
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Test/FizzBuzz.Test.csproj
@@ -0,0 +1,53 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FizzBuzz.Test</RootNamespace>
+    <AssemblyName>FizzBuzz.Test</AssemblyName>
+  </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.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FizzBuzz.Logic\FizzBuzz.Logic.csproj">
+      <Project>{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}</Project>
+      <Name>FizzBuzz.Logic</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/Program.cs b/eltoby/FizzBuzz/FizzBuzz.Test/Program.cs
new file mode 100644
index 0000000..79bc82f
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Test/Program.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FizzBuzz.Logic;
+namespace FizzBuzz.Test
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            FizzBuzzResolver f = new FizzBuzzResolver();
+            for (int i = 0; i <= 100; i++)
+                Console.WriteLine(f.GetFizzBuzz(i));
+
+            Console.WriteLine("Test Ended. Press Enter to continue...");
+            Console.Read();
+        }
+    }
+}
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/Properties/AssemblyInfo.cs b/eltoby/FizzBuzz/FizzBuzz.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..09a687f
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("FizzBuzz.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("FizzBuzz.Test")]
+[assembly: AssemblyCopyright("Copyright ©  2011")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("20a3d9e7-bc6c-49f5-9685-fbc8383fe008")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.dll b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.dll
new file mode 100644
index 0000000..d725b44
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.dll differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.pdb b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.pdb
new file mode 100644
index 0000000..e2e4e65
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Logic.pdb differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.exe b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.exe
new file mode 100644
index 0000000..c166941
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.exe differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.pdb b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.pdb
new file mode 100644
index 0000000..a374a09
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.pdb differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.vshost.exe b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.vshost.exe
new file mode 100644
index 0000000..ce3f102
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/bin/Debug/FizzBuzz.Test.vshost.exe differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.exe b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.exe
new file mode 100644
index 0000000..c166941
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.exe differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.pdb b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.pdb
new file mode 100644
index 0000000..a374a09
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/FizzBuzz.Test.pdb differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/ResolveAssemblyReference.cache b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/ResolveAssemblyReference.cache
new file mode 100644
index 0000000..d06eb6b
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.Test/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/eltoby/FizzBuzz/FizzBuzz.Test/obj/FizzBuzz.Test.csproj.FileListAbsolute.txt b/eltoby/FizzBuzz/FizzBuzz.Test/obj/FizzBuzz.Test.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..f8cf562
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.Test/obj/FizzBuzz.Test.csproj.FileListAbsolute.txt
@@ -0,0 +1,7 @@
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\bin\Debug\FizzBuzz.Test.exe
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\bin\Debug\FizzBuzz.Test.pdb
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\bin\Debug\FizzBuzz.Logic.dll
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\bin\Debug\FizzBuzz.Logic.pdb
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\obj\Debug\FizzBuzz.Test.exe
+C:\Users\root\12Katas\Marzo-FizzBuzz\eltoby\FizzBuzz\FizzBuzz.Test\obj\Debug\FizzBuzz.Test.pdb
diff --git a/eltoby/FizzBuzz/FizzBuzz.sln b/eltoby/FizzBuzz/FizzBuzz.sln
new file mode 100644
index 0000000..29aaea6
--- /dev/null
+++ b/eltoby/FizzBuzz/FizzBuzz.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzBuzz.Logic", "FizzBuzz.Logic\FizzBuzz.Logic.csproj", "{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzBuzz.Test", "FizzBuzz.Test\FizzBuzz.Test.csproj", "{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F4E75E6-8CBE-4288-BB64-B128CD09C1E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C2B93B4-4A1C-43A4-B7D0-D4A59146A41E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/eltoby/FizzBuzz/FizzBuzz.suo b/eltoby/FizzBuzz/FizzBuzz.suo
new file mode 100644
index 0000000..9f1f241
Binary files /dev/null and b/eltoby/FizzBuzz/FizzBuzz.suo differ